integrate TransportConnectionHandler class

Author: deadYokai

play-services-wearable/core/src/main/java/org/microg/gms/wearable/bluetooth/BluetoothConnectionThread.java

@@ -19,6 +19,7 @@
 import com.google.android.gms.wearable.ConnectionConfiguration;
 
 import org.microg.gms.wearable.MessageHandler;
+import org.microg.gms.wearable.TransportConnectionHandler;
 import org.microg.gms.wearable.WearableConnection;
 import org.microg.gms.wearable.WearableImpl;
 import org.microg.gms.wearable.proto.Connect;
@@ -209,11 +210,21 @@ private void connect() throws IOException, InterruptedException {
         isConnected = true;
         markActivity();
 
-        wearableConnection = new BluetoothWearableConnection(
-                socket, config.nodeId,
-                new ConnectionListener(context, config, wearableImpl, this)
-        );
-        wearableConnection.run();
+        BluetoothWearableConnection btConn =
+                  new BluetoothWearableConnection(socket, config.nodeId,
+                          new WearableConnection.Listener() {
+                              public void onConnected(WearableConnection c) {}
+                              public void onMessage(WearableConnection c, RootMessage m) {}
+                              public void onDisconnected() {}
+                          });
+          wearableConnection = btConn;
+
+          if (!btConn.handshake()) {
+              Log.e(TAG, "Handshake failed");
+              return;
+          }
+
+          new TransportConnectionHandler(wearableImpl, config).handle(btConn);
     }
 
     @RequiresPermission(Manifest.permission.BLUETOOTH_CONNECT)
@@ -468,57 +479,4 @@ public void close(){
         signalRetry();
         interrupt();
     }
-
-    private static class ConnectionListener implements WearableConnection.Listener {
-        private final Context context;
-        private final ConnectionConfiguration config;
-        private final WearableImpl wearableImpl;
-        private Connect peerConnect;
-        private WearableConnection connection;
-
-        private final BluetoothConnectionThread thread;
-
-        private MessageHandler messageHandler;
-
-        public ConnectionListener(Context context, ConnectionConfiguration config, WearableImpl wearableImpl, BluetoothConnectionThread thread) {
-            this.context = context;
-            this.config = config;
-            this.wearableImpl = wearableImpl;
-            this.thread = thread;
-        }
-
-        @Override
-        public void onConnected(WearableConnection connection) {
-            Log.d(TAG, "Wearable connection established for " + config.address);
-            thread.markActivity();
-            thread.isConnected = true;
-
-            this.connection = connection;
-
-            BluetoothWearableConnection btConnection = (BluetoothWearableConnection) connection;
-            this.peerConnect = btConnection.getPeerConnect();
-
-            this.messageHandler = new MessageHandler(context, wearableImpl, config);
-
-            wearableImpl.onConnectReceived(connection, config.nodeId, peerConnect);
-        }
-
-        @Override
-        public void onMessage(WearableConnection connection, RootMessage message) {
-            Log.d(TAG, "Message received from " + config.address + ": " + message.toString());
-            thread.markActivity();
-
-            if (peerConnect != null && messageHandler != null)
-                messageHandler.handleMessage(connection, peerConnect.id, message);
-        }
-
-        @Override
-        public void onDisconnected() {
-            Log.d(TAG, "Wearable connection disconnected for " + config.address);
-            thread.isConnected = false;
-            if (connection != null && peerConnect != null) {
-                wearableImpl.onDisconnectReceived(connection, peerConnect);
-            }
-        }
-    }
 }

play-services-wearable/core/src/main/java/org/microg/gms/wearable/bluetooth/BluetoothWearableConnection.java

@@ -62,7 +62,7 @@ public BluetoothWearableConnection(BluetoothSocket socket, String localNodeId, L
         }
     }
 
-    private boolean handshake() {
+    public boolean handshake() {
         Log.d(TAG, "Starting handshake, local node ID: " + localNodeId);
 
         final AtomicBoolean timedOut = new AtomicBoolean(false);

play-services-wearable/core/src/main/java/org/microg/gms/wearable/network/NetworkConnectionThread.java

@@ -7,6 +7,7 @@
 
 import org.microg.gms.wearable.MessageHandler;
 import org.microg.gms.wearable.SocketWearableConnection;
+import org.microg.gms.wearable.TransportConnectionHandler;
 import org.microg.gms.wearable.WearableConnection;
 import org.microg.gms.wearable.WearableImpl;
 import org.microg.gms.wearable.WearableReader;
@@ -101,25 +102,7 @@ private void connect() throws IOException {
         Log.d(TAG, "Connected to " + config.address);
 
         SocketWearableConnection raw = new SocketWearableConnection(socket, null);
-        MessageHandler msgHandler = new MessageHandler(context, wearable, config);
-        WearableWriter writer = new WearableWriter(config.address, raw);
-        QueueingConnection facade = new QueueingConnection(writer);
-        WearableReader reader = new WearableReader(config.address, raw, facade, msgHandler);
-
-        activeWriter = writer;
-
-        writer.start();
-        reader.start();
-
-        reader.awaitFinished();
-
-        writer.close();
-        writer.awaitFinished();
-
-        try {
-            raw.close();
-        } catch (IOException ignore) {}
-
+        new TransportConnectionHandler(wearable, config).handle(raw);
         activeWriter = null;
     }
 
@@ -230,44 +213,4 @@ private void teardown() {
             activeSocket = null;
         }
     }
-
-    private static final class QueueingConnection extends WearableConnection {
-        private static final Listener NO_OP = new Listener() {
-            @Override
-            public void onConnected(WearableConnection connection) {}
-
-            @Override
-            public void onMessage(WearableConnection connection, RootMessage message) {}
-
-            @Override
-            public void onDisconnected() {}
-        };
-
-        private final WearableWriter writer;
-
-        QueueingConnection(WearableWriter writer) {
-            super(NO_OP);
-            this.writer = writer;
-        }
-
-        @Override
-        public void writeMessage(RootMessage message) throws IOException {
-            writer.enqueue(message);
-        }
-
-        @Override
-        protected void writeMessagePiece(MessagePiece piece) throws IOException {
-            throw new UnsupportedOperationException("write-only facade");
-        }
-
-        @Override
-        protected MessagePiece readMessagePiece() throws IOException {
-            throw new UnsupportedOperationException("write-only facade");
-        }
-
-        @Override
-        public void close() throws IOException {
-            writer.close();
-        }
-    }
 }