General cleanup on AppRTC Android Demo codebase

webrtc/examples/androidapp/src/org/appspot/apprtc/WebSocketChannelClient.java

 /*
  *  Copyright 2014 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 47 matching lines @@
    */
   public enum WebSocketConnectionState {
     NEW, CONNECTED, REGISTERED, CLOSED, ERROR
   };
 
   /**
    * Callback interface for messages delivered on WebSocket.
    * All events are dispatched from a looper executor thread.
    */
   public interface WebSocketChannelEvents {
-    public void onWebSocketMessage(final String message);
-    public void onWebSocketClose();
-    public void onWebSocketError(final String description);
+    void onWebSocketMessage(final String message);
+    void onWebSocketClose();
+    void onWebSocketError(final String description);
   }
 
   public WebSocketChannelClient(LooperExecutor executor, WebSocketChannelEvents events) {
     this.executor = executor;
     this.events = events;
     roomID = null;
     clientID = null;
     wsSendQueue = new LinkedList<String>();
     state = WebSocketConnectionState.NEW;
   }
@@ skipping 25 matching lines @@
   }
 
   public void register(final String roomID, final String clientID) {
     checkIfCalledOnValidThread();
     this.roomID = roomID;
     this.clientID = clientID;
     if (state != WebSocketConnectionState.CONNECTED) {
       Log.w(TAG, "WebSocket register() in state " + state);
       return;
     }
-    Log.d(TAG, "Registering WebSocket for room " + roomID + ". CLientID: " + clientID);
+    Log.d(TAG, "Registering WebSocket for room " + roomID + ". ClientID: " + clientID);
     JSONObject json = new JSONObject();
     try {
       json.put("cmd", "register");
       json.put("roomid", roomID);
       json.put("clientid", clientID);
       Log.d(TAG, "C->WSS: " + json.toString());
       ws.sendTextMessage(json.toString());
       state = WebSocketConnectionState.REGISTERED;
       // Send any previously accumulated messages.
       for (String sendMessage : wsSendQueue) {
@@ skipping 25 matching lines @@
           json.put("cmd", "send");
           json.put("msg", message);
           message = json.toString();
           Log.d(TAG, "C->WSS: " + message);
           ws.sendTextMessage(message);
         } catch (JSONException e) {
           reportError("WebSocket send JSON error: " + e.getMessage());
         }
         break;
     }
-    return;
   }
 
   // This call can be used to send WebSocket messages before WebSocket
   // connection is opened.
   public void post(String message) {
     checkIfCalledOnValidThread();
     sendWSSMessage("POST", message);
   }
 
   public void disconnect(boolean waitForComplete) {
     checkIfCalledOnValidThread();
-    Log.d(TAG, "Disonnect WebSocket. State: " + state);
+    Log.d(TAG, "Disconnect WebSocket. State: " + state);
     if (state == WebSocketConnectionState.REGISTERED) {
       // Send "bye" to WebSocket server.
       send("{\"type\": \"bye\"}");
       state = WebSocketConnectionState.CONNECTED;
       // Send http DELETE to http WebSocket server.
       sendWSSMessage("DELETE", "");
     }
     // Close WebSocket in CONNECTED or ERROR states only.
     if (state == WebSocketConnectionState.CONNECTED
         || state == WebSocketConnectionState.ERROR) {
       ws.disconnect();
       state = WebSocketConnectionState.CLOSED;
 
       // Wait for websocket close event to prevent websocket library from
       // sending any pending messages to deleted looper thread.
       if (waitForComplete) {
         synchronized (closeEventLock) {
           while (!closeEvent) {
             try {
               closeEventLock.wait(CLOSE_TIMEOUT);
               break;
             } catch (InterruptedException e) {
               Log.e(TAG, "Wait error: " + e.toString());
             }
           }
         }
       }
     }
-    Log.d(TAG, "Disonnecting WebSocket done.");
+    Log.d(TAG, "Disconnecting WebSocket done.");
   }
 
   private void reportError(final String errorMessage) {
     Log.e(TAG, errorMessage);
     executor.execute(new Runnable() {
       @Override
       public void run() {
         if (state != WebSocketConnectionState.ERROR) {
           state = WebSocketConnectionState.ERROR;
           events.onWebSocketError(errorMessage);
@@ skipping 82 matching lines @@
     @Override
     public void onRawTextMessage(byte[] payload) {
     }
 
     @Override
     public void onBinaryMessage(byte[] payload) {
     }
   }
 
 }