From 5262f08184982bd360f1844a877ff430ec355322 Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Tue, 17 Oct 2017 09:03:57 +0200
Subject: [PATCH] Removes the idiotic decision of myself to store ports in
signed shorts.
---
.../java/de/kuschku/quasseldroid_ng/ui/chat/ChatActivity.kt | 2 +-
.../main/java/de/kuschku/libquassel/session/SocketAddress.kt | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/ChatActivity.kt b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/ChatActivity.kt
index be2ccd8d0..89ec4a464 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/ChatActivity.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/ChatActivity.kt
@@ -106,7 +106,7 @@ class ChatActivity : ServiceBoundActivity() {
finish()
} else {
backendValue.connectUnlessConnected(
- SocketAddress(account.host, account.port.toShort()),
+ SocketAddress(account.host, account.port),
account.user,
account.pass,
true
diff --git a/lib/src/main/java/de/kuschku/libquassel/session/SocketAddress.kt b/lib/src/main/java/de/kuschku/libquassel/session/SocketAddress.kt
index 5b7685c76..3f7214c59 100644
--- a/lib/src/main/java/de/kuschku/libquassel/session/SocketAddress.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/session/SocketAddress.kt
@@ -2,6 +2,6 @@ package de.kuschku.libquassel.session
import java.net.InetSocketAddress
-data class SocketAddress(val host: String, val port: Short) {
- fun data() = InetSocketAddress(host, port.toInt())
+data class SocketAddress(val host: String, val port: Int) {
+ fun data() = InetSocketAddress(host, port)
}
--
GitLab