diff --git a/talk/examples/android/src/org/appspot/apprtc/AppRTCClient.java b/talk/examples/android/src/org/appspot/apprtc/AppRTCClient.java index 034ce5517..97bebe17b 100644 --- a/talk/examples/android/src/org/appspot/apprtc/AppRTCClient.java +++ b/talk/examples/android/src/org/appspot/apprtc/AppRTCClient.java @@ -106,7 +106,7 @@ public interface AppRTCClient { /** * Callback interface for messages delivered on signaling channel. * - * Methods are guaranteed to be invoked on the UI thread of |activity|. + *

Methods are guaranteed to be invoked on the UI thread of |activity|. */ public static interface SignalingEvents { /** diff --git a/talk/examples/android/src/org/appspot/apprtc/AppRTCProximitySensor.java b/talk/examples/android/src/org/appspot/apprtc/AppRTCProximitySensor.java index 76f5d8f2b..c8ba788cb 100644 --- a/talk/examples/android/src/org/appspot/apprtc/AppRTCProximitySensor.java +++ b/talk/examples/android/src/org/appspot/apprtc/AppRTCProximitySensor.java @@ -54,11 +54,9 @@ public class AppRTCProximitySensor implements SensorEventListener { // the case. Only active when |DEBUG| is set to true. private final NonThreadSafe nonThreadSafe = new AppRTCUtils.NonThreadSafe(); - private final Context apprtcContext; private final Runnable onSensorStateListener; private final SensorManager sensorManager; private Sensor proximitySensor = null; - private boolean initialized = false; private boolean lastStateReportIsNear = false; /** Construction */ @@ -69,7 +67,6 @@ public class AppRTCProximitySensor implements SensorEventListener { private AppRTCProximitySensor(Context context, Runnable sensorStateListener) { Log.d(TAG, "AppRTCProximitySensor" + AppRTCUtils.getThreadInfo()); - apprtcContext = context; onSensorStateListener = sensorStateListener; sensorManager = ((SensorManager) context.getSystemService( Context.SENSOR_SERVICE)); @@ -161,8 +158,9 @@ public class AppRTCProximitySensor implements SensorEventListener { /** Helper method for logging information about the proximity sensor. */ private void logProximitySensorInfo() { - if (proximitySensor == null) + if (proximitySensor == null) { return; + } Log.d(TAG, "Proximity sensor: " + "name=" + proximitySensor.getName() + ", vendor: " + proximitySensor.getVendor() + ", type: " + proximitySensor.getStringType() diff --git a/talk/examples/android/src/org/appspot/apprtc/RoomParametersFetcher.java b/talk/examples/android/src/org/appspot/apprtc/RoomParametersFetcher.java index 7ff18ca02..4c015ba21 100644 --- a/talk/examples/android/src/org/appspot/apprtc/RoomParametersFetcher.java +++ b/talk/examples/android/src/org/appspot/apprtc/RoomParametersFetcher.java @@ -46,8 +46,10 @@ import java.net.URLConnection; import java.util.LinkedList; import java.util.Scanner; -// AsyncTask that converts an AppRTC room URL into the set of signaling -// parameters to use with that room. +/** + * AsyncTask that converts an AppRTC room URL into the set of signaling + * parameters to use with that room. + */ public class RoomParametersFetcher extends AsyncTask { private static final String TAG = "RoomRTCClient"; diff --git a/talk/examples/android/src/org/appspot/apprtc/WebSocketChannelClient.java b/talk/examples/android/src/org/appspot/apprtc/WebSocketChannelClient.java index 8eabd0222..99572536e 100644 --- a/talk/examples/android/src/org/appspot/apprtc/WebSocketChannelClient.java +++ b/talk/examples/android/src/org/appspot/apprtc/WebSocketChannelClient.java @@ -136,7 +136,7 @@ public class WebSocketChannelClient { ws.sendTextMessage(json.toString()); state = WebSocketConnectionState.REGISTERED; // Send any previously accumulated messages. - synchronized(wsSendQueue) { + synchronized (wsSendQueue) { for (String sendMessage : wsSendQueue) { send(sendMessage); } @@ -154,7 +154,7 @@ public class WebSocketChannelClient { // Store outgoing messages and send them after websocket client // is registered. Log.d(TAG, "WS ACC: " + message); - synchronized(wsSendQueue) { + synchronized (wsSendQueue) { wsSendQueue.add(message); return; } @@ -194,8 +194,8 @@ public class WebSocketChannelClient { state = WebSocketConnectionState.CONNECTED; } // Close WebSocket in CONNECTED or ERROR states only. - if (state == WebSocketConnectionState.CONNECTED || - state == WebSocketConnectionState.ERROR) { + if (state == WebSocketConnectionState.CONNECTED + || state == WebSocketConnectionState.ERROR) { ws.disconnect(); // Send DELETE to http WebSocket server. @@ -244,8 +244,8 @@ public class WebSocketChannelClient { try { // Send POST or DELETE request. String postUrl = postServerUrl + "/" + roomID + "/" + clientID; - Log.d(TAG, "WS " + wsHttpMessage.method + " : " + postUrl + " : " + - wsHttpMessage.message); + Log.d(TAG, "WS " + wsHttpMessage.method + " : " + postUrl + " : " + + wsHttpMessage.message); HttpURLConnection connection = (HttpURLConnection) new URL(postUrl).openConnection(); connection.setRequestProperty( @@ -258,8 +258,8 @@ public class WebSocketChannelClient { } int responseCode = connection.getResponseCode(); if (responseCode != 200) { - reportError("Non-200 response to " + wsHttpMessage.method + " : " + - connection.getHeaderField(null)); + reportError("Non-200 response to " + wsHttpMessage.method + " : " + + connection.getHeaderField(null)); } } catch (IOException e) { reportError("WS POST error: " + e.getMessage()); @@ -280,8 +280,8 @@ public class WebSocketChannelClient { @Override public void onClose(WebSocketCloseNotification code, String reason) { - Log.d(TAG, "WebSocket connection closed. Code: " + code + - ". Reason: " + reason); + Log.d(TAG, "WebSocket connection closed. Code: " + code + + ". Reason: " + reason); uiHandler.post(new Runnable() { public void run() { if (state != WebSocketConnectionState.CLOSED) { @@ -298,8 +298,8 @@ public class WebSocketChannelClient { final String message = payload; uiHandler.post(new Runnable() { public void run() { - if (state == WebSocketConnectionState.CONNECTED || - state == WebSocketConnectionState.REGISTERED) { + if (state == WebSocketConnectionState.CONNECTED + || state == WebSocketConnectionState.REGISTERED) { events.onWebSocketMessage(message); } } diff --git a/talk/examples/android/src/org/appspot/apprtc/WebSocketRTCClient.java b/talk/examples/android/src/org/appspot/apprtc/WebSocketRTCClient.java index dc7140267..227ebe03b 100644 --- a/talk/examples/android/src/org/appspot/apprtc/WebSocketRTCClient.java +++ b/talk/examples/android/src/org/appspot/apprtc/WebSocketRTCClient.java @@ -49,7 +49,7 @@ import org.webrtc.SessionDescription; * Negotiates signaling for chatting with apprtc.appspot.com "rooms". * Uses the client<->server specifics of the apprtc AppEngine webapp. * - * To use: create an instance of this object (registering a message handler) and + *

To use: create an instance of this object (registering a message handler) and * call connectToRoom(). Once room connection is established * onConnectedToRoom() callback with room parameters is invoked. * Messages to other party (with local Ice candidates and answer SDP) can @@ -94,10 +94,10 @@ public class WebSocketRTCClient implements AppRTCClient, Log.w(TAG, "No offer SDP in room response."); } initiator = params.initiator; - postMessageUrl = params.roomUrl + "/message/" + - params.roomId + "/" + params.clientId; - byeMessageUrl = params.roomUrl + "/bye/" + - params.roomId + "/" + params.clientId; + postMessageUrl = params.roomUrl + "/message/" + + params.roomId + "/" + params.clientId; + byeMessageUrl = params.roomUrl + "/bye/" + + params.roomId + "/" + params.clientId; roomState = ConnectionState.CONNECTED; // Connect to WebSocket server. @@ -176,8 +176,7 @@ public class WebSocketRTCClient implements AppRTCClient, } else { reportError("Unexpected WebSocket message: " + msg); } - } - else { + } else { if (errorText != null && errorText.length() > 0) { reportError("WebSocket error message: " + errorText); } else { @@ -370,8 +369,8 @@ public class WebSocketRTCClient implements AppRTCClient, // Get response. int responseCode = connection.getResponseCode(); if (responseCode != 200) { - reportError("Non-200 response to POST: " + - connection.getHeaderField(null)); + reportError("Non-200 response to POST: " + + connection.getHeaderField(null)); } InputStream responseStream = connection.getInputStream(); String response = drainStream(responseStream);