Try to fix ssl memory leak

Author: NaikSoftware

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.0-rc1'
+        classpath 'com.android.tools.build:gradle:2.3.0'
         classpath 'me.tatarka:gradle-retrolambda:3.4.0'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
 

example-client/src/main/java/ua/naiksoftware/stompclientexample/MainActivity.java

@@ -49,11 +49,13 @@ protected void onCreate(Bundle savedInstanceState) {
         mAdapter.setHasStableIds(true);
         mRecyclerView.setAdapter(mAdapter);
         mRecyclerView.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.VERTICAL, true));
+    }
 
-        connectStomp();
+    public void disconnectStomp(View view) {
+        mStompClient.disconnect();
     }
 
-    private void connectStomp() {
+    public void connectStomp(View view) {
         mStompClient = Stomp.over(WebSocket.class, "ws://" + ANDROID_EMULATOR_LOCALHOST
                 + ":" + RestClient.SERVER_PORT + "/example-endpoint/websocket");
 

example-client/src/main/res/layout/activity_main.xml

@@ -7,6 +7,37 @@
     android:orientation="vertical"
     tools:context="ua.naiksoftware.stompclientexample.MainActivity">
 
+    <LinearLayout
+        style="?android:buttonBarStyle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <Button
+            style="?android:buttonBarButtonStyle"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/connect_stomp"
+            android:onClick="connectStomp"/>
+
+        <Button
+            style="?android:buttonBarButtonStyle"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/disconnect_stomp"
+            android:onClick="disconnectStomp"/>
+
+    </LinearLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="#eee"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"/>
+
     <LinearLayout
         style="?android:buttonBarStyle"
         android:layout_width="match_parent"

example-client/src/main/res/values/strings.xml

@@ -2,4 +2,6 @@
     <string name="app_name">Example client</string>
     <string name="send_mode_1">Echo STOMP</string>
     <string name="send_mode_2">Echo REST</string>
+    <string name="connect_stomp">Connect STOMP</string>
+    <string name="disconnect_stomp">DISCONNECT STOMP</string>
 </resources>

lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java

@@ -1,5 +1,6 @@
 package ua.naiksoftware.stomp;
 
+import android.os.Looper;
 import android.util.Log;
 
 import org.java_websocket.WebSocket;
@@ -60,7 +61,10 @@ public Observable<String> messages() {
                 if (iterator.next().isUnsubscribed()) iterator.remove();
             }
 
-            if (mMessagesSubscribers.size() < 1) mWebSocketClient.close();
+            if (mMessagesSubscribers.size() < 1) {
+                Log.d(TAG, "Close web socket connection now in thread " + Thread.currentThread() + " in main loop? " + (Looper.getMainLooper() == Looper.myLooper()));
+                mWebSocketClient.close();
+            }
         });
 
         createWebSocketConnection();

lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java

@@ -15,6 +15,7 @@
 import rx.Subscriber;
 import rx.Subscription;
 import rx.observables.ConnectableObservable;
+import rx.schedulers.Schedulers;
 import ua.naiksoftware.stomp.ConnectionProvider;
 import ua.naiksoftware.stomp.LifecycleEvent;
 import ua.naiksoftware.stomp.StompHeader;
@@ -95,6 +96,7 @@ public void connect(List<StompHeader> _headers, boolean reconnect) {
 
         isConnecting = true;
         mMessagesSubscription = mConnectionProvider.messages()
+                .unsubscribeOn(Schedulers.io())
                 .map(StompMessage::from)
                 .subscribe(stompMessage -> {
                     if (stompMessage.getStompCommand().equals(StompCommand.CONNECTED)) {