Fixed back button in card tree and fixed connection shutdown

Signed-off-by: Brandyn A. White <[email protected]>

Author: Brandyn A. White

android/WearScript/libs/android-websockets.jar

@@ -87,6 +87,15 @@ static public String getDefaultUrl() {
         return (new String(wsUrlArray)).trim();
     }
 
+    public boolean treeBack() {
+        synchronized (lock) {
+            if (cardTree == null || cardTree.isRootCurrent())
+                return true;
+            cardTree.back();
+            return false;
+        }
+    }
+
     public void updateActivityView(final String mode) {
         if (activity == null)
             return;

android/WearScript/src/main/java/com/dappervision/wearscript/BackgroundService.java

@@ -176,8 +176,12 @@ private void setDeviceChannels(String device, Value[] channels) {
 
     public void connect(URI uri) {
         synchronized (this) {
+            if (shutdown) {
+                Log.w(TAG, "Trying to connect while shutdown");
+                return;
+            }
             Log.i(TAG, uri.toString());
-            if (uri.equals(this.uri) && client.isConnected()) {
+            if (uri.equals(this.uri) && connected) {
                 onConnect();
                 return;
             }
@@ -245,6 +249,7 @@ public void shutdown() {
         synchronized (this) {
             this.shutdown = true;
             disconnect();
+            client.getHandlerThread().getLooper().quit();
         }
     }
 
@@ -262,7 +267,7 @@ public void run() {
                     while (true) {
                         Log.w(TAG, "Lifecycle: Trying to reconnect...");
                         synchronized (WearScriptConnection.this) {
-                            if (client.isConnected() || shutdown) {
+                            if (connected || shutdown) {
                                 reconnecting = false;
                                 break;
                             }
@@ -281,7 +286,7 @@ public void run() {
                         // NOTE(brandyn): This ensures that we at least leave this thread with one of...
                         // 1.) socket connected (disconnect after this would trigger a reconnect)
                         // 2.) another thread that will try again
-                        if (!client.isConnected() && !shutdown)
+                        if (!connected && !shutdown)
                             reconnect();
                     }
                 }
@@ -313,20 +318,24 @@ public void onMessage(String s) {
         @Override
         public void onDisconnect(int i, String s) {
             Log.w(TAG, "Lifecycle: Underlying socket disconnected: i: " + i + " s: " + s);
-            if (shutdown)
-                return;
+            synchronized (this) {
+                connected = false;
+                if (shutdown)
+                    return;
+            }
             WearScriptConnection.this.onDisconnect();
-            connected = false;
             reconnect();
         }
 
         @Override
         public void onError(Exception e) {
             Log.w(TAG, "Lifecycle: Underlying socket errored: " + e.getLocalizedMessage());
-            if (shutdown)
-                return;
+            synchronized (this) {
+                connected = false;
+                if (shutdown)
+                    return;
+            }
             WearScriptConnection.this.onDisconnect();
-            connected = false;
             reconnect();
         }
 

android/WearScript/src/main/java/com/dappervision/wearscript/SocketClient.java

@@ -106,6 +106,7 @@ public void onEvent(ChannelUnsubscribeEvent e) {
 
     public void shutdown() {
         synchronized (this) {
+            super.shutdown();
             connection.shutdown();
         }
     }

android/WearScript/src/main/java/com/dappervision/wearscript/WearScriptConnection.java

@@ -110,6 +110,13 @@ public void onResume() {
         super.onResume();
     }
 
+    @Override
+    public void onBackPressed() {
+        Log.d(TAG, "Back pressed");
+        if (bs == null || bs.treeBack())
+            super.onBackPressed();
+    }
+
     public void onDestroy() {
         Log.i(TAG, "Lifecycle: ScriptActivity: onDestroy");
         getWindow().clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);