Fix: Socket leak on handshake failure and incomplete Connect message

Author: SBALAVIGNESH123

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

@@ -729,27 +729,36 @@ public void run() {
                                     // Start message processing thread
                                     new Thread(connection).start();
 
-                                    // Send our identity to the watch
-                                    String localId = getLocalNodeId();
-                                    connection.writeMessage(
-                                        new RootMessage.Builder()
-                                            .connect(new Connect.Builder()
-                                                .id(localId)
-                                                .name("Phone")
-                                                .build())
-                                            .build()
-                                    );
+                                    try {
+                                        // Send our identity to the watch
+                                        String localId = getLocalNodeId();
+                                        connection.writeMessage(
+                                            new RootMessage.Builder()
+                                                .connect(new Connect.Builder()
+                                                    .id(localId)
+                                                    .name("Phone")
+                                                    .networkId(localId)
+                                                    .peerAndroidId(localId)
+                                                    .peerVersion(2)
+                                                    .build())
+                                                .build()
+                                        );
+                                    } catch (IOException e) {
+                                        Log.w(TAG, "Handshake failed, closing connection", e);
+                                        connection.close();
+                                    }
                                 }
                             } catch (IOException e) {
                                 Log.d(TAG, "BT connection failed: " + e.getMessage());
-                                if (socket != null) {
+                                if (socket != null && !socket.isConnected()) {
                                     try {
                                         socket.close();
                                     } catch (IOException closeErr) {
                                         // Ignore
                                     }
                                 }
                             }
+
                         }
                     }
                 } catch (Exception e) {