* actually call stop on client

* InterruptedException resets interrupted flag, move to boolean and exit command to simplify handling (we can get SocketException first)
inckie · Apr 12, 2024 · 31374fb · 31374fb
1 parent e91cec4
commit 31374fb
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 6 deletions.
diff --git a/glass-ee/src/main/java/com/damn/anotherglass/glass/ee/host/core/HostService.kt b/glass-ee/src/main/java/com/damn/anotherglass/glass/ee/host/core/HostService.kt
@@ -56,6 +56,7 @@ class HostService(private val context: Context) {
     fun stop() {
         Log.i(TAG, "HostService stopped")
         gps.remove()
+        client.stop()
     }
 
     companion object {

diff --git a/glass-ee/src/main/java/com/damn/anotherglass/glass/ee/host/core/WiFiClient.kt b/glass-ee/src/main/java/com/damn/anotherglass/glass/ee/host/core/WiFiClient.kt
@@ -82,11 +82,14 @@ class WiFiClient : IRPCClient {
             val iss = socket.getInputStream()
             val oos = ObjectOutputStream(socket.getOutputStream())
             val ois = ObjectInputStream(iss)
-            while (!isInterrupted) {
+            while (true) {
                 while (null != mQueue.peek()) {
                     val message = mQueue.take()
                     oos.writeObject(message)
                     oos.flush()
+                    if (message.service == null) {
+                        return // disconnect requested
+                    }
                 }
                 while (iss.available() > 0) {
                     val message = ois.readObject() as RPCMessage
@@ -104,8 +107,9 @@ class WiFiClient : IRPCClient {
         }
 
         fun shutdown() {
+            // send empty message to notify host we are shutting down (we do not guarantee it will be sent though)
             // we do not keep the socket reference, so just wait till next iteration
-            interrupt()
+            mQueue.add(RPCMessage(null, null))
         }
 
     }

diff --git a/mobile/src/main/java/com/damn/anotherglass/core/WiFiHost.kt b/mobile/src/main/java/com/damn/anotherglass/core/WiFiHost.kt
@@ -65,9 +65,11 @@ class WiFiHost(listener: RPCMessageListener) : IRPCHost {
         private var mServerSocket: ServerSocket? = null
         @Volatile
         private var mSocket: Socket? = null
+        @Volatile
+        private var mActive = true
 
         override fun run() {
-            while (!isInterrupted) {
+            while (mActive) {
                 try {
                     mHandler.onWaiting()
                     ServerSocket(Constants.defaultPort).use { serverSocket ->
@@ -101,13 +103,16 @@ class WiFiHost(listener: RPCMessageListener) : IRPCHost {
             val iss = socket.getInputStream()
             val oos = ObjectOutputStream(socket.getOutputStream())
             val ois = ObjectInputStream(iss)
-            while (!isInterrupted) {
+            while (mActive) {
                 while (mQueue.peek() != null) {
                     val message = mQueue.take()
                     oos.writeObject(message)
                     oos.flush()
+                    if (message.service == null) {
+                        return // disconnect requested
+                    }
                 }
-                while (iss.available() > 0) {
+                while (mActive && iss.available() > 0) {
                     val message = ois.readObject() as RPCMessage
                     if (message.service == null) {
                         return // client disconnected
@@ -119,7 +124,9 @@ class WiFiHost(listener: RPCMessageListener) : IRPCHost {
         }
 
         fun shutdown() {
-            interrupt()
+            // send empty message to notify host we are shutting down (we do not guarantee it will be sent though)
+            mQueue.add(RPCMessage(null, null))
+            mActive = false
             Closeables.close(mSocket)
             Closeables.close(mServerSocket)
         }