Should not crash app when StateSync fails to bind.

futo-org · Dec 6, 2024 · 7c9e9d5 · 7c9e9d5
1 parent 4066ce7
commit 7c9e9d5
Showing 1 changed file with 13 additions and 8 deletions.
diff --git a/app/src/main/java/com/futo/platformplayer/states/StateSync.kt b/app/src/main/java/com/futo/platformplayer/states/StateSync.kt
@@ -112,18 +112,23 @@ class StateSync {
         Logger.i(TAG, "Sync key pair initialized (public key = ${publicKey})")
 
         _thread = Thread {
-            val serverSocket = ServerSocket(PORT)
-            _serverSocket = serverSocket
+            try {
+                val serverSocket = ServerSocket(PORT)
+                _serverSocket = serverSocket
 
-            Log.i(TAG, "Running on port ${PORT} (TCP)")
+                Log.i(TAG, "Running on port ${PORT} (TCP)")
 
-            while (_started) {
-                val socket = serverSocket.accept()
-                val session = createSocketSession(socket, true) { session, socketSession ->
+                while (_started) {
+                    val socket = serverSocket.accept()
+                    val session = createSocketSession(socket, true) { session, socketSession ->
 
+                    }
+
+                    session.startAsResponder()
                 }
-
-                session.startAsResponder()
+            } catch (e: Throwable) {
+                Logger.e(TAG, "Failed to bind server socket to port ${PORT}", e)
+                UIDialogs.toast("Failed to start sync, port in use")
             }
         }.apply { start() }