Merge pull request codebutler#13 from pefoley2/master

add isConnected method and remove incorrect annotations.
lopper · Apr 8, 2013 · 84119d1 · 84119d1
2 parents 878842d + 1174d7e
commit 84119d1
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/src/com/codebutler/android_websockets/WebSocketClient.java b/src/com/codebutler/android_websockets/WebSocketClient.java
@@ -36,6 +36,7 @@ public class WebSocketClient {
     private Handler                  mHandler;
     private List<BasicNameValuePair> mExtraHeaders;
     private HybiParser               mParser;
+    private boolean                  mConnected;
 
     private final Object mSendLock = new Object();
 
@@ -47,8 +48,9 @@ public static void setTrustManagers(TrustManager[] tm) {
 
     public WebSocketClient(URI uri, Listener listener, List<BasicNameValuePair> extraHeaders) {
         mURI          = uri;
-        mListener = listener;
+        mListener     = listener;
         mExtraHeaders = extraHeaders;
+        mConnected    = false;
         mParser       = new HybiParser(this);
 
         mHandlerThread = new HandlerThread("websocket-thread");
@@ -119,17 +121,21 @@ public void run() {
 
                     mListener.onConnect();
 
+                    mConnected = true;
+
                     // Now decode websocket frames.
                     mParser.start(stream);
 
                 } catch (EOFException ex) {
                     Log.d(TAG, "WebSocket EOF!", ex);
                     mListener.onDisconnect(0, "EOF");
+                    mConnected = false;
 
                 } catch (SSLException ex) {
                     // Connection reset by peer
                     Log.d(TAG, "Websocket SSL error!", ex);
                     mListener.onDisconnect(0, "SSL");
+                    mConnected = false;
 
                 } catch (Exception ex) {
                     mListener.onError(ex);
@@ -147,6 +153,7 @@ public void run() {
                     try {
                         mSocket.close();
                         mSocket = null;
+                        mConnected = false;
                     } catch (IOException ex) {
                         Log.d(TAG, "Error while disconnecting", ex);
                         mListener.onError(ex);
@@ -164,6 +171,10 @@ public void send(byte[] data) {
         sendFrame(mParser.frame(data));
     }
 
+    public boolean isConnected() {
+        return mConnected;
+    }
+
     private StatusLine parseStatusLine(String line) {
         if (TextUtils.isEmpty(line)) {
             return null;