Fix Typo, refactor

microg · Feb 6, 2016 · c12fe11 · c12fe11
1 parent e6d59dc
commit c12fe11
Show file tree

Hide file tree

Showing 3 changed files with 62 additions and 58 deletions.
diff --git a/wearable-lib/src/main/java/org/microg/wearable/MessageListener.java b/wearable-lib/src/main/java/org/microg/wearable/MessageListener.java
@@ -56,7 +56,7 @@ public void onMessage(WearableConnection connection, RootMessage message) {
         } else if (message.rcpRequest != null) {
             onRcpRequest(message.rcpRequest);
         } else if (message.heartbeat != null) {
-            onHearbeat(message.heartbeat);
+            onHeartbeat(message.heartbeat);
         } else if (message.filePiece != null) {
             onFilePiece(message.filePiece);
         } else if (message.channelRequest != null) {
@@ -78,7 +78,7 @@ public void onMessage(WearableConnection connection, RootMessage message) {
 
     public abstract void onRcpRequest(Request rcpRequest);
 
-    public abstract void onHearbeat(Heartbeat heartbeat);
+    public abstract void onHeartbeat(Heartbeat heartbeat);
 
     public abstract void onFilePiece(FilePiece filePiece);
 

diff --git a/wearable-tools/src/main/java/org/microg/wearable/tools/SocketProxy.java b/wearable-tools/src/main/java/org/microg/wearable/tools/SocketProxy.java
@@ -29,73 +29,77 @@ public class SocketProxy {
     private static RootMessage clientConnect;
 
     public static void main(String[] args) throws IOException {
-        SocketWearableConnection.serverListen(5601, new WearableConnection.Listener() {
-            @Override
-            public void onConnected(WearableConnection connection) {
-                synchronized (this) {
-                    server = connection;
-                    if (clientConnect != null) {
-                        try {
-                            server.writeMessage(clientConnect);
-                        } catch (IOException e) {
-                            throw new RuntimeException(e);
-                        }
+        SocketWearableConnection.serverListen(5601, new ProxyServerListener());
+        SocketWearableConnection.clientConnect(5602, new ProxyClientListener());
+    }
+
+    private static class ProxyServerListener implements WearableConnection.Listener {
+        @Override
+        public void onConnected(WearableConnection connection) {
+            synchronized (this) {
+                server = connection;
+                if (clientConnect != null) {
+                    try {
+                        server.writeMessage(clientConnect);
+                    } catch (IOException e) {
+                        throw new RuntimeException(e);
                     }
                 }
-                System.out.println("[Server]onConnected: " + connection);
             }
+            System.out.println("[Server]onConnected: " + connection);
+        }
 
-            @Override
-            public void onMessage(WearableConnection connection, RootMessage message) {
-                System.out.println("[Server]onMessage: " + message);
-                if (message.connect != null) {
-                    synchronized (this) {
-                        if (client == null) {
-                            serverConnect = message;
-                            return;
-                        }
+        @Override
+        public void onMessage(WearableConnection connection, RootMessage message) {
+            System.out.println("[Server]onMessage: " + message);
+            if (message.connect != null) {
+                synchronized (this) {
+                    if (client == null) {
+                        serverConnect = message;
+                        return;
                     }
                 }
-                try {
-                    client.writeMessage(message);
-                } catch (IOException e) {
-                    throw new RuntimeException(e);
-                }
             }
-        });
-        SocketWearableConnection.clientConnect(5602, new WearableConnection.Listener() {
-            @Override
-            public void onConnected(WearableConnection connection) {
-                synchronized (this) {
-                    client = connection;
-                    if (serverConnect != null) {
-                        try {
-                            client.writeMessage(serverConnect);
-                        } catch (IOException e) {
-                            throw new RuntimeException(e);
-                        }
+            try {
+                client.writeMessage(message);
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+        }
+    }
+
+    private static class ProxyClientListener implements WearableConnection.Listener {
+        @Override
+        public void onConnected(WearableConnection connection) {
+            synchronized (this) {
+                client = connection;
+                if (serverConnect != null) {
+                    try {
+                        client.writeMessage(serverConnect);
+                    } catch (IOException e) {
+                        throw new RuntimeException(e);
                     }
                 }
-                System.out.println("[Client]onConnected: " + connection);
             }
+            System.out.println("[Client]onConnected: " + connection);
+        }
 
-            @Override
-            public void onMessage(WearableConnection connection, RootMessage message) {
-                System.out.println("[Client]onMessage: " + message);
-                if (message.connect != null) {
-                    synchronized (this) {
-                        if (server == null) {
-                            clientConnect = message;
-                            return;
-                        }
+        @Override
+        public void onMessage(WearableConnection connection, RootMessage message) {
+            System.out.println("[Client]onMessage: " + message);
+            if (message.connect != null) {
+                synchronized (this) {
+                    if (server == null) {
+                        clientConnect = message;
+                        return;
                     }
                 }
-                try {
-                    server.writeMessage(message);
-                } catch (IOException e) {
-                    throw new RuntimeException(e);
-                }
             }
-        });
+            try {
+                server.writeMessage(message);
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+        }
     }
 }
diff --git a/wearable-tools/src/main/java/org/microg/wearable/tools/SocketServer.java b/wearable-tools/src/main/java/org/microg/wearable/tools/SocketServer.java
@@ -77,8 +77,8 @@ public void onRcpRequest(Request rcpRequest) {
         }
 
         @Override
-        public void onHearbeat(Heartbeat heartbeat) {
-            Log.d(TAG, "onHearbeat: " + heartbeat);
+        public void onHeartbeat(Heartbeat heartbeat) {
+            Log.d(TAG, "onHeartbeat: " + heartbeat);
         }
 
         @Override