From 8a0a0a2cd37e6302657dcd60f8b5708974ba8000 Mon Sep 17 00:00:00 2001
From: NaikSoftware <naiksav4enko@gmail.com>
Date: Thu, 23 Feb 2017 17:41:14 +0200
Subject: [PATCH 001/110] Add link to example backend

---
 .idea/misc.xml                           | 10 ----------
 build.gradle                             |  2 +-
 example-client/README.md                 |  3 +++
 example-client/build.gradle              |  6 +++---
 gradle/wrapper/gradle-wrapper.properties |  4 ++--
 5 files changed, 9 insertions(+), 16 deletions(-)
 create mode 100644 example-client/README.md

diff --git a/.idea/misc.xml b/.idea/misc.xml
index fbb6828..d2e6725 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -27,16 +27,6 @@
       </value>
     </option>
   </component>
-  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
-    <OptionsSetting value="true" id="Add" />
-    <OptionsSetting value="true" id="Remove" />
-    <OptionsSetting value="true" id="Checkout" />
-    <OptionsSetting value="true" id="Update" />
-    <OptionsSetting value="true" id="Status" />
-    <OptionsSetting value="true" id="Edit" />
-    <ConfirmationsSetting value="0" id="Add" />
-    <ConfirmationsSetting value="0" id="Remove" />
-  </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
diff --git a/build.gradle b/build.gradle
index a268320..e99910f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.2'
+        classpath 'com.android.tools.build:gradle:2.3.0-rc1'
         classpath 'me.tatarka:gradle-retrolambda:3.3.0'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
 
diff --git a/example-client/README.md b/example-client/README.md
new file mode 100644
index 0000000..deabae9
--- /dev/null
+++ b/example-client/README.md
@@ -0,0 +1,3 @@
+## Example client for library
+
+Use server from here https://github.com/NaikSoftware/stomp-protocol-example-server
\ No newline at end of file
diff --git a/example-client/build.gradle b/example-client/build.gradle
index deaa2cf..acfbdb3 100644
--- a/example-client/build.gradle
+++ b/example-client/build.gradle
@@ -2,12 +2,12 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 25
-    buildToolsVersion "25.0.1"
+    buildToolsVersion "25.0.2"
 
     defaultConfig {
         applicationId "ua.naiksoftware.stompclientexample"
         minSdkVersion 16
-        targetSdkVersion 24
+        targetSdkVersion 25
         versionCode 1
         versionName "1.0"
     }
@@ -22,5 +22,5 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     testCompile 'junit:junit:4.12'
-    compile 'com.android.support:appcompat-v7:25.1.0'
+    compile 'com.android.support:appcompat-v7:25.2.0'
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e30b867..16f16db 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Dec 15 18:53:34 EET 2016
+#Thu Feb 23 17:37:13 EET 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip

From 6bed15604b051bf0c8a8aecfde2d5c034f4c8299 Mon Sep 17 00:00:00 2001
From: NaikSoftware <naiksav4enko@gmail.com>
Date: Thu, 23 Feb 2017 18:07:55 +0200
Subject: [PATCH 002/110] Fix build example

---
 build.gradle                                                    | 1 +
 example-client/build.gradle                                     | 2 ++
 example-client/src/main/AndroidManifest.xml                     | 2 +-
 .../java/ua/naiksoftware/stompclientexample/MainActivity.java   | 2 --
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index e99910f..3797ddc 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,6 +17,7 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        maven { url "https://jitpack.io" }
     }
 }
 
diff --git a/example-client/build.gradle b/example-client/build.gradle
index acfbdb3..d8d057b 100644
--- a/example-client/build.gradle
+++ b/example-client/build.gradle
@@ -23,4 +23,6 @@ dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     testCompile 'junit:junit:4.12'
     compile 'com.android.support:appcompat-v7:25.2.0'
+    compile 'org.java-websocket:Java-WebSocket:1.3.0'
+    compile project(':lib')
 }
diff --git a/example-client/src/main/AndroidManifest.xml b/example-client/src/main/AndroidManifest.xml
index 84b4478..bc2c078 100644
--- a/example-client/src/main/AndroidManifest.xml
+++ b/example-client/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="ua.naiksoftware.stomp">
+          package="ua.naiksoftware.stompclientexample">
 
     <application
             android:allowBackup="true"
diff --git a/example-client/src/main/java/ua/naiksoftware/stompclientexample/MainActivity.java b/example-client/src/main/java/ua/naiksoftware/stompclientexample/MainActivity.java
index 0301a14..a335073 100644
--- a/example-client/src/main/java/ua/naiksoftware/stompclientexample/MainActivity.java
+++ b/example-client/src/main/java/ua/naiksoftware/stompclientexample/MainActivity.java
@@ -3,8 +3,6 @@
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 
-import ua.naiksoftware.stomp.R;
-
 public class MainActivity extends AppCompatActivity {
 
     @Override

From 9cf5f2dd29d5077bb43d93df3abd534bf94c17bd Mon Sep 17 00:00:00 2001
From: NaikSoftware <naiksav4enko@gmail.com>
Date: Thu, 23 Feb 2017 19:23:37 +0200
Subject: [PATCH 003/110] Update layout

---
 example-client/build.gradle                   |  1 +
 .../src/main/res/layout/activity_main.xml     | 33 +++++++++++++++----
 .../src/main/res/values/strings.xml           |  4 ++-
 3 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/example-client/build.gradle b/example-client/build.gradle
index d8d057b..9d874b8 100644
--- a/example-client/build.gradle
+++ b/example-client/build.gradle
@@ -24,5 +24,6 @@ dependencies {
     testCompile 'junit:junit:4.12'
     compile 'com.android.support:appcompat-v7:25.2.0'
     compile 'org.java-websocket:Java-WebSocket:1.3.0'
+    compile 'com.android.support:recyclerview-v7:25.2.0'
     compile project(':lib')
 }
diff --git a/example-client/src/main/res/layout/activity_main.xml b/example-client/src/main/res/layout/activity_main.xml
index bdb66c4..2fdfbf7 100644
--- a/example-client/src/main/res/layout/activity_main.xml
+++ b/example-client/src/main/res/layout/activity_main.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+<LinearLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
@@ -8,10 +8,31 @@
         android:paddingRight="@dimen/activity_horizontal_margin"
         android:paddingTop="@dimen/activity_vertical_margin"
         android:paddingBottom="@dimen/activity_vertical_margin"
+        android:orientation="vertical"
         tools:context="ua.naiksoftware.stompclientexample.MainActivity">
 
-    <TextView
-            android:text="Hello World!"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"/>
-</RelativeLayout>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <Button
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/send_mode_1"/>
+
+        <Button
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/send_mode_2"/>
+
+    </LinearLayout>
+
+    <android.support.v7.widget.RecyclerView
+        android:id="@+id/recycler_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+
+</LinearLayout>
diff --git a/example-client/src/main/res/values/strings.xml b/example-client/src/main/res/values/strings.xml
index 64fad88..9490790 100644
--- a/example-client/src/main/res/values/strings.xml
+++ b/example-client/src/main/res/values/strings.xml
@@ -1,3 +1,5 @@
 <resources>
-    <string name="app_name">android</string>
+    <string name="app_name">Example client</string>
+    <string name="send_mode_1">Send mode 1</string>
+    <string name="send_mode_2">Send mode 2</string>
 </resources>

From 7ac5e2eef0d512395a4d94c04584d91c0b4b5e39 Mon Sep 17 00:00:00 2001
From: NaikSoftware <naiksav4enko@gmail.com>
Date: Fri, 24 Feb 2017 11:54:14 +0200
Subject: [PATCH 004/110] Connect to STOMP working

---
 build.gradle                                  |  2 +-
 example-client/build.gradle                   | 10 +++
 example-client/src/main/AndroidManifest.xml   |  2 +
 .../stompclientexample/MainActivity.java      | 74 +++++++++++++++++++
 .../stompclientexample/SimpleAdapter.java     | 51 +++++++++++++
 .../src/main/res/layout/item_layout.xml       | 19 +++++
 6 files changed, 157 insertions(+), 1 deletion(-)
 create mode 100644 example-client/src/main/java/ua/naiksoftware/stompclientexample/SimpleAdapter.java
 create mode 100644 example-client/src/main/res/layout/item_layout.xml

diff --git a/build.gradle b/build.gradle
index 3797ddc..e5a677e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:2.3.0-rc1'
-        classpath 'me.tatarka:gradle-retrolambda:3.3.0'
+        classpath 'me.tatarka:gradle-retrolambda:3.4.0'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/example-client/build.gradle b/example-client/build.gradle
index 9d874b8..c3d4bf4 100644
--- a/example-client/build.gradle
+++ b/example-client/build.gradle
@@ -1,4 +1,5 @@
 apply plugin: 'com.android.application'
+apply plugin: 'me.tatarka.retrolambda'
 
 android {
     compileSdkVersion 25
@@ -17,6 +18,11 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
 
 dependencies {
@@ -25,5 +31,9 @@ dependencies {
     compile 'com.android.support:appcompat-v7:25.2.0'
     compile 'org.java-websocket:Java-WebSocket:1.3.0'
     compile 'com.android.support:recyclerview-v7:25.2.0'
+    compile 'io.reactivex:rxandroid:1.2.1'
+    compile 'com.squareup.retrofit2:converter-gson:2.1.0'
+    compile 'com.squareup.retrofit2:adapter-rxjava:2.1.0'
+    compile 'com.squareup.retrofit2:retrofit:2.1.0'
     compile project(':lib')
 }
diff --git a/example-client/src/main/AndroidManifest.xml b/example-client/src/main/AndroidManifest.xml
index bc2c078..8acdccd 100644
--- a/example-client/src/main/AndroidManifest.xml
+++ b/example-client/src/main/AndroidManifest.xml
@@ -2,6 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="ua.naiksoftware.stompclientexample">
 
+    <uses-permission android:name="android.permission.INTERNET"/>
+
     <application
             android:allowBackup="true"
             android:icon="@mipmap/ic_launcher"
diff --git a/example-client/src/main/java/ua/naiksoftware/stompclientexample/MainActivity.java b/example-client/src/main/java/ua/naiksoftware/stompclientexample/MainActivity.java
index a335073..9d65a9a 100644
--- a/example-client/src/main/java/ua/naiksoftware/stompclientexample/MainActivity.java
+++ b/example-client/src/main/java/ua/naiksoftware/stompclientexample/MainActivity.java
@@ -2,12 +2,86 @@
 
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import android.support.v7.widget.RecyclerView;
+import android.util.Log;
+import android.widget.Toast;
+
+import org.java_websocket.WebSocket;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
+import ua.naiksoftware.stomp.Stomp;
+import ua.naiksoftware.stomp.client.StompClient;
 
 public class MainActivity extends AppCompatActivity {
 
+    private static final String TAG = "MainActivity";
+    public static final String ANDROID_EMULATOR_LOCALHOST = "10.0.2.2";
+
+    private SimpleAdapter mAdapter;
+    private List<String> mDataSet = new ArrayList<>();
+    private StompClient mStompClient;
+    private int counter;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
+        RecyclerView recyclerView = (RecyclerView) findViewById(R.id.recycler_view);
+        mAdapter = new SimpleAdapter(mDataSet);
+        mAdapter.setHasStableIds(true);
+        recyclerView.setAdapter(mAdapter);
+
+        connectStomp();
+    }
+
+    private void connectStomp() {
+        mStompClient = Stomp.over(WebSocket.class, "ws://" + ANDROID_EMULATOR_LOCALHOST + ":8080/example-endpoint/websocket");
+        mStompClient.lifecycle()
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(lifecycleEvent -> {
+                    switch (lifecycleEvent.getType()) {
+                        case OPENED:
+                            toast("Stomp connection opened");
+                            break;
+                        case ERROR:
+                            Log.e(TAG, "Stomp connection error", lifecycleEvent.getException());
+                            toast("Stomp connection error");
+                            break;
+                        case CLOSED:
+                            toast("Stomp connection closed");
+                    }
+                });
+
+        // Receive greetings
+        mStompClient.topic("/topic/greetings")
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(topicMessage -> {
+                    Log.d(TAG, "Received " + topicMessage);
+                    addItem(topicMessage.getPayload());
+                });
+
+        mStompClient.connect();
+    }
+
+    private void addItem(String text) {
+        mDataSet.add(++counter + text);
+        mAdapter.notifyDataSetChanged();
+    }
+
+    private void toast(String text) {
+        Log.i(TAG, text);
+        Toast.makeText(this, text, Toast.LENGTH_SHORT).show();
+    }
+
+    @Override
+    protected void onDestroy() {
+        mStompClient.disconnect();
+        super.onDestroy();
     }
 }
diff --git a/example-client/src/main/java/ua/naiksoftware/stompclientexample/SimpleAdapter.java b/example-client/src/main/java/ua/naiksoftware/stompclientexample/SimpleAdapter.java
new file mode 100644
index 0000000..f546409
--- /dev/null
+++ b/example-client/src/main/java/ua/naiksoftware/stompclientexample/SimpleAdapter.java
@@ -0,0 +1,51 @@
+package ua.naiksoftware.stompclientexample;
+
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import java.util.List;
+
+/**
+ * Created by Naik on 24.02.17.
+ */
+public class SimpleAdapter extends RecyclerView.Adapter<SimpleAdapter.SimpleViewHolder> {
+
+    private final List<String> mDataSet;
+
+    public SimpleAdapter(List<String> dataSet) {
+        mDataSet = dataSet;
+    }
+
+    @Override
+    public SimpleViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        return new SimpleViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.item_layout, parent, false));
+    }
+
+    @Override
+    public void onBindViewHolder(SimpleViewHolder holder, int position) {
+        holder.mTextView.setText(mDataSet.get(position));
+    }
+
+    @Override
+    public int getItemCount() {
+        return mDataSet.size();
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return mDataSet.get(position).hashCode();
+    }
+
+    static class SimpleViewHolder extends RecyclerView.ViewHolder {
+
+        final TextView mTextView;
+
+        public SimpleViewHolder(View itemView) {
+            super(itemView);
+            mTextView = (TextView) itemView.findViewById(R.id.text);
+        }
+    }
+}
diff --git a/example-client/src/main/res/layout/item_layout.xml b/example-client/src/main/res/layout/item_layout.xml
new file mode 100644
index 0000000..eb200c4
--- /dev/null
+++ b/example-client/src/main/res/layout/item_layout.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:tools="http://schemas.android.com/tools"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical"
+              android:paddingBottom="8dp"
+              android:paddingLeft="16dp"
+              android:paddingRight="16dp"
+              android:paddingTop="8dp">
+
+    <TextView
+        android:id="@+id/text"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+        tools:text="Simple text"/>
+
+</LinearLayout>
\ No newline at end of file

From ce9a9344c5250c2b47c906936b552f5ced6ba59a Mon Sep 17 00:00:00 2001
From: NaikSoftware <naiksav4enko@gmail.com>
Date: Fri, 24 Feb 2017 19:25:57 +0200
Subject: [PATCH 005/110] Send REST echo working

---
 .../stompclientexample/EchoModel.java         | 20 ++++++
 .../stompclientexample/ExampleRepository.java | 14 ++++
 .../stompclientexample/MainActivity.java      | 67 ++++++++++++++++---
 .../stompclientexample/RestClient.java        | 44 ++++++++++++
 .../src/main/res/layout/activity_main.xml     | 32 +++++----
 .../src/main/res/layout/item_layout.xml       |  2 +-
 .../src/main/res/values/strings.xml           |  4 +-
 7 files changed, 158 insertions(+), 25 deletions(-)
 create mode 100644 example-client/src/main/java/ua/naiksoftware/stompclientexample/EchoModel.java
 create mode 100644 example-client/src/main/java/ua/naiksoftware/stompclientexample/ExampleRepository.java
 create mode 100644 example-client/src/main/java/ua/naiksoftware/stompclientexample/RestClient.java

diff --git a/example-client/src/main/java/ua/naiksoftware/stompclientexample/EchoModel.java b/example-client/src/main/java/ua/naiksoftware/stompclientexample/EchoModel.java
new file mode 100644
index 0000000..1c694ac
--- /dev/null
+++ b/example-client/src/main/java/ua/naiksoftware/stompclientexample/EchoModel.java
@@ -0,0 +1,20 @@
+package ua.naiksoftware.stompclientexample;
+
+/**
+ * Created by Naik on 24.02.17.
+ */
+public class EchoModel {
+
+    private String echo;
+
+    public EchoModel() {
+    }
+
+    public String getEcho() {
+        return echo;
+    }
+
+    public void setEcho(String echo) {
+        this.echo = echo;
+    }
+}
diff --git a/example-client/src/main/java/ua/naiksoftware/stompclientexample/ExampleRepository.java b/example-client/src/main/java/ua/naiksoftware/stompclientexample/ExampleRepository.java
new file mode 100644
index 0000000..b81f19a
--- /dev/null
+++ b/example-client/src/main/java/ua/naiksoftware/stompclientexample/ExampleRepository.java
@@ -0,0 +1,14 @@
+package ua.naiksoftware.stompclientexample;
+
+import retrofit2.http.POST;
+import retrofit2.http.Query;
+import rx.Observable;
+
+/**
+ * Created by Naik on 24.02.17.
+ */
+public interface ExampleRepository {
+
+    @POST("hello-convert-and-send")
+    Observable<Void> sendRestEcho(@Query("msg") String message);
+}
diff --git a/example-client/src/main/java/ua/naiksoftware/stompclientexample/MainActivity.java b/example-client/src/main/java/ua/naiksoftware/stompclientexample/MainActivity.java
index 9d65a9a..a21fb75 100644
--- a/example-client/src/main/java/ua/naiksoftware/stompclientexample/MainActivity.java
+++ b/example-client/src/main/java/ua/naiksoftware/stompclientexample/MainActivity.java
@@ -2,44 +2,61 @@
 
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.util.Log;
+import android.view.View;
 import android.widget.Toast;
 
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+
 import org.java_websocket.WebSocket;
 
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
+import java.util.Locale;
 
+import rx.Observable;
+import rx.Subscription;
 import rx.android.schedulers.AndroidSchedulers;
 import rx.schedulers.Schedulers;
 import ua.naiksoftware.stomp.Stomp;
 import ua.naiksoftware.stomp.client.StompClient;
 
+import static ua.naiksoftware.stompclientexample.RestClient.ANDROID_EMULATOR_LOCALHOST;
+
 public class MainActivity extends AppCompatActivity {
 
     private static final String TAG = "MainActivity";
-    public static final String ANDROID_EMULATOR_LOCALHOST = "10.0.2.2";
 
     private SimpleAdapter mAdapter;
     private List<String> mDataSet = new ArrayList<>();
     private StompClient mStompClient;
-    private int counter;
+    private Subscription mRestPingSubscription;
+    private final SimpleDateFormat mTimeFormat = new SimpleDateFormat("HH:mm:ss", Locale.getDefault());
+    private RecyclerView mRecyclerView;
+    private Gson mGson = new GsonBuilder().create();
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
-        RecyclerView recyclerView = (RecyclerView) findViewById(R.id.recycler_view);
+        mRecyclerView = (RecyclerView) findViewById(R.id.recycler_view);
         mAdapter = new SimpleAdapter(mDataSet);
         mAdapter.setHasStableIds(true);
-        recyclerView.setAdapter(mAdapter);
+        mRecyclerView.setAdapter(mAdapter);
+        mRecyclerView.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.VERTICAL, true));
 
         connectStomp();
     }
 
     private void connectStomp() {
-        mStompClient = Stomp.over(WebSocket.class, "ws://" + ANDROID_EMULATOR_LOCALHOST + ":8080/example-endpoint/websocket");
+        mStompClient = Stomp.over(WebSocket.class, "ws://" + ANDROID_EMULATOR_LOCALHOST
+                + ":" + RestClient.SERVER_PORT + "/example-endpoint/websocket");
+
         mStompClient.lifecycle()
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
@@ -62,16 +79,40 @@ private void connectStomp() {
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(topicMessage -> {
-                    Log.d(TAG, "Received " + topicMessage);
-                    addItem(topicMessage.getPayload());
+                    Log.d(TAG, "Received " + topicMessage.getPayload());
+                    addItem(mGson.fromJson(topicMessage.getPayload(), EchoModel.class));
                 });
 
         mStompClient.connect();
     }
 
-    private void addItem(String text) {
-        mDataSet.add(++counter + text);
+    public void sendEchoViaStomp(View v) {
+        mStompClient.send("Echo REST from " + mTimeFormat.format(new Date()))
+                .compose(applySchedulers())
+                .subscribe(aVoid -> {
+                    Log.d(TAG, "STOMP echo send successfully");
+                }, throwable -> {
+                    Log.e(TAG, "Error send STOMP echo", throwable);
+                    toast(throwable.getMessage());
+                });
+    }
+
+    public void sendEchoViaRest(View v) {
+        mRestPingSubscription = RestClient.getInstance().getExampleRepository()
+                .sendRestEcho("Echo REST from " + mTimeFormat.format(new Date()))
+                .compose(applySchedulers())
+                .subscribe(aVoid -> {
+                    Log.d(TAG, "REST echo send successfully");
+                }, throwable -> {
+                    Log.e(TAG, "Error send REST echo", throwable);
+                    toast(throwable.getMessage());
+                });
+    }
+
+    private void addItem(EchoModel echoModel) {
+        mDataSet.add(echoModel.getEcho() + " to " + mTimeFormat.format(new Date()));
         mAdapter.notifyDataSetChanged();
+        mRecyclerView.smoothScrollToPosition(mDataSet.size() - 1);
     }
 
     private void toast(String text) {
@@ -79,9 +120,17 @@ private void toast(String text) {
         Toast.makeText(this, text, Toast.LENGTH_SHORT).show();
     }
 
+    protected <T> Observable.Transformer<T, T> applySchedulers() {
+        return rObservable -> rObservable
+                .unsubscribeOn(Schedulers.newThread())
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread());
+    }
+
     @Override
     protected void onDestroy() {
         mStompClient.disconnect();
+        if (mRestPingSubscription != null) mRestPingSubscription.unsubscribe();
         super.onDestroy();
     }
 }
diff --git a/example-client/src/main/java/ua/naiksoftware/stompclientexample/RestClient.java b/example-client/src/main/java/ua/naiksoftware/stompclientexample/RestClient.java
new file mode 100644
index 0000000..6c71f7d
--- /dev/null
+++ b/example-client/src/main/java/ua/naiksoftware/stompclientexample/RestClient.java
@@ -0,0 +1,44 @@
+package ua.naiksoftware.stompclientexample;
+
+import retrofit2.Retrofit;
+import retrofit2.adapter.rxjava.RxJavaCallAdapterFactory;
+import retrofit2.converter.gson.GsonConverterFactory;
+
+/**
+ * Created by Naik on 24.02.17.
+ */
+public class RestClient {
+
+    public static final String ANDROID_EMULATOR_LOCALHOST = "10.0.2.2";
+    public static final String SERVER_PORT = "8080";
+
+    private static RestClient instance;
+    private static final Object lock = new Object();
+
+    public static RestClient getInstance() {
+        RestClient instance = RestClient.instance;
+        if (instance == null) {
+            synchronized (lock) {
+                instance = RestClient.instance;
+                if (instance == null) {
+                    RestClient.instance = instance = new RestClient();
+                }
+            }
+        }
+        return instance;
+    }
+
+    private final ExampleRepository mExampleRepository;
+
+    private RestClient() {
+        Retrofit retrofit = new Retrofit.Builder().baseUrl("http://" + ANDROID_EMULATOR_LOCALHOST + ":" + SERVER_PORT + "/")
+                .addConverterFactory(GsonConverterFactory.create())
+                .addCallAdapterFactory(RxJavaCallAdapterFactory.create())
+                .build();
+        mExampleRepository = retrofit.create(ExampleRepository.class);
+    }
+
+    public ExampleRepository getExampleRepository() {
+        return mExampleRepository;
+    }
+}
diff --git a/example-client/src/main/res/layout/activity_main.xml b/example-client/src/main/res/layout/activity_main.xml
index 2fdfbf7..0756ca3 100644
--- a/example-client/src/main/res/layout/activity_main.xml
+++ b/example-client/src/main/res/layout/activity_main.xml
@@ -1,38 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:paddingLeft="@dimen/activity_horizontal_margin"
-        android:paddingRight="@dimen/activity_horizontal_margin"
-        android:paddingTop="@dimen/activity_vertical_margin"
-        android:paddingBottom="@dimen/activity_vertical_margin"
-        android:orientation="vertical"
-        tools:context="ua.naiksoftware.stompclientexample.MainActivity">
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    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/send_mode_1"/>
+            android:text="@string/send_mode_1"
+            android:onClick="sendEchoViaStomp"/>
 
         <Button
+            style="?android:buttonBarButtonStyle"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:text="@string/send_mode_2"/>
+            android:text="@string/send_mode_2"
+            android:onClick="sendEchoViaRest"/>
 
     </LinearLayout>
 
     <android.support.v7.widget.RecyclerView
         android:id="@+id/recycler_view"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
+        android:layout_height="match_parent"
+        android:paddingBottom="@dimen/activity_vertical_margin"
+        android:paddingLeft="@dimen/activity_horizontal_margin"
+        android:paddingRight="@dimen/activity_horizontal_margin"
+        android:paddingTop="@dimen/activity_vertical_margin"
+        android:clipToPadding="false"/>
 
 </LinearLayout>
diff --git a/example-client/src/main/res/layout/item_layout.xml b/example-client/src/main/res/layout/item_layout.xml
index eb200c4..721614d 100644
--- a/example-client/src/main/res/layout/item_layout.xml
+++ b/example-client/src/main/res/layout/item_layout.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
               xmlns:tools="http://schemas.android.com/tools"
               android:layout_width="match_parent"
-              android:layout_height="match_parent"
+              android:layout_height="wrap_content"
               android:orientation="vertical"
               android:paddingBottom="8dp"
               android:paddingLeft="16dp"
diff --git a/example-client/src/main/res/values/strings.xml b/example-client/src/main/res/values/strings.xml
index 9490790..19e7e0d 100644
--- a/example-client/src/main/res/values/strings.xml
+++ b/example-client/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
 <resources>
     <string name="app_name">Example client</string>
-    <string name="send_mode_1">Send mode 1</string>
-    <string name="send_mode_2">Send mode 2</string>
+    <string name="send_mode_1">Echo STOMP</string>
+    <string name="send_mode_2">Echo REST</string>
 </resources>

From eb4b3f2d5777509c22a811b740f59a866b27bfc8 Mon Sep 17 00:00:00 2001
From: NaikSoftware <naiksav4enko@gmail.com>
Date: Tue, 28 Feb 2017 12:40:29 +0200
Subject: [PATCH 006/110] Send STOMP echo working

---
 .../ua/naiksoftware/stompclientexample/MainActivity.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/example-client/src/main/java/ua/naiksoftware/stompclientexample/MainActivity.java b/example-client/src/main/java/ua/naiksoftware/stompclientexample/MainActivity.java
index a21fb75..821b1cf 100644
--- a/example-client/src/main/java/ua/naiksoftware/stompclientexample/MainActivity.java
+++ b/example-client/src/main/java/ua/naiksoftware/stompclientexample/MainActivity.java
@@ -87,7 +87,7 @@ private void connectStomp() {
     }
 
     public void sendEchoViaStomp(View v) {
-        mStompClient.send("Echo REST from " + mTimeFormat.format(new Date()))
+        mStompClient.send("/topic/hello-msg-mapping", "Echo STOMP " + mTimeFormat.format(new Date()))
                 .compose(applySchedulers())
                 .subscribe(aVoid -> {
                     Log.d(TAG, "STOMP echo send successfully");
@@ -99,7 +99,7 @@ public void sendEchoViaStomp(View v) {
 
     public void sendEchoViaRest(View v) {
         mRestPingSubscription = RestClient.getInstance().getExampleRepository()
-                .sendRestEcho("Echo REST from " + mTimeFormat.format(new Date()))
+                .sendRestEcho("Echo REST " + mTimeFormat.format(new Date()))
                 .compose(applySchedulers())
                 .subscribe(aVoid -> {
                     Log.d(TAG, "REST echo send successfully");
@@ -110,7 +110,7 @@ public void sendEchoViaRest(View v) {
     }
 
     private void addItem(EchoModel echoModel) {
-        mDataSet.add(echoModel.getEcho() + " to " + mTimeFormat.format(new Date()));
+        mDataSet.add(echoModel.getEcho() + " - " + mTimeFormat.format(new Date()));
         mAdapter.notifyDataSetChanged();
         mRecyclerView.smoothScrollToPosition(mDataSet.size() - 1);
     }

From 7c274398f1673a80aae7ac7362612bdce070a06f Mon Sep 17 00:00:00 2001
From: NaikSoftware <naiksav4enko@gmail.com>
Date: Tue, 28 Feb 2017 12:54:27 +0200
Subject: [PATCH 007/110] Update readme

---
 README.md | 45 ++++++++++++++++++++++++++++++---------------
 1 file changed, 30 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index f79bdc9..f155906 100644
--- a/README.md
+++ b/README.md
@@ -25,37 +25,50 @@ dependencies {
 **WebSocketConfig.groovy**
 ```groovy
 @Configuration
+@EnableWebSocket
 @EnableWebSocketMessageBroker
-public class WebSocketConfig extends AbstractWebSocketMessageBrokerConfigurer {
+class WebSocketConfig extends AbstractWebSocketMessageBrokerConfigurer {
 
     @Override
-    public void configureMessageBroker(MessageBrokerRegistry config) {
-        config.enableSimpleBroker("/topic");
-        config.setApplicationDestinationPrefixes("/app");
+    void configureMessageBroker(MessageBrokerRegistry config) {
+        config.enableSimpleBroker("/topic", "/queue", "/exchange");
+//        config.enableStompBrokerRelay("/topic", "/queue", "/exchange"); // Uncomment for external message broker (ActiveMQ, RabbitMQ)
+        config.setApplicationDestinationPrefixes("/topic", "/queue"); // prefix in client queries
+        config.setUserDestinationPrefix("/user");
     }
 
     @Override
-    public void registerStompEndpoints(StompEndpointRegistry registry) {
-        registry.addEndpoint("/hello")/*.setAllowedOrigins('*')*/.withSockJS();
+    void registerStompEndpoints(StompEndpointRegistry registry) {
+        registry.addEndpoint("/example-endpoint").withSockJS()
     }
 
+    @Override
+    void configureWebSocketTransport(WebSocketTransportRegistration registration) {
+        registration.setMessageSizeLimit(8 * 1024);
+    }
 }
 ```
 
-**HelloSockController.groovy**
+**SocketController.groovy**
 ``` groovy
+@Log4j
 @RestController
-class HelloSockController {
+class SocketController {
+
+    @Autowired
+    SocketService socketService
 
-    @MessageMapping("/hello")
-    @SendTo("/topic/greetings")
-    def greeting(String msg) throws Exception {
-        println("Receive greeting ${msg}")
-        "ECHO: " + msg;
+    @MessageMapping('/hello-msg-mapping')
+    @SendTo('/topic/greetings')
+    EchoModel echoMessageMapping(String message) {
+        log.debug("React to hello-msg-mapping")
+        return new EchoModel(message.trim())
     }
 }
 ```
 
+Check out the full example server https://github.com/NaikSoftware/stomp-protocol-example-server
+
 ## Example library usage
 
 **Basic usage**
@@ -64,14 +77,14 @@ class HelloSockController {
  
  // ...
  
- mStompClient = Stomp.over(WebSocket.class, "ws://localhost:8080/app/hello/websocket");
+ mStompClient = Stomp.over(WebSocket.class, "ws://10.0.2.2:8080/example-endpoint/websocket");
  mStompClient.connect();
   
  mStompClient.topic("/topic/greetings").subscribe(topicMessage -> {
      Log.d(TAG, topicMessage.getPayload());
  });
   
- mStompClient.send("/app/hello", "My first STOMP message!").subscribe();
+ mStompClient.send("/topic/hello-msg-mapping", "My first STOMP message!").subscribe();
   
  // ...
  
@@ -79,6 +92,8 @@ class HelloSockController {
 
 ```
 
+See the full example https://github.com/NaikSoftware/StompProtocolAndroid/tree/master/example-client
+
 Method `Stomp.over` consume class for create connection as first parameter.
 You must provide dependency for lib and pass class.
 At now supported connection providers:

From 1746741e3e7e28380b80324ae9be36d751df2182 Mon Sep 17 00:00:00 2001
From: NaikSoftware <naiksav4enko@gmail.com>
Date: Tue, 28 Feb 2017 12:55:36 +0200
Subject: [PATCH 008/110] Clean readme

---
 README.md | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/README.md b/README.md
index f155906..bd4e31b 100644
--- a/README.md
+++ b/README.md
@@ -41,11 +41,6 @@ class WebSocketConfig extends AbstractWebSocketMessageBrokerConfigurer {
     void registerStompEndpoints(StompEndpointRegistry registry) {
         registry.addEndpoint("/example-endpoint").withSockJS()
     }
-
-    @Override
-    void configureWebSocketTransport(WebSocketTransportRegistration registration) {
-        registration.setMessageSizeLimit(8 * 1024);
-    }
 }
 ```
 
@@ -55,9 +50,6 @@ class WebSocketConfig extends AbstractWebSocketMessageBrokerConfigurer {
 @RestController
 class SocketController {
 
-    @Autowired
-    SocketService socketService
-
     @MessageMapping('/hello-msg-mapping')
     @SendTo('/topic/greetings')
     EchoModel echoMessageMapping(String message) {

From eb74d8813ba72524442e8e6f8e9d3558dab7da6b Mon Sep 17 00:00:00 2001
From: NaikSoftware <naiksav4enko@gmail.com>
Date: Tue, 28 Feb 2017 19:23:11 +0200
Subject: [PATCH 009/110] Add isConnecting method

---
 .../ua/naiksoftware/stomp/client/StompClient.java   | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java b/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
index 9973ccb..bf24449 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
@@ -35,6 +35,7 @@ public class StompClient {
     private final ConnectionProvider mConnectionProvider;
     private HashMap<String, String> mTopics;
     private boolean mConnected;
+    private boolean isConnecting;
 
     public StompClient(ConnectionProvider connectionProvider) {
         mConnectionProvider = connectionProvider;
@@ -82,15 +83,23 @@ public void connect(List<StompHeader> _headers, boolean reconnect) {
 
                         case CLOSED:
                             mConnected = false;
+                            isConnecting = false;
+                            break;
+
+                        case ERROR:
+                            mConnected = false;
+                            isConnecting = false;
                             break;
                     }
                 });
 
+        isConnecting = true;
         mMessagesSubscription = mConnectionProvider.messages()
                 .map(StompMessage::from)
                 .subscribe(stompMessage -> {
                     if (stompMessage.getStompCommand().equals(StompCommand.CONNECTED)) {
                         mConnected = true;
+                        isConnecting = false;
                         for (ConnectableObservable<Void> observable : mWaitConnectionObservables) {
                             observable.connect();
                         }
@@ -203,4 +212,8 @@ private Observable<Void> unsubscribePath(String dest) {
     public boolean isConnected() {
         return mConnected;
     }
+
+    public boolean isConnecting() {
+        return isConnecting;
+    }
 }

From 603b24aa2b933fd0de43e618940004f7203481d3 Mon Sep 17 00:00:00 2001
From: NaikSoftware <naiksav4enko@gmail.com>
Date: Wed, 1 Mar 2017 17:45:39 +0200
Subject: [PATCH 010/110] Add send message logging

---
 .../java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java b/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java
index 459398d..ae855e9 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java
@@ -132,6 +132,7 @@ public Observable<Void> send(String stompMessage) {
             if (mWebSocketClient == null) {
                 subscriber.onError(new IllegalStateException("Not connected yet"));
             } else {
+                Log.d(TAG, "Send STOMP message: " + stompMessage);
                 mWebSocketClient.send(stompMessage);
                 subscriber.onCompleted();
             }

From 608d74829def5088486f0a1081fe902e6d5bbc3d Mon Sep 17 00:00:00 2001
From: NaikSoftware <naiksav4enko@gmail.com>
Date: Wed, 5 Apr 2017 11:51:49 +0300
Subject: [PATCH 011/110] Try to fix ssl memory leak

---
 build.gradle                                  |  2 +-
 .../stompclientexample/MainActivity.java      |  6 ++--
 .../src/main/res/layout/activity_main.xml     | 31 +++++++++++++++++++
 .../src/main/res/values/strings.xml           |  2 ++
 .../stomp/WebSocketsConnectionProvider.java   |  6 +++-
 .../stomp/client/StompClient.java             |  2 ++
 6 files changed, 45 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index e5a677e..1f0befd 100644
--- a/build.gradle
+++ b/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'
 
diff --git a/example-client/src/main/java/ua/naiksoftware/stompclientexample/MainActivity.java b/example-client/src/main/java/ua/naiksoftware/stompclientexample/MainActivity.java
index 821b1cf..91bc44a 100644
--- a/example-client/src/main/java/ua/naiksoftware/stompclientexample/MainActivity.java
+++ b/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");
 
diff --git a/example-client/src/main/res/layout/activity_main.xml b/example-client/src/main/res/layout/activity_main.xml
index 0756ca3..0596fa9 100644
--- a/example-client/src/main/res/layout/activity_main.xml
+++ b/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"
diff --git a/example-client/src/main/res/values/strings.xml b/example-client/src/main/res/values/strings.xml
index 19e7e0d..972391e 100644
--- a/example-client/src/main/res/values/strings.xml
+++ b/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>
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java b/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java
index ae855e9..444a603 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java
+++ b/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();
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java b/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
index bf24449..3686bd1 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
+++ b/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)) {

From dbe40a60005aa66f3af5c11bc1b4476348872abc Mon Sep 17 00:00:00 2001
From: NaikSoftware <naiksav4enko@gmail.com>
Date: Wed, 5 Apr 2017 12:06:23 +0300
Subject: [PATCH 012/110] Revert

---
 .../ua/naiksoftware/stomp/WebSocketsConnectionProvider.java     | 2 +-
 lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java b/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java
index 444a603..89735cd 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java
@@ -62,7 +62,7 @@ public Observable<String> messages() {
             }
 
             if (mMessagesSubscribers.size() < 1) {
-                Log.d(TAG, "Close web socket connection now in thread " + Thread.currentThread() + " in main loop? " + (Looper.getMainLooper() == Looper.myLooper()));
+                Log.d(TAG, "Close web socket connection now in thread " + Thread.currentThread());
                 mWebSocketClient.close();
             }
         });
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java b/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
index 3686bd1..cf6b02f 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
@@ -96,7 +96,6 @@ 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)) {

From 10ac44f3404ac9ee947112d6b082e8851cd0a967 Mon Sep 17 00:00:00 2001
From: NaikSoftware <naiksav4enko@gmail.com>
Date: Wed, 5 Apr 2017 13:07:56 +0300
Subject: [PATCH 013/110] Update java_web_socket dependency

---
 build.gradle                | 1 +
 example-client/build.gradle | 2 +-
 lib/build.gradle            | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 1f0befd..de159c8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,6 +18,7 @@ allprojects {
     repositories {
         jcenter()
         maven { url "https://jitpack.io" }
+        maven { url "http://clojars.org/repo" }
     }
 }
 
diff --git a/example-client/build.gradle b/example-client/build.gradle
index c3d4bf4..f254f38 100644
--- a/example-client/build.gradle
+++ b/example-client/build.gradle
@@ -29,7 +29,7 @@ dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     testCompile 'junit:junit:4.12'
     compile 'com.android.support:appcompat-v7:25.2.0'
-    compile 'org.java-websocket:Java-WebSocket:1.3.0'
+    compile 'org.java-websocket:java-websocket:1.3.2'
     compile 'com.android.support:recyclerview-v7:25.2.0'
     compile 'io.reactivex:rxandroid:1.2.1'
     compile 'com.squareup.retrofit2:converter-gson:2.1.0'
diff --git a/lib/build.gradle b/lib/build.gradle
index 1e58803..588ed92 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -34,7 +34,7 @@ dependencies {
     testCompile 'junit:junit:4.12'
     compile 'io.reactivex:rxjava:1.2.0'
     // Supported transports
-    provided 'org.java-websocket:Java-WebSocket:1.3.0'
+    provided "org.java-websocket:java-websocket:1.3.2"
 }
 
 task sourcesJar(type: Jar) {

From 81916e974d2511cea2c7e58eeecb9ebc08208ecd Mon Sep 17 00:00:00 2001
From: NaikSoftware <naiksav4enko@gmail.com>
Date: Wed, 5 Apr 2017 13:21:14 +0300
Subject: [PATCH 014/110] Fix build

---
 .../stomp/WebSocketsConnectionProvider.java        | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java b/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java
index 89735cd..f1ccd12 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java
@@ -1,10 +1,8 @@
 package ua.naiksoftware.stomp;
 
-import android.os.Looper;
 import android.util.Log;
 
 import org.java_websocket.WebSocket;
-import org.java_websocket.client.DefaultSSLWebSocketClientFactory;
 import org.java_websocket.client.WebSocketClient;
 import org.java_websocket.drafts.Draft_17;
 import org.java_websocket.exceptions.InvalidDataException;
@@ -19,8 +17,6 @@
 import java.util.Map;
 import java.util.TreeMap;
 
-import javax.net.ssl.SSLContext;
-
 import rx.Observable;
 import rx.Subscriber;
 
@@ -116,16 +112,6 @@ public void onError(Exception ex) {
             }
         };
 
-        if(mUri.startsWith("wss")) {
-            try {
-                SSLContext sc = SSLContext.getInstance("TLS");
-                sc.init(null, null, null);
-                mWebSocketClient.setWebSocketFactory(new DefaultSSLWebSocketClientFactory(sc));
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-
         mWebSocketClient.connect();
         haveConnection = true;
     }

From 14c468b23edb9dce8dbf6ca34e970b4e749dae1e Mon Sep 17 00:00:00 2001
From: NaikSoftware <naiksav4enko@gmail.com>
Date: Wed, 5 Apr 2017 14:27:43 +0300
Subject: [PATCH 015/110] Fix SSL

---
 .../stomp/WebSocketsConnectionProvider.java       | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java b/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java
index f1ccd12..e8129a6 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java
+++ b/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;
@@ -17,6 +18,9 @@
 import java.util.Map;
 import java.util.TreeMap;
 
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSocketFactory;
+
 import rx.Observable;
 import rx.Subscriber;
 
@@ -112,6 +116,17 @@ public void onError(Exception ex) {
             }
         };
 
+        if(mUri.startsWith("wss")) {
+            try {
+                SSLContext sc = SSLContext.getInstance("TLS");
+                sc.init(null, null, null);
+                SSLSocketFactory factory = sc.getSocketFactory();
+                mWebSocketClient.setSocket(factory.createSocket());
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+
         mWebSocketClient.connect();
         haveConnection = true;
     }

From 1c8bef5699c5cb7d8b098e840b40c5f7db62fdde Mon Sep 17 00:00:00 2001
From: lmorda <lmorda2@hotmail.com>
Date: Fri, 14 Apr 2017 14:18:16 -0700
Subject: [PATCH 016/110] Issue #40 - Unsubscribing a list of subscriptions
 causes ConcurrentModificationException

---
 .../main/java/ua/naiksoftware/stomp/client/StompClient.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java b/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
index cf6b02f..1e1e185 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
@@ -15,7 +15,6 @@
 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;
@@ -171,18 +170,21 @@ public Observable<StompMessage> topic(String destinationPath, List<StompHeader>
            subscribersSet.add(subscriber);
 
        }).doOnUnsubscribe(() -> {
+           Set<String> destSet = new HashSet<String>();
            for (String dest : mSubscribers.keySet()) {
                Set<Subscriber<? super StompMessage>> set = mSubscribers.get(dest);
                for (Subscriber<? super StompMessage> subscriber : set) {
                    if (subscriber.isUnsubscribed()) {
                        set.remove(subscriber);
                        if (set.size() < 1) {
-                           mSubscribers.remove(dest);
+                           destSet.add(dest);
                            unsubscribePath(dest).subscribe();
                        }
                    }
                }
            }
+           for (String dest : destSet)
+               mSubscribers.remove(dest);
        });
    }
 

From 9f7a6186eca1740cc527cd209c1a58c22c4ff2c0 Mon Sep 17 00:00:00 2001
From: lmorda <lmorda2@hotmail.com>
Date: Tue, 25 Apr 2017 10:55:57 -0700
Subject: [PATCH 017/110] Replaced for loops with while loops and iterators.

---
 .../stomp/client/StompClient.java             | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java b/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
index 1e1e185..26bee54 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
@@ -6,6 +6,7 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -170,21 +171,22 @@ public Observable<StompMessage> topic(String destinationPath, List<StompHeader>
            subscribersSet.add(subscriber);
 
        }).doOnUnsubscribe(() -> {
-           Set<String> destSet = new HashSet<String>();
-           for (String dest : mSubscribers.keySet()) {
-               Set<Subscriber<? super StompMessage>> set = mSubscribers.get(dest);
-               for (Subscriber<? super StompMessage> subscriber : set) {
+           Iterator<String> mapIterator = mSubscribers.keySet().iterator();
+           while (mapIterator.hasNext()) {
+               String destinationUrl = mapIterator.next();
+               Set<Subscriber<? super StompMessage>> set = mSubscribers.get(destinationUrl);
+               Iterator<Subscriber<? super StompMessage>> setIterator = set.iterator();
+               while (setIterator.hasNext()) {
+                   Subscriber<? super StompMessage> subscriber = setIterator.next();
                    if (subscriber.isUnsubscribed()) {
-                       set.remove(subscriber);
+                       setIterator.remove();
                        if (set.size() < 1) {
-                           destSet.add(dest);
-                           unsubscribePath(dest).subscribe();
+                           mapIterator.remove();
+                           unsubscribePath(destinationUrl).subscribe();
                        }
                    }
                }
            }
-           for (String dest : destSet)
-               mSubscribers.remove(dest);
        });
    }
 

From 46170cad28e02c0f02a3115c915ba481b023bc25 Mon Sep 17 00:00:00 2001
From: Francois Lolom <francois.lolom@gmail.com>
Date: Tue, 30 May 2017 11:14:08 +0200
Subject: [PATCH 018/110] Add a new connection provider: OkHttp

---
 lib/build.gradle                              |   1 +
 .../stomp/OkHttpConnectionProvider.java       | 169 ++++++++++++++++++
 .../java/ua/naiksoftware/stomp/Stomp.java     |   3 +
 3 files changed, 173 insertions(+)
 create mode 100644 lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java

diff --git a/lib/build.gradle b/lib/build.gradle
index 588ed92..183b041 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -35,6 +35,7 @@ dependencies {
     compile 'io.reactivex:rxjava:1.2.0'
     // Supported transports
     provided "org.java-websocket:java-websocket:1.3.2"
+    provided 'com.squareup.okhttp3:okhttp:3.8.0'
 }
 
 task sourcesJar(type: Jar) {
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java b/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java
new file mode 100644
index 0000000..80ab787
--- /dev/null
+++ b/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java
@@ -0,0 +1,169 @@
+package ua.naiksoftware.stomp;
+
+import android.util.Log;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
+import okhttp3.Headers;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+import okhttp3.WebSocket;
+import okhttp3.WebSocketListener;
+import okio.ByteString;
+import rx.Observable;
+import rx.Subscriber;
+
+/* package */ class OkHttpConnectionProvider implements ConnectionProvider {
+
+    private static final String TAG = WebSocketsConnectionProvider.class.getSimpleName();
+
+    private final String mUri;
+    private final Map<String, String> mConnectHttpHeaders;
+
+    private final List<Subscriber<? super LifecycleEvent>> mLifecycleSubscribers;
+    private final List<Subscriber<? super String>> mMessagesSubscribers;
+
+    private WebSocket openedSocked;
+
+
+    /* package */ OkHttpConnectionProvider(String uri, Map<String, String> connectHttpHeaders) {
+        mUri = uri;
+        mConnectHttpHeaders = connectHttpHeaders != null ? connectHttpHeaders : new HashMap<>();
+        mLifecycleSubscribers = new ArrayList<>();
+        mMessagesSubscribers = new ArrayList<>();
+    }
+
+    @Override
+    public Observable<String> messages() {
+        Observable<String> observable = Observable.<String>create(subscriber -> {
+            mMessagesSubscribers.add(subscriber);
+
+        }).doOnUnsubscribe(() -> {
+            Iterator<Subscriber<? super String>> iterator = mMessagesSubscribers.iterator();
+            while (iterator.hasNext()) {
+                if (iterator.next().isUnsubscribed()) iterator.remove();
+            }
+
+            if (mMessagesSubscribers.size() < 1) {
+                Log.d(TAG, "Close web socket connection now in thread " + Thread.currentThread());
+                openedSocked.close(1000, "");
+                openedSocked = null;
+            }
+        });
+
+        createWebSocketConnection();
+        return observable;
+    }
+
+    private void createWebSocketConnection() {
+
+        if (openedSocked != null) {
+            throw new IllegalStateException("Already have connection to web socket");
+        }
+
+        OkHttpClient okHttpClient = new OkHttpClient.Builder()
+                .build();
+
+        Request.Builder requestBuilder = new Request.Builder()
+                .url(mUri);
+        
+        addConnectionHeadersToBuilder(requestBuilder, mConnectHttpHeaders);
+        
+        openedSocked = okHttpClient.newWebSocket(requestBuilder.build(),
+                new WebSocketListener() {
+                    @Override
+                    public void onOpen(WebSocket webSocket, Response response) {
+                        LifecycleEvent openEvent = new LifecycleEvent(LifecycleEvent.Type.OPENED);
+
+                        TreeMap<String, String> headersAsMap = headersAsMap(response);
+
+                        openEvent.setHandshakeResponseHeaders(headersAsMap);
+                        emitLifecycleEvent(openEvent);
+                    }
+
+                    @Override
+                    public void onMessage(WebSocket webSocket, String text) {
+                        emitMessage(text);
+                    }
+
+                    @Override
+                    public void onMessage(WebSocket webSocket, ByteString bytes) {
+                        emitMessage(bytes.utf8());
+                    }
+
+                    @Override
+                    public void onClosed(WebSocket webSocket, int code, String reason) {
+                        emitLifecycleEvent(new LifecycleEvent(LifecycleEvent.Type.CLOSED));
+                        openedSocked = null;
+                    }
+
+                    @Override
+                    public void onFailure(WebSocket webSocket, Throwable t, Response response) {
+                        emitLifecycleEvent(new LifecycleEvent(LifecycleEvent.Type.ERROR, new Exception(t)));
+                    }
+                }
+
+        );
+    }
+
+    @Override
+    public Observable<Void> send(String stompMessage) {
+        return Observable.create(subscriber -> {
+            if (openedSocked == null) {
+                subscriber.onError(new IllegalStateException("Not connected yet"));
+            } else {
+                Log.d(TAG, "Send STOMP message: " + stompMessage);
+                openedSocked.send(stompMessage);
+                subscriber.onCompleted();
+            }
+        });
+    }
+
+    @Override
+    public Observable<LifecycleEvent> getLifecycleReceiver() {
+        return Observable.<LifecycleEvent>create(subscriber -> {
+            mLifecycleSubscribers.add(subscriber);
+
+        }).doOnUnsubscribe(() -> {
+            Iterator<Subscriber<? super LifecycleEvent>> iterator = mLifecycleSubscribers.iterator();
+            while (iterator.hasNext()) {
+                if (iterator.next().isUnsubscribed()) iterator.remove();
+            }
+        });
+    }
+
+    private TreeMap<String, String> headersAsMap(Response response) {
+        TreeMap<String, String> headersAsMap = new TreeMap<>();
+        Headers headers = response.headers();
+        for (String key : headers.names()) {
+            headersAsMap.put(key, headers.get(key));
+        }
+        return headersAsMap;
+    }
+
+    private void addConnectionHeadersToBuilder(Request.Builder requestBuilder, Map<String, String> mConnectHttpHeaders) {
+        for (Map.Entry<String, String> headerEntry : mConnectHttpHeaders.entrySet()) {
+            requestBuilder.addHeader(headerEntry.getKey(), headerEntry.getValue());
+        }
+    }
+
+    private void emitLifecycleEvent(LifecycleEvent lifecycleEvent) {
+        Log.d(TAG, "Emit lifecycle event: " + lifecycleEvent.getType().name());
+        for (Subscriber<? super LifecycleEvent> subscriber : mLifecycleSubscribers) {
+            subscriber.onNext(lifecycleEvent);
+        }
+    }
+
+    private void emitMessage(String stompMessage) {
+        Log.d(TAG, "Emit STOMP message: " + stompMessage);
+        for (Subscriber<? super String> subscriber : mMessagesSubscribers) {
+            subscriber.onNext(stompMessage);
+        }
+    }
+}
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/Stomp.java b/lib/src/main/java/ua/naiksoftware/stomp/Stomp.java
index 5a1d1c5..8dc4eda 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/Stomp.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/Stomp.java
@@ -9,6 +9,7 @@
 /**
  * Supported overlays:
  *  - org.java_websocket.WebSocket ('org.java-websocket:Java-WebSocket:1.3.0')
+ *  - okhttp3.WebSocket ('com.squareup.okhttp3:okhttp:3.8.0')
  *
  *  You can add own relay, just implement ConnectionProvider for you stomp transport,
  *  such as web socket.
@@ -31,6 +32,8 @@ public static StompClient over(Class clazz, String uri) {
     public static StompClient over(Class clazz, String uri, Map<String, String> connectHttpHeaders) {
         if (clazz == WebSocket.class) {
             return createStompClient(new WebSocketsConnectionProvider(uri, connectHttpHeaders));
+        } else if (clazz == okhttp3.WebSocket.class) {
+            return createStompClient(new OkHttpConnectionProvider(uri, connectHttpHeaders));
         }
 
         throw new RuntimeException("Not supported overlay transport: " + clazz.getName());

From 12876e921d02cfa18ffb05388342bb734b79eabf Mon Sep 17 00:00:00 2001
From: Francois Lolom <francois.lolom@gmail.com>
Date: Tue, 30 May 2017 14:25:30 +0200
Subject: [PATCH 019/110] Small refactor the WebSocket connection provider

* clean imports
* package visibility for all provider implementation (force instantiation
of the connection provider from the Stomp class only)
* Subscriber lists are final
---
 .../stomp/WebSocketsConnectionProvider.java           | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java b/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java
index e8129a6..9c23c65 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java
@@ -1,6 +1,5 @@
 package ua.naiksoftware.stomp;
 
-import android.os.Looper;
 import android.util.Log;
 
 import org.java_websocket.WebSocket;
@@ -27,15 +26,17 @@
 /**
  * Created by naik on 05.05.16.
  */
-public class WebSocketsConnectionProvider implements ConnectionProvider {
+/* package */ class WebSocketsConnectionProvider implements ConnectionProvider {
 
     private static final String TAG = WebSocketsConnectionProvider.class.getSimpleName();
 
     private final String mUri;
     private final Map<String, String> mConnectHttpHeaders;
+
+    private final List<Subscriber<? super LifecycleEvent>> mLifecycleSubscribers;
+    private final List<Subscriber<? super String>> mMessagesSubscribers;
+
     private WebSocketClient mWebSocketClient;
-    private List<Subscriber<? super LifecycleEvent>> mLifecycleSubscribers;
-    private List<Subscriber<? super String>> mMessagesSubscribers;
     private boolean haveConnection;
     private TreeMap<String, String> mServerHandshakeHeaders;
 
@@ -43,7 +44,7 @@ public class WebSocketsConnectionProvider implements ConnectionProvider {
      * Support UIR scheme ws://host:port/path
      * @param connectHttpHeaders may be null
      */
-    public WebSocketsConnectionProvider(String uri, Map<String, String> connectHttpHeaders) {
+    /* package */ WebSocketsConnectionProvider(String uri, Map<String, String> connectHttpHeaders) {
         mUri = uri;
         mConnectHttpHeaders = connectHttpHeaders != null ? connectHttpHeaders : new HashMap<>();
         mLifecycleSubscribers = new ArrayList<>();

From 09f8b4b25493665357963473ef0c12d77cbb79c3 Mon Sep 17 00:00:00 2001
From: Francois Lolom <francois.lolom@gmail.com>
Date: Tue, 30 May 2017 15:39:08 +0200
Subject: [PATCH 020/110] Accept existing websocket client as parameter

The main motivation is to make possible to the user of the library to pass
its own websocket client: this way, the developer can configure and/or
enable/disable additionnal features of the client (ping to keep the connection alive
with OkHttp, or configure timeouts for example)
---
 .../stomp/OkHttpConnectionProvider.java       |  9 ++--
 .../java/ua/naiksoftware/stomp/Stomp.java     | 42 ++++++++++++++++++-
 2 files changed, 44 insertions(+), 7 deletions(-)

diff --git a/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java b/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java
index 80ab787..7e9e7e9 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java
@@ -25,6 +25,7 @@
 
     private final String mUri;
     private final Map<String, String> mConnectHttpHeaders;
+    private final OkHttpClient mOkHttpClient;
 
     private final List<Subscriber<? super LifecycleEvent>> mLifecycleSubscribers;
     private final List<Subscriber<? super String>> mMessagesSubscribers;
@@ -32,11 +33,12 @@
     private WebSocket openedSocked;
 
 
-    /* package */ OkHttpConnectionProvider(String uri, Map<String, String> connectHttpHeaders) {
+    /* package */ OkHttpConnectionProvider(String uri, Map<String, String> connectHttpHeaders, OkHttpClient okHttpClient) {
         mUri = uri;
         mConnectHttpHeaders = connectHttpHeaders != null ? connectHttpHeaders : new HashMap<>();
         mLifecycleSubscribers = new ArrayList<>();
         mMessagesSubscribers = new ArrayList<>();
+        mOkHttpClient = okHttpClient;
     }
 
     @Override
@@ -67,15 +69,12 @@ private void createWebSocketConnection() {
             throw new IllegalStateException("Already have connection to web socket");
         }
 
-        OkHttpClient okHttpClient = new OkHttpClient.Builder()
-                .build();
-
         Request.Builder requestBuilder = new Request.Builder()
                 .url(mUri);
         
         addConnectionHeadersToBuilder(requestBuilder, mConnectHttpHeaders);
         
-        openedSocked = okHttpClient.newWebSocket(requestBuilder.build(),
+        openedSocked = mOkHttpClient.newWebSocket(requestBuilder.build(),
                 new WebSocketListener() {
                     @Override
                     public void onOpen(WebSocket webSocket, Response response) {
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/Stomp.java b/lib/src/main/java/ua/naiksoftware/stomp/Stomp.java
index 8dc4eda..025c70c 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/Stomp.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/Stomp.java
@@ -4,6 +4,7 @@
 
 import java.util.Map;
 
+import okhttp3.OkHttpClient;
 import ua.naiksoftware.stomp.client.StompClient;
 
 /**
@@ -19,7 +20,7 @@
 public class Stomp {
 
     public static StompClient over(Class clazz, String uri) {
-        return over(clazz, uri, null);
+        return over(clazz, uri, null, null);
     }
 
     /**
@@ -30,10 +31,34 @@ public static StompClient over(Class clazz, String uri) {
      * @return StompClient for receiving and sending messages. Call #StompClient.connect
      */
     public static StompClient over(Class clazz, String uri, Map<String, String> connectHttpHeaders) {
+        return over(clazz, uri, connectHttpHeaders, null);
+    }
+
+    /**
+     * {@code webSocketClient} can accept the following type of clients:
+     * <ul>
+     *     <li>{@code org.java_websocket.WebSocket}: cannot accept an existing client</li>
+     *     <li>{@code okhttp3.WebSocket}: can accept a non-null instance of {@code okhttp3.OkHttpClient}</li>
+     * </ul>
+     * @param clazz class for using as transport
+     * @param uri URI to connect
+     * @param connectHttpHeaders HTTP headers, will be passed with handshake query, may be null
+     * @param webSocketClient Existing client that will be used to open the WebSocket connection, may be null to use default client
+     * @return StompClient for receiving and sending messages. Call #StompClient.connect
+     */
+    public static StompClient over(Class clazz, String uri, Map<String, String> connectHttpHeaders, Object webSocketClient) {
         if (clazz == WebSocket.class) {
+
+            if (webSocketClient != null) {
+                throw new IllegalArgumentException("You cannot pass a webSocketClient with 'org.java_websocket.WebSocket'. use null instead.");
+            }
+
             return createStompClient(new WebSocketsConnectionProvider(uri, connectHttpHeaders));
         } else if (clazz == okhttp3.WebSocket.class) {
-            return createStompClient(new OkHttpConnectionProvider(uri, connectHttpHeaders));
+
+            OkHttpClient okHttpClient = getOkHttpClient(webSocketClient);
+
+            return createStompClient(new OkHttpConnectionProvider(uri, connectHttpHeaders, okHttpClient));
         }
 
         throw new RuntimeException("Not supported overlay transport: " + clazz.getName());
@@ -42,4 +67,17 @@ public static StompClient over(Class clazz, String uri, Map<String, String> conn
     private static StompClient createStompClient(ConnectionProvider connectionProvider) {
         return new StompClient(connectionProvider);
     }
+
+    private static OkHttpClient getOkHttpClient(Object webSocketClient) {
+        if (webSocketClient != null) {
+            if (webSocketClient instanceof OkHttpClient) {
+                return (OkHttpClient) webSocketClient;
+            } else {
+                throw new IllegalArgumentException("You must pass a non-null instance of an 'okhttp3.OkHttpClient'. Or pass null to use a default websocket client.");
+            }
+        } else {
+            // default http client
+            return new OkHttpClient();
+        }
+    }
 }

From fec8f16dcc225e93fec3ffe35ae6467edfd67ddd Mon Sep 17 00:00:00 2001
From: Francois Lolom <francois.lolom@gmail.com>
Date: Tue, 30 May 2017 15:48:54 +0200
Subject: [PATCH 021/110] Update README with OkHttp connection provider

---
 README.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index bd4e31b..38fa3e0 100644
--- a/README.md
+++ b/README.md
@@ -65,6 +65,8 @@ Check out the full example server https://github.com/NaikSoftware/stomp-protocol
 
 **Basic usage**
 ``` java
+ import org.java_websocket.WebSocket;
+
  private StompClient mStompClient;
  
  // ...
@@ -89,7 +91,8 @@ See the full example https://github.com/NaikSoftware/StompProtocolAndroid/tree/m
 Method `Stomp.over` consume class for create connection as first parameter.
 You must provide dependency for lib and pass class.
 At now supported connection providers:
-- WebSocket.class ('org.java-websocket:Java-WebSocket:1.3.0')
+- `org.java_websocket.WebSocket.class` ('org.java-websocket:Java-WebSocket:1.3.0')
+- `okhttp3.WebSocket.class` ('com.squareup.okhttp3:okhttp:3.8.0')
 
 You can add own connection provider. Just implement interface `ConnectionProvider`.
 If you implement new provider, please create pull request :)

From 631a4e3473a3225c5dde08fc63042635a1abbd8d Mon Sep 17 00:00:00 2001
From: NaikSoftware <naiksav4enko@gmail.com>
Date: Sat, 17 Jun 2017 17:58:48 +0300
Subject: [PATCH 022/110] Fix ClassNotFoundException

---
 .../java/ua/naiksoftware/stomp/Stomp.java     | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/lib/src/main/java/ua/naiksoftware/stomp/Stomp.java b/lib/src/main/java/ua/naiksoftware/stomp/Stomp.java
index 025c70c..1f714df 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/Stomp.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/Stomp.java
@@ -47,19 +47,24 @@ public static StompClient over(Class clazz, String uri, Map<String, String> conn
      * @return StompClient for receiving and sending messages. Call #StompClient.connect
      */
     public static StompClient over(Class clazz, String uri, Map<String, String> connectHttpHeaders, Object webSocketClient) {
-        if (clazz == WebSocket.class) {
+        try {
+            if (Class.forName("org.java_websocket.WebSocket") != null && clazz == WebSocket.class) {
 
-            if (webSocketClient != null) {
-                throw new IllegalArgumentException("You cannot pass a webSocketClient with 'org.java_websocket.WebSocket'. use null instead.");
-            }
+                if (webSocketClient != null) {
+                    throw new IllegalArgumentException("You cannot pass a webSocketClient with 'org.java_websocket.WebSocket'. use null instead.");
+                }
 
-            return createStompClient(new WebSocketsConnectionProvider(uri, connectHttpHeaders));
-        } else if (clazz == okhttp3.WebSocket.class) {
+                return createStompClient(new WebSocketsConnectionProvider(uri, connectHttpHeaders));
+            }
+        } catch (ClassNotFoundException e) {}
+        try {
+            if (Class.forName("okhttp3.WebSocket") != null && clazz == okhttp3.WebSocket.class) {
 
-            OkHttpClient okHttpClient = getOkHttpClient(webSocketClient);
+                OkHttpClient okHttpClient = getOkHttpClient(webSocketClient);
 
-            return createStompClient(new OkHttpConnectionProvider(uri, connectHttpHeaders, okHttpClient));
-        }
+                return createStompClient(new OkHttpConnectionProvider(uri, connectHttpHeaders, okHttpClient));
+            }
+        } catch (ClassNotFoundException e) {}
 
         throw new RuntimeException("Not supported overlay transport: " + clazz.getName());
     }

From d2cac6d351f97faf9945fc81a4c9c003355a1026 Mon Sep 17 00:00:00 2001
From: NaikSoftware <naiksav4enko@gmail.com>
Date: Mon, 3 Jul 2017 16:09:46 +0300
Subject: [PATCH 023/110] Use concurrent list instead ArrayList for deferred
 subscribers

---
 .../main/java/ua/naiksoftware/stomp/client/StompClient.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java b/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
index 26bee54..cb84462 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
@@ -11,6 +11,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
+import java.util.concurrent.CopyOnWriteArrayList;
 
 import rx.Observable;
 import rx.Subscriber;
@@ -40,7 +41,7 @@ public class StompClient {
 
     public StompClient(ConnectionProvider connectionProvider) {
         mConnectionProvider = connectionProvider;
-        mWaitConnectionObservables = new ArrayList<>();
+        mWaitConnectionObservables = new CopyOnWriteArrayList<>();
     }
 
     /**

From e1bfc3b6c725823f8c5c958fbc38f3d6c3843c62 Mon Sep 17 00:00:00 2001
From: Forrest Hopkins <fingerheroes@gmail.com>
Date: Mon, 31 Jul 2017 17:00:12 -0700
Subject: [PATCH 024/110] Removing Retrolambda and adding support for Native
 Java 8 compilation

---
 .gitignore                               | 3 +++
 build.gradle                             | 8 +++++---
 example-client/build.gradle              | 7 +++----
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 lib/build.gradle                         | 7 +++----
 5 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index c6cbe56..a814809 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,9 @@
 /local.properties
 /.idea/workspace.xml
 /.idea/libraries
+/.idea/misc.xml
+/.idea/modules.xml
+/.idea/vcs.xml
 .DS_Store
 /build
 /captures
diff --git a/build.gradle b/build.gradle
index de159c8..4b06603 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,11 +3,13 @@
 buildscript {
     repositories {
         jcenter()
+        maven {
+            url "https://maven.google.com"
+        }
     }
     dependencies {
-        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'
+        classpath 'com.android.tools.build:gradle:3.0.0-alpha8'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/example-client/build.gradle b/example-client/build.gradle
index f254f38..b12b778 100644
--- a/example-client/build.gradle
+++ b/example-client/build.gradle
@@ -1,5 +1,4 @@
 apply plugin: 'com.android.application'
-apply plugin: 'me.tatarka.retrolambda'
 
 android {
     compileSdkVersion 25
@@ -32,8 +31,8 @@ dependencies {
     compile 'org.java-websocket:java-websocket:1.3.2'
     compile 'com.android.support:recyclerview-v7:25.2.0'
     compile 'io.reactivex:rxandroid:1.2.1'
-    compile 'com.squareup.retrofit2:converter-gson:2.1.0'
-    compile 'com.squareup.retrofit2:adapter-rxjava:2.1.0'
-    compile 'com.squareup.retrofit2:retrofit:2.1.0'
+    compile 'com.squareup.retrofit2:converter-gson:2.3.0'
+    compile 'com.squareup.retrofit2:adapter-rxjava:2.3.0'
+    compile 'com.squareup.retrofit2:retrofit:2.3.0'
     compile project(':lib')
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 16f16db..3eecfb3 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Feb 23 17:37:13 EET 2017
+#Mon Jul 31 15:30:48 MST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-milestone-1-all.zip
diff --git a/lib/build.gradle b/lib/build.gradle
index 183b041..4401dad 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -1,12 +1,11 @@
 apply plugin: 'com.android.library'
-apply plugin: 'me.tatarka.retrolambda'
 apply plugin: 'com.github.dcendents.android-maven'
 
 group='com.github.NaikSoftware'
 
 android {
     compileSdkVersion 25
-    buildToolsVersion "25.0.1"
+    buildToolsVersion "25.0.2"
 
     defaultConfig {
         minSdkVersion 16
@@ -32,10 +31,10 @@ android {
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
     testCompile 'junit:junit:4.12'
-    compile 'io.reactivex:rxjava:1.2.0'
+    compile 'io.reactivex:rxjava:1.3.0'
     // Supported transports
     provided "org.java-websocket:java-websocket:1.3.2"
-    provided 'com.squareup.okhttp3:okhttp:3.8.0'
+    provided 'com.squareup.okhttp3:okhttp:3.8.1'
 }
 
 task sourcesJar(type: Jar) {

From 36ba99c8f46afc421cc39f79970714d3f8f65d5f Mon Sep 17 00:00:00 2001
From: Forrest Hopkins <fingerheroes@gmail.com>
Date: Tue, 1 Aug 2017 08:08:34 -0700
Subject: [PATCH 025/110] Update to Canary 9

---
 build.gradle                             | 2 +-
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 4b06603..4a30413 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0-alpha8'
+        classpath 'com.android.tools.build:gradle:3.0.0-alpha9'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 3eecfb3..168b761 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Jul 31 15:30:48 MST 2017
+#Tue Aug 01 08:03:03 MST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-milestone-1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-rc-1-all.zip

From 1952ea1396ec5c48888c1bc97bb4426e2a251118 Mon Sep 17 00:00:00 2001
From: Forrest Hopkins <fhopkins@cfms4.com>
Date: Tue, 1 Aug 2017 12:43:10 -0700
Subject: [PATCH 026/110] Fixed Gradle expecting both OkHttp and JWS, and
 updated documentation

---
 README.md        | 119 ++++++++++++++++++++++++++++++-----------------
 lib/build.gradle |   4 +-
 2 files changed, 79 insertions(+), 44 deletions(-)

diff --git a/README.md b/README.md
index 38fa3e0..0f6ab24 100644
--- a/README.md
+++ b/README.md
@@ -1,14 +1,17 @@
 # STOMP protocol via WebSocket for Android
 
-[![Release](https://jitpack.io/v/NaikSoftware/StompProtocolAndroid.svg)](https://jitpack.io/#NaikSoftware/StompProtocolAndroid)
+[![Release](https://jitpack.io/v/forresthopkinsa/StompProtocolAndroid.svg)](https://jitpack.io/#forresthopkinsa/StompProtocolAndroid)
 
 ## Overview
 
-This library provide support for STOMP protocol https://stomp.github.io/
-At now library works only as client for backend with support STOMP, such as
-NodeJS (stompjs or other) or Spring Boot (SockJS).
+**Note that this is a FORK of a project by NaikSoftware! This version is purely to avoid using RetroLambda!**
 
-Add library as gradle dependency
+This library provides support for [STOMP protocol](https://stomp.github.io/) over Websockets.
+
+At now library works only as client for any backend that supports STOMP, such as
+NodeJS (e.g. using StompJS) or Spring Boot ([with WebSocket support](https://spring.io/guides/gs/messaging-stomp-websocket/)).
+
+Add library as gradle dependency (Versioning info [here](https://jitpack.io/#forresthopkinsa/StompProtocolAndroid)):
 
 ```gradle
 repositories { 
@@ -16,45 +19,54 @@ repositories {
     maven { url "https://jitpack.io" }
 }
 dependencies {
-    compile 'com.github.NaikSoftware:StompProtocolAndroid:{latest version}'
+    compile 'com.github.forresthopkinsa:StompProtocolAndroid:{latest version}'
 }
 ```
 
+You can use this library two ways:
+
+- Using the old JACK toolchain
+  - If you have Java 8 compatiblity and Jack enabled, this library will work for you
+- Using the new Native Java 8 support
+  - As of this writing, you must be using Android Studio Canary to use this feature.
+  - You can find more info on the [Releases Page](https://github.com/forresthopkinsa/StompProtocolAndroid/releases)
+
+However, *this fork is NOT compatible with Retrolambda.*
+If you have RL as a dependency, then you should be using the [upstream version](https://github.com/NaikSoftware/StompProtocolAndroid) of this project!
+
 ## Example backend (Spring Boot)
 
-**WebSocketConfig.groovy**
-```groovy
+**WebSocketConfig.java**
+```java
 @Configuration
 @EnableWebSocket
 @EnableWebSocketMessageBroker
 class WebSocketConfig extends AbstractWebSocketMessageBrokerConfigurer {
 
     @Override
-    void configureMessageBroker(MessageBrokerRegistry config) {
-        config.enableSimpleBroker("/topic", "/queue", "/exchange");
-//        config.enableStompBrokerRelay("/topic", "/queue", "/exchange"); // Uncomment for external message broker (ActiveMQ, RabbitMQ)
-        config.setApplicationDestinationPrefixes("/topic", "/queue"); // prefix in client queries
-        config.setUserDestinationPrefix("/user");
+    public void configureMessageBroker(MessageBrokerRegistry config) {
+        // We're using Spring's built-in message broker, with prefix "/topic"
+        config.enableSimpleBroker("/topic");
+        // This is the prefix for client requests
+        config.setApplicationDestinationPrefixes("/app");
     }
 
     @Override
-    void registerStompEndpoints(StompEndpointRegistry registry) {
-        registry.addEndpoint("/example-endpoint").withSockJS()
+    public void registerStompEndpoints(StompEndpointRegistry registry) {
+        registry.addEndpoint("/example-endpoint");
     }
 }
 ```
 
-**SocketController.groovy**
-``` groovy
-@Log4j
+**SocketController.java**
+``` java
 @RestController
 class SocketController {
 
-    @MessageMapping('/hello-msg-mapping')
+    @MessageMapping('/hello')
     @SendTo('/topic/greetings')
-    EchoModel echoMessageMapping(String message) {
-        log.debug("React to hello-msg-mapping")
-        return new EchoModel(message.trim())
+    public String greeting(String name) {
+        return "Hello, " + name + "!";
     }
 }
 ```
@@ -65,24 +77,30 @@ Check out the full example server https://github.com/NaikSoftware/stomp-protocol
 
 **Basic usage**
 ``` java
- import org.java_websocket.WebSocket;
-
- private StompClient mStompClient;
+ import okhttp3.OkHttpClient;
+ import okhttp3.Request;
+ import okhttp3.Response;
+ import okhttp3.WebSocket;
+ import okhttp3.WebSocketListener;
  
  // ...
  
- mStompClient = Stomp.over(WebSocket.class, "ws://10.0.2.2:8080/example-endpoint/websocket");
- mStompClient.connect();
+ StompClient client = Stomp.over(WebSocket.class, "http://localhost/example-endpoint");
+ client.connect();
   
- mStompClient.topic("/topic/greetings").subscribe(topicMessage -> {
-     Log.d(TAG, topicMessage.getPayload());
+ client.topic("/topic/greetings").subscribe(message -> {
+     Log.i(TAG, "Received message: " + message.getPayload());
  });
   
- mStompClient.send("/topic/hello-msg-mapping", "My first STOMP message!").subscribe();
+ client.send("/app/hello", "world").subscribe(
+     aVoid -> Log.d(TAG, "Sent data!"),
+     error -> Log.e(TAG, "Encountered error while sending data!", error)
+ );
   
  // ...
- 
- mStompClient.disconnect();
+
+ // close socket connection when finished or exiting
+ client.disconnect();
 
 ```
 
@@ -91,30 +109,47 @@ See the full example https://github.com/NaikSoftware/StompProtocolAndroid/tree/m
 Method `Stomp.over` consume class for create connection as first parameter.
 You must provide dependency for lib and pass class.
 At now supported connection providers:
-- `org.java_websocket.WebSocket.class` ('org.java-websocket:Java-WebSocket:1.3.0')
-- `okhttp3.WebSocket.class` ('com.squareup.okhttp3:okhttp:3.8.0')
+- `org.java_websocket.WebSocket.class` ('org.java-websocket:Java-WebSocket:1.3.2')
+- `okhttp3.WebSocket.class` ('com.squareup.okhttp3:okhttp:3.8.1')
 
 You can add own connection provider. Just implement interface `ConnectionProvider`.
 If you implement new provider, please create pull request :)
 
 **Subscribe lifecycle connection**
 ``` java
-mStompClient.lifecycle().subscribe(lifecycleEvent -> {
+client.lifecycle().subscribe(lifecycleEvent -> {
     switch (lifecycleEvent.getType()) {
-    
         case OPENED:
             Log.d(TAG, "Stomp connection opened");
             break;
-            
-        case ERROR:
-            Log.e(TAG, "Error", lifecycleEvent.getException());
-            break;
-            
         case CLOSED:
              Log.d(TAG, "Stomp connection closed");
              break;
+        case ERROR:
+            Log.e(TAG, "Stomp connection error", lifecycleEvent.getException());
+            break;
     }
 });
 ```
 
-Library support just send & receive messages. ACK messages, transactions not implemented yet.
+**Custom client**
+
+You can use a custom HttpClient (for example, if you want to allow untrusted HTTPS) using the four-argument overload of Stomp.over, like so:
+
+``` java
+client = Stomp.over(WebSocket.class, address, null, unsafeClient);
+```
+
+Yes, it's safe to pass `null` for either (or both) of the last two arguments. That's exactly what the shorter overloads do.
+
+**Support**
+
+Right now, the library only supports sending and receiving messages. ACK messages and transactions are not implemented yet.
+
+**Additional Reading**
+
+- [Spring + Websockets + STOMP](https://spring.io/guides/gs/messaging-stomp-websocket/)
+- [STOMP Protocol](http://stomp.github.io/)
+- [Spring detailed documentation](https://docs.spring.io/spring/docs/current/spring-framework-reference/html/websocket.html#websocket-stomp)
+- [Create an Unsafe OkHttp Client](https://gist.github.com/grow2014/b6969d8f0cfc0f0a1b2bf12f84973dec)
+  - (for developing with invalid SSL certs)
\ No newline at end of file
diff --git a/lib/build.gradle b/lib/build.gradle
index 4401dad..141d5c5 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -33,8 +33,8 @@ dependencies {
     testCompile 'junit:junit:4.12'
     compile 'io.reactivex:rxjava:1.3.0'
     // Supported transports
-    provided "org.java-websocket:java-websocket:1.3.2"
-    provided 'com.squareup.okhttp3:okhttp:3.8.1'
+    compile 'org.java-websocket:java-websocket:1.3.2'
+    compile 'com.squareup.okhttp3:okhttp:3.8.1'
 }
 
 task sourcesJar(type: Jar) {

From 98e578a704ce7bebcffcb85b4206d22032acd459 Mon Sep 17 00:00:00 2001
From: Forrest Hopkins <fingerheroes@gmail.com>
Date: Wed, 2 Aug 2017 16:58:23 -0700
Subject: [PATCH 027/110] Added disconnect() to interface, cleaned up some Rx
 methods

---
 .../stomp/ConnectionProvider.java             |  7 +++
 .../stomp/OkHttpConnectionProvider.java       | 47 +++++++++++++++++--
 .../stomp/WebSocketsConnectionProvider.java   |  9 ++++
 .../stomp/client/StompClient.java             | 14 +++---
 4 files changed, 66 insertions(+), 11 deletions(-)

diff --git a/lib/src/main/java/ua/naiksoftware/stomp/ConnectionProvider.java b/lib/src/main/java/ua/naiksoftware/stomp/ConnectionProvider.java
index bf39020..28a0460 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/ConnectionProvider.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/ConnectionProvider.java
@@ -1,5 +1,6 @@
 package ua.naiksoftware.stomp;
 
+import rx.Completable;
 import rx.Observable;
 
 /**
@@ -23,4 +24,10 @@ public interface ConnectionProvider {
      * Subscribe this for receive #LifecycleEvent events
      */
     Observable<LifecycleEvent> getLifecycleReceiver();
+
+    /**
+     * Disconnects from server. This is basically a Callable.
+     * Automatically emits Lifecycle.CLOSE
+     */
+    Completable disconnect();
 }
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java b/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java
index 7e9e7e9..0625ef0 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java
@@ -16,8 +16,10 @@
 import okhttp3.WebSocket;
 import okhttp3.WebSocketListener;
 import okio.ByteString;
+import rx.Completable;
 import rx.Observable;
 import rx.Subscriber;
+import rx.subjects.PublishSubject;
 
 /* package */ class OkHttpConnectionProvider implements ConnectionProvider {
 
@@ -28,7 +30,9 @@
     private final OkHttpClient mOkHttpClient;
 
     private final List<Subscriber<? super LifecycleEvent>> mLifecycleSubscribers;
+    private final PublishSubject<LifecycleEvent> mLifecycleStream;
     private final List<Subscriber<? super String>> mMessagesSubscribers;
+    private final PublishSubject<String> mMessagesStream;
 
     private WebSocket openedSocked;
 
@@ -39,10 +43,20 @@
         mLifecycleSubscribers = new ArrayList<>();
         mMessagesSubscribers = new ArrayList<>();
         mOkHttpClient = okHttpClient;
+
+        mLifecycleStream = PublishSubject.create();
+        mMessagesStream = PublishSubject.create();
     }
 
     @Override
     public Observable<String> messages() {
+        createWebSocketConnection();
+        // By using Subjects, we can leave the tracking of Subscribers to Rx.
+        // Additionally, server disconnection is now handled manually
+        //    (instead of trying to support disconnecting just by unsubscribing)
+        return mMessagesStream;
+
+        /*
         Observable<String> observable = Observable.<String>create(subscriber -> {
             mMessagesSubscribers.add(subscriber);
 
@@ -61,6 +75,14 @@ public Observable<String> messages() {
 
         createWebSocketConnection();
         return observable;
+        */
+    }
+
+    // this used to be done automatically whenever the "subscriber list" was empty
+    // this way is more discrete
+    @Override
+    public Completable disconnect() {
+        return Completable.fromAction(() -> openedSocked.close(1000, ""));
     }
 
     private void createWebSocketConnection() {
@@ -71,9 +93,9 @@ private void createWebSocketConnection() {
 
         Request.Builder requestBuilder = new Request.Builder()
                 .url(mUri);
-        
+
         addConnectionHeadersToBuilder(requestBuilder, mConnectHttpHeaders);
-        
+
         openedSocked = mOkHttpClient.newWebSocket(requestBuilder.build(),
                 new WebSocketListener() {
                     @Override
@@ -113,19 +135,24 @@ public void onFailure(WebSocket webSocket, Throwable t, Response response) {
 
     @Override
     public Observable<Void> send(String stompMessage) {
-        return Observable.create(subscriber -> {
+        // .create(onSubscribe) is deprecated because it's unsafe
+        return Observable.fromCallable(() -> {
             if (openedSocked == null) {
-                subscriber.onError(new IllegalStateException("Not connected yet"));
+                throw new IllegalStateException("Not connected yet");
             } else {
                 Log.d(TAG, "Send STOMP message: " + stompMessage);
                 openedSocked.send(stompMessage);
-                subscriber.onCompleted();
+                return null;
             }
         });
     }
 
     @Override
     public Observable<LifecycleEvent> getLifecycleReceiver() {
+        // Once again, opting to leave Subscriber tracking to Rx
+        return mLifecycleStream;
+
+        /*
         return Observable.<LifecycleEvent>create(subscriber -> {
             mLifecycleSubscribers.add(subscriber);
 
@@ -135,6 +162,7 @@ public Observable<LifecycleEvent> getLifecycleReceiver() {
                 if (iterator.next().isUnsubscribed()) iterator.remove();
             }
         });
+        */
     }
 
     private TreeMap<String, String> headersAsMap(Response response) {
@@ -154,15 +182,24 @@ private void addConnectionHeadersToBuilder(Request.Builder requestBuilder, Map<S
 
     private void emitLifecycleEvent(LifecycleEvent lifecycleEvent) {
         Log.d(TAG, "Emit lifecycle event: " + lifecycleEvent.getType().name());
+        // I know Subjects are discouraged, but I think this is way cleaner than before
+        mLifecycleStream.onNext(lifecycleEvent);
+
+        /*
         for (Subscriber<? super LifecycleEvent> subscriber : mLifecycleSubscribers) {
             subscriber.onNext(lifecycleEvent);
         }
+        */
     }
 
     private void emitMessage(String stompMessage) {
         Log.d(TAG, "Emit STOMP message: " + stompMessage);
+        mMessagesStream.onNext(stompMessage);
+
+        /*
         for (Subscriber<? super String> subscriber : mMessagesSubscribers) {
             subscriber.onNext(stompMessage);
         }
+        */
     }
 }
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java b/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java
index 9c23c65..d5bc991 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java
@@ -20,6 +20,7 @@
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLSocketFactory;
 
+import rx.Completable;
 import rx.Observable;
 import rx.Subscriber;
 
@@ -145,6 +146,14 @@ public Observable<Void> send(String stompMessage) {
         });
     }
 
+    // Just to appease javac
+    @Override
+    public Completable disconnect() {
+        return Completable.fromAction(() -> {
+            throw new UnsupportedOperationException("JAVA WEB SOCKETS ARE NOT YET SUPPORTED IN THIS VERSION");
+        });
+    }
+
     private void emitLifecycleEvent(LifecycleEvent lifecycleEvent) {
         Log.d(TAG, "Emit lifecycle event: " + lifecycleEvent.getType().name());
         for (Subscriber<? super LifecycleEvent> subscriber : mLifecycleSubscribers) {
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java b/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
index cb84462..187119d 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
@@ -72,7 +72,8 @@ public void connect(List<StompHeader> _headers) {
     public void connect(List<StompHeader> _headers, boolean reconnect) {
         if (reconnect) disconnect();
         if (mConnected) return;
-        mConnectionProvider.getLifecycleReceiver()
+        // why wasn't this DRY before?
+        lifecycle()
                 .subscribe(lifecycleEvent -> {
                     switch (lifecycleEvent.getType()) {
                         case OPENED:
@@ -128,9 +129,10 @@ public Observable<Void> send(String destination, String data) {
     public Observable<Void> send(StompMessage stompMessage) {
         Observable<Void> observable = mConnectionProvider.send(stompMessage.compile());
         if (!mConnected) {
-            ConnectableObservable<Void> deffered = observable.publish();
-            mWaitConnectionObservables.add(deffered);
-            return deffered;
+            // my inner grammar nazi
+            ConnectableObservable<Void> deferred = observable.publish();
+            mWaitConnectionObservables.add(deferred);
+            return deferred;
         } else {
             return observable;
         }
@@ -153,8 +155,8 @@ public Observable<LifecycleEvent> lifecycle() {
     }
 
     public void disconnect() {
-        if (mMessagesSubscription != null) mMessagesSubscription.unsubscribe();
-        mConnected = false;
+        // the other things are now taken care of downstream
+        mConnectionProvider.disconnect().subscribe();
     }
 
     public Observable<StompMessage> topic(String destinationPath) {

From 24f989f5375a9f2948a4e3097c4f44710ef19362 Mon Sep 17 00:00:00 2001
From: Forrest Hopkins <fingerheroes@gmail.com>
Date: Thu, 3 Aug 2017 09:21:42 -0700
Subject: [PATCH 028/110] Cleaning up, restoring JWS support

---
 README.md                                     |  2 +-
 .../stomp/ConnectionProvider.java             |  2 +-
 .../stomp/OkHttpConnectionProvider.java       | 70 +----------------
 .../stomp/WebSocketsConnectionProvider.java   | 76 ++++++-------------
 .../stomp/client/StompClient.java             |  5 +-
 5 files changed, 30 insertions(+), 125 deletions(-)

diff --git a/README.md b/README.md
index 0f6ab24..9402e78 100644
--- a/README.md
+++ b/README.md
@@ -146,7 +146,7 @@ Yes, it's safe to pass `null` for either (or both) of the last two arguments. Th
 
 Right now, the library only supports sending and receiving messages. ACK messages and transactions are not implemented yet.
 
-**Additional Reading**
+## Additional Reading
 
 - [Spring + Websockets + STOMP](https://spring.io/guides/gs/messaging-stomp-websocket/)
 - [STOMP Protocol](http://stomp.github.io/)
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/ConnectionProvider.java b/lib/src/main/java/ua/naiksoftware/stomp/ConnectionProvider.java
index 28a0460..7866527 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/ConnectionProvider.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/ConnectionProvider.java
@@ -18,7 +18,7 @@ public interface ConnectionProvider {
      * onError if not connected or error detected will be called, or onCompleted id sending started
      * TODO: send messages with ACK
      */
-    Observable<Void> send(String stompMessage);
+    Completable send(String stompMessage);
 
     /**
      * Subscribe this for receive #LifecycleEvent events
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java b/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java
index 0625ef0..ffa79cc 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java
@@ -2,10 +2,7 @@
 
 import android.util.Log;
 
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 
@@ -18,10 +15,9 @@
 import okio.ByteString;
 import rx.Completable;
 import rx.Observable;
-import rx.Subscriber;
 import rx.subjects.PublishSubject;
 
-/* package */ class OkHttpConnectionProvider implements ConnectionProvider {
+class OkHttpConnectionProvider implements ConnectionProvider {
 
     private static final String TAG = WebSocketsConnectionProvider.class.getSimpleName();
 
@@ -29,19 +25,14 @@
     private final Map<String, String> mConnectHttpHeaders;
     private final OkHttpClient mOkHttpClient;
 
-    private final List<Subscriber<? super LifecycleEvent>> mLifecycleSubscribers;
     private final PublishSubject<LifecycleEvent> mLifecycleStream;
-    private final List<Subscriber<? super String>> mMessagesSubscribers;
     private final PublishSubject<String> mMessagesStream;
 
     private WebSocket openedSocked;
 
-
-    /* package */ OkHttpConnectionProvider(String uri, Map<String, String> connectHttpHeaders, OkHttpClient okHttpClient) {
+    OkHttpConnectionProvider(String uri, Map<String, String> connectHttpHeaders, OkHttpClient okHttpClient) {
         mUri = uri;
         mConnectHttpHeaders = connectHttpHeaders != null ? connectHttpHeaders : new HashMap<>();
-        mLifecycleSubscribers = new ArrayList<>();
-        mMessagesSubscribers = new ArrayList<>();
         mOkHttpClient = okHttpClient;
 
         mLifecycleStream = PublishSubject.create();
@@ -51,35 +42,9 @@
     @Override
     public Observable<String> messages() {
         createWebSocketConnection();
-        // By using Subjects, we can leave the tracking of Subscribers to Rx.
-        // Additionally, server disconnection is now handled manually
-        //    (instead of trying to support disconnecting just by unsubscribing)
         return mMessagesStream;
-
-        /*
-        Observable<String> observable = Observable.<String>create(subscriber -> {
-            mMessagesSubscribers.add(subscriber);
-
-        }).doOnUnsubscribe(() -> {
-            Iterator<Subscriber<? super String>> iterator = mMessagesSubscribers.iterator();
-            while (iterator.hasNext()) {
-                if (iterator.next().isUnsubscribed()) iterator.remove();
-            }
-
-            if (mMessagesSubscribers.size() < 1) {
-                Log.d(TAG, "Close web socket connection now in thread " + Thread.currentThread());
-                openedSocked.close(1000, "");
-                openedSocked = null;
-            }
-        });
-
-        createWebSocketConnection();
-        return observable;
-        */
     }
 
-    // this used to be done automatically whenever the "subscriber list" was empty
-    // this way is more discrete
     @Override
     public Completable disconnect() {
         return Completable.fromAction(() -> openedSocked.close(1000, ""));
@@ -134,9 +99,8 @@ public void onFailure(WebSocket webSocket, Throwable t, Response response) {
     }
 
     @Override
-    public Observable<Void> send(String stompMessage) {
-        // .create(onSubscribe) is deprecated because it's unsafe
-        return Observable.fromCallable(() -> {
+    public Completable send(String stompMessage) {
+        return Completable.fromCallable(() -> {
             if (openedSocked == null) {
                 throw new IllegalStateException("Not connected yet");
             } else {
@@ -149,20 +113,7 @@ public Observable<Void> send(String stompMessage) {
 
     @Override
     public Observable<LifecycleEvent> getLifecycleReceiver() {
-        // Once again, opting to leave Subscriber tracking to Rx
         return mLifecycleStream;
-
-        /*
-        return Observable.<LifecycleEvent>create(subscriber -> {
-            mLifecycleSubscribers.add(subscriber);
-
-        }).doOnUnsubscribe(() -> {
-            Iterator<Subscriber<? super LifecycleEvent>> iterator = mLifecycleSubscribers.iterator();
-            while (iterator.hasNext()) {
-                if (iterator.next().isUnsubscribed()) iterator.remove();
-            }
-        });
-        */
     }
 
     private TreeMap<String, String> headersAsMap(Response response) {
@@ -182,24 +133,11 @@ private void addConnectionHeadersToBuilder(Request.Builder requestBuilder, Map<S
 
     private void emitLifecycleEvent(LifecycleEvent lifecycleEvent) {
         Log.d(TAG, "Emit lifecycle event: " + lifecycleEvent.getType().name());
-        // I know Subjects are discouraged, but I think this is way cleaner than before
         mLifecycleStream.onNext(lifecycleEvent);
-
-        /*
-        for (Subscriber<? super LifecycleEvent> subscriber : mLifecycleSubscribers) {
-            subscriber.onNext(lifecycleEvent);
-        }
-        */
     }
 
     private void emitMessage(String stompMessage) {
         Log.d(TAG, "Emit STOMP message: " + stompMessage);
         mMessagesStream.onNext(stompMessage);
-
-        /*
-        for (Subscriber<? super String> subscriber : mMessagesSubscribers) {
-            subscriber.onNext(stompMessage);
-        }
-        */
     }
 }
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java b/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java
index d5bc991..4c6f94f 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java
@@ -10,10 +10,8 @@
 import org.java_websocket.handshake.ServerHandshake;
 
 import java.net.URI;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 
@@ -22,55 +20,47 @@
 
 import rx.Completable;
 import rx.Observable;
-import rx.Subscriber;
+import rx.subjects.PublishSubject;
 
 /**
  * Created by naik on 05.05.16.
  */
-/* package */ class WebSocketsConnectionProvider implements ConnectionProvider {
+
+class WebSocketsConnectionProvider implements ConnectionProvider {
 
     private static final String TAG = WebSocketsConnectionProvider.class.getSimpleName();
 
     private final String mUri;
     private final Map<String, String> mConnectHttpHeaders;
 
-    private final List<Subscriber<? super LifecycleEvent>> mLifecycleSubscribers;
-    private final List<Subscriber<? super String>> mMessagesSubscribers;
-
     private WebSocketClient mWebSocketClient;
     private boolean haveConnection;
     private TreeMap<String, String> mServerHandshakeHeaders;
 
+    private final PublishSubject<LifecycleEvent> mLifecycleStream;
+    private final PublishSubject<String> mMessagesStream;
+
     /**
      * Support UIR scheme ws://host:port/path
      * @param connectHttpHeaders may be null
      */
-    /* package */ WebSocketsConnectionProvider(String uri, Map<String, String> connectHttpHeaders) {
+    WebSocketsConnectionProvider(String uri, Map<String, String> connectHttpHeaders) {
         mUri = uri;
         mConnectHttpHeaders = connectHttpHeaders != null ? connectHttpHeaders : new HashMap<>();
-        mLifecycleSubscribers = new ArrayList<>();
-        mMessagesSubscribers = new ArrayList<>();
+
+        mLifecycleStream = PublishSubject.create();
+        mMessagesStream = PublishSubject.create();
     }
 
     @Override
     public Observable<String> messages() {
-        Observable<String> observable = Observable.<String>create(subscriber -> {
-            mMessagesSubscribers.add(subscriber);
-
-        }).doOnUnsubscribe(() -> {
-            Iterator<Subscriber<? super String>> iterator = mMessagesSubscribers.iterator();
-            while (iterator.hasNext()) {
-                if (iterator.next().isUnsubscribed()) iterator.remove();
-            }
-
-            if (mMessagesSubscribers.size() < 1) {
-                Log.d(TAG, "Close web socket connection now in thread " + Thread.currentThread());
-                mWebSocketClient.close();
-            }
-        });
-
         createWebSocketConnection();
-        return observable;
+        return mMessagesStream;
+    }
+
+    @Override
+    public Completable disconnect() {
+        return Completable.fromAction(() -> mWebSocketClient.close());
     }
 
     private void createWebSocketConnection() {
@@ -134,50 +124,30 @@ public void onError(Exception ex) {
     }
 
     @Override
-    public Observable<Void> send(String stompMessage) {
-        return Observable.create(subscriber -> {
+    public Completable send(String stompMessage) {
+        return Completable.fromCallable(() -> {
             if (mWebSocketClient == null) {
-                subscriber.onError(new IllegalStateException("Not connected yet"));
+                throw new IllegalStateException("Not connected yet");
             } else {
                 Log.d(TAG, "Send STOMP message: " + stompMessage);
                 mWebSocketClient.send(stompMessage);
-                subscriber.onCompleted();
+                return null;
             }
         });
     }
 
-    // Just to appease javac
-    @Override
-    public Completable disconnect() {
-        return Completable.fromAction(() -> {
-            throw new UnsupportedOperationException("JAVA WEB SOCKETS ARE NOT YET SUPPORTED IN THIS VERSION");
-        });
-    }
-
     private void emitLifecycleEvent(LifecycleEvent lifecycleEvent) {
         Log.d(TAG, "Emit lifecycle event: " + lifecycleEvent.getType().name());
-        for (Subscriber<? super LifecycleEvent> subscriber : mLifecycleSubscribers) {
-            subscriber.onNext(lifecycleEvent);
-        }
+        mLifecycleStream.onNext(lifecycleEvent);
     }
 
     private void emitMessage(String stompMessage) {
         Log.d(TAG, "Emit STOMP message: " + stompMessage);
-        for (Subscriber<? super String> subscriber : mMessagesSubscribers) {
-            subscriber.onNext(stompMessage);
-        }
+        mMessagesStream.onNext(stompMessage);
     }
 
     @Override
     public Observable<LifecycleEvent> getLifecycleReceiver() {
-        return Observable.<LifecycleEvent>create(subscriber -> {
-            mLifecycleSubscribers.add(subscriber);
-
-        }).doOnUnsubscribe(() -> {
-            Iterator<Subscriber<? super LifecycleEvent>> iterator = mLifecycleSubscribers.iterator();
-            while (iterator.hasNext()) {
-                if (iterator.next().isUnsubscribed()) iterator.remove();
-            }
-        });
+        return mLifecycleStream;
     }
 }
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java b/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
index 187119d..bef1299 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
@@ -72,7 +72,6 @@ public void connect(List<StompHeader> _headers) {
     public void connect(List<StompHeader> _headers, boolean reconnect) {
         if (reconnect) disconnect();
         if (mConnected) return;
-        // why wasn't this DRY before?
         lifecycle()
                 .subscribe(lifecycleEvent -> {
                     switch (lifecycleEvent.getType()) {
@@ -127,9 +126,8 @@ public Observable<Void> send(String destination, String data) {
     }
 
     public Observable<Void> send(StompMessage stompMessage) {
-        Observable<Void> observable = mConnectionProvider.send(stompMessage.compile());
+        Observable<Void> observable = mConnectionProvider.send(stompMessage.compile()).toObservable();
         if (!mConnected) {
-            // my inner grammar nazi
             ConnectableObservable<Void> deferred = observable.publish();
             mWaitConnectionObservables.add(deferred);
             return deferred;
@@ -155,7 +153,6 @@ public Observable<LifecycleEvent> lifecycle() {
     }
 
     public void disconnect() {
-        // the other things are now taken care of downstream
         mConnectionProvider.disconnect().subscribe();
     }
 

From a5c7586a9824aa1209f1921ab7e0af5799ae667b Mon Sep 17 00:00:00 2001
From: forresthopkinsa <fingerheroes@gmail.com>
Date: Fri, 4 Aug 2017 09:16:14 -0700
Subject: [PATCH 029/110] Working on StompClient. This version is not stable

---
 README.md                                     |  75 ++++++++++-
 .../stomp/client/StompClient.java             | 119 +++++++++++++-----
 2 files changed, 158 insertions(+), 36 deletions(-)

diff --git a/README.md b/README.md
index 9402e78..5dc7c79 100644
--- a/README.md
+++ b/README.md
@@ -134,18 +134,89 @@ client.lifecycle().subscribe(lifecycleEvent -> {
 
 **Custom client**
 
-You can use a custom HttpClient (for example, if you want to allow untrusted HTTPS) using the four-argument overload of Stomp.over, like so:
+You can use a custom OkHttpClient (for example, [if you want to allow untrusted HTTPS](getUnsafeOkHttpClient())) using the four-argument overload of Stomp.over, like so:
 
 ``` java
-client = Stomp.over(WebSocket.class, address, null, unsafeClient);
+client = Stomp.over(WebSocket.class, address, null, getUnsafeOkHttpClient());
 ```
 
 Yes, it's safe to pass `null` for either (or both) of the last two arguments. That's exactly what the shorter overloads do.
 
+Note: This method is only supported using OkHttp, not JWS.
+
 **Support**
 
 Right now, the library only supports sending and receiving messages. ACK messages and transactions are not implemented yet.
 
+## Changes in this fork
+
+**Build changes**
+
+The upstream master is based on Retrolambda. This version is based on Native Java 8 compilation,
+although it should also work with Jack. It will *not* work with Retrolambda.
+
+**Code changes**
+
+These are the possible changes you need to make to your code for this branch, if you were using the upstream before:
+
+- Disconnecting is now mandatory
+  - Previously, the socket would automatically disconnect if nothing was listening to it
+  - Now, it will not disconnect unless you explicitly run client.disconnect()
+- send() now returns a Completable
+  - Previously, it returned an Observable\<Void\>
+  - Now, it and all its overloads return a Completable, which is functionally about the same
+  - **However**, Completable does not inherit from Observable, so there are a couple differences:
+    - Of course, if you were storing send() in an Observable, you'll have to change that
+    - Additionally, if you were inheriting onNext before, you're going to have to adjust it:
+      - Old way, deprecated:
+        ``` java
+        client.send("/app/hello", "world").subscribe(
+            aVoid -> Log.d(TAG, "Sent data!"),
+            error -> Log.e(TAG, "Encountered error while sending data!", error)
+        );
+        ```
+        !! -v:
+        ``` java
+        client.send("/app/hello", "world").subscribe(new Subscriber<Void>() {
+            @Override
+            public void onNext(Void aVoid) {
+                Log.d(TAG, "Sent data!");
+            }
+            @Override
+            public void onError(Throwable error) {
+                Log.e(TAG, "Encountered error while sending data!", error);
+            }
+            @Override
+            public void onCompleted() {} // useless
+        });
+        ```
+      - New way of handling it:
+        ``` java
+        client.send("/app/hello", "world").subscribe(
+            () -> Log.d(TAG, "Sent data!"),
+            error -> Log.e(TAG, "Encountered error while sending data!", error)
+        );
+        ```
+        Or if you just can't get enough of anonymous classes:
+        ``` java
+        client.send("/app/hello", "world").subscribe(new Subscriber<Object /*This can be anything*/ >() {
+            @Override
+            public void onCompleted() {
+                Log.d(TAG, "Sent data!");
+            }
+            @Override
+            public void onError(Throwable error) {
+                Log.e(TAG, "Encountered error while sending data!", error);
+            }
+            @Override
+            public void onNext(Object o) {} // useless
+        });
+        ```
+    - Be sure to implement this change, because the IDE might not catch the error.
+- Passing null as the topic path now throws an exception
+  - Previously, it was supposed to silently fail, although it would probably hit a NPE first (untested)
+  - Now it throws an IllegalArgumentException
+
 ## Additional Reading
 
 - [Spring + Websockets + STOMP](https://spring.io/guides/gs/messaging-stomp-websocket/)
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java b/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
index bef1299..1b20093 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
@@ -13,10 +13,12 @@
 import java.util.UUID;
 import java.util.concurrent.CopyOnWriteArrayList;
 
+import rx.Completable;
 import rx.Observable;
 import rx.Subscriber;
 import rx.Subscription;
 import rx.observables.ConnectableObservable;
+import rx.subjects.PublishSubject;
 import ua.naiksoftware.stomp.ConnectionProvider;
 import ua.naiksoftware.stomp.LifecycleEvent;
 import ua.naiksoftware.stomp.StompHeader;
@@ -31,17 +33,22 @@ public class StompClient {
     public static final String SUPPORTED_VERSIONS = "1.1,1.0";
     public static final String DEFAULT_ACK = "auto";
 
+    /*
     private Subscription mMessagesSubscription;
     private Map<String, Set<Subscriber<? super StompMessage>>> mSubscribers = new HashMap<>();
-    private List<ConnectableObservable<Void>> mWaitConnectionObservables;
+    */
+    private List<Completable> mWaitConnectionCompletables;
     private final ConnectionProvider mConnectionProvider;
     private HashMap<String, String> mTopics;
     private boolean mConnected;
     private boolean isConnecting;
 
+    private PublishSubject<StompMessage> mMessageStream;
+
     public StompClient(ConnectionProvider connectionProvider) {
         mConnectionProvider = connectionProvider;
-        mWaitConnectionObservables = new CopyOnWriteArrayList<>();
+        mWaitConnectionCompletables = new CopyOnWriteArrayList<>();
+        mMessageStream = PublishSubject.create();
     }
 
     /**
@@ -96,46 +103,43 @@ public void connect(List<StompHeader> _headers, boolean reconnect) {
                 });
 
         isConnecting = true;
-        mMessagesSubscription = mConnectionProvider.messages()
+        mConnectionProvider.messages()
                 .map(StompMessage::from)
+                .doOnNext(this::callSubscribers)
+                .filter(msg -> msg.getStompCommand().equals(StompCommand.CONNECTED))
                 .subscribe(stompMessage -> {
-                    if (stompMessage.getStompCommand().equals(StompCommand.CONNECTED)) {
-                        mConnected = true;
-                        isConnecting = false;
-                        for (ConnectableObservable<Void> observable : mWaitConnectionObservables) {
-                            observable.connect();
-                        }
-                        mWaitConnectionObservables.clear();
+                    mConnected = true;
+                    isConnecting = false;
+                    for (Completable completable : mWaitConnectionCompletables) {
+                        completable.subscribe();
                     }
-                    callSubscribers(stompMessage);
+                    mWaitConnectionCompletables.clear();
                 });
     }
 
-    public Observable<Void> send(String destination) {
+    public Completable send(String destination) {
         return send(new StompMessage(
                 StompCommand.SEND,
                 Collections.singletonList(new StompHeader(StompHeader.DESTINATION, destination)),
                 null));
     }
 
-    public Observable<Void> send(String destination, String data) {
+    public Completable send(String destination, String data) {
         return send(new StompMessage(
                 StompCommand.SEND,
                 Collections.singletonList(new StompHeader(StompHeader.DESTINATION, destination)),
                 data));
     }
 
-    public Observable<Void> send(StompMessage stompMessage) {
-        Observable<Void> observable = mConnectionProvider.send(stompMessage.compile()).toObservable();
+    public Completable send(StompMessage stompMessage) {
+        Completable completable = mConnectionProvider.send(stompMessage.compile());
         if (!mConnected) {
-            ConnectableObservable<Void> deferred = observable.publish();
-            mWaitConnectionObservables.add(deferred);
-            return deferred;
-        } else {
-            return observable;
+            mWaitConnectionCompletables.add(completable);
         }
+        return completable;
     }
 
+    /*
     private void callSubscribers(StompMessage stompMessage) {
         String messageDestination = stompMessage.findHeader(StompHeader.DESTINATION);
         for (String dest : mSubscribers.keySet()) {
@@ -147,6 +151,11 @@ private void callSubscribers(StompMessage stompMessage) {
             }
         }
     }
+    */
+
+    private void callSubscribers(StompMessage stompMessage) {
+        mMessageStream.onNext(stompMessage);
+    }
 
     public Observable<LifecycleEvent> lifecycle() {
         return mConnectionProvider.getLifecycleReceiver();
@@ -160,28 +169,65 @@ public Observable<StompMessage> topic(String destinationPath) {
         return topic(destinationPath, null);
     }
 
+    public Observable<StompMessage> topic(String destPath, List<StompHeader> headerList) {
+        Observable<StompMessage> ret;
+
+        if (destPath == null)
+            ret = Observable.error(new IllegalArgumentException("Topic path cannot be null"));
+        else
+            ret = mMessageStream
+                .filter(msg -> destPath.equals(msg.findHeader(StompHeader.DESTINATION)))
+                .doOnSubscribe(() -> subscribePath(destPath, headerList));
+        // still need to figure out how to do the unsubscribes reactively... more difficult than it sounds
+        return ret;
+    }
+
+    /*
     public Observable<StompMessage> topic(String destinationPath, List<StompHeader> headerList) {
+        // basically:
+        // on SUBSCRIBE, add the observer to the Set in the mSubscribers map that's associated with the specified topic,
+        // and send a subscribe message IF WE HAVEN'T ALREADY SUBSCRIBED TO THE TOPIC
+        //
+        // on UNSUBSCRIBE, remove unsubscribed observers, and remove unobserved topics
+
+        // on observer subscribe...
        return Observable.<StompMessage>create(subscriber -> {
+           // get list of other subscribers to topic
            Set<Subscriber<? super StompMessage>> subscribersSet = mSubscribers.get(destinationPath);
+           // if there are no other subscribers on topic...
            if (subscribersSet == null) {
+               // create new subscriber list,
                subscribersSet = new HashSet<>();
+               // and add the list to the map
                mSubscribers.put(destinationPath, subscribersSet);
+               // send SUBSCRIBE message and add topic to mTopics
                subscribePath(destinationPath, headerList).subscribe();
            }
+           // finally, now that we know that there is a list for this topic, add observer to it
            subscribersSet.add(subscriber);
 
        }).doOnUnsubscribe(() -> {
+           // on unsubscribe...
            Iterator<String> mapIterator = mSubscribers.keySet().iterator();
+           // for each topic in the map,
            while (mapIterator.hasNext()) {
+               // get topic path
                String destinationUrl = mapIterator.next();
+               // get observers subscribed to this topic
                Set<Subscriber<? super StompMessage>> set = mSubscribers.get(destinationUrl);
                Iterator<Subscriber<? super StompMessage>> setIterator = set.iterator();
+               // for each observer subscribed to this topic,
                while (setIterator.hasNext()) {
                    Subscriber<? super StompMessage> subscriber = setIterator.next();
+                   // if observer is no longer subscribed,
                    if (subscriber.isUnsubscribed()) {
+                       // remove it from the set
                        setIterator.remove();
+                       // if there are no observers subscribed to this topic anymore...
                        if (set.size() < 1) {
+                           // remote the set from the map
                            mapIterator.remove();
+                           // send UNSUBSCRIBE message
                            unsubscribePath(destinationUrl).subscribe();
                        }
                    }
@@ -189,24 +235,29 @@ public Observable<StompMessage> topic(String destinationPath, List<StompHeader>
            }
        });
    }
+   */
+
+    private Completable subscribePath(String destinationPath, List<StompHeader> headerList) {
+        String topicId = UUID.randomUUID().toString();
 
-    private Observable<Void> subscribePath(String destinationPath, List<StompHeader> headerList) {
-          if (destinationPath == null) return Observable.empty();
-          String topicId = UUID.randomUUID().toString();
+        if (mTopics == null) mTopics = new HashMap<>();
 
-          if (mTopics == null) mTopics = new HashMap<>();
-          mTopics.put(destinationPath, topicId);
-          List<StompHeader> headers = new ArrayList<>();
-          headers.add(new StompHeader(StompHeader.ID, topicId));
-          headers.add(new StompHeader(StompHeader.DESTINATION, destinationPath));
-          headers.add(new StompHeader(StompHeader.ACK, DEFAULT_ACK));
-          if (headerList != null) headers.addAll(headerList);
-          return send(new StompMessage(StompCommand.SUBSCRIBE,
-                  headers, null));
-      }
+        // Only continue if we don't already have a subscription to the topic
+        if (mTopics.containsKey(destinationPath))
+            return Completable.complete();
+
+        mTopics.put(destinationPath, topicId);
+        List<StompHeader> headers = new ArrayList<>();
+        headers.add(new StompHeader(StompHeader.ID, topicId));
+        headers.add(new StompHeader(StompHeader.DESTINATION, destinationPath));
+        headers.add(new StompHeader(StompHeader.ACK, DEFAULT_ACK));
+        if (headerList != null) headers.addAll(headerList);
+        return send(new StompMessage(StompCommand.SUBSCRIBE,
+                headers, null));
+    }
 
 
-    private Observable<Void> unsubscribePath(String dest) {
+    private Completable unsubscribePath(String dest) {
         String topicId = mTopics.get(dest);
         Log.d(TAG, "Unsubscribe path: " + dest + " id: " + topicId);
 

From d94518299c73dd1d204ff24b9127911f1e4108d2 Mon Sep 17 00:00:00 2001
From: hardyeats <hardyeats702@gmail.com>
Date: Sat, 5 Aug 2017 23:28:17 +0900
Subject: [PATCH 030/110] Issue #48 : Convert from RxJava 1 to RxJava 2.

---
 example-client/build.gradle                   |   8 +-
 .../stompclientexample/ExampleRepository.java |   4 +-
 .../stompclientexample/MainActivity.java      |  20 ++--
 .../stompclientexample/RestClient.java        |   4 +-
 lib/build.gradle                              |   2 +-
 .../stomp/ConnectionProvider.java             |   8 +-
 .../stomp/OkHttpConnectionProvider.java       |  74 ++++++-------
 .../stomp/WebSocketsConnectionProvider.java   |  78 +++++++-------
 .../stomp/client/StompClient.java             | 101 +++++++++---------
 9 files changed, 146 insertions(+), 153 deletions(-)

diff --git a/example-client/build.gradle b/example-client/build.gradle
index f254f38..2646b67 100644
--- a/example-client/build.gradle
+++ b/example-client/build.gradle
@@ -31,9 +31,9 @@ dependencies {
     compile 'com.android.support:appcompat-v7:25.2.0'
     compile 'org.java-websocket:java-websocket:1.3.2'
     compile 'com.android.support:recyclerview-v7:25.2.0'
-    compile 'io.reactivex:rxandroid:1.2.1'
-    compile 'com.squareup.retrofit2:converter-gson:2.1.0'
-    compile 'com.squareup.retrofit2:adapter-rxjava:2.1.0'
-    compile 'com.squareup.retrofit2:retrofit:2.1.0'
+    compile 'io.reactivex.rxjava2:rxandroid:2.0.1'
+    compile 'com.squareup.retrofit2:converter-gson:2.3.0'
+    compile 'com.squareup.retrofit2:adapter-rxjava2:2.3.0'
+    compile 'com.squareup.retrofit2:retrofit:2.3.0'
     compile project(':lib')
 }
diff --git a/example-client/src/main/java/ua/naiksoftware/stompclientexample/ExampleRepository.java b/example-client/src/main/java/ua/naiksoftware/stompclientexample/ExampleRepository.java
index b81f19a..b3beb47 100644
--- a/example-client/src/main/java/ua/naiksoftware/stompclientexample/ExampleRepository.java
+++ b/example-client/src/main/java/ua/naiksoftware/stompclientexample/ExampleRepository.java
@@ -1,8 +1,8 @@
 package ua.naiksoftware.stompclientexample;
 
+import io.reactivex.Flowable;
 import retrofit2.http.POST;
 import retrofit2.http.Query;
-import rx.Observable;
 
 /**
  * Created by Naik on 24.02.17.
@@ -10,5 +10,5 @@
 public interface ExampleRepository {
 
     @POST("hello-convert-and-send")
-    Observable<Void> sendRestEcho(@Query("msg") String message);
+    Flowable<Void> sendRestEcho(@Query("msg") String message);
 }
diff --git a/example-client/src/main/java/ua/naiksoftware/stompclientexample/MainActivity.java b/example-client/src/main/java/ua/naiksoftware/stompclientexample/MainActivity.java
index 91bc44a..55ae725 100644
--- a/example-client/src/main/java/ua/naiksoftware/stompclientexample/MainActivity.java
+++ b/example-client/src/main/java/ua/naiksoftware/stompclientexample/MainActivity.java
@@ -1,7 +1,7 @@
 package ua.naiksoftware.stompclientexample;
 
-import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.util.Log;
@@ -19,10 +19,10 @@
 import java.util.List;
 import java.util.Locale;
 
-import rx.Observable;
-import rx.Subscription;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
+import io.reactivex.FlowableTransformer;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.Disposable;
+import io.reactivex.schedulers.Schedulers;
 import ua.naiksoftware.stomp.Stomp;
 import ua.naiksoftware.stomp.client.StompClient;
 
@@ -35,7 +35,7 @@ public class MainActivity extends AppCompatActivity {
     private SimpleAdapter mAdapter;
     private List<String> mDataSet = new ArrayList<>();
     private StompClient mStompClient;
-    private Subscription mRestPingSubscription;
+    private Disposable mRestPingDisposable;
     private final SimpleDateFormat mTimeFormat = new SimpleDateFormat("HH:mm:ss", Locale.getDefault());
     private RecyclerView mRecyclerView;
     private Gson mGson = new GsonBuilder().create();
@@ -100,7 +100,7 @@ public void sendEchoViaStomp(View v) {
     }
 
     public void sendEchoViaRest(View v) {
-        mRestPingSubscription = RestClient.getInstance().getExampleRepository()
+        mRestPingDisposable = RestClient.getInstance().getExampleRepository()
                 .sendRestEcho("Echo REST " + mTimeFormat.format(new Date()))
                 .compose(applySchedulers())
                 .subscribe(aVoid -> {
@@ -122,8 +122,8 @@ private void toast(String text) {
         Toast.makeText(this, text, Toast.LENGTH_SHORT).show();
     }
 
-    protected <T> Observable.Transformer<T, T> applySchedulers() {
-        return rObservable -> rObservable
+    protected <T> FlowableTransformer<T, T> applySchedulers() {
+        return tFlowable -> tFlowable
                 .unsubscribeOn(Schedulers.newThread())
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread());
@@ -132,7 +132,7 @@ protected <T> Observable.Transformer<T, T> applySchedulers() {
     @Override
     protected void onDestroy() {
         mStompClient.disconnect();
-        if (mRestPingSubscription != null) mRestPingSubscription.unsubscribe();
+        if (mRestPingDisposable != null) mRestPingDisposable.dispose();
         super.onDestroy();
     }
 }
diff --git a/example-client/src/main/java/ua/naiksoftware/stompclientexample/RestClient.java b/example-client/src/main/java/ua/naiksoftware/stompclientexample/RestClient.java
index 6c71f7d..209a497 100644
--- a/example-client/src/main/java/ua/naiksoftware/stompclientexample/RestClient.java
+++ b/example-client/src/main/java/ua/naiksoftware/stompclientexample/RestClient.java
@@ -1,7 +1,7 @@
 package ua.naiksoftware.stompclientexample;
 
 import retrofit2.Retrofit;
-import retrofit2.adapter.rxjava.RxJavaCallAdapterFactory;
+import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory;
 import retrofit2.converter.gson.GsonConverterFactory;
 
 /**
@@ -33,7 +33,7 @@ public static RestClient getInstance() {
     private RestClient() {
         Retrofit retrofit = new Retrofit.Builder().baseUrl("http://" + ANDROID_EMULATOR_LOCALHOST + ":" + SERVER_PORT + "/")
                 .addConverterFactory(GsonConverterFactory.create())
-                .addCallAdapterFactory(RxJavaCallAdapterFactory.create())
+                .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
                 .build();
         mExampleRepository = retrofit.create(ExampleRepository.class);
     }
diff --git a/lib/build.gradle b/lib/build.gradle
index 183b041..6817ee2 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -32,7 +32,7 @@ android {
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
     testCompile 'junit:junit:4.12'
-    compile 'io.reactivex:rxjava:1.2.0'
+    compile "io.reactivex.rxjava2:rxjava:2.1.2"
     // Supported transports
     provided "org.java-websocket:java-websocket:1.3.2"
     provided 'com.squareup.okhttp3:okhttp:3.8.0'
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/ConnectionProvider.java b/lib/src/main/java/ua/naiksoftware/stomp/ConnectionProvider.java
index bf39020..068963e 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/ConnectionProvider.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/ConnectionProvider.java
@@ -1,6 +1,6 @@
 package ua.naiksoftware.stomp;
 
-import rx.Observable;
+import io.reactivex.Flowable;
 
 /**
  * Created by naik on 05.05.16.
@@ -10,17 +10,17 @@ public interface ConnectionProvider {
     /**
      * Subscribe this for receive stomp messages
      */
-    Observable<String> messages();
+    Flowable<String> messages();
 
     /**
      * Sending stomp messages via you ConnectionProvider.
      * onError if not connected or error detected will be called, or onCompleted id sending started
      * TODO: send messages with ACK
      */
-    Observable<Void> send(String stompMessage);
+    Flowable<Void> send(String stompMessage);
 
     /**
      * Subscribe this for receive #LifecycleEvent events
      */
-    Observable<LifecycleEvent> getLifecycleReceiver();
+    Flowable<LifecycleEvent> getLifecycleReceiver();
 }
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java b/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java
index 7e9e7e9..6d53692 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java
@@ -9,6 +9,9 @@
 import java.util.Map;
 import java.util.TreeMap;
 
+import io.reactivex.BackpressureStrategy;
+import io.reactivex.Flowable;
+import io.reactivex.FlowableEmitter;
 import okhttp3.Headers;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
@@ -16,8 +19,6 @@
 import okhttp3.WebSocket;
 import okhttp3.WebSocketListener;
 import okio.ByteString;
-import rx.Observable;
-import rx.Subscriber;
 
 /* package */ class OkHttpConnectionProvider implements ConnectionProvider {
 
@@ -27,8 +28,8 @@
     private final Map<String, String> mConnectHttpHeaders;
     private final OkHttpClient mOkHttpClient;
 
-    private final List<Subscriber<? super LifecycleEvent>> mLifecycleSubscribers;
-    private final List<Subscriber<? super String>> mMessagesSubscribers;
+    private final List<FlowableEmitter<? super LifecycleEvent>> mLifecycleEmitters;
+    private final List<FlowableEmitter<? super String>> mMessagesEmitters;
 
     private WebSocket openedSocked;
 
@@ -36,31 +37,28 @@
     /* package */ OkHttpConnectionProvider(String uri, Map<String, String> connectHttpHeaders, OkHttpClient okHttpClient) {
         mUri = uri;
         mConnectHttpHeaders = connectHttpHeaders != null ? connectHttpHeaders : new HashMap<>();
-        mLifecycleSubscribers = new ArrayList<>();
-        mMessagesSubscribers = new ArrayList<>();
+        mLifecycleEmitters = new ArrayList<>();
+        mMessagesEmitters = new ArrayList<>();
         mOkHttpClient = okHttpClient;
     }
 
     @Override
-    public Observable<String> messages() {
-        Observable<String> observable = Observable.<String>create(subscriber -> {
-            mMessagesSubscribers.add(subscriber);
-
-        }).doOnUnsubscribe(() -> {
-            Iterator<Subscriber<? super String>> iterator = mMessagesSubscribers.iterator();
-            while (iterator.hasNext()) {
-                if (iterator.next().isUnsubscribed()) iterator.remove();
-            }
-
-            if (mMessagesSubscribers.size() < 1) {
-                Log.d(TAG, "Close web socket connection now in thread " + Thread.currentThread());
-                openedSocked.close(1000, "");
-                openedSocked = null;
-            }
-        });
+    public Flowable<String> messages() {
+        Flowable<String> flowable = Flowable.<String>create(mMessagesEmitters::add, BackpressureStrategy.BUFFER)
+            .doOnCancel(() -> {
+                Iterator<FlowableEmitter<? super String>> iterator = mMessagesEmitters.iterator();
+                while (iterator.hasNext()) {
+                    if (iterator.next().isCancelled()) iterator.remove();
+                }
 
+                if (mMessagesEmitters.size() < 1) {
+                    Log.d(TAG, "Close web socket connection now in thread " + Thread.currentThread());
+                    openedSocked.close(1000, "");
+                    openedSocked = null;
+                }
+            });
         createWebSocketConnection();
-        return observable;
+        return flowable;
     }
 
     private void createWebSocketConnection() {
@@ -112,29 +110,27 @@ public void onFailure(WebSocket webSocket, Throwable t, Response response) {
     }
 
     @Override
-    public Observable<Void> send(String stompMessage) {
-        return Observable.create(subscriber -> {
+    public Flowable<Void> send(String stompMessage) {
+        return Flowable.create(subscriber -> {
             if (openedSocked == null) {
                 subscriber.onError(new IllegalStateException("Not connected yet"));
             } else {
                 Log.d(TAG, "Send STOMP message: " + stompMessage);
                 openedSocked.send(stompMessage);
-                subscriber.onCompleted();
+                subscriber.onComplete();
             }
-        });
+        }, BackpressureStrategy.BUFFER);
     }
 
     @Override
-    public Observable<LifecycleEvent> getLifecycleReceiver() {
-        return Observable.<LifecycleEvent>create(subscriber -> {
-            mLifecycleSubscribers.add(subscriber);
-
-        }).doOnUnsubscribe(() -> {
-            Iterator<Subscriber<? super LifecycleEvent>> iterator = mLifecycleSubscribers.iterator();
-            while (iterator.hasNext()) {
-                if (iterator.next().isUnsubscribed()) iterator.remove();
-            }
-        });
+    public Flowable<LifecycleEvent> getLifecycleReceiver() {
+        return Flowable.<LifecycleEvent>create(mLifecycleEmitters::add, BackpressureStrategy.BUFFER)
+            .doOnCancel(() -> {
+                Iterator<FlowableEmitter<? super LifecycleEvent>> iterator = mLifecycleEmitters.iterator();
+                while (iterator.hasNext()) {
+                    if (iterator.next().isCancelled()) iterator.remove();
+                }
+            });
     }
 
     private TreeMap<String, String> headersAsMap(Response response) {
@@ -154,14 +150,14 @@ private void addConnectionHeadersToBuilder(Request.Builder requestBuilder, Map<S
 
     private void emitLifecycleEvent(LifecycleEvent lifecycleEvent) {
         Log.d(TAG, "Emit lifecycle event: " + lifecycleEvent.getType().name());
-        for (Subscriber<? super LifecycleEvent> subscriber : mLifecycleSubscribers) {
+        for (FlowableEmitter<? super LifecycleEvent> subscriber : mLifecycleEmitters) {
             subscriber.onNext(lifecycleEvent);
         }
     }
 
     private void emitMessage(String stompMessage) {
         Log.d(TAG, "Emit STOMP message: " + stompMessage);
-        for (Subscriber<? super String> subscriber : mMessagesSubscribers) {
+        for (FlowableEmitter<? super String> subscriber : mMessagesEmitters) {
             subscriber.onNext(stompMessage);
         }
     }
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java b/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java
index 9c23c65..17db25e 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java
@@ -20,8 +20,9 @@
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLSocketFactory;
 
-import rx.Observable;
-import rx.Subscriber;
+import io.reactivex.BackpressureStrategy;
+import io.reactivex.Flowable;
+import io.reactivex.FlowableEmitter;
 
 /**
  * Created by naik on 05.05.16.
@@ -33,8 +34,8 @@
     private final String mUri;
     private final Map<String, String> mConnectHttpHeaders;
 
-    private final List<Subscriber<? super LifecycleEvent>> mLifecycleSubscribers;
-    private final List<Subscriber<? super String>> mMessagesSubscribers;
+    private final List<FlowableEmitter<? super LifecycleEvent>> mLifecycleEmitters;
+    private final List<FlowableEmitter<? super String>> mMessagesEmitters;
 
     private WebSocketClient mWebSocketClient;
     private boolean haveConnection;
@@ -47,29 +48,26 @@
     /* package */ WebSocketsConnectionProvider(String uri, Map<String, String> connectHttpHeaders) {
         mUri = uri;
         mConnectHttpHeaders = connectHttpHeaders != null ? connectHttpHeaders : new HashMap<>();
-        mLifecycleSubscribers = new ArrayList<>();
-        mMessagesSubscribers = new ArrayList<>();
+        mLifecycleEmitters = new ArrayList<>();
+        mMessagesEmitters = new ArrayList<>();
     }
 
     @Override
-    public Observable<String> messages() {
-        Observable<String> observable = Observable.<String>create(subscriber -> {
-            mMessagesSubscribers.add(subscriber);
-
-        }).doOnUnsubscribe(() -> {
-            Iterator<Subscriber<? super String>> iterator = mMessagesSubscribers.iterator();
-            while (iterator.hasNext()) {
-                if (iterator.next().isUnsubscribed()) iterator.remove();
-            }
-
-            if (mMessagesSubscribers.size() < 1) {
-                Log.d(TAG, "Close web socket connection now in thread " + Thread.currentThread());
-                mWebSocketClient.close();
-            }
-        });
+    public Flowable<String> messages() {
+        Flowable<String> flowable = Flowable.<String>create(mMessagesEmitters::add, BackpressureStrategy.BUFFER)
+            .doOnCancel(() -> {
+                Iterator<FlowableEmitter<? super String>> iterator = mMessagesEmitters.iterator();
+                while (iterator.hasNext()) {
+                    if (iterator.next().isCancelled()) iterator.remove();
+                }
 
+                if (mMessagesEmitters.size() < 1) {
+                    Log.d(TAG, "Close web socket connection now in thread " + Thread.currentThread());
+                    mWebSocketClient.close();
+                }
+            });
         createWebSocketConnection();
-        return observable;
+        return flowable;
     }
 
     private void createWebSocketConnection() {
@@ -133,42 +131,40 @@ public void onError(Exception ex) {
     }
 
     @Override
-    public Observable<Void> send(String stompMessage) {
-        return Observable.create(subscriber -> {
+    public Flowable<Void> send(String stompMessage) {
+        return Flowable.create(emitter -> {
             if (mWebSocketClient == null) {
-                subscriber.onError(new IllegalStateException("Not connected yet"));
+                emitter.onError(new IllegalStateException("Not connected yet"));
             } else {
                 Log.d(TAG, "Send STOMP message: " + stompMessage);
                 mWebSocketClient.send(stompMessage);
-                subscriber.onCompleted();
+                emitter.onComplete();
             }
-        });
+        }, BackpressureStrategy.BUFFER);
     }
 
     private void emitLifecycleEvent(LifecycleEvent lifecycleEvent) {
         Log.d(TAG, "Emit lifecycle event: " + lifecycleEvent.getType().name());
-        for (Subscriber<? super LifecycleEvent> subscriber : mLifecycleSubscribers) {
-            subscriber.onNext(lifecycleEvent);
+        for (FlowableEmitter<? super LifecycleEvent> emitter : mLifecycleEmitters) {
+            emitter.onNext(lifecycleEvent);
         }
     }
 
     private void emitMessage(String stompMessage) {
         Log.d(TAG, "Emit STOMP message: " + stompMessage);
-        for (Subscriber<? super String> subscriber : mMessagesSubscribers) {
-            subscriber.onNext(stompMessage);
+        for (FlowableEmitter<? super String> emitter : mMessagesEmitters) {
+            emitter.onNext(stompMessage);
         }
     }
 
     @Override
-    public Observable<LifecycleEvent> getLifecycleReceiver() {
-        return Observable.<LifecycleEvent>create(subscriber -> {
-            mLifecycleSubscribers.add(subscriber);
-
-        }).doOnUnsubscribe(() -> {
-            Iterator<Subscriber<? super LifecycleEvent>> iterator = mLifecycleSubscribers.iterator();
-            while (iterator.hasNext()) {
-                if (iterator.next().isUnsubscribed()) iterator.remove();
-            }
-        });
+    public Flowable<LifecycleEvent> getLifecycleReceiver() {
+        return Flowable.<LifecycleEvent>create(mLifecycleEmitters::add, BackpressureStrategy.BUFFER)
+            .doOnCancel(() -> {
+                Iterator<FlowableEmitter<? super LifecycleEvent>> iterator = mLifecycleEmitters.iterator();
+                while (iterator.hasNext()) {
+                 if (iterator.next().isCancelled()) iterator.remove();
+                }
+            });
     }
 }
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java b/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
index cb84462..89ddd03 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
@@ -13,10 +13,11 @@
 import java.util.UUID;
 import java.util.concurrent.CopyOnWriteArrayList;
 
-import rx.Observable;
-import rx.Subscriber;
-import rx.Subscription;
-import rx.observables.ConnectableObservable;
+import io.reactivex.BackpressureStrategy;
+import io.reactivex.Flowable;
+import io.reactivex.FlowableEmitter;
+import io.reactivex.disposables.Disposable;
+import io.reactivex.flowables.ConnectableFlowable;
 import ua.naiksoftware.stomp.ConnectionProvider;
 import ua.naiksoftware.stomp.LifecycleEvent;
 import ua.naiksoftware.stomp.StompHeader;
@@ -31,9 +32,9 @@ public class StompClient {
     public static final String SUPPORTED_VERSIONS = "1.1,1.0";
     public static final String DEFAULT_ACK = "auto";
 
-    private Subscription mMessagesSubscription;
-    private Map<String, Set<Subscriber<? super StompMessage>>> mSubscribers = new HashMap<>();
-    private List<ConnectableObservable<Void>> mWaitConnectionObservables;
+    private Disposable mMessagesDisposable;
+    private Map<String, Set<FlowableEmitter<? super StompMessage>>> mEmitters = new HashMap<>();
+    private List<ConnectableFlowable<Void>> mWaitConnectionFlowables;
     private final ConnectionProvider mConnectionProvider;
     private HashMap<String, String> mTopics;
     private boolean mConnected;
@@ -41,7 +42,7 @@ public class StompClient {
 
     public StompClient(ConnectionProvider connectionProvider) {
         mConnectionProvider = connectionProvider;
-        mWaitConnectionObservables = new CopyOnWriteArrayList<>();
+        mWaitConnectionFlowables = new CopyOnWriteArrayList<>();
     }
 
     /**
@@ -96,51 +97,51 @@ public void connect(List<StompHeader> _headers, boolean reconnect) {
                 });
 
         isConnecting = true;
-        mMessagesSubscription = mConnectionProvider.messages()
+        mMessagesDisposable = mConnectionProvider.messages()
                 .map(StompMessage::from)
                 .subscribe(stompMessage -> {
                     if (stompMessage.getStompCommand().equals(StompCommand.CONNECTED)) {
                         mConnected = true;
                         isConnecting = false;
-                        for (ConnectableObservable<Void> observable : mWaitConnectionObservables) {
-                            observable.connect();
+                        for (ConnectableFlowable<Void> flowable : mWaitConnectionFlowables) {
+                            flowable.connect();
                         }
-                        mWaitConnectionObservables.clear();
+                        mWaitConnectionFlowables.clear();
                     }
                     callSubscribers(stompMessage);
                 });
     }
 
-    public Observable<Void> send(String destination) {
+    public Flowable<Void> send(String destination) {
         return send(new StompMessage(
                 StompCommand.SEND,
                 Collections.singletonList(new StompHeader(StompHeader.DESTINATION, destination)),
                 null));
     }
 
-    public Observable<Void> send(String destination, String data) {
+    public Flowable<Void> send(String destination, String data) {
         return send(new StompMessage(
                 StompCommand.SEND,
                 Collections.singletonList(new StompHeader(StompHeader.DESTINATION, destination)),
                 data));
     }
 
-    public Observable<Void> send(StompMessage stompMessage) {
-        Observable<Void> observable = mConnectionProvider.send(stompMessage.compile());
+    public Flowable<Void> send(StompMessage stompMessage) {
+        Flowable<Void> flowable = mConnectionProvider.send(stompMessage.compile());
         if (!mConnected) {
-            ConnectableObservable<Void> deffered = observable.publish();
-            mWaitConnectionObservables.add(deffered);
+            ConnectableFlowable<Void> deffered = flowable.publish();
+            mWaitConnectionFlowables.add(deffered);
             return deffered;
         } else {
-            return observable;
+            return flowable;
         }
     }
 
     private void callSubscribers(StompMessage stompMessage) {
         String messageDestination = stompMessage.findHeader(StompHeader.DESTINATION);
-        for (String dest : mSubscribers.keySet()) {
+        for (String dest : mEmitters.keySet()) {
             if (dest.equals(messageDestination)) {
-                for (Subscriber<? super StompMessage> subscriber : mSubscribers.get(dest)) {
+                for (FlowableEmitter<? super StompMessage> subscriber : mEmitters.get(dest)) {
                     subscriber.onNext(stompMessage);
                 }
                 return;
@@ -148,51 +149,51 @@ private void callSubscribers(StompMessage stompMessage) {
         }
     }
 
-    public Observable<LifecycleEvent> lifecycle() {
+    public Flowable<LifecycleEvent> lifecycle() {
         return mConnectionProvider.getLifecycleReceiver();
     }
 
     public void disconnect() {
-        if (mMessagesSubscription != null) mMessagesSubscription.unsubscribe();
+        if (mMessagesDisposable != null) mMessagesDisposable.dispose();
         mConnected = false;
     }
 
-    public Observable<StompMessage> topic(String destinationPath) {
+    public Flowable<StompMessage> topic(String destinationPath) {
         return topic(destinationPath, null);
     }
 
-    public Observable<StompMessage> topic(String destinationPath, List<StompHeader> headerList) {
-       return Observable.<StompMessage>create(subscriber -> {
-           Set<Subscriber<? super StompMessage>> subscribersSet = mSubscribers.get(destinationPath);
-           if (subscribersSet == null) {
-               subscribersSet = new HashSet<>();
-               mSubscribers.put(destinationPath, subscribersSet);
+    public Flowable<StompMessage> topic(String destinationPath, List<StompHeader> headerList) {
+       return Flowable.<StompMessage>create(emitter -> {
+           Set<FlowableEmitter<? super StompMessage>> emittersSet = mEmitters.get(destinationPath);
+           if (emittersSet == null) {
+               emittersSet = new HashSet<>();
+               mEmitters.put(destinationPath, emittersSet);
                subscribePath(destinationPath, headerList).subscribe();
            }
-           subscribersSet.add(subscriber);
-
-       }).doOnUnsubscribe(() -> {
-           Iterator<String> mapIterator = mSubscribers.keySet().iterator();
-           while (mapIterator.hasNext()) {
-               String destinationUrl = mapIterator.next();
-               Set<Subscriber<? super StompMessage>> set = mSubscribers.get(destinationUrl);
-               Iterator<Subscriber<? super StompMessage>> setIterator = set.iterator();
-               while (setIterator.hasNext()) {
-                   Subscriber<? super StompMessage> subscriber = setIterator.next();
-                   if (subscriber.isUnsubscribed()) {
-                       setIterator.remove();
-                       if (set.size() < 1) {
-                           mapIterator.remove();
-                           unsubscribePath(destinationUrl).subscribe();
+           emittersSet.add(emitter);
+       }, BackpressureStrategy.BUFFER)
+           .doOnCancel(() -> {
+               Iterator<String> mapIterator = mEmitters.keySet().iterator();
+               while (mapIterator.hasNext()) {
+                   String destinationUrl = mapIterator.next();
+                   Set<FlowableEmitter<? super StompMessage>> set = mEmitters.get(destinationUrl);
+                   Iterator<FlowableEmitter<? super StompMessage>> setIterator = set.iterator();
+                   while (setIterator.hasNext()) {
+                       FlowableEmitter<? super StompMessage> subscriber = setIterator.next();
+                       if (subscriber.isCancelled()) {
+                           setIterator.remove();
+                           if (set.size() < 1) {
+                               mapIterator.remove();
+                               unsubscribePath(destinationUrl).subscribe();
+                           }
                        }
                    }
                }
-           }
-       });
+           });
    }
 
-    private Observable<Void> subscribePath(String destinationPath, List<StompHeader> headerList) {
-          if (destinationPath == null) return Observable.empty();
+    private Flowable<Void> subscribePath(String destinationPath, List<StompHeader> headerList) {
+          if (destinationPath == null) return Flowable.empty();
           String topicId = UUID.randomUUID().toString();
 
           if (mTopics == null) mTopics = new HashMap<>();
@@ -207,7 +208,7 @@ private Observable<Void> subscribePath(String destinationPath, List<StompHeader>
       }
 
 
-    private Observable<Void> unsubscribePath(String dest) {
+    private Flowable<Void> unsubscribePath(String dest) {
         String topicId = mTopics.get(dest);
         Log.d(TAG, "Unsubscribe path: " + dest + " id: " + topicId);
 

From da0be9c4d64e1f0862e734c6be75b367c6f385cf Mon Sep 17 00:00:00 2001
From: forresthopkinsa <fingerheroes@gmail.com>
Date: Mon, 7 Aug 2017 16:42:07 -0700
Subject: [PATCH 031/110] Successfully replaced the old mechanism for caching
 pre-connect sends.

There is a lot of debug logging in this build, but everything now seems to be working correctly.
---
 lib/build.gradle                              |  2 ++
 .../stomp/OkHttpConnectionProvider.java       |  2 +-
 .../stomp/client/StompClient.java             | 28 +++++++++++++------
 3 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/lib/build.gradle b/lib/build.gradle
index 141d5c5..4d3f9a5 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -32,6 +32,8 @@ dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
     testCompile 'junit:junit:4.12'
     compile 'io.reactivex:rxjava:1.3.0'
+    compile 'net.sourceforge.streamsupport:streamsupport:1.5.5'
+    compile 'net.sourceforge.streamsupport:streamsupport-cfuture:1.5.5'
     // Supported transports
     compile 'org.java-websocket:java-websocket:1.3.2'
     compile 'com.squareup.okhttp3:okhttp:3.8.1'
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java b/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java
index ffa79cc..ef014eb 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java
@@ -19,7 +19,7 @@
 
 class OkHttpConnectionProvider implements ConnectionProvider {
 
-    private static final String TAG = WebSocketsConnectionProvider.class.getSimpleName();
+    private static final String TAG = OkHttpConnectionProvider.class.getSimpleName();
 
     private final String mUri;
     private final Map<String, String> mConnectHttpHeaders;
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java b/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
index 1b20093..0e1ff26 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
@@ -13,11 +13,13 @@
 import java.util.UUID;
 import java.util.concurrent.CopyOnWriteArrayList;
 
+import java8.util.concurrent.CompletableFuture;
 import rx.Completable;
 import rx.Observable;
 import rx.Subscriber;
 import rx.Subscription;
 import rx.observables.ConnectableObservable;
+import rx.schedulers.Schedulers;
 import rx.subjects.PublishSubject;
 import ua.naiksoftware.stomp.ConnectionProvider;
 import ua.naiksoftware.stomp.LifecycleEvent;
@@ -37,18 +39,23 @@ public class StompClient {
     private Subscription mMessagesSubscription;
     private Map<String, Set<Subscriber<? super StompMessage>>> mSubscribers = new HashMap<>();
     */
-    private List<Completable> mWaitConnectionCompletables;
+//    private List<Completable> mWaitConnectionCompletables;
     private final ConnectionProvider mConnectionProvider;
     private HashMap<String, String> mTopics;
     private boolean mConnected;
     private boolean isConnecting;
 
     private PublishSubject<StompMessage> mMessageStream;
+    private CompletableFuture<Boolean> connectionStatus;
+    private Completable waitForConnect;
 
     public StompClient(ConnectionProvider connectionProvider) {
         mConnectionProvider = connectionProvider;
-        mWaitConnectionCompletables = new CopyOnWriteArrayList<>();
+//        mWaitConnectionCompletables = new CopyOnWriteArrayList<>();
         mMessageStream = PublishSubject.create();
+        connectionStatus = new CompletableFuture<>();
+        waitForConnect = Completable.fromFuture(connectionStatus).subscribeOn(Schedulers.newThread());
+        waitForConnect.subscribe(() -> Log.d(TAG, "waitForConnect completed"));
     }
 
     /**
@@ -87,7 +94,7 @@ public void connect(List<StompHeader> _headers, boolean reconnect) {
                             headers.add(new StompHeader(StompHeader.VERSION, SUPPORTED_VERSIONS));
                             if (_headers != null) headers.addAll(_headers);
                             mConnectionProvider.send(new StompMessage(StompCommand.CONNECT, headers, null).compile())
-                                    .subscribe();
+                                    .subscribe(() -> Log.d(TAG, "CONNECT command sent!"));
                             break;
 
                         case CLOSED:
@@ -110,18 +117,18 @@ public void connect(List<StompHeader> _headers, boolean reconnect) {
                 .subscribe(stompMessage -> {
                     mConnected = true;
                     isConnecting = false;
+                    connectionStatus.complete(true);
+                    /*
                     for (Completable completable : mWaitConnectionCompletables) {
                         completable.subscribe();
                     }
                     mWaitConnectionCompletables.clear();
+                    */
                 });
     }
 
     public Completable send(String destination) {
-        return send(new StompMessage(
-                StompCommand.SEND,
-                Collections.singletonList(new StompHeader(StompHeader.DESTINATION, destination)),
-                null));
+        return send(destination, null);
     }
 
     public Completable send(String destination, String data) {
@@ -133,10 +140,13 @@ public Completable send(String destination, String data) {
 
     public Completable send(StompMessage stompMessage) {
         Completable completable = mConnectionProvider.send(stompMessage.compile());
+        /*
         if (!mConnected) {
             mWaitConnectionCompletables.add(completable);
         }
-        return completable;
+        */
+        waitForConnect.subscribe(() -> Log.d(TAG, "SEND waitForConnect complete, continuing!"));
+        return completable.startWith(waitForConnect);
     }
 
     /*
@@ -177,7 +187,7 @@ public Observable<StompMessage> topic(String destPath, List<StompHeader> headerL
         else
             ret = mMessageStream
                 .filter(msg -> destPath.equals(msg.findHeader(StompHeader.DESTINATION)))
-                .doOnSubscribe(() -> subscribePath(destPath, headerList));
+                .doOnSubscribe(() -> subscribePath(destPath, headerList).subscribe());
         // still need to figure out how to do the unsubscribes reactively... more difficult than it sounds
         return ret;
     }

From 8a4177054670d7eb43a40d21d312a0e1457e5edb Mon Sep 17 00:00:00 2001
From: forresthopkinsa <fingerheroes@gmail.com>
Date: Tue, 8 Aug 2017 11:31:05 -0700
Subject: [PATCH 032/110] Now we have Topic Unsubscribe working as intended.

Needs to be tested
---
 .../stomp/client/StompClient.java             | 27 ++++++++++++-------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java b/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
index 0e1ff26..00f1e29 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
@@ -48,6 +48,7 @@ public class StompClient {
     private PublishSubject<StompMessage> mMessageStream;
     private CompletableFuture<Boolean> connectionStatus;
     private Completable waitForConnect;
+    private HashMap<String, Observable<StompMessage>> msgStreams;
 
     public StompClient(ConnectionProvider connectionProvider) {
         mConnectionProvider = connectionProvider;
@@ -56,6 +57,7 @@ public StompClient(ConnectionProvider connectionProvider) {
         connectionStatus = new CompletableFuture<>();
         waitForConnect = Completable.fromFuture(connectionStatus).subscribeOn(Schedulers.newThread());
         waitForConnect.subscribe(() -> Log.d(TAG, "waitForConnect completed"));
+        msgStreams = new HashMap<>();
     }
 
     /**
@@ -180,16 +182,17 @@ public Observable<StompMessage> topic(String destinationPath) {
     }
 
     public Observable<StompMessage> topic(String destPath, List<StompHeader> headerList) {
-        Observable<StompMessage> ret;
-
         if (destPath == null)
-            ret = Observable.error(new IllegalArgumentException("Topic path cannot be null"));
-        else
-            ret = mMessageStream
-                .filter(msg -> destPath.equals(msg.findHeader(StompHeader.DESTINATION)))
-                .doOnSubscribe(() -> subscribePath(destPath, headerList).subscribe());
-        // still need to figure out how to do the unsubscribes reactively... more difficult than it sounds
-        return ret;
+            return Observable.error(new IllegalArgumentException("Topic path cannot be null"));
+        else if (!msgStreams.containsKey(destPath))
+            msgStreams.put(destPath,
+                    mMessageStream
+                            .filter(msg -> destPath.equals(msg.findHeader(StompHeader.DESTINATION)))
+                            .doOnSubscribe(() -> subscribePath(destPath, headerList).subscribe())
+                            .doOnUnsubscribe(() -> unsubscribePath(destPath).subscribe())
+                            .share()
+            );
+        return msgStreams.get(destPath);
     }
 
     /*
@@ -253,8 +256,10 @@ private Completable subscribePath(String destinationPath, List<StompHeader> head
         if (mTopics == null) mTopics = new HashMap<>();
 
         // Only continue if we don't already have a subscription to the topic
-        if (mTopics.containsKey(destinationPath))
+        if (mTopics.containsKey(destinationPath)) {
+            Log.d(TAG, "Attempted to subscribe to already-subscribed path!");
             return Completable.complete();
+        }
 
         mTopics.put(destinationPath, topicId);
         List<StompHeader> headers = new ArrayList<>();
@@ -268,6 +273,8 @@ private Completable subscribePath(String destinationPath, List<StompHeader> head
 
 
     private Completable unsubscribePath(String dest) {
+        msgStreams.remove(dest);
+
         String topicId = mTopics.get(dest);
         Log.d(TAG, "Unsubscribe path: " + dest + " id: " + topicId);
 

From 0e82ce91827586e05d1c6d2bbbdea378ac553d96 Mon Sep 17 00:00:00 2001
From: forresthopkinsa <fingerheroes@gmail.com>
Date: Tue, 8 Aug 2017 12:35:03 -0700
Subject: [PATCH 033/110] Did some cleanup, created another ConnectionProvider
 abstraction

---
 .../stomp/AbstractConnectionProvider.java     | 101 ++++++++++++++
 .../stomp/OkHttpConnectionProvider.java       |  50 ++-----
 .../java/ua/naiksoftware/stomp/Stomp.java     |   4 +-
 .../stomp/WebSocketsConnectionProvider.java   |  45 +------
 .../stomp/client/StompClient.java             | 123 ++----------------
 5 files changed, 132 insertions(+), 191 deletions(-)
 create mode 100644 lib/src/main/java/ua/naiksoftware/stomp/AbstractConnectionProvider.java

diff --git a/lib/src/main/java/ua/naiksoftware/stomp/AbstractConnectionProvider.java b/lib/src/main/java/ua/naiksoftware/stomp/AbstractConnectionProvider.java
new file mode 100644
index 0000000..3d4afd0
--- /dev/null
+++ b/lib/src/main/java/ua/naiksoftware/stomp/AbstractConnectionProvider.java
@@ -0,0 +1,101 @@
+package ua.naiksoftware.stomp;
+
+import android.util.Log;
+
+import rx.Completable;
+import rx.Observable;
+import rx.subjects.PublishSubject;
+
+/**
+ * Created by forresthopkinsa on 8/8/2017.
+ * <p>
+ * Created because there was a lot of shared code between JWS and OkHttp connection providers.
+ */
+
+abstract class AbstractConnectionProvider implements ConnectionProvider {
+
+    private static final String TAG = AbstractConnectionProvider.class.getSimpleName();
+
+    private final PublishSubject<LifecycleEvent> mLifecycleStream;
+    private final PublishSubject<String> mMessagesStream;
+
+    AbstractConnectionProvider() {
+        mLifecycleStream = PublishSubject.create();
+        mMessagesStream = PublishSubject.create();
+    }
+
+    @Override
+    public Observable<String> messages() {
+        createWebSocketConnection();
+        return mMessagesStream;
+    }
+
+    /**
+     * Completable to close socket.
+     * <p>
+     * For example:
+     * <pre>
+     * return Completable.fromAction(() -> webSocket.close());
+     * </pre>
+     */
+    @Override
+    public abstract Completable disconnect();
+
+    /**
+     * Most important method: connects to websocket and notifies program of messages.
+     * <p>
+     * See implementations in OkHttpConnectionProvider and WebSocketsConnectionProvider.
+     */
+    abstract void createWebSocketConnection();
+
+    @Override
+    public Completable send(String stompMessage) {
+        return Completable.fromCallable(() -> {
+            if (getSocket() == null) {
+                throw new IllegalStateException("Not connected yet");
+            } else {
+                Log.d(TAG, "Send STOMP message: " + stompMessage);
+                bareSend(stompMessage);
+                return null;
+            }
+        });
+    }
+
+    /**
+     * Just a simple message send.
+     * <p>
+     * For example:
+     * <pre>
+     * webSocket.send(stompMessage);
+     * </pre>
+     *
+     * @param stompMessage message to send
+     */
+    abstract void bareSend(String stompMessage);
+
+    /**
+     * Get socket object.
+     * Used for null checking; this object is expected to be null when the connection is not yet established.
+     * <p>
+     * For example:
+     * <pre>
+     * return webSocket;
+     * </pre>
+     */
+    abstract Object getSocket();
+
+    void emitLifecycleEvent(LifecycleEvent lifecycleEvent) {
+        Log.d(TAG, "Emit lifecycle event: " + lifecycleEvent.getType().name());
+        mLifecycleStream.onNext(lifecycleEvent);
+    }
+
+    void emitMessage(String stompMessage) {
+        Log.d(TAG, "Emit STOMP message: " + stompMessage);
+        mMessagesStream.onNext(stompMessage);
+    }
+
+    @Override
+    public Observable<LifecycleEvent> getLifecycleReceiver() {
+        return mLifecycleStream;
+    }
+}
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java b/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java
index ef014eb..1e23b7e 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java
@@ -1,7 +1,5 @@
 package ua.naiksoftware.stomp;
 
-import android.util.Log;
-
 import java.util.HashMap;
 import java.util.Map;
 import java.util.TreeMap;
@@ -14,35 +12,20 @@
 import okhttp3.WebSocketListener;
 import okio.ByteString;
 import rx.Completable;
-import rx.Observable;
-import rx.subjects.PublishSubject;
-
-class OkHttpConnectionProvider implements ConnectionProvider {
 
-    private static final String TAG = OkHttpConnectionProvider.class.getSimpleName();
+class OkHttpConnectionProvider extends AbstractConnectionProvider {
 
     private final String mUri;
     private final Map<String, String> mConnectHttpHeaders;
     private final OkHttpClient mOkHttpClient;
 
-    private final PublishSubject<LifecycleEvent> mLifecycleStream;
-    private final PublishSubject<String> mMessagesStream;
-
     private WebSocket openedSocked;
 
     OkHttpConnectionProvider(String uri, Map<String, String> connectHttpHeaders, OkHttpClient okHttpClient) {
+        super();
         mUri = uri;
         mConnectHttpHeaders = connectHttpHeaders != null ? connectHttpHeaders : new HashMap<>();
         mOkHttpClient = okHttpClient;
-
-        mLifecycleStream = PublishSubject.create();
-        mMessagesStream = PublishSubject.create();
-    }
-
-    @Override
-    public Observable<String> messages() {
-        createWebSocketConnection();
-        return mMessagesStream;
     }
 
     @Override
@@ -50,7 +33,8 @@ public Completable disconnect() {
         return Completable.fromAction(() -> openedSocked.close(1000, ""));
     }
 
-    private void createWebSocketConnection() {
+    @Override
+    void createWebSocketConnection() {
 
         if (openedSocked != null) {
             throw new IllegalStateException("Already have connection to web socket");
@@ -99,21 +83,13 @@ public void onFailure(WebSocket webSocket, Throwable t, Response response) {
     }
 
     @Override
-    public Completable send(String stompMessage) {
-        return Completable.fromCallable(() -> {
-            if (openedSocked == null) {
-                throw new IllegalStateException("Not connected yet");
-            } else {
-                Log.d(TAG, "Send STOMP message: " + stompMessage);
-                openedSocked.send(stompMessage);
-                return null;
-            }
-        });
+    void bareSend(String stompMessage) {
+        openedSocked.send(stompMessage);
     }
 
     @Override
-    public Observable<LifecycleEvent> getLifecycleReceiver() {
-        return mLifecycleStream;
+    Object getSocket() {
+        return openedSocked;
     }
 
     private TreeMap<String, String> headersAsMap(Response response) {
@@ -130,14 +106,4 @@ private void addConnectionHeadersToBuilder(Request.Builder requestBuilder, Map<S
             requestBuilder.addHeader(headerEntry.getKey(), headerEntry.getValue());
         }
     }
-
-    private void emitLifecycleEvent(LifecycleEvent lifecycleEvent) {
-        Log.d(TAG, "Emit lifecycle event: " + lifecycleEvent.getType().name());
-        mLifecycleStream.onNext(lifecycleEvent);
-    }
-
-    private void emitMessage(String stompMessage) {
-        Log.d(TAG, "Emit STOMP message: " + stompMessage);
-        mMessagesStream.onNext(stompMessage);
-    }
 }
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/Stomp.java b/lib/src/main/java/ua/naiksoftware/stomp/Stomp.java
index 1f714df..ed4fef5 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/Stomp.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/Stomp.java
@@ -9,8 +9,8 @@
 
 /**
  * Supported overlays:
- *  - org.java_websocket.WebSocket ('org.java-websocket:Java-WebSocket:1.3.0')
- *  - okhttp3.WebSocket ('com.squareup.okhttp3:okhttp:3.8.0')
+ *  - org.java_websocket.WebSocket ('org.java-websocket:Java-WebSocket:1.3.2')
+ *  - okhttp3.WebSocket ('com.squareup.okhttp3:okhttp:3.8.1')
  *
  *  You can add own relay, just implement ConnectionProvider for you stomp transport,
  *  such as web socket.
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java b/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java
index 4c6f94f..48ad588 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java
@@ -19,14 +19,12 @@
 import javax.net.ssl.SSLSocketFactory;
 
 import rx.Completable;
-import rx.Observable;
-import rx.subjects.PublishSubject;
 
 /**
  * Created by naik on 05.05.16.
  */
 
-class WebSocketsConnectionProvider implements ConnectionProvider {
+class WebSocketsConnectionProvider extends AbstractConnectionProvider {
 
     private static final String TAG = WebSocketsConnectionProvider.class.getSimpleName();
 
@@ -37,9 +35,6 @@ class WebSocketsConnectionProvider implements ConnectionProvider {
     private boolean haveConnection;
     private TreeMap<String, String> mServerHandshakeHeaders;
 
-    private final PublishSubject<LifecycleEvent> mLifecycleStream;
-    private final PublishSubject<String> mMessagesStream;
-
     /**
      * Support UIR scheme ws://host:port/path
      * @param connectHttpHeaders may be null
@@ -47,15 +42,6 @@ class WebSocketsConnectionProvider implements ConnectionProvider {
     WebSocketsConnectionProvider(String uri, Map<String, String> connectHttpHeaders) {
         mUri = uri;
         mConnectHttpHeaders = connectHttpHeaders != null ? connectHttpHeaders : new HashMap<>();
-
-        mLifecycleStream = PublishSubject.create();
-        mMessagesStream = PublishSubject.create();
-    }
-
-    @Override
-    public Observable<String> messages() {
-        createWebSocketConnection();
-        return mMessagesStream;
     }
 
     @Override
@@ -63,7 +49,8 @@ public Completable disconnect() {
         return Completable.fromAction(() -> mWebSocketClient.close());
     }
 
-    private void createWebSocketConnection() {
+    @Override
+    void createWebSocketConnection() {
         if (haveConnection)
             throw new IllegalStateException("Already have connection to web socket");
 
@@ -124,30 +111,12 @@ public void onError(Exception ex) {
     }
 
     @Override
-    public Completable send(String stompMessage) {
-        return Completable.fromCallable(() -> {
-            if (mWebSocketClient == null) {
-                throw new IllegalStateException("Not connected yet");
-            } else {
-                Log.d(TAG, "Send STOMP message: " + stompMessage);
-                mWebSocketClient.send(stompMessage);
-                return null;
-            }
-        });
-    }
-
-    private void emitLifecycleEvent(LifecycleEvent lifecycleEvent) {
-        Log.d(TAG, "Emit lifecycle event: " + lifecycleEvent.getType().name());
-        mLifecycleStream.onNext(lifecycleEvent);
-    }
-
-    private void emitMessage(String stompMessage) {
-        Log.d(TAG, "Emit STOMP message: " + stompMessage);
-        mMessagesStream.onNext(stompMessage);
+    void bareSend(String stompMessage) {
+        mWebSocketClient.send(stompMessage);
     }
 
     @Override
-    public Observable<LifecycleEvent> getLifecycleReceiver() {
-        return mLifecycleStream;
+    Object getSocket() {
+        return mWebSocketClient;
     }
 }
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java b/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
index 00f1e29..2c2b968 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
@@ -5,20 +5,12 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
-import java.util.Map;
-import java.util.Set;
 import java.util.UUID;
-import java.util.concurrent.CopyOnWriteArrayList;
 
 import java8.util.concurrent.CompletableFuture;
 import rx.Completable;
 import rx.Observable;
-import rx.Subscriber;
-import rx.Subscription;
-import rx.observables.ConnectableObservable;
 import rx.schedulers.Schedulers;
 import rx.subjects.PublishSubject;
 import ua.naiksoftware.stomp.ConnectionProvider;
@@ -35,29 +27,22 @@ public class StompClient {
     public static final String SUPPORTED_VERSIONS = "1.1,1.0";
     public static final String DEFAULT_ACK = "auto";
 
-    /*
-    private Subscription mMessagesSubscription;
-    private Map<String, Set<Subscriber<? super StompMessage>>> mSubscribers = new HashMap<>();
-    */
-//    private List<Completable> mWaitConnectionCompletables;
     private final ConnectionProvider mConnectionProvider;
     private HashMap<String, String> mTopics;
     private boolean mConnected;
     private boolean isConnecting;
 
     private PublishSubject<StompMessage> mMessageStream;
-    private CompletableFuture<Boolean> connectionStatus;
-    private Completable waitForConnect;
-    private HashMap<String, Observable<StompMessage>> msgStreams;
+    private CompletableFuture<Boolean> mConnectionFuture;
+    private Completable mConnectionComplete;
+    private HashMap<String, Observable<StompMessage>> mStreamMap;
 
     public StompClient(ConnectionProvider connectionProvider) {
         mConnectionProvider = connectionProvider;
-//        mWaitConnectionCompletables = new CopyOnWriteArrayList<>();
         mMessageStream = PublishSubject.create();
-        connectionStatus = new CompletableFuture<>();
-        waitForConnect = Completable.fromFuture(connectionStatus).subscribeOn(Schedulers.newThread());
-        waitForConnect.subscribe(() -> Log.d(TAG, "waitForConnect completed"));
-        msgStreams = new HashMap<>();
+        mConnectionFuture = new CompletableFuture<>();
+        mConnectionComplete = Completable.fromFuture(mConnectionFuture).subscribeOn(Schedulers.newThread());
+        mStreamMap = new HashMap<>();
     }
 
     /**
@@ -96,7 +81,7 @@ public void connect(List<StompHeader> _headers, boolean reconnect) {
                             headers.add(new StompHeader(StompHeader.VERSION, SUPPORTED_VERSIONS));
                             if (_headers != null) headers.addAll(_headers);
                             mConnectionProvider.send(new StompMessage(StompCommand.CONNECT, headers, null).compile())
-                                    .subscribe(() -> Log.d(TAG, "CONNECT command sent!"));
+                                    .subscribe();
                             break;
 
                         case CLOSED:
@@ -119,13 +104,7 @@ public void connect(List<StompHeader> _headers, boolean reconnect) {
                 .subscribe(stompMessage -> {
                     mConnected = true;
                     isConnecting = false;
-                    connectionStatus.complete(true);
-                    /*
-                    for (Completable completable : mWaitConnectionCompletables) {
-                        completable.subscribe();
-                    }
-                    mWaitConnectionCompletables.clear();
-                    */
+                    mConnectionFuture.complete(true);
                 });
     }
 
@@ -142,29 +121,10 @@ public Completable send(String destination, String data) {
 
     public Completable send(StompMessage stompMessage) {
         Completable completable = mConnectionProvider.send(stompMessage.compile());
-        /*
-        if (!mConnected) {
-            mWaitConnectionCompletables.add(completable);
-        }
-        */
-        waitForConnect.subscribe(() -> Log.d(TAG, "SEND waitForConnect complete, continuing!"));
-        return completable.startWith(waitForConnect);
+        mConnectionComplete.subscribe();
+        return completable.startWith(mConnectionComplete);
     }
 
-    /*
-    private void callSubscribers(StompMessage stompMessage) {
-        String messageDestination = stompMessage.findHeader(StompHeader.DESTINATION);
-        for (String dest : mSubscribers.keySet()) {
-            if (dest.equals(messageDestination)) {
-                for (Subscriber<? super StompMessage> subscriber : mSubscribers.get(dest)) {
-                    subscriber.onNext(stompMessage);
-                }
-                return;
-            }
-        }
-    }
-    */
-
     private void callSubscribers(StompMessage stompMessage) {
         mMessageStream.onNext(stompMessage);
     }
@@ -184,72 +144,17 @@ public Observable<StompMessage> topic(String destinationPath) {
     public Observable<StompMessage> topic(String destPath, List<StompHeader> headerList) {
         if (destPath == null)
             return Observable.error(new IllegalArgumentException("Topic path cannot be null"));
-        else if (!msgStreams.containsKey(destPath))
-            msgStreams.put(destPath,
+        else if (!mStreamMap.containsKey(destPath))
+            mStreamMap.put(destPath,
                     mMessageStream
                             .filter(msg -> destPath.equals(msg.findHeader(StompHeader.DESTINATION)))
                             .doOnSubscribe(() -> subscribePath(destPath, headerList).subscribe())
                             .doOnUnsubscribe(() -> unsubscribePath(destPath).subscribe())
                             .share()
             );
-        return msgStreams.get(destPath);
+        return mStreamMap.get(destPath);
     }
 
-    /*
-    public Observable<StompMessage> topic(String destinationPath, List<StompHeader> headerList) {
-        // basically:
-        // on SUBSCRIBE, add the observer to the Set in the mSubscribers map that's associated with the specified topic,
-        // and send a subscribe message IF WE HAVEN'T ALREADY SUBSCRIBED TO THE TOPIC
-        //
-        // on UNSUBSCRIBE, remove unsubscribed observers, and remove unobserved topics
-
-        // on observer subscribe...
-       return Observable.<StompMessage>create(subscriber -> {
-           // get list of other subscribers to topic
-           Set<Subscriber<? super StompMessage>> subscribersSet = mSubscribers.get(destinationPath);
-           // if there are no other subscribers on topic...
-           if (subscribersSet == null) {
-               // create new subscriber list,
-               subscribersSet = new HashSet<>();
-               // and add the list to the map
-               mSubscribers.put(destinationPath, subscribersSet);
-               // send SUBSCRIBE message and add topic to mTopics
-               subscribePath(destinationPath, headerList).subscribe();
-           }
-           // finally, now that we know that there is a list for this topic, add observer to it
-           subscribersSet.add(subscriber);
-
-       }).doOnUnsubscribe(() -> {
-           // on unsubscribe...
-           Iterator<String> mapIterator = mSubscribers.keySet().iterator();
-           // for each topic in the map,
-           while (mapIterator.hasNext()) {
-               // get topic path
-               String destinationUrl = mapIterator.next();
-               // get observers subscribed to this topic
-               Set<Subscriber<? super StompMessage>> set = mSubscribers.get(destinationUrl);
-               Iterator<Subscriber<? super StompMessage>> setIterator = set.iterator();
-               // for each observer subscribed to this topic,
-               while (setIterator.hasNext()) {
-                   Subscriber<? super StompMessage> subscriber = setIterator.next();
-                   // if observer is no longer subscribed,
-                   if (subscriber.isUnsubscribed()) {
-                       // remove it from the set
-                       setIterator.remove();
-                       // if there are no observers subscribed to this topic anymore...
-                       if (set.size() < 1) {
-                           // remote the set from the map
-                           mapIterator.remove();
-                           // send UNSUBSCRIBE message
-                           unsubscribePath(destinationUrl).subscribe();
-                       }
-                   }
-               }
-           }
-       });
-   }
-   */
-
     private Completable subscribePath(String destinationPath, List<StompHeader> headerList) {
         String topicId = UUID.randomUUID().toString();
 
@@ -273,7 +178,7 @@ private Completable subscribePath(String destinationPath, List<StompHeader> head
 
 
     private Completable unsubscribePath(String dest) {
-        msgStreams.remove(dest);
+        mStreamMap.remove(dest);
 
         String topicId = mTopics.get(dest);
         Log.d(TAG, "Unsubscribe path: " + dest + " id: " + topicId);

From de27e320358b98ec30b24580d56375b68776389e Mon Sep 17 00:00:00 2001
From: forresthopkinsa <fingerheroes@gmail.com>
Date: Tue, 8 Aug 2017 13:58:59 -0700
Subject: [PATCH 034/110] Preparing for release

---
 README.md                                     | 16 ++++--
 lib/build.gradle                              |  3 +-
 .../java/ua/naiksoftware/stomp/Stomp.java     | 57 +++++++------------
 3 files changed, 33 insertions(+), 43 deletions(-)

diff --git a/README.md b/README.md
index 5dc7c79..e2fb713 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 
 ## Overview
 
-**Note that this is a FORK of a project by NaikSoftware! This version is purely to avoid using RetroLambda!**
+**Note that this is a FORK of a project by NaikSoftware! This version is made to avoid using RetroLambda! (Scroll down to see other changes)**
 
 This library provides support for [STOMP protocol](https://stomp.github.io/) over Websockets.
 
@@ -19,7 +19,7 @@ repositories {
     maven { url "https://jitpack.io" }
 }
 dependencies {
-    compile 'com.github.forresthopkinsa:StompProtocolAndroid:{latest version}'
+    compile 'com.github.forresthopkinsa:StompProtocolAndroid:1.4.0'
 }
 ```
 
@@ -29,11 +29,17 @@ You can use this library two ways:
   - If you have Java 8 compatiblity and Jack enabled, this library will work for you
 - Using the new Native Java 8 support
   - As of this writing, you must be using Android Studio Canary to use this feature.
+  - Has been tested in the following environments:
+    - Canary 9, Gradle plugin v3.0.0-alpha9
+    - Canary 8, Gradle plugin v3.0.0-alpha8
+  - It *should* work in all 3.0.0+ versions
   - You can find more info on the [Releases Page](https://github.com/forresthopkinsa/StompProtocolAndroid/releases)
 
 However, *this fork is NOT compatible with Retrolambda.*
 If you have RL as a dependency, then you should be using the [upstream version](https://github.com/NaikSoftware/StompProtocolAndroid) of this project!
 
+Finally, please take bugs and questions to the [Issues page](https://github.com/forresthopkinsa/StompProtocolAndroid/issues)! I'll try to answer within one business day.
+
 ## Example backend (Spring Boot)
 
 **WebSocketConfig.java**
@@ -71,7 +77,7 @@ class SocketController {
 }
 ```
 
-Check out the full example server https://github.com/NaikSoftware/stomp-protocol-example-server
+Check out the [full example server](https://github.com/NaikSoftware/stomp-protocol-example-server)
 
 ## Example library usage
 
@@ -104,7 +110,7 @@ Check out the full example server https://github.com/NaikSoftware/stomp-protocol
 
 ```
 
-See the full example https://github.com/NaikSoftware/StompProtocolAndroid/tree/master/example-client
+See the [full example](https://github.com/NaikSoftware/StompProtocolAndroid/tree/master/example-client)
 
 Method `Stomp.over` consume class for create connection as first parameter.
 You must provide dependency for lib and pass class.
@@ -134,7 +140,7 @@ client.lifecycle().subscribe(lifecycleEvent -> {
 
 **Custom client**
 
-You can use a custom OkHttpClient (for example, [if you want to allow untrusted HTTPS](getUnsafeOkHttpClient())) using the four-argument overload of Stomp.over, like so:
+You can use a custom OkHttpClient (for example, [if you want to allow untrusted HTTPS](https://gist.github.com/grow2014/b6969d8f0cfc0f0a1b2bf12f84973dec)) using the four-argument overload of Stomp.over, like so:
 
 ``` java
 client = Stomp.over(WebSocket.class, address, null, getUnsafeOkHttpClient());
diff --git a/lib/build.gradle b/lib/build.gradle
index 4d3f9a5..1c4e625 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
 
-group='com.github.NaikSoftware'
+group='com.github.forresthopkinsa'
 
 android {
     compileSdkVersion 25
@@ -37,6 +37,7 @@ dependencies {
     // Supported transports
     compile 'org.java-websocket:java-websocket:1.3.2'
     compile 'com.squareup.okhttp3:okhttp:3.8.1'
+    implementation 'com.android.support:support-annotations:24.2.0'
 }
 
 task sourcesJar(type: Jar) {
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/Stomp.java b/lib/src/main/java/ua/naiksoftware/stomp/Stomp.java
index ed4fef5..57508ef 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/Stomp.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/Stomp.java
@@ -1,6 +1,6 @@
 package ua.naiksoftware.stomp;
 
-import org.java_websocket.WebSocket;
+import android.support.annotation.Nullable;
 
 import java.util.Map;
 
@@ -19,19 +19,19 @@
  */
 public class Stomp {
 
-    public static StompClient over(Class clazz, String uri) {
-        return over(clazz, uri, null, null);
+    public static StompClient over(Transport transport, String uri) {
+        return over(transport, uri, null, null);
     }
 
     /**
      *
-     * @param clazz class for using as transport
+     * @param transport transport method
      * @param uri URI to connect
      * @param connectHttpHeaders HTTP headers, will be passed with handshake query, may be null
      * @return StompClient for receiving and sending messages. Call #StompClient.connect
      */
-    public static StompClient over(Class clazz, String uri, Map<String, String> connectHttpHeaders) {
-        return over(clazz, uri, connectHttpHeaders, null);
+    public static StompClient over(Transport transport, String uri, Map<String, String> connectHttpHeaders) {
+        return over(transport, uri, connectHttpHeaders, null);
     }
 
     /**
@@ -40,49 +40,32 @@ public static StompClient over(Class clazz, String uri, Map<String, String> conn
      *     <li>{@code org.java_websocket.WebSocket}: cannot accept an existing client</li>
      *     <li>{@code okhttp3.WebSocket}: can accept a non-null instance of {@code okhttp3.OkHttpClient}</li>
      * </ul>
-     * @param clazz class for using as transport
+     * @param transport transport method
      * @param uri URI to connect
      * @param connectHttpHeaders HTTP headers, will be passed with handshake query, may be null
-     * @param webSocketClient Existing client that will be used to open the WebSocket connection, may be null to use default client
+     * @param okHttpClient Existing client that will be used to open the WebSocket connection, may be null to use default client
      * @return StompClient for receiving and sending messages. Call #StompClient.connect
      */
-    public static StompClient over(Class clazz, String uri, Map<String, String> connectHttpHeaders, Object webSocketClient) {
-        try {
-            if (Class.forName("org.java_websocket.WebSocket") != null && clazz == WebSocket.class) {
-
-                if (webSocketClient != null) {
-                    throw new IllegalArgumentException("You cannot pass a webSocketClient with 'org.java_websocket.WebSocket'. use null instead.");
-                }
-
-                return createStompClient(new WebSocketsConnectionProvider(uri, connectHttpHeaders));
+    public static StompClient over(Transport transport, String uri, @Nullable Map<String, String> connectHttpHeaders, @Nullable OkHttpClient okHttpClient) {
+        if (transport == Transport.JWS) {
+            if (okHttpClient != null) {
+                throw new IllegalArgumentException("You cannot pass a webSocketClient with 'org.java_websocket.WebSocket'. use null instead.");
             }
-        } catch (ClassNotFoundException e) {}
-        try {
-            if (Class.forName("okhttp3.WebSocket") != null && clazz == okhttp3.WebSocket.class) {
-
-                OkHttpClient okHttpClient = getOkHttpClient(webSocketClient);
+            return createStompClient(new WebSocketsConnectionProvider(uri, connectHttpHeaders));
+        }
 
-                return createStompClient(new OkHttpConnectionProvider(uri, connectHttpHeaders, okHttpClient));
-            }
-        } catch (ClassNotFoundException e) {}
+        if (transport == Transport.OKHTTP) {
+            return createStompClient(new OkHttpConnectionProvider(uri, connectHttpHeaders, (okHttpClient == null) ? new OkHttpClient() : okHttpClient));
+        }
 
-        throw new RuntimeException("Not supported overlay transport: " + clazz.getName());
+        throw new IllegalArgumentException("Transport type not supported: " + transport.toString());
     }
 
     private static StompClient createStompClient(ConnectionProvider connectionProvider) {
         return new StompClient(connectionProvider);
     }
 
-    private static OkHttpClient getOkHttpClient(Object webSocketClient) {
-        if (webSocketClient != null) {
-            if (webSocketClient instanceof OkHttpClient) {
-                return (OkHttpClient) webSocketClient;
-            } else {
-                throw new IllegalArgumentException("You must pass a non-null instance of an 'okhttp3.OkHttpClient'. Or pass null to use a default websocket client.");
-            }
-        } else {
-            // default http client
-            return new OkHttpClient();
-        }
+    public enum Transport {
+        OKHTTP, JWS
     }
 }

From 14e9dd65f3a0f522e333db4cf7dcb32b279b98b4 Mon Sep 17 00:00:00 2001
From: forresthopkinsa <fingerheroes@gmail.com>
Date: Tue, 8 Aug 2017 14:10:23 -0700
Subject: [PATCH 035/110] Nullity inference and documentation update

Also, it seems that "Transport" isn't a legal name for an inner enum
---
 README.md                                     | 21 +++++++++-------
 .../stomp/AbstractConnectionProvider.java     | 10 +++++++-
 .../stomp/OkHttpConnectionProvider.java       | 18 +++++++++----
 .../java/ua/naiksoftware/stomp/Stomp.java     | 25 ++++++++++---------
 .../stomp/WebSocketsConnectionProvider.java   | 10 +++++---
 .../stomp/client/StompClient.java             | 10 +++++---
 .../stomp/client/StompMessage.java            |  7 +++++-
 7 files changed, 66 insertions(+), 35 deletions(-)

diff --git a/README.md b/README.md
index e2fb713..b7647f4 100644
--- a/README.md
+++ b/README.md
@@ -77,7 +77,7 @@ class SocketController {
 }
 ```
 
-Check out the [full example server](https://github.com/NaikSoftware/stomp-protocol-example-server)
+Check out the [upstream example server](https://github.com/NaikSoftware/stomp-protocol-example-server)
 
 ## Example library usage
 
@@ -91,7 +91,7 @@ Check out the [full example server](https://github.com/NaikSoftware/stomp-protoc
  
  // ...
  
- StompClient client = Stomp.over(WebSocket.class, "http://localhost/example-endpoint");
+ StompClient client = Stomp.over(Stomp.ConnectionProvider.OKHTTP, "http://localhost/example-endpoint");
  client.connect();
   
  client.topic("/topic/greetings").subscribe(message -> {
@@ -110,13 +110,13 @@ Check out the [full example server](https://github.com/NaikSoftware/stomp-protoc
 
 ```
 
-See the [full example](https://github.com/NaikSoftware/StompProtocolAndroid/tree/master/example-client)
+See the [upstream example](https://github.com/NaikSoftware/StompProtocolAndroid/tree/master/example-client)
 
-Method `Stomp.over` consume class for create connection as first parameter.
-You must provide dependency for lib and pass class.
-At now supported connection providers:
-- `org.java_websocket.WebSocket.class` ('org.java-websocket:Java-WebSocket:1.3.2')
-- `okhttp3.WebSocket.class` ('com.squareup.okhttp3:okhttp:3.8.1')
+Method `Stomp.over` uses an enum to know what connection provider to use.
+
+Currently supported connection providers:
+- `Stomp.ConnectionProvider.JWS` ('org.java-websocket:Java-WebSocket:1.3.2')
+- `Stomp.ConnectionProvider.OKHTTP` ('com.squareup.okhttp3:okhttp:3.8.1')
 
 You can add own connection provider. Just implement interface `ConnectionProvider`.
 If you implement new provider, please create pull request :)
@@ -143,7 +143,7 @@ client.lifecycle().subscribe(lifecycleEvent -> {
 You can use a custom OkHttpClient (for example, [if you want to allow untrusted HTTPS](https://gist.github.com/grow2014/b6969d8f0cfc0f0a1b2bf12f84973dec)) using the four-argument overload of Stomp.over, like so:
 
 ``` java
-client = Stomp.over(WebSocket.class, address, null, getUnsafeOkHttpClient());
+client = Stomp.over(Stomp.ConnectionProvider.OKHTTP, address, null, getUnsafeOkHttpClient());
 ```
 
 Yes, it's safe to pass `null` for either (or both) of the last two arguments. That's exactly what the shorter overloads do.
@@ -222,6 +222,9 @@ These are the possible changes you need to make to your code for this branch, if
 - Passing null as the topic path now throws an exception
   - Previously, it was supposed to silently fail, although it would probably hit a NPE first (untested)
   - Now it throws an IllegalArgumentException
+- Connection Provider is selected by an enum
+  - It used to be done by passing it a WebSocket class from either JWS or OkHttp
+  - New way of using it can be seen in the examples above
 
 ## Additional Reading
 
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/AbstractConnectionProvider.java b/lib/src/main/java/ua/naiksoftware/stomp/AbstractConnectionProvider.java
index 3d4afd0..be5eb51 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/AbstractConnectionProvider.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/AbstractConnectionProvider.java
@@ -1,5 +1,7 @@
 package ua.naiksoftware.stomp;
 
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.util.Log;
 
 import rx.Completable;
@@ -16,7 +18,9 @@ abstract class AbstractConnectionProvider implements ConnectionProvider {
 
     private static final String TAG = AbstractConnectionProvider.class.getSimpleName();
 
+    @NonNull
     private final PublishSubject<LifecycleEvent> mLifecycleStream;
+    @NonNull
     private final PublishSubject<String> mMessagesStream;
 
     AbstractConnectionProvider() {
@@ -24,6 +28,7 @@ abstract class AbstractConnectionProvider implements ConnectionProvider {
         mMessagesStream = PublishSubject.create();
     }
 
+    @NonNull
     @Override
     public Observable<String> messages() {
         createWebSocketConnection();
@@ -48,6 +53,7 @@ public Observable<String> messages() {
      */
     abstract void createWebSocketConnection();
 
+    @NonNull
     @Override
     public Completable send(String stompMessage) {
         return Completable.fromCallable(() -> {
@@ -82,9 +88,10 @@ public Completable send(String stompMessage) {
      * return webSocket;
      * </pre>
      */
+    @Nullable
     abstract Object getSocket();
 
-    void emitLifecycleEvent(LifecycleEvent lifecycleEvent) {
+    void emitLifecycleEvent(@NonNull LifecycleEvent lifecycleEvent) {
         Log.d(TAG, "Emit lifecycle event: " + lifecycleEvent.getType().name());
         mLifecycleStream.onNext(lifecycleEvent);
     }
@@ -94,6 +101,7 @@ void emitMessage(String stompMessage) {
         mMessagesStream.onNext(stompMessage);
     }
 
+    @NonNull
     @Override
     public Observable<LifecycleEvent> getLifecycleReceiver() {
         return mLifecycleStream;
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java b/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java
index 1e23b7e..39c21ed 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java
@@ -1,5 +1,8 @@
 package ua.naiksoftware.stomp;
 
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+
 import java.util.HashMap;
 import java.util.Map;
 import java.util.TreeMap;
@@ -16,18 +19,21 @@
 class OkHttpConnectionProvider extends AbstractConnectionProvider {
 
     private final String mUri;
+    @NonNull
     private final Map<String, String> mConnectHttpHeaders;
     private final OkHttpClient mOkHttpClient;
 
+    @Nullable
     private WebSocket openedSocked;
 
-    OkHttpConnectionProvider(String uri, Map<String, String> connectHttpHeaders, OkHttpClient okHttpClient) {
+    OkHttpConnectionProvider(String uri, @Nullable Map<String, String> connectHttpHeaders, OkHttpClient okHttpClient) {
         super();
         mUri = uri;
         mConnectHttpHeaders = connectHttpHeaders != null ? connectHttpHeaders : new HashMap<>();
         mOkHttpClient = okHttpClient;
     }
 
+    @NonNull
     @Override
     public Completable disconnect() {
         return Completable.fromAction(() -> openedSocked.close(1000, ""));
@@ -48,7 +54,7 @@ void createWebSocketConnection() {
         openedSocked = mOkHttpClient.newWebSocket(requestBuilder.build(),
                 new WebSocketListener() {
                     @Override
-                    public void onOpen(WebSocket webSocket, Response response) {
+                    public void onOpen(WebSocket webSocket, @NonNull Response response) {
                         LifecycleEvent openEvent = new LifecycleEvent(LifecycleEvent.Type.OPENED);
 
                         TreeMap<String, String> headersAsMap = headersAsMap(response);
@@ -63,7 +69,7 @@ public void onMessage(WebSocket webSocket, String text) {
                     }
 
                     @Override
-                    public void onMessage(WebSocket webSocket, ByteString bytes) {
+                    public void onMessage(WebSocket webSocket, @NonNull ByteString bytes) {
                         emitMessage(bytes.utf8());
                     }
 
@@ -87,12 +93,14 @@ void bareSend(String stompMessage) {
         openedSocked.send(stompMessage);
     }
 
+    @Nullable
     @Override
     Object getSocket() {
         return openedSocked;
     }
 
-    private TreeMap<String, String> headersAsMap(Response response) {
+    @NonNull
+    private TreeMap<String, String> headersAsMap(@NonNull Response response) {
         TreeMap<String, String> headersAsMap = new TreeMap<>();
         Headers headers = response.headers();
         for (String key : headers.names()) {
@@ -101,7 +109,7 @@ private TreeMap<String, String> headersAsMap(Response response) {
         return headersAsMap;
     }
 
-    private void addConnectionHeadersToBuilder(Request.Builder requestBuilder, Map<String, String> mConnectHttpHeaders) {
+    private void addConnectionHeadersToBuilder(@NonNull Request.Builder requestBuilder, @NonNull Map<String, String> mConnectHttpHeaders) {
         for (Map.Entry<String, String> headerEntry : mConnectHttpHeaders.entrySet()) {
             requestBuilder.addHeader(headerEntry.getKey(), headerEntry.getValue());
         }
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/Stomp.java b/lib/src/main/java/ua/naiksoftware/stomp/Stomp.java
index 57508ef..31fba3e 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/Stomp.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/Stomp.java
@@ -1,5 +1,6 @@
 package ua.naiksoftware.stomp;
 
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
 import java.util.Map;
@@ -19,19 +20,19 @@
  */
 public class Stomp {
 
-    public static StompClient over(Transport transport, String uri) {
-        return over(transport, uri, null, null);
+    public static StompClient over(@NonNull ConnectionProvider connectionProvider, String uri) {
+        return over(connectionProvider, uri, null, null);
     }
 
     /**
      *
-     * @param transport transport method
+     * @param connectionProvider connectionProvider method
      * @param uri URI to connect
      * @param connectHttpHeaders HTTP headers, will be passed with handshake query, may be null
      * @return StompClient for receiving and sending messages. Call #StompClient.connect
      */
-    public static StompClient over(Transport transport, String uri, Map<String, String> connectHttpHeaders) {
-        return over(transport, uri, connectHttpHeaders, null);
+    public static StompClient over(@NonNull ConnectionProvider connectionProvider, String uri, Map<String, String> connectHttpHeaders) {
+        return over(connectionProvider, uri, connectHttpHeaders, null);
     }
 
     /**
@@ -40,32 +41,32 @@ public static StompClient over(Transport transport, String uri, Map<String, Stri
      *     <li>{@code org.java_websocket.WebSocket}: cannot accept an existing client</li>
      *     <li>{@code okhttp3.WebSocket}: can accept a non-null instance of {@code okhttp3.OkHttpClient}</li>
      * </ul>
-     * @param transport transport method
+     * @param connectionProvider connectionProvider method
      * @param uri URI to connect
      * @param connectHttpHeaders HTTP headers, will be passed with handshake query, may be null
      * @param okHttpClient Existing client that will be used to open the WebSocket connection, may be null to use default client
      * @return StompClient for receiving and sending messages. Call #StompClient.connect
      */
-    public static StompClient over(Transport transport, String uri, @Nullable Map<String, String> connectHttpHeaders, @Nullable OkHttpClient okHttpClient) {
-        if (transport == Transport.JWS) {
+    public static StompClient over(@NonNull ConnectionProvider connectionProvider, String uri, @Nullable Map<String, String> connectHttpHeaders, @Nullable OkHttpClient okHttpClient) {
+        if (connectionProvider == ConnectionProvider.JWS) {
             if (okHttpClient != null) {
                 throw new IllegalArgumentException("You cannot pass a webSocketClient with 'org.java_websocket.WebSocket'. use null instead.");
             }
             return createStompClient(new WebSocketsConnectionProvider(uri, connectHttpHeaders));
         }
 
-        if (transport == Transport.OKHTTP) {
+        if (connectionProvider == ConnectionProvider.OKHTTP) {
             return createStompClient(new OkHttpConnectionProvider(uri, connectHttpHeaders, (okHttpClient == null) ? new OkHttpClient() : okHttpClient));
         }
 
-        throw new IllegalArgumentException("Transport type not supported: " + transport.toString());
+        throw new IllegalArgumentException("ConnectionProvider type not supported: " + connectionProvider.toString());
     }
 
-    private static StompClient createStompClient(ConnectionProvider connectionProvider) {
+    private static StompClient createStompClient(ua.naiksoftware.stomp.ConnectionProvider connectionProvider) {
         return new StompClient(connectionProvider);
     }
 
-    public enum Transport {
+    public enum ConnectionProvider {
         OKHTTP, JWS
     }
 }
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java b/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java
index 48ad588..c672df4 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java
@@ -1,5 +1,7 @@
 package ua.naiksoftware.stomp;
 
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.util.Log;
 
 import org.java_websocket.WebSocket;
@@ -29,6 +31,7 @@ class WebSocketsConnectionProvider extends AbstractConnectionProvider {
     private static final String TAG = WebSocketsConnectionProvider.class.getSimpleName();
 
     private final String mUri;
+    @NonNull
     private final Map<String, String> mConnectHttpHeaders;
 
     private WebSocketClient mWebSocketClient;
@@ -39,11 +42,12 @@ class WebSocketsConnectionProvider extends AbstractConnectionProvider {
      * Support UIR scheme ws://host:port/path
      * @param connectHttpHeaders may be null
      */
-    WebSocketsConnectionProvider(String uri, Map<String, String> connectHttpHeaders) {
+    WebSocketsConnectionProvider(String uri, @Nullable Map<String, String> connectHttpHeaders) {
         mUri = uri;
         mConnectHttpHeaders = connectHttpHeaders != null ? connectHttpHeaders : new HashMap<>();
     }
 
+    @NonNull
     @Override
     public Completable disconnect() {
         return Completable.fromAction(() -> mWebSocketClient.close());
@@ -57,7 +61,7 @@ void createWebSocketConnection() {
         mWebSocketClient = new WebSocketClient(URI.create(mUri), new Draft_17(), mConnectHttpHeaders, 0) {
 
             @Override
-            public void onWebsocketHandshakeReceivedAsClient(WebSocket conn, ClientHandshake request, ServerHandshake response) throws InvalidDataException {
+            public void onWebsocketHandshakeReceivedAsClient(WebSocket conn, ClientHandshake request, @NonNull ServerHandshake response) throws InvalidDataException {
                 Log.d(TAG, "onWebsocketHandshakeReceivedAsClient with response: " + response.getHttpStatus() + " " + response.getHttpStatusMessage());
                 mServerHandshakeHeaders = new TreeMap<>();
                 Iterator<String> keys = response.iterateHttpFields();
@@ -68,7 +72,7 @@ public void onWebsocketHandshakeReceivedAsClient(WebSocket conn, ClientHandshake
             }
 
             @Override
-            public void onOpen(ServerHandshake handshakeData) {
+            public void onOpen(@NonNull ServerHandshake handshakeData) {
                 Log.d(TAG, "onOpen with handshakeData: " + handshakeData.getHttpStatus() + " " + handshakeData.getHttpStatusMessage());
                 LifecycleEvent openEvent = new LifecycleEvent(LifecycleEvent.Type.OPENED);
                 openEvent.setHandshakeResponseHeaders(mServerHandshakeHeaders);
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java b/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
index 2c2b968..67c4428 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
@@ -1,5 +1,7 @@
 package ua.naiksoftware.stomp.client;
 
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.util.Log;
 
 import java.util.ArrayList;
@@ -70,7 +72,7 @@ public void connect(List<StompHeader> _headers) {
      *
      * @param _headers might be null
      */
-    public void connect(List<StompHeader> _headers, boolean reconnect) {
+    public void connect(@Nullable List<StompHeader> _headers, boolean reconnect) {
         if (reconnect) disconnect();
         if (mConnected) return;
         lifecycle()
@@ -119,7 +121,7 @@ public Completable send(String destination, String data) {
                 data));
     }
 
-    public Completable send(StompMessage stompMessage) {
+    public Completable send(@NonNull StompMessage stompMessage) {
         Completable completable = mConnectionProvider.send(stompMessage.compile());
         mConnectionComplete.subscribe();
         return completable.startWith(mConnectionComplete);
@@ -141,7 +143,7 @@ public Observable<StompMessage> topic(String destinationPath) {
         return topic(destinationPath, null);
     }
 
-    public Observable<StompMessage> topic(String destPath, List<StompHeader> headerList) {
+    public Observable<StompMessage> topic(@Nullable String destPath, List<StompHeader> headerList) {
         if (destPath == null)
             return Observable.error(new IllegalArgumentException("Topic path cannot be null"));
         else if (!mStreamMap.containsKey(destPath))
@@ -155,7 +157,7 @@ else if (!mStreamMap.containsKey(destPath))
         return mStreamMap.get(destPath);
     }
 
-    private Completable subscribePath(String destinationPath, List<StompHeader> headerList) {
+    private Completable subscribePath(String destinationPath, @Nullable List<StompHeader> headerList) {
         String topicId = UUID.randomUUID().toString();
 
         if (mTopics == null) mTopics = new HashMap<>();
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/client/StompMessage.java b/lib/src/main/java/ua/naiksoftware/stomp/client/StompMessage.java
index 37810e2..ee3619c 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/client/StompMessage.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/client/StompMessage.java
@@ -1,5 +1,8 @@
 package ua.naiksoftware.stomp.client;
 
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+
 import java.io.StringReader;
 import java.util.ArrayList;
 import java.util.List;
@@ -40,6 +43,7 @@ public String getStompCommand() {
         return mStompCommand;
     }
 
+    @Nullable
     public String findHeader(String key) {
         if (mStompHeaders == null) return null;
         for (StompHeader header : mStompHeaders) {
@@ -48,6 +52,7 @@ public String findHeader(String key) {
         return null;
     }
 
+    @NonNull
     public String compile() {
         StringBuilder builder = new StringBuilder();
         builder.append(mStompCommand).append('\n');
@@ -62,7 +67,7 @@ public String compile() {
         return builder.toString();
     }
 
-    public static StompMessage from(String data) {
+    public static StompMessage from(@Nullable String data) {
         if (data == null || data.trim().isEmpty()) {
             return new StompMessage(StompCommand.UNKNOWN, null, data);
         }

From 0a179d9302a20706b4cc06358ee11313d07f4119 Mon Sep 17 00:00:00 2001
From: NaikSoftware <naiksav4enko@gmail.com>
Date: Thu, 10 Aug 2017 20:16:09 +0300
Subject: [PATCH 036/110] Fix NPE when unsubscribe from lifecycle and emit
 lifecycle event in one time

---
 .idea/misc.xml                                |  2 +-
 example-client/build.gradle                   |  4 +-
 .../stomp/OkHttpConnectionProvider.java       | 50 +++++++++++--------
 .../stomp/WebSocketsConnectionProvider.java   | 49 ++++++++++--------
 4 files changed, 59 insertions(+), 46 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index d2e6725..4c9d020 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -27,7 +27,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="JDK" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/example-client/build.gradle b/example-client/build.gradle
index 2646b67..6133d79 100644
--- a/example-client/build.gradle
+++ b/example-client/build.gradle
@@ -28,9 +28,9 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     testCompile 'junit:junit:4.12'
-    compile 'com.android.support:appcompat-v7:25.2.0'
+    compile 'com.android.support:appcompat-v7:25.3.1'
     compile 'org.java-websocket:java-websocket:1.3.2'
-    compile 'com.android.support:recyclerview-v7:25.2.0'
+    compile 'com.android.support:recyclerview-v7:25.3.1'
     compile 'io.reactivex.rxjava2:rxandroid:2.0.1'
     compile 'com.squareup.retrofit2:converter-gson:2.3.0'
     compile 'com.squareup.retrofit2:adapter-rxjava2:2.3.0'
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java b/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java
index 6d53692..0bdfffb 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java
@@ -33,6 +33,8 @@
 
     private WebSocket openedSocked;
 
+    private final Object mLifecycleLock = new Object();
+
 
     /* package */ OkHttpConnectionProvider(String uri, Map<String, String> connectHttpHeaders, OkHttpClient okHttpClient) {
         mUri = uri;
@@ -45,18 +47,18 @@
     @Override
     public Flowable<String> messages() {
         Flowable<String> flowable = Flowable.<String>create(mMessagesEmitters::add, BackpressureStrategy.BUFFER)
-            .doOnCancel(() -> {
-                Iterator<FlowableEmitter<? super String>> iterator = mMessagesEmitters.iterator();
-                while (iterator.hasNext()) {
-                    if (iterator.next().isCancelled()) iterator.remove();
-                }
+                .doOnCancel(() -> {
+                    Iterator<FlowableEmitter<? super String>> iterator = mMessagesEmitters.iterator();
+                    while (iterator.hasNext()) {
+                        if (iterator.next().isCancelled()) iterator.remove();
+                    }
 
-                if (mMessagesEmitters.size() < 1) {
-                    Log.d(TAG, "Close web socket connection now in thread " + Thread.currentThread());
-                    openedSocked.close(1000, "");
-                    openedSocked = null;
-                }
-            });
+                    if (mMessagesEmitters.size() < 1) {
+                        Log.d(TAG, "Close web socket connection now in thread " + Thread.currentThread());
+                        openedSocked.close(1000, "");
+                        openedSocked = null;
+                    }
+                });
         createWebSocketConnection();
         return flowable;
     }
@@ -69,9 +71,9 @@ private void createWebSocketConnection() {
 
         Request.Builder requestBuilder = new Request.Builder()
                 .url(mUri);
-        
+
         addConnectionHeadersToBuilder(requestBuilder, mConnectHttpHeaders);
-        
+
         openedSocked = mOkHttpClient.newWebSocket(requestBuilder.build(),
                 new WebSocketListener() {
                     @Override
@@ -125,12 +127,14 @@ public Flowable<Void> send(String stompMessage) {
     @Override
     public Flowable<LifecycleEvent> getLifecycleReceiver() {
         return Flowable.<LifecycleEvent>create(mLifecycleEmitters::add, BackpressureStrategy.BUFFER)
-            .doOnCancel(() -> {
-                Iterator<FlowableEmitter<? super LifecycleEvent>> iterator = mLifecycleEmitters.iterator();
-                while (iterator.hasNext()) {
-                    if (iterator.next().isCancelled()) iterator.remove();
-                }
-            });
+                .doOnCancel(() -> {
+                    synchronized (mLifecycleLock) {
+                        Iterator<FlowableEmitter<? super LifecycleEvent>> iterator = mLifecycleEmitters.iterator();
+                        while (iterator.hasNext()) {
+                            if (iterator.next().isCancelled()) iterator.remove();
+                        }
+                    }
+                });
     }
 
     private TreeMap<String, String> headersAsMap(Response response) {
@@ -149,9 +153,11 @@ private void addConnectionHeadersToBuilder(Request.Builder requestBuilder, Map<S
     }
 
     private void emitLifecycleEvent(LifecycleEvent lifecycleEvent) {
-        Log.d(TAG, "Emit lifecycle event: " + lifecycleEvent.getType().name());
-        for (FlowableEmitter<? super LifecycleEvent> subscriber : mLifecycleEmitters) {
-            subscriber.onNext(lifecycleEvent);
+        synchronized (mLifecycleLock) {
+            Log.d(TAG, "Emit lifecycle event: " + lifecycleEvent.getType().name());
+            for (FlowableEmitter<? super LifecycleEvent> subscriber : mLifecycleEmitters) {
+                subscriber.onNext(lifecycleEvent);
+            }
         }
     }
 
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java b/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java
index 17db25e..4ad7d59 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java
@@ -41,8 +41,11 @@
     private boolean haveConnection;
     private TreeMap<String, String> mServerHandshakeHeaders;
 
+    private final Object mLifecycleLock = new Object();
+
     /**
      * Support UIR scheme ws://host:port/path
+     *
      * @param connectHttpHeaders may be null
      */
     /* package */ WebSocketsConnectionProvider(String uri, Map<String, String> connectHttpHeaders) {
@@ -55,17 +58,17 @@
     @Override
     public Flowable<String> messages() {
         Flowable<String> flowable = Flowable.<String>create(mMessagesEmitters::add, BackpressureStrategy.BUFFER)
-            .doOnCancel(() -> {
-                Iterator<FlowableEmitter<? super String>> iterator = mMessagesEmitters.iterator();
-                while (iterator.hasNext()) {
-                    if (iterator.next().isCancelled()) iterator.remove();
-                }
-
-                if (mMessagesEmitters.size() < 1) {
-                    Log.d(TAG, "Close web socket connection now in thread " + Thread.currentThread());
-                    mWebSocketClient.close();
-                }
-            });
+                .doOnCancel(() -> {
+                    Iterator<FlowableEmitter<? super String>> iterator = mMessagesEmitters.iterator();
+                    while (iterator.hasNext()) {
+                        if (iterator.next().isCancelled()) iterator.remove();
+                    }
+
+                    if (mMessagesEmitters.size() < 1) {
+                        Log.d(TAG, "Close web socket connection now in thread " + Thread.currentThread());
+                        mWebSocketClient.close();
+                    }
+                });
         createWebSocketConnection();
         return flowable;
     }
@@ -115,7 +118,7 @@ public void onError(Exception ex) {
             }
         };
 
-        if(mUri.startsWith("wss")) {
+        if (mUri.startsWith("wss")) {
             try {
                 SSLContext sc = SSLContext.getInstance("TLS");
                 sc.init(null, null, null);
@@ -144,9 +147,11 @@ public Flowable<Void> send(String stompMessage) {
     }
 
     private void emitLifecycleEvent(LifecycleEvent lifecycleEvent) {
-        Log.d(TAG, "Emit lifecycle event: " + lifecycleEvent.getType().name());
-        for (FlowableEmitter<? super LifecycleEvent> emitter : mLifecycleEmitters) {
-            emitter.onNext(lifecycleEvent);
+        synchronized (mLifecycleLock) {
+            Log.d(TAG, "Emit lifecycle event: " + lifecycleEvent.getType().name());
+            for (FlowableEmitter<? super LifecycleEvent> emitter : mLifecycleEmitters) {
+                emitter.onNext(lifecycleEvent);
+            }
         }
     }
 
@@ -160,11 +165,13 @@ private void emitMessage(String stompMessage) {
     @Override
     public Flowable<LifecycleEvent> getLifecycleReceiver() {
         return Flowable.<LifecycleEvent>create(mLifecycleEmitters::add, BackpressureStrategy.BUFFER)
-            .doOnCancel(() -> {
-                Iterator<FlowableEmitter<? super LifecycleEvent>> iterator = mLifecycleEmitters.iterator();
-                while (iterator.hasNext()) {
-                 if (iterator.next().isCancelled()) iterator.remove();
-                }
-            });
+                .doOnCancel(() -> {
+                    synchronized (mLifecycleLock) {
+                        Iterator<FlowableEmitter<? super LifecycleEvent>> iterator = mLifecycleEmitters.iterator();
+                        while (iterator.hasNext()) {
+                            if (iterator.next().isCancelled()) iterator.remove();
+                        }
+                    }
+                });
     }
 }

From d7963576b44904f4c6b965b15aae2ef9488e3e8c Mon Sep 17 00:00:00 2001
From: forresthopkinsa <fingerheroes@gmail.com>
Date: Fri, 11 Aug 2017 10:06:42 -0700
Subject: [PATCH 037/110] Working on reconnection

---
 build.gradle                                      |  2 +-
 .../stomp/OkHttpConnectionProvider.java           | 13 +++++++++++--
 .../ua/naiksoftware/stomp/client/StompClient.java | 15 ++++++++++-----
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/build.gradle b/build.gradle
index 4a30413..55f34ea 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0-alpha9'
+        classpath 'com.android.tools.build:gradle:3.0.0-beta1'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java b/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java
index 39c21ed..a52db6b 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java
@@ -2,6 +2,7 @@
 
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.util.Log;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -22,6 +23,7 @@ class OkHttpConnectionProvider extends AbstractConnectionProvider {
     @NonNull
     private final Map<String, String> mConnectHttpHeaders;
     private final OkHttpClient mOkHttpClient;
+    private final String tag = OkHttpConnectionProvider.class.getSimpleName();
 
     @Nullable
     private WebSocket openedSocked;
@@ -36,7 +38,11 @@ class OkHttpConnectionProvider extends AbstractConnectionProvider {
     @NonNull
     @Override
     public Completable disconnect() {
-        return Completable.fromAction(() -> openedSocked.close(1000, ""));
+        if (openedSocked == null) {
+            return Completable.error(new IllegalStateException("Attempted to disconnect when already disconnected"));
+        }
+        return Completable
+                .fromAction(() -> openedSocked.close(1000, ""));
     }
 
     @Override
@@ -65,7 +71,10 @@ public void onOpen(WebSocket webSocket, @NonNull Response response) {
 
                     @Override
                     public void onMessage(WebSocket webSocket, String text) {
-                        emitMessage(text);
+                        if (text.equals("\n"))
+                            Log.d(tag, "RECEIVED HEARTBEAT");
+                        else
+                            emitMessage(text);
                     }
 
                     @Override
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java b/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
index 67c4428..7f3aed5 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
@@ -29,6 +29,7 @@ public class StompClient {
     public static final String SUPPORTED_VERSIONS = "1.1,1.0";
     public static final String DEFAULT_ACK = "auto";
 
+    private final String tag = StompClient.class.getSimpleName();
     private final ConnectionProvider mConnectionProvider;
     private HashMap<String, String> mTopics;
     private boolean mConnected;
@@ -42,9 +43,13 @@ public class StompClient {
     public StompClient(ConnectionProvider connectionProvider) {
         mConnectionProvider = connectionProvider;
         mMessageStream = PublishSubject.create();
+        mStreamMap = new HashMap<>();
+        resetStatus();
+    }
+
+    private void resetStatus() {
         mConnectionFuture = new CompletableFuture<>();
         mConnectionComplete = Completable.fromFuture(mConnectionFuture).subscribeOn(Schedulers.newThread());
-        mStreamMap = new HashMap<>();
     }
 
     /**
@@ -61,7 +66,7 @@ public void connect(boolean reconnect) {
     /**
      * Connect without reconnect if connected
      *
-     * @param _headers might be null
+     * @param _headers HTTP headers to send in the INITIAL REQUEST, i.e. during the protocol upgrade
      */
     public void connect(List<StompHeader> _headers) {
         connect(_headers, false);
@@ -70,7 +75,7 @@ public void connect(List<StompHeader> _headers) {
     /**
      * If already connected and reconnect=false - nope
      *
-     * @param _headers might be null
+     * @param _headers HTTP headers to send in the INITIAL REQUEST, i.e. during the protocol upgrade
      */
     public void connect(@Nullable List<StompHeader> _headers, boolean reconnect) {
         if (reconnect) disconnect();
@@ -123,7 +128,6 @@ public Completable send(String destination, String data) {
 
     public Completable send(@NonNull StompMessage stompMessage) {
         Completable completable = mConnectionProvider.send(stompMessage.compile());
-        mConnectionComplete.subscribe();
         return completable.startWith(mConnectionComplete);
     }
 
@@ -136,7 +140,8 @@ public Observable<LifecycleEvent> lifecycle() {
     }
 
     public void disconnect() {
-        mConnectionProvider.disconnect().subscribe();
+        resetStatus();
+        mConnectionProvider.disconnect().subscribe(() -> mConnected = false);
     }
 
     public Observable<StompMessage> topic(String destinationPath) {

From d719ba65cad00f36b60be1cc8e79946694cf5811 Mon Sep 17 00:00:00 2001
From: forresthopkinsa <fingerheroes@gmail.com>
Date: Fri, 11 Aug 2017 13:45:31 -0700
Subject: [PATCH 038/110] Support for RabbitMQ topic wildcards

---
 README.md                                     | 12 +++
 .../stomp/client/StompClient.java             | 77 ++++++++++++++++++-
 2 files changed, 87 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index b7647f4..65f033e 100644
--- a/README.md
+++ b/README.md
@@ -225,6 +225,18 @@ These are the possible changes you need to make to your code for this branch, if
 - Connection Provider is selected by an enum
   - It used to be done by passing it a WebSocket class from either JWS or OkHttp
   - New way of using it can be seen in the examples above
+- Topic subscription now supports wildcard parsing
+  - Example: RabbitMQ allows subscribing to topics with wildcards ([more info](https://www.rabbitmq.com/tutorials/tutorial-five-java.html))
+  - Usage:
+    ``` java
+    StompClient client = Stomp.over(...);
+    client.setParser(StompClient.Parser.RABBITMQ);
+    client.connect();
+
+    client.topic("/topic/*").subscribe(message -> {
+        Log.i(TAG, "Received message: " + message.getPayload());
+    });
+    ```
 
 ## Additional Reading
 
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java b/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
index 7f3aed5..5c96a87 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
@@ -10,6 +10,7 @@
 import java.util.List;
 import java.util.UUID;
 
+import java8.util.StringJoiner;
 import java8.util.concurrent.CompletableFuture;
 import rx.Completable;
 import rx.Observable;
@@ -39,12 +40,14 @@ public class StompClient {
     private CompletableFuture<Boolean> mConnectionFuture;
     private Completable mConnectionComplete;
     private HashMap<String, Observable<StompMessage>> mStreamMap;
+    private Parser parser;
 
     public StompClient(ConnectionProvider connectionProvider) {
         mConnectionProvider = connectionProvider;
         mMessageStream = PublishSubject.create();
         mStreamMap = new HashMap<>();
         resetStatus();
+        parser = Parser.NONE;
     }
 
     private void resetStatus() {
@@ -52,6 +55,26 @@ private void resetStatus() {
         mConnectionComplete = Completable.fromFuture(mConnectionFuture).subscribeOn(Schedulers.newThread());
     }
 
+    public enum Parser {
+        NONE,
+        RABBITMQ
+    }
+
+    /**
+     * Set the wildcard parser for Topic subscription.
+     * <p>
+     * Right now, the only options are NONE and RABBITMQ.
+     * <p>
+     * When set to RABBITMQ, topic subscription allows for RMQ-style wildcards.
+     * <p>
+     * See more info <a href="https://www.rabbitmq.com/tutorials/tutorial-five-java.html">here</a>.
+     *
+     * @param parser Set to NONE by default
+     */
+    public void setParser(Parser parser) {
+        this.parser = parser;
+    }
+
     /**
      * Connect without reconnect if connected
      */
@@ -148,13 +171,13 @@ public Observable<StompMessage> topic(String destinationPath) {
         return topic(destinationPath, null);
     }
 
-    public Observable<StompMessage> topic(@Nullable String destPath, List<StompHeader> headerList) {
+    public Observable<StompMessage> topic(@NonNull String destPath, List<StompHeader> headerList) {
         if (destPath == null)
             return Observable.error(new IllegalArgumentException("Topic path cannot be null"));
         else if (!mStreamMap.containsKey(destPath))
             mStreamMap.put(destPath,
                     mMessageStream
-                            .filter(msg -> destPath.equals(msg.findHeader(StompHeader.DESTINATION)))
+                            .filter(msg -> matches(destPath, msg))
                             .doOnSubscribe(() -> subscribePath(destPath, headerList).subscribe())
                             .doOnUnsubscribe(() -> unsubscribePath(destPath).subscribe())
                             .share()
@@ -162,6 +185,56 @@ else if (!mStreamMap.containsKey(destPath))
         return mStreamMap.get(destPath);
     }
 
+    private boolean matches(String path, StompMessage msg) {
+        String dest = msg.findHeader(StompHeader.DESTINATION);
+        if (dest == null) return false;
+        boolean ret;
+
+        switch (parser) {
+            case NONE:
+                ret = path.equals(dest);
+                break;
+
+            case RABBITMQ:
+                // for example string "lorem.ipsum.*.sit":
+
+                // split it up into ["lorem", "ipsum", "*", "sit"]
+                String[] split = path.split("\\.");
+                ArrayList<String> transformed = new ArrayList<>();
+                // check for wildcards and replace with corresponding regex
+                for (String s : split) {
+                    switch (s) {
+                        case "*":
+                            transformed.add("[^.]+");
+                            break;
+                        case "#":
+                            // TODO: make this work with zero-word
+                            // e.g. "lorem.#.dolor" should ideally match "lorem.dolor"
+                            transformed.add(".*");
+                            break;
+                        default:
+                            transformed.add(s);
+                            break;
+                    }
+                }
+                // at this point, 'transformed' looks like ["lorem", "ipsum", "[^.]+", "sit"]
+                StringJoiner sj = new StringJoiner("\\.");
+                for (String s : transformed)
+                    sj.add(s);
+                String join = sj.toString();
+                // join = "lorem\.ipsum\.[^.]+\.sit"
+
+                ret = dest.matches(join);
+                break;
+
+            default:
+                ret = false;
+                break;
+        }
+
+        return ret;
+    }
+
     private Completable subscribePath(String destinationPath, @Nullable List<StompHeader> headerList) {
         String topicId = UUID.randomUUID().toString();
 

From 9c7a46bcf0a5b79d697a797e86e7e8d11ddab560 Mon Sep 17 00:00:00 2001
From: forresthopkinsa <fingerheroes@gmail.com>
Date: Tue, 15 Aug 2017 15:05:37 -0700
Subject: [PATCH 039/110] Finished fixing reconnect and its race conditions

Managed to do it without any `synchronized` blocking
---
 README.md                                     | 17 +++++++++
 build.gradle                                  |  2 +-
 .../stomp/OkHttpConnectionProvider.java       | 36 +++++++++++++++++--
 .../stomp/client/StompClient.java             | 32 ++++++++---------
 4 files changed, 68 insertions(+), 19 deletions(-)

diff --git a/README.md b/README.md
index 65f033e..c4e8748 100644
--- a/README.md
+++ b/README.md
@@ -30,6 +30,8 @@ You can use this library two ways:
 - Using the new Native Java 8 support
   - As of this writing, you must be using Android Studio Canary to use this feature.
   - Has been tested in the following environments:
+    - Beta 2, Gradle plugin v3.0.0-beta2
+    - Beta 1, Gradle plugin v3.0.0-beta1
     - Canary 9, Gradle plugin v3.0.0-alpha9
     - Canary 8, Gradle plugin v3.0.0-alpha8
   - It *should* work in all 3.0.0+ versions
@@ -219,6 +221,21 @@ These are the possible changes you need to make to your code for this branch, if
         });
         ```
     - Be sure to implement this change, because the IDE might not catch the error.
+- Removed `reconnect` parameter from `connect(...)` methods
+  - Old, deprecated overloads of the method:
+    ``` java
+    void connect(boolean reconnect) {...}
+    void connect(List<StompHeader> _headers, boolean reconnect) {...}
+    ```
+  - Now, these are the *only* two ways to call `connect` (these existed before, too):
+    ``` java
+    void connect() {...}
+    void connect(List<StompHeader> _headers) {...}
+    ```
+  - Additionally, reconnection is now handled by just calling `reconnect()`
+    - It automatically attaches the last-used connect headers
+    - It is meant to be used when already connected; it executes `disconnect()`
+    - Note that if you're already disconnected, this will throw a `TimeoutException`
 - Passing null as the topic path now throws an exception
   - Previously, it was supposed to silently fail, although it would probably hit a NPE first (untested)
   - Now it throws an IllegalArgumentException
diff --git a/build.gradle b/build.gradle
index 55f34ea..333cf60 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0-beta1'
+        classpath 'com.android.tools.build:gradle:3.0.0-beta2'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java b/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java
index a52db6b..259031d 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java
@@ -7,6 +7,8 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.TreeMap;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 
 import okhttp3.Headers;
 import okhttp3.OkHttpClient;
@@ -16,6 +18,7 @@
 import okhttp3.WebSocketListener;
 import okio.ByteString;
 import rx.Completable;
+import rx.subjects.BehaviorSubject;
 
 class OkHttpConnectionProvider extends AbstractConnectionProvider {
 
@@ -24,6 +27,7 @@ class OkHttpConnectionProvider extends AbstractConnectionProvider {
     private final Map<String, String> mConnectHttpHeaders;
     private final OkHttpClient mOkHttpClient;
     private final String tag = OkHttpConnectionProvider.class.getSimpleName();
+    private final BehaviorSubject<Boolean> mConnectionStream;
 
     @Nullable
     private WebSocket openedSocked;
@@ -33,24 +37,50 @@ class OkHttpConnectionProvider extends AbstractConnectionProvider {
         mUri = uri;
         mConnectHttpHeaders = connectHttpHeaders != null ? connectHttpHeaders : new HashMap<>();
         mOkHttpClient = okHttpClient;
+        mConnectionStream = BehaviorSubject.create(false);
+        mConnectionStream.subscribe(value -> Log.d(tag, "Connection stream emitted: " + value));
     }
 
     @NonNull
     @Override
     public Completable disconnect() {
+        Completable block = mConnectionStream
+                .first(isConnected -> isConnected)
+                .timeout(1, TimeUnit.SECONDS)
+                .doOnError(error -> {
+                    if (error.getClass().equals(TimeoutException.class))
+                            Log.e(tag, "Attempted to disconnect when already disconnected");
+                })
+                .toCompletable();
+
+        /*
         if (openedSocked == null) {
             return Completable.error(new IllegalStateException("Attempted to disconnect when already disconnected"));
         }
+        */
+
         return Completable
-                .fromAction(() -> openedSocked.close(1000, ""));
+                .fromAction(() -> openedSocked.close(1000, ""))
+                .startWith(block);
     }
 
     @Override
     void createWebSocketConnection() {
-
+        Completable block = mConnectionStream
+                .first(isConnected -> !isConnected)
+                .timeout(1, TimeUnit.SECONDS)
+                .doOnError(error -> {
+                    if (error.getClass().equals(TimeoutException.class))
+                        Log.e(tag, "Attempted to connect when already connected");
+                })
+                .toCompletable();
+        block.get(); // todo: do this the right way
+
+        /*
         if (openedSocked != null) {
             throw new IllegalStateException("Already have connection to web socket");
         }
+        */
 
         Request.Builder requestBuilder = new Request.Builder()
                 .url(mUri);
@@ -86,6 +116,7 @@ public void onMessage(WebSocket webSocket, @NonNull ByteString bytes) {
                     public void onClosed(WebSocket webSocket, int code, String reason) {
                         emitLifecycleEvent(new LifecycleEvent(LifecycleEvent.Type.CLOSED));
                         openedSocked = null;
+                        mConnectionStream.onNext(false);
                     }
 
                     @Override
@@ -95,6 +126,7 @@ public void onFailure(WebSocket webSocket, Throwable t, Response response) {
                 }
 
         );
+        mConnectionStream.onNext(true);
     }
 
     @Override
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java b/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
index 5c96a87..6b7697f 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
@@ -14,6 +14,7 @@
 import java8.util.concurrent.CompletableFuture;
 import rx.Completable;
 import rx.Observable;
+import rx.Subscription;
 import rx.schedulers.Schedulers;
 import rx.subjects.PublishSubject;
 import ua.naiksoftware.stomp.ConnectionProvider;
@@ -41,6 +42,8 @@ public class StompClient {
     private Completable mConnectionComplete;
     private HashMap<String, Observable<StompMessage>> mStreamMap;
     private Parser parser;
+    private Subscription lifecycleSub;
+    private List<StompHeader> mHeaders;
 
     public StompClient(ConnectionProvider connectionProvider) {
         mConnectionProvider = connectionProvider;
@@ -82,28 +85,16 @@ public void connect() {
         connect(null);
     }
 
-    public void connect(boolean reconnect) {
-        connect(null, reconnect);
-    }
-
-    /**
-     * Connect without reconnect if connected
-     *
-     * @param _headers HTTP headers to send in the INITIAL REQUEST, i.e. during the protocol upgrade
-     */
-    public void connect(List<StompHeader> _headers) {
-        connect(_headers, false);
-    }
-
     /**
      * If already connected and reconnect=false - nope
      *
      * @param _headers HTTP headers to send in the INITIAL REQUEST, i.e. during the protocol upgrade
      */
-    public void connect(@Nullable List<StompHeader> _headers, boolean reconnect) {
-        if (reconnect) disconnect();
+    public void connect(@Nullable List<StompHeader> _headers) {
+        mHeaders = _headers;
+
         if (mConnected) return;
-        lifecycle()
+        lifecycleSub = lifecycle()
                 .subscribe(lifecycleEvent -> {
                     switch (lifecycleEvent.getType()) {
                         case OPENED:
@@ -138,6 +129,14 @@ public void connect(@Nullable List<StompHeader> _headers, boolean reconnect) {
                 });
     }
 
+    /**
+     * Disconnect from server, and then reconnect with the last-used headers
+     */
+    public void reconnect() {
+        disconnect();
+        connect(mHeaders);
+    }
+
     public Completable send(String destination) {
         return send(destination, null);
     }
@@ -164,6 +163,7 @@ public Observable<LifecycleEvent> lifecycle() {
 
     public void disconnect() {
         resetStatus();
+        lifecycleSub.unsubscribe();
         mConnectionProvider.disconnect().subscribe(() -> mConnected = false);
     }
 

From 2067dfcc61b2ed54e1f6ddc1d3fdeffa1c81d722 Mon Sep 17 00:00:00 2001
From: forresthopkinsa <fingerheroes@gmail.com>
Date: Tue, 15 Aug 2017 16:47:24 -0700
Subject: [PATCH 040/110] Abstracted reconnect logic and implemented it for JWS

(JWS is still totally untested)
---
 .../stomp/AbstractConnectionProvider.java     | 46 ++++++++++++++---
 .../stomp/OkHttpConnectionProvider.java       | 49 ++-----------------
 .../stomp/WebSocketsConnectionProvider.java   |  9 ++--
 3 files changed, 47 insertions(+), 57 deletions(-)

diff --git a/lib/src/main/java/ua/naiksoftware/stomp/AbstractConnectionProvider.java b/lib/src/main/java/ua/naiksoftware/stomp/AbstractConnectionProvider.java
index be5eb51..d22bc91 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/AbstractConnectionProvider.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/AbstractConnectionProvider.java
@@ -4,8 +4,11 @@
 import android.support.annotation.Nullable;
 import android.util.Log;
 
+import java.util.concurrent.TimeUnit;
+
 import rx.Completable;
 import rx.Observable;
+import rx.subjects.BehaviorSubject;
 import rx.subjects.PublishSubject;
 
 /**
@@ -22,29 +25,56 @@ abstract class AbstractConnectionProvider implements ConnectionProvider {
     private final PublishSubject<LifecycleEvent> mLifecycleStream;
     @NonNull
     private final PublishSubject<String> mMessagesStream;
+    final BehaviorSubject<Boolean> mConnectionStream;
 
     AbstractConnectionProvider() {
         mLifecycleStream = PublishSubject.create();
         mMessagesStream = PublishSubject.create();
+        mConnectionStream = BehaviorSubject.create(false);
     }
 
     @NonNull
     @Override
     public Observable<String> messages() {
-        createWebSocketConnection();
-        return mMessagesStream;
+        return mMessagesStream.startWith(initSocket().toObservable());
     }
 
     /**
-     * Completable to close socket.
+     * Simply close socket.
      * <p>
      * For example:
      * <pre>
-     * return Completable.fromAction(() -> webSocket.close());
+     * webSocket.close();
      * </pre>
      */
+    abstract void rawDisconnect();
+
     @Override
-    public abstract Completable disconnect();
+    public Completable disconnect() {
+        Observable<Boolean> ex = Observable.error(new IllegalStateException("Attempted to disconnect when already disconnected"));
+
+        Completable block = mConnectionStream
+                .first(isConnected -> isConnected)
+                .timeout(1, TimeUnit.SECONDS, ex)
+                .toCompletable();
+
+        return Completable
+                .fromAction(this::rawDisconnect)
+                .startWith(block);
+    }
+
+    private Completable initSocket() {
+        Observable<Boolean> ex = Observable.error(new IllegalStateException("Attempted to connect when already connected"));
+
+        Completable block = mConnectionStream
+                .first(isConnected -> !isConnected)
+                .timeout(1, TimeUnit.SECONDS, ex)
+                .toCompletable();
+
+        return Completable
+                .fromAction(this::createWebSocketConnection)
+                .startWith(block);
+    }
 
     /**
      * Most important method: connects to websocket and notifies program of messages.
@@ -61,7 +91,7 @@ public Completable send(String stompMessage) {
                 throw new IllegalStateException("Not connected yet");
             } else {
                 Log.d(TAG, "Send STOMP message: " + stompMessage);
-                bareSend(stompMessage);
+                rawSend(stompMessage);
                 return null;
             }
         });
@@ -77,7 +107,7 @@ public Completable send(String stompMessage) {
      *
      * @param stompMessage message to send
      */
-    abstract void bareSend(String stompMessage);
+    abstract void rawSend(String stompMessage);
 
     /**
      * Get socket object.
@@ -94,6 +124,8 @@ public Completable send(String stompMessage) {
     void emitLifecycleEvent(@NonNull LifecycleEvent lifecycleEvent) {
         Log.d(TAG, "Emit lifecycle event: " + lifecycleEvent.getType().name());
         mLifecycleStream.onNext(lifecycleEvent);
+        if (lifecycleEvent.getType().equals(LifecycleEvent.Type.CLOSED))
+            mConnectionStream.onNext(false);
     }
 
     void emitMessage(String stompMessage) {
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java b/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java
index 259031d..945b11d 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java
@@ -7,8 +7,6 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.TreeMap;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
 
 import okhttp3.Headers;
 import okhttp3.OkHttpClient;
@@ -17,8 +15,6 @@
 import okhttp3.WebSocket;
 import okhttp3.WebSocketListener;
 import okio.ByteString;
-import rx.Completable;
-import rx.subjects.BehaviorSubject;
 
 class OkHttpConnectionProvider extends AbstractConnectionProvider {
 
@@ -27,7 +23,6 @@ class OkHttpConnectionProvider extends AbstractConnectionProvider {
     private final Map<String, String> mConnectHttpHeaders;
     private final OkHttpClient mOkHttpClient;
     private final String tag = OkHttpConnectionProvider.class.getSimpleName();
-    private final BehaviorSubject<Boolean> mConnectionStream;
 
     @Nullable
     private WebSocket openedSocked;
@@ -37,51 +32,16 @@ class OkHttpConnectionProvider extends AbstractConnectionProvider {
         mUri = uri;
         mConnectHttpHeaders = connectHttpHeaders != null ? connectHttpHeaders : new HashMap<>();
         mOkHttpClient = okHttpClient;
-        mConnectionStream = BehaviorSubject.create(false);
-        mConnectionStream.subscribe(value -> Log.d(tag, "Connection stream emitted: " + value));
     }
 
     @NonNull
     @Override
-    public Completable disconnect() {
-        Completable block = mConnectionStream
-                .first(isConnected -> isConnected)
-                .timeout(1, TimeUnit.SECONDS)
-                .doOnError(error -> {
-                    if (error.getClass().equals(TimeoutException.class))
-                            Log.e(tag, "Attempted to disconnect when already disconnected");
-                })
-                .toCompletable();
-
-        /*
-        if (openedSocked == null) {
-            return Completable.error(new IllegalStateException("Attempted to disconnect when already disconnected"));
-        }
-        */
-
-        return Completable
-                .fromAction(() -> openedSocked.close(1000, ""))
-                .startWith(block);
+    public void rawDisconnect() {
+        openedSocked.close(1000, "");
     }
 
     @Override
     void createWebSocketConnection() {
-        Completable block = mConnectionStream
-                .first(isConnected -> !isConnected)
-                .timeout(1, TimeUnit.SECONDS)
-                .doOnError(error -> {
-                    if (error.getClass().equals(TimeoutException.class))
-                        Log.e(tag, "Attempted to connect when already connected");
-                })
-                .toCompletable();
-        block.get(); // todo: do this the right way
-
-        /*
-        if (openedSocked != null) {
-            throw new IllegalStateException("Already have connection to web socket");
-        }
-        */
-
         Request.Builder requestBuilder = new Request.Builder()
                 .url(mUri);
 
@@ -114,9 +74,8 @@ public void onMessage(WebSocket webSocket, @NonNull ByteString bytes) {
 
                     @Override
                     public void onClosed(WebSocket webSocket, int code, String reason) {
-                        emitLifecycleEvent(new LifecycleEvent(LifecycleEvent.Type.CLOSED));
                         openedSocked = null;
-                        mConnectionStream.onNext(false);
+                        emitLifecycleEvent(new LifecycleEvent(LifecycleEvent.Type.CLOSED));
                     }
 
                     @Override
@@ -130,7 +89,7 @@ public void onFailure(WebSocket webSocket, Throwable t, Response response) {
     }
 
     @Override
-    void bareSend(String stompMessage) {
+    void rawSend(String stompMessage) {
         openedSocked.send(stompMessage);
     }
 
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java b/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java
index c672df4..4f93085 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java
@@ -20,8 +20,6 @@
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLSocketFactory;
 
-import rx.Completable;
-
 /**
  * Created by naik on 05.05.16.
  */
@@ -49,8 +47,8 @@ class WebSocketsConnectionProvider extends AbstractConnectionProvider {
 
     @NonNull
     @Override
-    public Completable disconnect() {
-        return Completable.fromAction(() -> mWebSocketClient.close());
+    public void rawDisconnect() {
+        mWebSocketClient.close();
     }
 
     @Override
@@ -112,10 +110,11 @@ public void onError(Exception ex) {
 
         mWebSocketClient.connect();
         haveConnection = true;
+        mConnectionStream.onNext(true);
     }
 
     @Override
-    void bareSend(String stompMessage) {
+    void rawSend(String stompMessage) {
         mWebSocketClient.send(stompMessage);
     }
 

From 2de7ea39cb1854e96f9948281e54c8b2e147d583 Mon Sep 17 00:00:00 2001
From: steviemo <stephen.dmorrison@gmail.com>
Date: Thu, 24 Aug 2017 17:30:59 +0100
Subject: [PATCH 041/110] concurrenthashmap

---
 .../main/java/ua/naiksoftware/stomp/client/StompClient.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java b/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
index 89ddd03..3cdb8d3 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
@@ -11,6 +11,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CopyOnWriteArrayList;
 
 import io.reactivex.BackpressureStrategy;
@@ -33,7 +34,7 @@ public class StompClient {
     public static final String DEFAULT_ACK = "auto";
 
     private Disposable mMessagesDisposable;
-    private Map<String, Set<FlowableEmitter<? super StompMessage>>> mEmitters = new HashMap<>();
+    private Map<String, Set<FlowableEmitter<? super StompMessage>>> mEmitters = new ConcurrentHashMap<>();
     private List<ConnectableFlowable<Void>> mWaitConnectionFlowables;
     private final ConnectionProvider mConnectionProvider;
     private HashMap<String, String> mTopics;

From 8526f1dd575a07a8e9c6ffe0b2de6e50314dd040 Mon Sep 17 00:00:00 2001
From: steviemo <stephen.dmorrison@gmail.com>
Date: Fri, 25 Aug 2017 12:52:21 +0100
Subject: [PATCH 042/110] handle onclosing

---
 .../java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java b/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java
index 0bdfffb..fab4803 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java
@@ -106,6 +106,11 @@ public void onClosed(WebSocket webSocket, int code, String reason) {
                     public void onFailure(WebSocket webSocket, Throwable t, Response response) {
                         emitLifecycleEvent(new LifecycleEvent(LifecycleEvent.Type.ERROR, new Exception(t)));
                     }
+                    
+                    @Override
+                    public void onClosing(final WebSocket webSocket, final int code, final String reason) {
+                        webSocket.close(code, reason);
+                    }
                 }
 
         );

From b55536b5500e8cdafb61b1040cd46533aa21cf98 Mon Sep 17 00:00:00 2001
From: NaikSoftware <naiksav4enko@gmail.com>
Date: Mon, 4 Sep 2017 12:18:47 +0300
Subject: [PATCH 043/110] Fix disposable leak

---
 .../main/java/ua/naiksoftware/stomp/client/StompClient.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java b/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
index 3cdb8d3..f9605f1 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
@@ -34,6 +34,7 @@ public class StompClient {
     public static final String DEFAULT_ACK = "auto";
 
     private Disposable mMessagesDisposable;
+    private Disposable mLifecycleDisposable;
     private Map<String, Set<FlowableEmitter<? super StompMessage>>> mEmitters = new ConcurrentHashMap<>();
     private List<ConnectableFlowable<Void>> mWaitConnectionFlowables;
     private final ConnectionProvider mConnectionProvider;
@@ -74,7 +75,7 @@ public void connect(List<StompHeader> _headers) {
     public void connect(List<StompHeader> _headers, boolean reconnect) {
         if (reconnect) disconnect();
         if (mConnected) return;
-        mConnectionProvider.getLifecycleReceiver()
+        mLifecycleDisposable = mConnectionProvider.getLifecycleReceiver()
                 .subscribe(lifecycleEvent -> {
                     switch (lifecycleEvent.getType()) {
                         case OPENED:
@@ -156,6 +157,7 @@ public Flowable<LifecycleEvent> lifecycle() {
 
     public void disconnect() {
         if (mMessagesDisposable != null) mMessagesDisposable.dispose();
+        if (mLifecycleDisposable != null) mLifecycleDisposable.dispose();
         mConnected = false;
     }
 

From 3880e3cd25f7cc6f06d3cd12f854262fc27c8512 Mon Sep 17 00:00:00 2001
From: forresthopkinsa <fingerheroes@gmail.com>
Date: Tue, 19 Sep 2017 10:05:58 -0700
Subject: [PATCH 044/110] Started on heartbeats, fixed example

---
 README.md                                     | 37 +++++++++++++------
 build.gradle                                  |  2 +-
 .../stompclientexample/MainActivity.java      | 30 +++++----------
 gradle/wrapper/gradle-wrapper.properties      |  4 +-
 .../stomp/AbstractConnectionProvider.java     |  5 +++
 .../stomp/ConnectionProvider.java             |  2 +
 .../java/ua/naiksoftware/stomp/Stomp.java     |  2 +-
 .../stomp/client/StompClient.java             | 16 +++++++-
 8 files changed, 61 insertions(+), 37 deletions(-)

diff --git a/README.md b/README.md
index c4e8748..2516c19 100644
--- a/README.md
+++ b/README.md
@@ -1,15 +1,17 @@
-# STOMP protocol via WebSocket for Android
+# Websockets on Android
 
 [![Release](https://jitpack.io/v/forresthopkinsa/StompProtocolAndroid.svg)](https://jitpack.io/#forresthopkinsa/StompProtocolAndroid)
 
 ## Overview
 
-**Note that this is a FORK of a project by NaikSoftware! This version is made to avoid using RetroLambda! (Scroll down to see other changes)**
+**Note that this is a FORK of a project by NaikSoftware! This version was originally made to avoid using RetroLambda.**
+
+*(It now has [many other differences](#changes-in-this-fork).)*
 
 This library provides support for [STOMP protocol](https://stomp.github.io/) over Websockets.
 
-At now library works only as client for any backend that supports STOMP, such as
-NodeJS (e.g. using StompJS) or Spring Boot ([with WebSocket support](https://spring.io/guides/gs/messaging-stomp-websocket/)).
+Right now, the library works as a client for any backend that supports STOMP, such as
+Node.js (e.g. using StompJS) or Spring Boot ([with WebSocket support](https://spring.io/guides/gs/messaging-stomp-websocket/)).
 
 Add library as gradle dependency (Versioning info [here](https://jitpack.io/#forresthopkinsa/StompProtocolAndroid)):
 
@@ -28,12 +30,10 @@ You can use this library two ways:
 - Using the old JACK toolchain
   - If you have Java 8 compatiblity and Jack enabled, this library will work for you
 - Using the new Native Java 8 support
-  - As of this writing, you must be using Android Studio Canary to use this feature.
+  - As of this writing, you must be using Android Studio Beta to use this feature.
   - Has been tested in the following environments:
-    - Beta 2, Gradle plugin v3.0.0-beta2
-    - Beta 1, Gradle plugin v3.0.0-beta1
-    - Canary 9, Gradle plugin v3.0.0-alpha9
-    - Canary 8, Gradle plugin v3.0.0-alpha8
+    - Beta 1-9, Gradle plugin v3.0.0-beta(1-9)
+    - Canary 8-9, Gradle plugin v3.0.0-alpha(8-9)
   - It *should* work in all 3.0.0+ versions
   - You can find more info on the [Releases Page](https://github.com/forresthopkinsa/StompProtocolAndroid/releases)
 
@@ -101,7 +101,7 @@ Check out the [upstream example server](https://github.com/NaikSoftware/stomp-pr
  });
   
  client.send("/app/hello", "world").subscribe(
-     aVoid -> Log.d(TAG, "Sent data!"),
+     () -> Log.d(TAG, "Sent data!"),
      error -> Log.e(TAG, "Encountered error while sending data!", error)
  );
   
@@ -131,8 +131,8 @@ client.lifecycle().subscribe(lifecycleEvent -> {
             Log.d(TAG, "Stomp connection opened");
             break;
         case CLOSED:
-             Log.d(TAG, "Stomp connection closed");
-             break;
+            Log.d(TAG, "Stomp connection closed");
+            break;
         case ERROR:
             Log.e(TAG, "Stomp connection error", lifecycleEvent.getException());
             break;
@@ -152,6 +152,16 @@ Yes, it's safe to pass `null` for either (or both) of the last two arguments. Th
 
 Note: This method is only supported using OkHttp, not JWS.
 
+**Heartbeating**
+
+STOMP Heartbeat implementation is in progress. Right now, you can send a heartbeat request header upon initial websocket connect:
+
+``` java
+// ask server to send us heartbeat every ten seconds
+client.setHeartbeat(10000);
+client.connect();
+```
+
 **Support**
 
 Right now, the library only supports sending and receiving messages. ACK messages and transactions are not implemented yet.
@@ -254,6 +264,9 @@ These are the possible changes you need to make to your code for this branch, if
         Log.i(TAG, "Received message: " + message.getPayload());
     });
     ```
+- Rudimentary heartbeat mechanism
+  - You can use `StompClient.setHeartbeat(ms interval)` to send a heartbeat header to the server
+  - WIP; currently we don't deal with those heartbeats in any way other than printing them to console
 
 ## Additional Reading
 
diff --git a/build.gradle b/build.gradle
index 333cf60..5625c67 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0-beta2'
+        classpath 'com.android.tools.build:gradle:3.0.0-beta6'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/example-client/src/main/java/ua/naiksoftware/stompclientexample/MainActivity.java b/example-client/src/main/java/ua/naiksoftware/stompclientexample/MainActivity.java
index 91bc44a..28a7ac9 100644
--- a/example-client/src/main/java/ua/naiksoftware/stompclientexample/MainActivity.java
+++ b/example-client/src/main/java/ua/naiksoftware/stompclientexample/MainActivity.java
@@ -1,7 +1,7 @@
 package ua.naiksoftware.stompclientexample;
 
-import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.util.Log;
@@ -11,15 +11,12 @@
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 
-import org.java_websocket.WebSocket;
-
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Locale;
 
-import rx.Observable;
 import rx.Subscription;
 import rx.android.schedulers.AndroidSchedulers;
 import rx.schedulers.Schedulers;
@@ -56,7 +53,7 @@ public void disconnectStomp(View view) {
     }
 
     public void connectStomp(View view) {
-        mStompClient = Stomp.over(WebSocket.class, "ws://" + ANDROID_EMULATOR_LOCALHOST
+        mStompClient = Stomp.over(Stomp.ConnectionProvider.JWS, "ws://" + ANDROID_EMULATOR_LOCALHOST
                 + ":" + RestClient.SERVER_PORT + "/example-endpoint/websocket");
 
         mStompClient.lifecycle()
@@ -90,10 +87,10 @@ public void connectStomp(View view) {
 
     public void sendEchoViaStomp(View v) {
         mStompClient.send("/topic/hello-msg-mapping", "Echo STOMP " + mTimeFormat.format(new Date()))
-                .compose(applySchedulers())
-                .subscribe(aVoid -> {
-                    Log.d(TAG, "STOMP echo send successfully");
-                }, throwable -> {
+                .unsubscribeOn(Schedulers.newThread())
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(() -> Log.d(TAG, "STOMP echo send successfully"), throwable -> {
                     Log.e(TAG, "Error send STOMP echo", throwable);
                     toast(throwable.getMessage());
                 });
@@ -102,10 +99,10 @@ public void sendEchoViaStomp(View v) {
     public void sendEchoViaRest(View v) {
         mRestPingSubscription = RestClient.getInstance().getExampleRepository()
                 .sendRestEcho("Echo REST " + mTimeFormat.format(new Date()))
-                .compose(applySchedulers())
-                .subscribe(aVoid -> {
-                    Log.d(TAG, "REST echo send successfully");
-                }, throwable -> {
+                .unsubscribeOn(Schedulers.newThread())
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(aVoid -> Log.d(TAG, "REST echo send successfully"), throwable -> {
                     Log.e(TAG, "Error send REST echo", throwable);
                     toast(throwable.getMessage());
                 });
@@ -122,13 +119,6 @@ private void toast(String text) {
         Toast.makeText(this, text, Toast.LENGTH_SHORT).show();
     }
 
-    protected <T> Observable.Transformer<T, T> applySchedulers() {
-        return rObservable -> rObservable
-                .unsubscribeOn(Schedulers.newThread())
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread());
-    }
-
     @Override
     protected void onDestroy() {
         mStompClient.disconnect();
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 168b761..d72e173 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Aug 01 08:03:03 MST 2017
+#Tue Sep 05 08:26:08 MST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-rc-1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/AbstractConnectionProvider.java b/lib/src/main/java/ua/naiksoftware/stomp/AbstractConnectionProvider.java
index d22bc91..9e2982b 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/AbstractConnectionProvider.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/AbstractConnectionProvider.java
@@ -76,6 +76,11 @@ private Completable initSocket() {
                 .startWith(block);
     }
 
+    // Doesn't do anything at all, only here as a stub
+    public Completable setHeartbeat(int ms) {
+        return Completable.complete();
+    }
+
     /**
      * Most important method: connects to websocket and notifies program of messages.
      * <p>
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/ConnectionProvider.java b/lib/src/main/java/ua/naiksoftware/stomp/ConnectionProvider.java
index 7866527..0d18ac0 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/ConnectionProvider.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/ConnectionProvider.java
@@ -30,4 +30,6 @@ public interface ConnectionProvider {
      * Automatically emits Lifecycle.CLOSE
      */
     Completable disconnect();
+
+    Completable setHeartbeat(int ms);
 }
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/Stomp.java b/lib/src/main/java/ua/naiksoftware/stomp/Stomp.java
index 31fba3e..1eb7658 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/Stomp.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/Stomp.java
@@ -50,7 +50,7 @@ public static StompClient over(@NonNull ConnectionProvider connectionProvider, S
     public static StompClient over(@NonNull ConnectionProvider connectionProvider, String uri, @Nullable Map<String, String> connectHttpHeaders, @Nullable OkHttpClient okHttpClient) {
         if (connectionProvider == ConnectionProvider.JWS) {
             if (okHttpClient != null) {
-                throw new IllegalArgumentException("You cannot pass a webSocketClient with 'org.java_websocket.WebSocket'. use null instead.");
+                throw new IllegalArgumentException("You cannot pass an OkHttpClient when using JWS. Use null instead.");
             }
             return createStompClient(new WebSocketsConnectionProvider(uri, connectHttpHeaders));
         }
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java b/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
index 6b7697f..a100dfc 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
@@ -44,6 +44,7 @@ public class StompClient {
     private Parser parser;
     private Subscription lifecycleSub;
     private List<StompHeader> mHeaders;
+    private int heartbeat;
 
     public StompClient(ConnectionProvider connectionProvider) {
         mConnectionProvider = connectionProvider;
@@ -78,6 +79,18 @@ public void setParser(Parser parser) {
         this.parser = parser;
     }
 
+    /**
+     * Sets the heartbeat interval to request from the server.
+     * <p>
+     * Not very useful yet, because we don't have any heartbeat logic on our side.
+     *
+     * @param ms heartbeat time in milliseconds
+     */
+    public void setHeartbeat(int ms) {
+        heartbeat = ms;
+        mConnectionProvider.setHeartbeat(ms).subscribe();
+    }
+
     /**
      * Connect without reconnect if connected
      */
@@ -86,7 +99,7 @@ public void connect() {
     }
 
     /**
-     * If already connected and reconnect=false - nope
+     * Connect to websocket. If already connected, this will silently fail.
      *
      * @param _headers HTTP headers to send in the INITIAL REQUEST, i.e. during the protocol upgrade
      */
@@ -100,6 +113,7 @@ public void connect(@Nullable List<StompHeader> _headers) {
                         case OPENED:
                             List<StompHeader> headers = new ArrayList<>();
                             headers.add(new StompHeader(StompHeader.VERSION, SUPPORTED_VERSIONS));
+                            headers.add(new StompHeader(StompHeader.HEART_BEAT, "0," + heartbeat));
                             if (_headers != null) headers.addAll(_headers);
                             mConnectionProvider.send(new StompMessage(StompCommand.CONNECT, headers, null).compile())
                                     .subscribe();

From 24da370ff803daae39501faf8dfbb86b2acdf30e Mon Sep 17 00:00:00 2001
From: forresthopkinsa <fingerheroes@gmail.com>
Date: Tue, 19 Sep 2017 13:20:16 -0700
Subject: [PATCH 045/110] Huge cleanup, ready for release

---
 .gitignore                                    |  8 ++-----
 example-client/src/main/AndroidManifest.xml   | 18 +++++++-------
 .../stompclientexample/ExampleUnitTest.java   |  2 +-
 lib/src/main/AndroidManifest.xml              |  5 ++--
 .../java/ua/naiksoftware/stomp/Stomp.java     | 24 +++++++++----------
 .../stomp/WebSocketsConnectionProvider.java   |  3 ++-
 .../naiksoftware/stomp/ExampleUnitTest.java   |  2 +-
 7 files changed, 29 insertions(+), 33 deletions(-)

diff --git a/.gitignore b/.gitignore
index a814809..9a4a2d1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,7 @@
 *.iml
 .gradle
 /local.properties
-/.idea/workspace.xml
-/.idea/libraries
-/.idea/misc.xml
-/.idea/modules.xml
-/.idea/vcs.xml
+.idea
 .DS_Store
 /build
-/captures
+/captures
\ No newline at end of file
diff --git a/example-client/src/main/AndroidManifest.xml b/example-client/src/main/AndroidManifest.xml
index 8acdccd..2b1f999 100644
--- a/example-client/src/main/AndroidManifest.xml
+++ b/example-client/src/main/AndroidManifest.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="ua.naiksoftware.stompclientexample">
+    package="ua.naiksoftware.stompclientexample">
 
-    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.INTERNET" />
 
     <application
-            android:allowBackup="true"
-            android:icon="@mipmap/ic_launcher"
-            android:label="@string/app_name"
-            android:supportsRtl="true"
-            android:theme="@style/AppTheme">
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme">
         <activity android:name="ua.naiksoftware.stompclientexample.MainActivity">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
+                <action android:name="android.intent.action.MAIN" />
 
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
     </application>
diff --git a/example-client/src/test/java/ua/naiksoftware/stompclientexample/ExampleUnitTest.java b/example-client/src/test/java/ua/naiksoftware/stompclientexample/ExampleUnitTest.java
index 4795c29..ac03654 100644
--- a/example-client/src/test/java/ua/naiksoftware/stompclientexample/ExampleUnitTest.java
+++ b/example-client/src/test/java/ua/naiksoftware/stompclientexample/ExampleUnitTest.java
@@ -2,7 +2,7 @@
 
 import org.junit.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 /**
  * To work on unit tests, switch the Test Artifact in the Build Variants view.
diff --git a/lib/src/main/AndroidManifest.xml b/lib/src/main/AndroidManifest.xml
index 8fdbc9a..58c8122 100644
--- a/lib/src/main/AndroidManifest.xml
+++ b/lib/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="ua.naiksoftware.stomp">
+<manifest package="ua.naiksoftware.stomp">
 
-    <application/>
+    <application />
 
 </manifest>
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/Stomp.java b/lib/src/main/java/ua/naiksoftware/stomp/Stomp.java
index 1eb7658..f64d60d 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/Stomp.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/Stomp.java
@@ -10,12 +10,12 @@
 
 /**
  * Supported overlays:
- *  - org.java_websocket.WebSocket ('org.java-websocket:Java-WebSocket:1.3.2')
- *  - okhttp3.WebSocket ('com.squareup.okhttp3:okhttp:3.8.1')
- *
- *  You can add own relay, just implement ConnectionProvider for you stomp transport,
- *  such as web socket.
- *
+ * - org.java_websocket.WebSocket ('org.java-websocket:Java-WebSocket:1.3.2')
+ * - okhttp3.WebSocket ('com.squareup.okhttp3:okhttp:3.8.1')
+ * <p>
+ * You can add own relay, just implement ConnectionProvider for you stomp transport,
+ * such as web socket.
+ * <p>
  * Created by naik on 05.05.16.
  */
 public class Stomp {
@@ -25,9 +25,8 @@ public static StompClient over(@NonNull ConnectionProvider connectionProvider, S
     }
 
     /**
-     *
      * @param connectionProvider connectionProvider method
-     * @param uri URI to connect
+     * @param uri                URI to connect
      * @param connectHttpHeaders HTTP headers, will be passed with handshake query, may be null
      * @return StompClient for receiving and sending messages. Call #StompClient.connect
      */
@@ -38,13 +37,14 @@ public static StompClient over(@NonNull ConnectionProvider connectionProvider, S
     /**
      * {@code webSocketClient} can accept the following type of clients:
      * <ul>
-     *     <li>{@code org.java_websocket.WebSocket}: cannot accept an existing client</li>
-     *     <li>{@code okhttp3.WebSocket}: can accept a non-null instance of {@code okhttp3.OkHttpClient}</li>
+     * <li>{@code org.java_websocket.WebSocket}: cannot accept an existing client</li>
+     * <li>{@code okhttp3.WebSocket}: can accept a non-null instance of {@code okhttp3.OkHttpClient}</li>
      * </ul>
+     *
      * @param connectionProvider connectionProvider method
-     * @param uri URI to connect
+     * @param uri                URI to connect
      * @param connectHttpHeaders HTTP headers, will be passed with handshake query, may be null
-     * @param okHttpClient Existing client that will be used to open the WebSocket connection, may be null to use default client
+     * @param okHttpClient       Existing client that will be used to open the WebSocket connection, may be null to use default client
      * @return StompClient for receiving and sending messages. Call #StompClient.connect
      */
     public static StompClient over(@NonNull ConnectionProvider connectionProvider, String uri, @Nullable Map<String, String> connectHttpHeaders, @Nullable OkHttpClient okHttpClient) {
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java b/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java
index 4f93085..372afab 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java
@@ -38,6 +38,7 @@ class WebSocketsConnectionProvider extends AbstractConnectionProvider {
 
     /**
      * Support UIR scheme ws://host:port/path
+     *
      * @param connectHttpHeaders may be null
      */
     WebSocketsConnectionProvider(String uri, @Nullable Map<String, String> connectHttpHeaders) {
@@ -97,7 +98,7 @@ public void onError(Exception ex) {
             }
         };
 
-        if(mUri.startsWith("wss")) {
+        if (mUri.startsWith("wss")) {
             try {
                 SSLContext sc = SSLContext.getInstance("TLS");
                 sc.init(null, null, null);
diff --git a/lib/src/test/java/ua/naiksoftware/stomp/ExampleUnitTest.java b/lib/src/test/java/ua/naiksoftware/stomp/ExampleUnitTest.java
index 082e58a..3b89b15 100644
--- a/lib/src/test/java/ua/naiksoftware/stomp/ExampleUnitTest.java
+++ b/lib/src/test/java/ua/naiksoftware/stomp/ExampleUnitTest.java
@@ -2,7 +2,7 @@
 
 import org.junit.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 /**
  * To work on unit tests, switch the Test Artifact in the Build Variants view.

From cb10e8b3c11ec68967e3d13ee3062f368d1e7e1f Mon Sep 17 00:00:00 2001
From: forresthopkinsa <fingerheroes@gmail.com>
Date: Fri, 29 Sep 2017 14:46:13 -0700
Subject: [PATCH 046/110] Fixed protocol breach with message format; removed
 Clojars dependency.

Also cleaned up some remnants of the merge in the example client.
---
 README.md                                     |  6 +++++-
 build.gradle                                  |  1 -
 example-client/build.gradle                   |  2 +-
 .../stompclientexample/ExampleRepository.java |  4 ++--
 .../stompclientexample/RestClient.java        |  4 ++--
 lib/build.gradle                              |  2 +-
 .../stomp/client/StompClient.java             | 20 +++++++++++++++++--
 .../stomp/client/StompMessage.java            |  8 +++++++-
 8 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 2516c19..4324a4f 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@ You can use this library two ways:
 - Using the new Native Java 8 support
   - As of this writing, you must be using Android Studio Beta to use this feature.
   - Has been tested in the following environments:
-    - Beta 1-9, Gradle plugin v3.0.0-beta(1-9)
+    - Beta 1-6, Gradle plugin v3.0.0-beta(1-6)
     - Canary 8-9, Gradle plugin v3.0.0-alpha(8-9)
   - It *should* work in all 3.0.0+ versions
   - You can find more info on the [Releases Page](https://github.com/forresthopkinsa/StompProtocolAndroid/releases)
@@ -267,6 +267,10 @@ These are the possible changes you need to make to your code for this branch, if
 - Rudimentary heartbeat mechanism
   - You can use `StompClient.setHeartbeat(ms interval)` to send a heartbeat header to the server
   - WIP; currently we don't deal with those heartbeats in any way other than printing them to console
+- Better adherence to STOMP spec
+  - According to the [spec](http://stomp.github.io/stomp-specification-1.2.html#STOMP_Frames), the end of the message body should be immediately followed by a NULL octet, marking the end of the frame.
+  - Before, we were adding an extra two newlines between the body and NULL octet, which was breaking compatibility with picky servers.
+  - This shouldn't make any difference, but if it does, you can revert to legacy formatting with `client.setLegacyWhitespace(true)`.
 
 ## Additional Reading
 
diff --git a/build.gradle b/build.gradle
index 5625c67..ae5ccda 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,7 +20,6 @@ allprojects {
     repositories {
         jcenter()
         maven { url "https://jitpack.io" }
-        maven { url "http://clojars.org/repo" }
     }
 }
 
diff --git a/example-client/build.gradle b/example-client/build.gradle
index b12b778..73a2602 100644
--- a/example-client/build.gradle
+++ b/example-client/build.gradle
@@ -28,7 +28,7 @@ dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     testCompile 'junit:junit:4.12'
     compile 'com.android.support:appcompat-v7:25.2.0'
-    compile 'org.java-websocket:java-websocket:1.3.2'
+    compile 'org.java-websocket:Java-WebSocket:1.3.4'
     compile 'com.android.support:recyclerview-v7:25.2.0'
     compile 'io.reactivex:rxandroid:1.2.1'
     compile 'com.squareup.retrofit2:converter-gson:2.3.0'
diff --git a/example-client/src/main/java/ua/naiksoftware/stompclientexample/ExampleRepository.java b/example-client/src/main/java/ua/naiksoftware/stompclientexample/ExampleRepository.java
index b3beb47..b81f19a 100644
--- a/example-client/src/main/java/ua/naiksoftware/stompclientexample/ExampleRepository.java
+++ b/example-client/src/main/java/ua/naiksoftware/stompclientexample/ExampleRepository.java
@@ -1,8 +1,8 @@
 package ua.naiksoftware.stompclientexample;
 
-import io.reactivex.Flowable;
 import retrofit2.http.POST;
 import retrofit2.http.Query;
+import rx.Observable;
 
 /**
  * Created by Naik on 24.02.17.
@@ -10,5 +10,5 @@
 public interface ExampleRepository {
 
     @POST("hello-convert-and-send")
-    Flowable<Void> sendRestEcho(@Query("msg") String message);
+    Observable<Void> sendRestEcho(@Query("msg") String message);
 }
diff --git a/example-client/src/main/java/ua/naiksoftware/stompclientexample/RestClient.java b/example-client/src/main/java/ua/naiksoftware/stompclientexample/RestClient.java
index 209a497..6c71f7d 100644
--- a/example-client/src/main/java/ua/naiksoftware/stompclientexample/RestClient.java
+++ b/example-client/src/main/java/ua/naiksoftware/stompclientexample/RestClient.java
@@ -1,7 +1,7 @@
 package ua.naiksoftware.stompclientexample;
 
 import retrofit2.Retrofit;
-import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory;
+import retrofit2.adapter.rxjava.RxJavaCallAdapterFactory;
 import retrofit2.converter.gson.GsonConverterFactory;
 
 /**
@@ -33,7 +33,7 @@ public static RestClient getInstance() {
     private RestClient() {
         Retrofit retrofit = new Retrofit.Builder().baseUrl("http://" + ANDROID_EMULATOR_LOCALHOST + ":" + SERVER_PORT + "/")
                 .addConverterFactory(GsonConverterFactory.create())
-                .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
+                .addCallAdapterFactory(RxJavaCallAdapterFactory.create())
                 .build();
         mExampleRepository = retrofit.create(ExampleRepository.class);
     }
diff --git a/lib/build.gradle b/lib/build.gradle
index 1c4e625..8675db1 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -35,7 +35,7 @@ dependencies {
     compile 'net.sourceforge.streamsupport:streamsupport:1.5.5'
     compile 'net.sourceforge.streamsupport:streamsupport-cfuture:1.5.5'
     // Supported transports
-    compile 'org.java-websocket:java-websocket:1.3.2'
+    compile 'org.java-websocket:Java-WebSocket:1.3.4'
     compile 'com.squareup.okhttp3:okhttp:3.8.1'
     implementation 'com.android.support:support-annotations:24.2.0'
 }
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java b/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
index 02562b3..ff90f01 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
@@ -36,6 +36,7 @@ public class StompClient {
     private ConcurrentHashMap<String, String> mTopics;
     private boolean mConnected;
     private boolean isConnecting;
+    private boolean legacyWhitespace;
 
     private PublishSubject<StompMessage> mMessageStream;
     private CompletableFuture<Boolean> mConnectionFuture;
@@ -115,7 +116,7 @@ public void connect(@Nullable List<StompHeader> _headers) {
                             headers.add(new StompHeader(StompHeader.VERSION, SUPPORTED_VERSIONS));
                             headers.add(new StompHeader(StompHeader.HEART_BEAT, "0," + heartbeat));
                             if (_headers != null) headers.addAll(_headers);
-                            mConnectionProvider.send(new StompMessage(StompCommand.CONNECT, headers, null).compile())
+                            mConnectionProvider.send(new StompMessage(StompCommand.CONNECT, headers, null).compile(legacyWhitespace))
                                     .subscribe();
                             break;
 
@@ -163,7 +164,7 @@ public Completable send(String destination, String data) {
     }
 
     public Completable send(@NonNull StompMessage stompMessage) {
-        Completable completable = mConnectionProvider.send(stompMessage.compile());
+        Completable completable = mConnectionProvider.send(stompMessage.compile(legacyWhitespace));
         return completable.startWith(mConnectionComplete);
     }
 
@@ -199,6 +200,21 @@ else if (!mStreamMap.containsKey(destPath))
         return mStreamMap.get(destPath);
     }
 
+    /**
+     * Reverts to the old frame formatting, which included two newlines between the message body
+     * and the end-of-frame marker.
+     * <p>
+     * Before: Body\n\n^@
+     * <p>
+     * After: Body^@
+     *
+     * @param legacyWhitespace whether to append an extra two newlines
+     * @see <a href="http://stomp.github.io/stomp-specification-1.2.html#STOMP_Frames">The STOMP spec</a>
+     */
+    public void setLegacyWhitespace(boolean legacyWhitespace) {
+        this.legacyWhitespace = legacyWhitespace;
+    }
+
     private boolean matches(String path, StompMessage msg) {
         String dest = msg.findHeader(StompHeader.DESTINATION);
         if (dest == null) return false;
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/client/StompMessage.java b/lib/src/main/java/ua/naiksoftware/stomp/client/StompMessage.java
index ee3619c..c5c2dda 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/client/StompMessage.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/client/StompMessage.java
@@ -54,6 +54,11 @@ public String findHeader(String key) {
 
     @NonNull
     public String compile() {
+        return compile(false);
+    }
+
+    @NonNull
+    public String compile(boolean legacyWhitespace) {
         StringBuilder builder = new StringBuilder();
         builder.append(mStompCommand).append('\n');
         for (StompHeader header : mStompHeaders) {
@@ -61,7 +66,8 @@ public String compile() {
         }
         builder.append('\n');
         if (mPayload != null) {
-            builder.append(mPayload).append("\n\n");
+            builder.append(mPayload);
+            if (legacyWhitespace) builder.append("\n\n");
         }
         builder.append(TERMINATE_MESSAGE_SYMBOL);
         return builder.toString();

From a939004f45f403cd94a4e78f901977a9a28e17de Mon Sep 17 00:00:00 2001
From: steviemo <stephen.dmorrison@gmail.com>
Date: Fri, 20 Oct 2017 09:30:14 +0100
Subject: [PATCH 047/110] null check

---
 .../stomp/client/StompClient.java             | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java b/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
index 89ddd03..47a258a 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
@@ -177,17 +177,20 @@ public Flowable<StompMessage> topic(String destinationPath, List<StompHeader> he
                while (mapIterator.hasNext()) {
                    String destinationUrl = mapIterator.next();
                    Set<FlowableEmitter<? super StompMessage>> set = mEmitters.get(destinationUrl);
-                   Iterator<FlowableEmitter<? super StompMessage>> setIterator = set.iterator();
-                   while (setIterator.hasNext()) {
-                       FlowableEmitter<? super StompMessage> subscriber = setIterator.next();
-                       if (subscriber.isCancelled()) {
-                           setIterator.remove();
-                           if (set.size() < 1) {
-                               mapIterator.remove();
-                               unsubscribePath(destinationUrl).subscribe();
+                   if (null != set) {
+                       Iterator<FlowableEmitter<? super StompMessage>> setIterator = set.iterator();
+                       while (setIterator.hasNext()) {
+                           FlowableEmitter<? super StompMessage> subscriber = setIterator.next();
+                           if (subscriber.isCancelled()) {
+                               setIterator.remove();
+                               if (set.size() < 1) {
+                                   mapIterator.remove();
+                                   unsubscribePath(destinationUrl).subscribe();
+                               }
                            }
                        }
                    }
+                   
                }
            });
    }

From 1dafbfca4edf887c61a9039fb90c07d3ffedbecd Mon Sep 17 00:00:00 2001
From: steviemo <stephen.dmorrison@gmail.com>
Date: Fri, 20 Oct 2017 09:32:59 +0100
Subject: [PATCH 048/110] null check

---
 lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java b/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
index 47a258a..eb8f5ca 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
@@ -190,7 +190,6 @@ public Flowable<StompMessage> topic(String destinationPath, List<StompHeader> he
                            }
                        }
                    }
-                   
                }
            });
    }

From 5871667e93f4a3c52bee5e6a2152b1dea0ab7f32 Mon Sep 17 00:00:00 2001
From: steviemo <stephen.dmorrison@gmail.com>
Date: Thu, 26 Oct 2017 10:05:36 +0100
Subject: [PATCH 049/110] Concurrenthashmap instead of null check

---
 .../stomp/client/StompClient.java             | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java b/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
index eb8f5ca..3cdb8d3 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
@@ -11,6 +11,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CopyOnWriteArrayList;
 
 import io.reactivex.BackpressureStrategy;
@@ -33,7 +34,7 @@ public class StompClient {
     public static final String DEFAULT_ACK = "auto";
 
     private Disposable mMessagesDisposable;
-    private Map<String, Set<FlowableEmitter<? super StompMessage>>> mEmitters = new HashMap<>();
+    private Map<String, Set<FlowableEmitter<? super StompMessage>>> mEmitters = new ConcurrentHashMap<>();
     private List<ConnectableFlowable<Void>> mWaitConnectionFlowables;
     private final ConnectionProvider mConnectionProvider;
     private HashMap<String, String> mTopics;
@@ -177,16 +178,14 @@ public Flowable<StompMessage> topic(String destinationPath, List<StompHeader> he
                while (mapIterator.hasNext()) {
                    String destinationUrl = mapIterator.next();
                    Set<FlowableEmitter<? super StompMessage>> set = mEmitters.get(destinationUrl);
-                   if (null != set) {
-                       Iterator<FlowableEmitter<? super StompMessage>> setIterator = set.iterator();
-                       while (setIterator.hasNext()) {
-                           FlowableEmitter<? super StompMessage> subscriber = setIterator.next();
-                           if (subscriber.isCancelled()) {
-                               setIterator.remove();
-                               if (set.size() < 1) {
-                                   mapIterator.remove();
-                                   unsubscribePath(destinationUrl).subscribe();
-                               }
+                   Iterator<FlowableEmitter<? super StompMessage>> setIterator = set.iterator();
+                   while (setIterator.hasNext()) {
+                       FlowableEmitter<? super StompMessage> subscriber = setIterator.next();
+                       if (subscriber.isCancelled()) {
+                           setIterator.remove();
+                           if (set.size() < 1) {
+                               mapIterator.remove();
+                               unsubscribePath(destinationUrl).subscribe();
                            }
                        }
                    }

From a429a3ba40e3254361fa00d56ba32fac412061dd Mon Sep 17 00:00:00 2001
From: forresthopkinsa <fingerheroes@gmail.com>
Date: Wed, 22 Nov 2017 09:03:55 -0700
Subject: [PATCH 050/110] Updating documentation and Gradle files

---
 README.md                   | 22 ++++++++++++++--------
 build.gradle                |  2 +-
 example-client/build.gradle |  1 -
 lib/build.gradle            |  1 -
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 4324a4f..4d33ba9 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
 
 **Note that this is a FORK of a project by NaikSoftware! This version was originally made to avoid using RetroLambda.**
 
-*(It now has [many other differences](#changes-in-this-fork).)*
+*(It now has [many other important differences](#changes-in-this-fork).)*
 
 This library provides support for [STOMP protocol](https://stomp.github.io/) over Websockets.
 
@@ -21,7 +21,7 @@ repositories {
     maven { url "https://jitpack.io" }
 }
 dependencies {
-    compile 'com.github.forresthopkinsa:StompProtocolAndroid:1.4.0'
+    compile 'com.github.forresthopkinsa:StompProtocolAndroid:17.10.0'
 }
 ```
 
@@ -30,12 +30,8 @@ You can use this library two ways:
 - Using the old JACK toolchain
   - If you have Java 8 compatiblity and Jack enabled, this library will work for you
 - Using the new Native Java 8 support
-  - As of this writing, you must be using Android Studio Beta to use this feature.
-  - Has been tested in the following environments:
-    - Beta 1-6, Gradle plugin v3.0.0-beta(1-6)
-    - Canary 8-9, Gradle plugin v3.0.0-alpha(8-9)
-  - It *should* work in all 3.0.0+ versions
-  - You can find more info on the [Releases Page](https://github.com/forresthopkinsa/StompProtocolAndroid/releases)
+  - It should work in all Android Studio (and Gradle plugin) 3.0.0+ versions
+  - You can find compatibility info on the [Releases Page](https://github.com/forresthopkinsa/StompProtocolAndroid/releases)
 
 However, *this fork is NOT compatible with Retrolambda.*
 If you have RL as a dependency, then you should be using the [upstream version](https://github.com/NaikSoftware/StompProtocolAndroid) of this project!
@@ -168,6 +164,15 @@ Right now, the library only supports sending and receiving messages. ACK message
 
 ## Changes in this fork
 
+**Summary**
+
+Improvements: Most of the Rx logic has been rewritten, and a good portion of the other code has also been modified
+to allow for more stability. Additionally, a lot of blocking code has been replaced with reactive code,
+resulting in better performance.
+
+Drawbacks: In order to allow for major changes, this branch sacrifices backward compatibility. Code written
+for the upstream will likely have to be modified to work with this version. You can find more details below.
+
 **Build changes**
 
 The upstream master is based on Retrolambda. This version is based on Native Java 8 compilation,
@@ -270,6 +275,7 @@ These are the possible changes you need to make to your code for this branch, if
 - Better adherence to STOMP spec
   - According to the [spec](http://stomp.github.io/stomp-specification-1.2.html#STOMP_Frames), the end of the message body should be immediately followed by a NULL octet, marking the end of the frame.
   - Before, we were adding an extra two newlines between the body and NULL octet, which was breaking compatibility with picky servers.
+  - Now, we format it correctly; there is no whitespace between the end of the body and the `\u0000`.
   - This shouldn't make any difference, but if it does, you can revert to legacy formatting with `client.setLegacyWhitespace(true)`.
 
 ## Additional Reading
diff --git a/build.gradle b/build.gradle
index ae5ccda..be064ef 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0-beta6'
+        classpath 'com.android.tools.build:gradle:3.0.1'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/example-client/build.gradle b/example-client/build.gradle
index 73a2602..b3bd364 100644
--- a/example-client/build.gradle
+++ b/example-client/build.gradle
@@ -2,7 +2,6 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 25
-    buildToolsVersion "25.0.2"
 
     defaultConfig {
         applicationId "ua.naiksoftware.stompclientexample"
diff --git a/lib/build.gradle b/lib/build.gradle
index 8675db1..2fa2922 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -5,7 +5,6 @@ group='com.github.forresthopkinsa'
 
 android {
     compileSdkVersion 25
-    buildToolsVersion "25.0.2"
 
     defaultConfig {
         minSdkVersion 16

From 4695ad00a373647091e0f6dc0d5bc4889878aa7f Mon Sep 17 00:00:00 2001
From: forresthopkinsa <fingerheroes@gmail.com>
Date: Mon, 27 Nov 2017 13:58:43 -0700
Subject: [PATCH 051/110] Updating JWS to new implementation (Draft 17 to 6455,
 RFC compliant)

Fixes https://github.com/NaikSoftware/StompProtocolAndroid/issues/79
---
 lib/build.gradle                                             | 2 +-
 .../ua/naiksoftware/stomp/WebSocketsConnectionProvider.java  | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/lib/build.gradle b/lib/build.gradle
index 2fa2922..57a627a 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -34,7 +34,7 @@ dependencies {
     compile 'net.sourceforge.streamsupport:streamsupport:1.5.5'
     compile 'net.sourceforge.streamsupport:streamsupport-cfuture:1.5.5'
     // Supported transports
-    compile 'org.java-websocket:Java-WebSocket:1.3.4'
+    compile 'org.java-websocket:Java-WebSocket:1.3.6'
     compile 'com.squareup.okhttp3:okhttp:3.8.1'
     implementation 'com.android.support:support-annotations:24.2.0'
 }
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java b/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java
index 372afab..9ee4b16 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java
@@ -6,7 +6,7 @@
 
 import org.java_websocket.WebSocket;
 import org.java_websocket.client.WebSocketClient;
-import org.java_websocket.drafts.Draft_17;
+import org.java_websocket.drafts.Draft_6455;
 import org.java_websocket.exceptions.InvalidDataException;
 import org.java_websocket.handshake.ClientHandshake;
 import org.java_websocket.handshake.ServerHandshake;
@@ -46,7 +46,6 @@ class WebSocketsConnectionProvider extends AbstractConnectionProvider {
         mConnectHttpHeaders = connectHttpHeaders != null ? connectHttpHeaders : new HashMap<>();
     }
 
-    @NonNull
     @Override
     public void rawDisconnect() {
         mWebSocketClient.close();
@@ -57,7 +56,7 @@ void createWebSocketConnection() {
         if (haveConnection)
             throw new IllegalStateException("Already have connection to web socket");
 
-        mWebSocketClient = new WebSocketClient(URI.create(mUri), new Draft_17(), mConnectHttpHeaders, 0) {
+        mWebSocketClient = new WebSocketClient(URI.create(mUri), new Draft_6455(), mConnectHttpHeaders, 0) {
 
             @Override
             public void onWebsocketHandshakeReceivedAsClient(WebSocket conn, ClientHandshake request, @NonNull ServerHandshake response) throws InvalidDataException {

From 17b9d6c65bca90b509a539e460a1932e4dd5b802 Mon Sep 17 00:00:00 2001
From: forresthopkinsa <fingerheroes@gmail.com>
Date: Mon, 27 Nov 2017 14:11:35 -0700
Subject: [PATCH 052/110] Deleting the old, non-functional example client and
 unit tests

I'll replace these with a real example and real tests sometime soon
---
 .idea/gradle.xml                              |   1 -
 example-client/.gitignore                     |   1 -
 example-client/README.md                      |   3 -
 example-client/build.gradle                   |  37 -----
 example-client/proguard-rules.pro             |  17 ---
 .../stompclientexample/ApplicationTest.java   |  13 --
 example-client/src/main/AndroidManifest.xml   |  22 ---
 .../stompclientexample/EchoModel.java         |  20 ---
 .../stompclientexample/ExampleRepository.java |  14 --
 .../stompclientexample/MainActivity.java      | 128 ------------------
 .../stompclientexample/RestClient.java        |  44 ------
 .../stompclientexample/SimpleAdapter.java     |  51 -------
 .../src/main/res/layout/activity_main.xml     |  75 ----------
 .../src/main/res/layout/item_layout.xml       |  19 ---
 .../src/main/res/mipmap-hdpi/ic_launcher.png  | Bin 3418 -> 0 bytes
 .../src/main/res/mipmap-mdpi/ic_launcher.png  | Bin 2206 -> 0 bytes
 .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 4842 -> 0 bytes
 .../main/res/mipmap-xxhdpi/ic_launcher.png    | Bin 7718 -> 0 bytes
 .../main/res/mipmap-xxxhdpi/ic_launcher.png   | Bin 10486 -> 0 bytes
 .../src/main/res/values-w820dp/dimens.xml     |   6 -
 example-client/src/main/res/values/colors.xml |   6 -
 example-client/src/main/res/values/dimens.xml |   5 -
 .../src/main/res/values/strings.xml           |   7 -
 example-client/src/main/res/values/styles.xml |  11 --
 .../stompclientexample/ExampleUnitTest.java   |  15 --
 .../naiksoftware/stomp/ApplicationTest.java   |  13 --
 settings.gradle                               |   2 +-
 27 files changed, 1 insertion(+), 509 deletions(-)
 delete mode 100644 example-client/.gitignore
 delete mode 100644 example-client/README.md
 delete mode 100644 example-client/build.gradle
 delete mode 100644 example-client/proguard-rules.pro
 delete mode 100644 example-client/src/androidTest/java/ua/naiksoftware/stompclientexample/ApplicationTest.java
 delete mode 100644 example-client/src/main/AndroidManifest.xml
 delete mode 100644 example-client/src/main/java/ua/naiksoftware/stompclientexample/EchoModel.java
 delete mode 100644 example-client/src/main/java/ua/naiksoftware/stompclientexample/ExampleRepository.java
 delete mode 100644 example-client/src/main/java/ua/naiksoftware/stompclientexample/MainActivity.java
 delete mode 100644 example-client/src/main/java/ua/naiksoftware/stompclientexample/RestClient.java
 delete mode 100644 example-client/src/main/java/ua/naiksoftware/stompclientexample/SimpleAdapter.java
 delete mode 100644 example-client/src/main/res/layout/activity_main.xml
 delete mode 100644 example-client/src/main/res/layout/item_layout.xml
 delete mode 100644 example-client/src/main/res/mipmap-hdpi/ic_launcher.png
 delete mode 100644 example-client/src/main/res/mipmap-mdpi/ic_launcher.png
 delete mode 100644 example-client/src/main/res/mipmap-xhdpi/ic_launcher.png
 delete mode 100644 example-client/src/main/res/mipmap-xxhdpi/ic_launcher.png
 delete mode 100644 example-client/src/main/res/mipmap-xxxhdpi/ic_launcher.png
 delete mode 100644 example-client/src/main/res/values-w820dp/dimens.xml
 delete mode 100644 example-client/src/main/res/values/colors.xml
 delete mode 100644 example-client/src/main/res/values/dimens.xml
 delete mode 100644 example-client/src/main/res/values/strings.xml
 delete mode 100644 example-client/src/main/res/values/styles.xml
 delete mode 100644 example-client/src/test/java/ua/naiksoftware/stompclientexample/ExampleUnitTest.java
 delete mode 100644 lib/src/androidTest/java/ua/naiksoftware/stomp/ApplicationTest.java

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index e9273c1..edcc4de 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -8,7 +8,6 @@
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/example-client" />
             <option value="$PROJECT_DIR$/lib" />
           </set>
         </option>
diff --git a/example-client/.gitignore b/example-client/.gitignore
deleted file mode 100644
index 796b96d..0000000
--- a/example-client/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/example-client/README.md b/example-client/README.md
deleted file mode 100644
index deabae9..0000000
--- a/example-client/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-## Example client for library
-
-Use server from here https://github.com/NaikSoftware/stomp-protocol-example-server
\ No newline at end of file
diff --git a/example-client/build.gradle b/example-client/build.gradle
deleted file mode 100644
index b3bd364..0000000
--- a/example-client/build.gradle
+++ /dev/null
@@ -1,37 +0,0 @@
-apply plugin: 'com.android.application'
-
-android {
-    compileSdkVersion 25
-
-    defaultConfig {
-        applicationId "ua.naiksoftware.stompclientexample"
-        minSdkVersion 16
-        targetSdkVersion 25
-        versionCode 1
-        versionName "1.0"
-    }
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-    }
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-}
-
-dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    testCompile 'junit:junit:4.12'
-    compile 'com.android.support:appcompat-v7:25.2.0'
-    compile 'org.java-websocket:Java-WebSocket:1.3.4'
-    compile 'com.android.support:recyclerview-v7:25.2.0'
-    compile 'io.reactivex:rxandroid:1.2.1'
-    compile 'com.squareup.retrofit2:converter-gson:2.3.0'
-    compile 'com.squareup.retrofit2:adapter-rxjava:2.3.0'
-    compile 'com.squareup.retrofit2:retrofit:2.3.0'
-    compile project(':lib')
-}
diff --git a/example-client/proguard-rules.pro b/example-client/proguard-rules.pro
deleted file mode 100644
index c96428f..0000000
--- a/example-client/proguard-rules.pro
+++ /dev/null
@@ -1,17 +0,0 @@
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in /home/naik/Programs/android-sdk-linux/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the proguardFiles
-# directive in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
diff --git a/example-client/src/androidTest/java/ua/naiksoftware/stompclientexample/ApplicationTest.java b/example-client/src/androidTest/java/ua/naiksoftware/stompclientexample/ApplicationTest.java
deleted file mode 100644
index 3a0f4c2..0000000
--- a/example-client/src/androidTest/java/ua/naiksoftware/stompclientexample/ApplicationTest.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package ua.naiksoftware.stompclientexample;
-
-import android.app.Application;
-import android.test.ApplicationTestCase;
-
-/**
- * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
- */
-public class ApplicationTest extends ApplicationTestCase<Application> {
-    public ApplicationTest() {
-        super(Application.class);
-    }
-}
\ No newline at end of file
diff --git a/example-client/src/main/AndroidManifest.xml b/example-client/src/main/AndroidManifest.xml
deleted file mode 100644
index 2b1f999..0000000
--- a/example-client/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="ua.naiksoftware.stompclientexample">
-
-    <uses-permission android:name="android.permission.INTERNET" />
-
-    <application
-        android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
-        android:supportsRtl="true"
-        android:theme="@style/AppTheme">
-        <activity android:name="ua.naiksoftware.stompclientexample.MainActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-
-</manifest>
\ No newline at end of file
diff --git a/example-client/src/main/java/ua/naiksoftware/stompclientexample/EchoModel.java b/example-client/src/main/java/ua/naiksoftware/stompclientexample/EchoModel.java
deleted file mode 100644
index 1c694ac..0000000
--- a/example-client/src/main/java/ua/naiksoftware/stompclientexample/EchoModel.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package ua.naiksoftware.stompclientexample;
-
-/**
- * Created by Naik on 24.02.17.
- */
-public class EchoModel {
-
-    private String echo;
-
-    public EchoModel() {
-    }
-
-    public String getEcho() {
-        return echo;
-    }
-
-    public void setEcho(String echo) {
-        this.echo = echo;
-    }
-}
diff --git a/example-client/src/main/java/ua/naiksoftware/stompclientexample/ExampleRepository.java b/example-client/src/main/java/ua/naiksoftware/stompclientexample/ExampleRepository.java
deleted file mode 100644
index b81f19a..0000000
--- a/example-client/src/main/java/ua/naiksoftware/stompclientexample/ExampleRepository.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package ua.naiksoftware.stompclientexample;
-
-import retrofit2.http.POST;
-import retrofit2.http.Query;
-import rx.Observable;
-
-/**
- * Created by Naik on 24.02.17.
- */
-public interface ExampleRepository {
-
-    @POST("hello-convert-and-send")
-    Observable<Void> sendRestEcho(@Query("msg") String message);
-}
diff --git a/example-client/src/main/java/ua/naiksoftware/stompclientexample/MainActivity.java b/example-client/src/main/java/ua/naiksoftware/stompclientexample/MainActivity.java
deleted file mode 100644
index 28a7ac9..0000000
--- a/example-client/src/main/java/ua/naiksoftware/stompclientexample/MainActivity.java
+++ /dev/null
@@ -1,128 +0,0 @@
-package ua.naiksoftware.stompclientexample;
-
-import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.util.Log;
-import android.view.View;
-import android.widget.Toast;
-
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Locale;
-
-import rx.Subscription;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
-import ua.naiksoftware.stomp.Stomp;
-import ua.naiksoftware.stomp.client.StompClient;
-
-import static ua.naiksoftware.stompclientexample.RestClient.ANDROID_EMULATOR_LOCALHOST;
-
-public class MainActivity extends AppCompatActivity {
-
-    private static final String TAG = "MainActivity";
-
-    private SimpleAdapter mAdapter;
-    private List<String> mDataSet = new ArrayList<>();
-    private StompClient mStompClient;
-    private Subscription mRestPingSubscription;
-    private final SimpleDateFormat mTimeFormat = new SimpleDateFormat("HH:mm:ss", Locale.getDefault());
-    private RecyclerView mRecyclerView;
-    private Gson mGson = new GsonBuilder().create();
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
-        mRecyclerView = (RecyclerView) findViewById(R.id.recycler_view);
-        mAdapter = new SimpleAdapter(mDataSet);
-        mAdapter.setHasStableIds(true);
-        mRecyclerView.setAdapter(mAdapter);
-        mRecyclerView.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.VERTICAL, true));
-    }
-
-    public void disconnectStomp(View view) {
-        mStompClient.disconnect();
-    }
-
-    public void connectStomp(View view) {
-        mStompClient = Stomp.over(Stomp.ConnectionProvider.JWS, "ws://" + ANDROID_EMULATOR_LOCALHOST
-                + ":" + RestClient.SERVER_PORT + "/example-endpoint/websocket");
-
-        mStompClient.lifecycle()
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(lifecycleEvent -> {
-                    switch (lifecycleEvent.getType()) {
-                        case OPENED:
-                            toast("Stomp connection opened");
-                            break;
-                        case ERROR:
-                            Log.e(TAG, "Stomp connection error", lifecycleEvent.getException());
-                            toast("Stomp connection error");
-                            break;
-                        case CLOSED:
-                            toast("Stomp connection closed");
-                    }
-                });
-
-        // Receive greetings
-        mStompClient.topic("/topic/greetings")
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(topicMessage -> {
-                    Log.d(TAG, "Received " + topicMessage.getPayload());
-                    addItem(mGson.fromJson(topicMessage.getPayload(), EchoModel.class));
-                });
-
-        mStompClient.connect();
-    }
-
-    public void sendEchoViaStomp(View v) {
-        mStompClient.send("/topic/hello-msg-mapping", "Echo STOMP " + mTimeFormat.format(new Date()))
-                .unsubscribeOn(Schedulers.newThread())
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(() -> Log.d(TAG, "STOMP echo send successfully"), throwable -> {
-                    Log.e(TAG, "Error send STOMP echo", throwable);
-                    toast(throwable.getMessage());
-                });
-    }
-
-    public void sendEchoViaRest(View v) {
-        mRestPingSubscription = RestClient.getInstance().getExampleRepository()
-                .sendRestEcho("Echo REST " + mTimeFormat.format(new Date()))
-                .unsubscribeOn(Schedulers.newThread())
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(aVoid -> Log.d(TAG, "REST echo send successfully"), throwable -> {
-                    Log.e(TAG, "Error send REST echo", throwable);
-                    toast(throwable.getMessage());
-                });
-    }
-
-    private void addItem(EchoModel echoModel) {
-        mDataSet.add(echoModel.getEcho() + " - " + mTimeFormat.format(new Date()));
-        mAdapter.notifyDataSetChanged();
-        mRecyclerView.smoothScrollToPosition(mDataSet.size() - 1);
-    }
-
-    private void toast(String text) {
-        Log.i(TAG, text);
-        Toast.makeText(this, text, Toast.LENGTH_SHORT).show();
-    }
-
-    @Override
-    protected void onDestroy() {
-        mStompClient.disconnect();
-        if (mRestPingSubscription != null) mRestPingSubscription.unsubscribe();
-        super.onDestroy();
-    }
-}
diff --git a/example-client/src/main/java/ua/naiksoftware/stompclientexample/RestClient.java b/example-client/src/main/java/ua/naiksoftware/stompclientexample/RestClient.java
deleted file mode 100644
index 6c71f7d..0000000
--- a/example-client/src/main/java/ua/naiksoftware/stompclientexample/RestClient.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package ua.naiksoftware.stompclientexample;
-
-import retrofit2.Retrofit;
-import retrofit2.adapter.rxjava.RxJavaCallAdapterFactory;
-import retrofit2.converter.gson.GsonConverterFactory;
-
-/**
- * Created by Naik on 24.02.17.
- */
-public class RestClient {
-
-    public static final String ANDROID_EMULATOR_LOCALHOST = "10.0.2.2";
-    public static final String SERVER_PORT = "8080";
-
-    private static RestClient instance;
-    private static final Object lock = new Object();
-
-    public static RestClient getInstance() {
-        RestClient instance = RestClient.instance;
-        if (instance == null) {
-            synchronized (lock) {
-                instance = RestClient.instance;
-                if (instance == null) {
-                    RestClient.instance = instance = new RestClient();
-                }
-            }
-        }
-        return instance;
-    }
-
-    private final ExampleRepository mExampleRepository;
-
-    private RestClient() {
-        Retrofit retrofit = new Retrofit.Builder().baseUrl("http://" + ANDROID_EMULATOR_LOCALHOST + ":" + SERVER_PORT + "/")
-                .addConverterFactory(GsonConverterFactory.create())
-                .addCallAdapterFactory(RxJavaCallAdapterFactory.create())
-                .build();
-        mExampleRepository = retrofit.create(ExampleRepository.class);
-    }
-
-    public ExampleRepository getExampleRepository() {
-        return mExampleRepository;
-    }
-}
diff --git a/example-client/src/main/java/ua/naiksoftware/stompclientexample/SimpleAdapter.java b/example-client/src/main/java/ua/naiksoftware/stompclientexample/SimpleAdapter.java
deleted file mode 100644
index f546409..0000000
--- a/example-client/src/main/java/ua/naiksoftware/stompclientexample/SimpleAdapter.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package ua.naiksoftware.stompclientexample;
-
-import android.support.v7.widget.RecyclerView;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-import java.util.List;
-
-/**
- * Created by Naik on 24.02.17.
- */
-public class SimpleAdapter extends RecyclerView.Adapter<SimpleAdapter.SimpleViewHolder> {
-
-    private final List<String> mDataSet;
-
-    public SimpleAdapter(List<String> dataSet) {
-        mDataSet = dataSet;
-    }
-
-    @Override
-    public SimpleViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-        return new SimpleViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.item_layout, parent, false));
-    }
-
-    @Override
-    public void onBindViewHolder(SimpleViewHolder holder, int position) {
-        holder.mTextView.setText(mDataSet.get(position));
-    }
-
-    @Override
-    public int getItemCount() {
-        return mDataSet.size();
-    }
-
-    @Override
-    public long getItemId(int position) {
-        return mDataSet.get(position).hashCode();
-    }
-
-    static class SimpleViewHolder extends RecyclerView.ViewHolder {
-
-        final TextView mTextView;
-
-        public SimpleViewHolder(View itemView) {
-            super(itemView);
-            mTextView = (TextView) itemView.findViewById(R.id.text);
-        }
-    }
-}
diff --git a/example-client/src/main/res/layout/activity_main.xml b/example-client/src/main/res/layout/activity_main.xml
deleted file mode 100644
index 0596fa9..0000000
--- a/example-client/src/main/res/layout/activity_main.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    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"
-        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/send_mode_1"
-            android:onClick="sendEchoViaStomp"/>
-
-        <Button
-            style="?android:buttonBarButtonStyle"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="@string/send_mode_2"
-            android:onClick="sendEchoViaRest"/>
-
-    </LinearLayout>
-
-    <android.support.v7.widget.RecyclerView
-        android:id="@+id/recycler_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:paddingBottom="@dimen/activity_vertical_margin"
-        android:paddingLeft="@dimen/activity_horizontal_margin"
-        android:paddingRight="@dimen/activity_horizontal_margin"
-        android:paddingTop="@dimen/activity_vertical_margin"
-        android:clipToPadding="false"/>
-
-</LinearLayout>
diff --git a/example-client/src/main/res/layout/item_layout.xml b/example-client/src/main/res/layout/item_layout.xml
deleted file mode 100644
index 721614d..0000000
--- a/example-client/src/main/res/layout/item_layout.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:tools="http://schemas.android.com/tools"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:orientation="vertical"
-              android:paddingBottom="8dp"
-              android:paddingLeft="16dp"
-              android:paddingRight="16dp"
-              android:paddingTop="8dp">
-
-    <TextView
-        android:id="@+id/text"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-        tools:text="Simple text"/>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/example-client/src/main/res/mipmap-hdpi/ic_launcher.png b/example-client/src/main/res/mipmap-hdpi/ic_launcher.png
deleted file mode 100644
index cde69bcccec65160d92116f20ffce4fce0b5245c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3418
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

diff --git a/example-client/src/main/res/mipmap-mdpi/ic_launcher.png b/example-client/src/main/res/mipmap-mdpi/ic_launcher.png
deleted file mode 100644
index c133a0cbd379f5af6dbf1a899a0293ca5eccfad0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2206
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

diff --git a/example-client/src/main/res/mipmap-xhdpi/ic_launcher.png b/example-client/src/main/res/mipmap-xhdpi/ic_launcher.png
deleted file mode 100644
index bfa42f0e7b91d006d22352c9ff2f134e504e3c1d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4842
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

diff --git a/example-client/src/main/res/mipmap-xxhdpi/ic_launcher.png b/example-client/src/main/res/mipmap-xxhdpi/ic_launcher.png
deleted file mode 100644
index 324e72cdd7480cb983fa1bcc7ce686e51ef87fe7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7718
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

diff --git a/example-client/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/example-client/src/main/res/mipmap-xxxhdpi/ic_launcher.png
deleted file mode 100644
index aee44e138434630332d88b1680f33c4b24c70ab3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10486
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
acChvT-wm8jF7_S`fH(4La<wuRVgChb86-jg

diff --git a/example-client/src/main/res/values-w820dp/dimens.xml b/example-client/src/main/res/values-w820dp/dimens.xml
deleted file mode 100644
index 63fc816..0000000
--- a/example-client/src/main/res/values-w820dp/dimens.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<resources>
-    <!-- Example customization of dimensions originally defined in res/values/dimens.xml
-         (such as screen margins) for screens with more than 820dp of available width. This
-         would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
-    <dimen name="activity_horizontal_margin">64dp</dimen>
-</resources>
diff --git a/example-client/src/main/res/values/colors.xml b/example-client/src/main/res/values/colors.xml
deleted file mode 100644
index 3ab3e9c..0000000
--- a/example-client/src/main/res/values/colors.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="colorPrimary">#3F51B5</color>
-    <color name="colorPrimaryDark">#303F9F</color>
-    <color name="colorAccent">#FF4081</color>
-</resources>
diff --git a/example-client/src/main/res/values/dimens.xml b/example-client/src/main/res/values/dimens.xml
deleted file mode 100644
index 47c8224..0000000
--- a/example-client/src/main/res/values/dimens.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<resources>
-    <!-- Default screen margins, per the Android Design guidelines. -->
-    <dimen name="activity_horizontal_margin">16dp</dimen>
-    <dimen name="activity_vertical_margin">16dp</dimen>
-</resources>
diff --git a/example-client/src/main/res/values/strings.xml b/example-client/src/main/res/values/strings.xml
deleted file mode 100644
index 972391e..0000000
--- a/example-client/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<resources>
-    <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>
diff --git a/example-client/src/main/res/values/styles.xml b/example-client/src/main/res/values/styles.xml
deleted file mode 100644
index 5885930..0000000
--- a/example-client/src/main/res/values/styles.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<resources>
-
-    <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
-    </style>
-
-</resources>
diff --git a/example-client/src/test/java/ua/naiksoftware/stompclientexample/ExampleUnitTest.java b/example-client/src/test/java/ua/naiksoftware/stompclientexample/ExampleUnitTest.java
deleted file mode 100644
index ac03654..0000000
--- a/example-client/src/test/java/ua/naiksoftware/stompclientexample/ExampleUnitTest.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package ua.naiksoftware.stompclientexample;
-
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * To work on unit tests, switch the Test Artifact in the Build Variants view.
- */
-public class ExampleUnitTest {
-    @Test
-    public void addition_isCorrect() throws Exception {
-        assertEquals(4, 2 + 2);
-    }
-}
\ No newline at end of file
diff --git a/lib/src/androidTest/java/ua/naiksoftware/stomp/ApplicationTest.java b/lib/src/androidTest/java/ua/naiksoftware/stomp/ApplicationTest.java
deleted file mode 100644
index b1a27b4..0000000
--- a/lib/src/androidTest/java/ua/naiksoftware/stomp/ApplicationTest.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package ua.naiksoftware.stomp;
-
-import android.app.Application;
-import android.test.ApplicationTestCase;
-
-/**
- * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
- */
-public class ApplicationTest extends ApplicationTestCase<Application> {
-    public ApplicationTest() {
-        super(Application.class);
-    }
-}
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index e5b9f10..8c2a2e0 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-include ':example-client', ':lib'
+include ':lib'

From 29e6f01421618dbfa043e170f8226feadf983400 Mon Sep 17 00:00:00 2001
From: forresthopkinsa <fingerheroes@gmail.com>
Date: Mon, 27 Nov 2017 14:15:38 -0700
Subject: [PATCH 053/110] Simple repair of broken resubscribe. Easy fix, but
 still needs testing.

Fixes #3
---
 lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java b/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
index ff90f01..9b35d73 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
@@ -289,6 +289,7 @@ private Completable subscribePath(String destinationPath, @Nullable List<StompHe
 
     private Completable unsubscribePath(String dest) {
         mStreamMap.remove(dest);
+        mTopics.remove(dest);
 
         String topicId = mTopics.get(dest);
         Log.d(TAG, "Unsubscribe path: " + dest + " id: " + topicId);

From efcb19faffb72b30c259f1be5e65be260e6a706c Mon Sep 17 00:00:00 2001
From: forresthopkinsa <fingerheroes@gmail.com>
Date: Tue, 28 Nov 2017 15:50:05 -0700
Subject: [PATCH 054/110] Fixing stupid mistake in the last commit

---
 .../java/ua/naiksoftware/stomp/client/StompClient.java     | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java b/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
index 9b35d73..e2d59a8 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
@@ -204,9 +204,9 @@ else if (!mStreamMap.containsKey(destPath))
      * Reverts to the old frame formatting, which included two newlines between the message body
      * and the end-of-frame marker.
      * <p>
-     * Before: Body\n\n^@
+     * Legacy: Body\n\n^@
      * <p>
-     * After: Body^@
+     * Default: Body^@
      *
      * @param legacyWhitespace whether to append an extra two newlines
      * @see <a href="http://stomp.github.io/stomp-specification-1.2.html#STOMP_Frames">The STOMP spec</a>
@@ -289,9 +289,10 @@ private Completable subscribePath(String destinationPath, @Nullable List<StompHe
 
     private Completable unsubscribePath(String dest) {
         mStreamMap.remove(dest);
-        mTopics.remove(dest);
 
         String topicId = mTopics.get(dest);
+        mTopics.remove(dest);
+
         Log.d(TAG, "Unsubscribe path: " + dest + " id: " + topicId);
 
         return send(new StompMessage(StompCommand.UNSUBSCRIBE,

From 08631fe08b3c26c51796004188e6261dd56feddf Mon Sep 17 00:00:00 2001
From: Daria Komkova <daria.komkova@itechart-group.com>
Date: Fri, 1 Dec 2017 01:03:45 +0300
Subject: [PATCH 055/110] Unsubscribe from messages on disconnect

---
 .../main/java/ua/naiksoftware/stomp/client/StompClient.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java b/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
index e2d59a8..78df5d8 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
@@ -44,6 +44,7 @@ public class StompClient {
     private ConcurrentHashMap<String, Observable<StompMessage>> mStreamMap;
     private Parser parser;
     private Subscription lifecycleSub;
+    private Subscription messagesSubscription;
     private List<StompHeader> mHeaders;
     private int heartbeat;
 
@@ -133,7 +134,7 @@ public void connect(@Nullable List<StompHeader> _headers) {
                 });
 
         isConnecting = true;
-        mConnectionProvider.messages()
+        messagesSubscription = mConnectionProvider.messages()
                 .map(StompMessage::from)
                 .doOnNext(this::callSubscribers)
                 .filter(msg -> msg.getStompCommand().equals(StompCommand.CONNECTED))
@@ -179,6 +180,7 @@ public Observable<LifecycleEvent> lifecycle() {
     public void disconnect() {
         resetStatus();
         lifecycleSub.unsubscribe();
+        messagesSubscription.unsubscribe();
         mConnectionProvider.disconnect().subscribe(() -> mConnected = false);
     }
 

From 9983e9db2cbd5d69083d957e7f6dd7247b624f24 Mon Sep 17 00:00:00 2001
From: forresthopkinsa <fingerheroes@gmail.com>
Date: Thu, 30 Nov 2017 17:13:15 -0700
Subject: [PATCH 056/110] 17.11.0 release

---
 README.md                        | 2 +-
 lib/src/main/AndroidManifest.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 4d33ba9..cc3793d 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ repositories {
     maven { url "https://jitpack.io" }
 }
 dependencies {
-    compile 'com.github.forresthopkinsa:StompProtocolAndroid:17.10.0'
+    compile 'com.github.forresthopkinsa:StompProtocolAndroid:17.11.0'
 }
 ```
 
diff --git a/lib/src/main/AndroidManifest.xml b/lib/src/main/AndroidManifest.xml
index 58c8122..d651998 100644
--- a/lib/src/main/AndroidManifest.xml
+++ b/lib/src/main/AndroidManifest.xml
@@ -1,4 +1,4 @@
-<manifest package="ua.naiksoftware.stomp">
+<manifest package="com.github.forresthopkinsa">
 
     <application />
 

From 965f1275adf268bfca85e051b85b535259172633 Mon Sep 17 00:00:00 2001
From: forresthopkinsa <fingerheroes@gmail.com>
Date: Fri, 1 Dec 2017 09:54:33 -0700
Subject: [PATCH 057/110] OkHttp Failures are a combination of an Error *and* a
 Close.

We were only sending the Error, not the Close.

Should fix #6. Closes #7.
---
 .../java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java b/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java
index a0b8bd4..9046400 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java
@@ -80,7 +80,10 @@ public void onClosed(WebSocket webSocket, int code, String reason) {
 
                     @Override
                     public void onFailure(WebSocket webSocket, Throwable t, Response response) {
+                        // in OkHttp, a Failure is equivalent to a JWS-Error *and* a JWS-Close
                         emitLifecycleEvent(new LifecycleEvent(LifecycleEvent.Type.ERROR, new Exception(t)));
+                        openedSocked = null;
+                        emitLifecycleEvent(new LifecycleEvent(LifecycleEvent.Type.CLOSED));
                     }
 
                     @Override

From ccb87f6ae37c7dc36dc150e7aabb121887186caa Mon Sep 17 00:00:00 2001
From: NaikSoftware <naiksav4enko@gmail.com>
Date: Mon, 25 Dec 2017 17:36:02 +0200
Subject: [PATCH 058/110] Fix concurrent modification exception

---
 .../stomp/OkHttpConnectionProvider.java       |  9 ++--
 .../stomp/client/StompClient.java             | 54 ++++++++++---------
 2 files changed, 34 insertions(+), 29 deletions(-)

diff --git a/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java b/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java
index fab4803..5b5b765 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java
@@ -3,6 +3,7 @@
 import android.util.Log;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -33,13 +34,11 @@
 
     private WebSocket openedSocked;
 
-    private final Object mLifecycleLock = new Object();
-
 
     /* package */ OkHttpConnectionProvider(String uri, Map<String, String> connectHttpHeaders, OkHttpClient okHttpClient) {
         mUri = uri;
         mConnectHttpHeaders = connectHttpHeaders != null ? connectHttpHeaders : new HashMap<>();
-        mLifecycleEmitters = new ArrayList<>();
+        mLifecycleEmitters = Collections.synchronizedList(new ArrayList<>());
         mMessagesEmitters = new ArrayList<>();
         mOkHttpClient = okHttpClient;
     }
@@ -133,7 +132,7 @@ public Flowable<Void> send(String stompMessage) {
     public Flowable<LifecycleEvent> getLifecycleReceiver() {
         return Flowable.<LifecycleEvent>create(mLifecycleEmitters::add, BackpressureStrategy.BUFFER)
                 .doOnCancel(() -> {
-                    synchronized (mLifecycleLock) {
+                    synchronized (mLifecycleEmitters) {
                         Iterator<FlowableEmitter<? super LifecycleEvent>> iterator = mLifecycleEmitters.iterator();
                         while (iterator.hasNext()) {
                             if (iterator.next().isCancelled()) iterator.remove();
@@ -158,7 +157,7 @@ private void addConnectionHeadersToBuilder(Request.Builder requestBuilder, Map<S
     }
 
     private void emitLifecycleEvent(LifecycleEvent lifecycleEvent) {
-        synchronized (mLifecycleLock) {
+        synchronized (mLifecycleEmitters) {
             Log.d(TAG, "Emit lifecycle event: " + lifecycleEvent.getType().name());
             for (FlowableEmitter<? super LifecycleEvent> subscriber : mLifecycleEmitters) {
                 subscriber.onNext(lifecycleEvent);
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java b/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
index f9605f1..dcad677 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
@@ -35,7 +35,7 @@ public class StompClient {
 
     private Disposable mMessagesDisposable;
     private Disposable mLifecycleDisposable;
-    private Map<String, Set<FlowableEmitter<? super StompMessage>>> mEmitters = new ConcurrentHashMap<>();
+    private Map<String, Set<FlowableEmitter<? super StompMessage>>> mEmitters = Collections.synchronizedMap(new HashMap<>());
     private List<ConnectableFlowable<Void>> mWaitConnectionFlowables;
     private final ConnectionProvider mConnectionProvider;
     private HashMap<String, String> mTopics;
@@ -141,12 +141,14 @@ public Flowable<Void> send(StompMessage stompMessage) {
 
     private void callSubscribers(StompMessage stompMessage) {
         String messageDestination = stompMessage.findHeader(StompHeader.DESTINATION);
-        for (String dest : mEmitters.keySet()) {
-            if (dest.equals(messageDestination)) {
-                for (FlowableEmitter<? super StompMessage> subscriber : mEmitters.get(dest)) {
-                    subscriber.onNext(stompMessage);
+        synchronized (mEmitters) {
+            for (String dest : mEmitters.keySet()) {
+                if (dest.equals(messageDestination)) {
+                    for (FlowableEmitter<? super StompMessage> subscriber : mEmitters.get(dest)) {
+                        subscriber.onNext(stompMessage);
+                    }
+                    return;
                 }
-                return;
             }
         }
     }
@@ -167,27 +169,31 @@ public Flowable<StompMessage> topic(String destinationPath) {
 
     public Flowable<StompMessage> topic(String destinationPath, List<StompHeader> headerList) {
        return Flowable.<StompMessage>create(emitter -> {
-           Set<FlowableEmitter<? super StompMessage>> emittersSet = mEmitters.get(destinationPath);
-           if (emittersSet == null) {
-               emittersSet = new HashSet<>();
-               mEmitters.put(destinationPath, emittersSet);
-               subscribePath(destinationPath, headerList).subscribe();
+           synchronized (mEmitters) {
+               Set<FlowableEmitter<? super StompMessage>> emittersSet = mEmitters.get(destinationPath);
+               if (emittersSet == null) {
+                   emittersSet = new HashSet<>();
+                   mEmitters.put(destinationPath, emittersSet);
+                   subscribePath(destinationPath, headerList).subscribe();
+               }
+               emittersSet.add(emitter);
            }
-           emittersSet.add(emitter);
        }, BackpressureStrategy.BUFFER)
            .doOnCancel(() -> {
-               Iterator<String> mapIterator = mEmitters.keySet().iterator();
-               while (mapIterator.hasNext()) {
-                   String destinationUrl = mapIterator.next();
-                   Set<FlowableEmitter<? super StompMessage>> set = mEmitters.get(destinationUrl);
-                   Iterator<FlowableEmitter<? super StompMessage>> setIterator = set.iterator();
-                   while (setIterator.hasNext()) {
-                       FlowableEmitter<? super StompMessage> subscriber = setIterator.next();
-                       if (subscriber.isCancelled()) {
-                           setIterator.remove();
-                           if (set.size() < 1) {
-                               mapIterator.remove();
-                               unsubscribePath(destinationUrl).subscribe();
+               synchronized (mEmitters) {
+                   Iterator<String> mapIterator = mEmitters.keySet().iterator();
+                   while (mapIterator.hasNext()) {
+                       String destinationUrl = mapIterator.next();
+                       Set<FlowableEmitter<? super StompMessage>> set = mEmitters.get(destinationUrl);
+                       Iterator<FlowableEmitter<? super StompMessage>> setIterator = set.iterator();
+                       while (setIterator.hasNext()) {
+                           FlowableEmitter<? super StompMessage> subscriber = setIterator.next();
+                           if (subscriber.isCancelled()) {
+                               setIterator.remove();
+                               if (set.size() < 1) {
+                                   mapIterator.remove();
+                                   unsubscribePath(destinationUrl).subscribe();
+                               }
                            }
                        }
                    }

From 3c10dc49ca1e4d97220e49b8ffc99ecad5b76d86 Mon Sep 17 00:00:00 2001
From: NaikSoftware <naiksav4enko@gmail.com>
Date: Wed, 27 Dec 2017 15:32:58 +0200
Subject: [PATCH 059/110] Fix typo

---
 .../main/java/ua/naiksoftware/stomp/client/StompClient.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java b/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
index dcad677..f127f41 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
@@ -131,9 +131,9 @@ public Flowable<Void> send(String destination, String data) {
     public Flowable<Void> send(StompMessage stompMessage) {
         Flowable<Void> flowable = mConnectionProvider.send(stompMessage.compile());
         if (!mConnected) {
-            ConnectableFlowable<Void> deffered = flowable.publish();
-            mWaitConnectionFlowables.add(deffered);
-            return deffered;
+            ConnectableFlowable<Void> deferred = flowable.publish();
+            mWaitConnectionFlowables.add(deferred);
+            return deferred;
         } else {
             return flowable;
         }

From fae04e62e5d459ebe8ea09eb885f31ac5dd76f75 Mon Sep 17 00:00:00 2001
From: NaikSoftware <naiksav4enko@gmail.com>
Date: Fri, 30 Mar 2018 21:35:23 +0300
Subject: [PATCH 060/110] Fix memory leaks (clear subscriptions)

---
 .../java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java  | 4 ++--
 .../ua/naiksoftware/stomp/WebSocketsConnectionProvider.java   | 4 ++--
 .../main/java/ua/naiksoftware/stomp/client/StompClient.java   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java b/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java
index 5b5b765..9190095 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java
@@ -46,7 +46,7 @@
     @Override
     public Flowable<String> messages() {
         Flowable<String> flowable = Flowable.<String>create(mMessagesEmitters::add, BackpressureStrategy.BUFFER)
-                .doOnCancel(() -> {
+                .doFinally(() -> {
                     Iterator<FlowableEmitter<? super String>> iterator = mMessagesEmitters.iterator();
                     while (iterator.hasNext()) {
                         if (iterator.next().isCancelled()) iterator.remove();
@@ -131,7 +131,7 @@ public Flowable<Void> send(String stompMessage) {
     @Override
     public Flowable<LifecycleEvent> getLifecycleReceiver() {
         return Flowable.<LifecycleEvent>create(mLifecycleEmitters::add, BackpressureStrategy.BUFFER)
-                .doOnCancel(() -> {
+                .doFinally(() -> {
                     synchronized (mLifecycleEmitters) {
                         Iterator<FlowableEmitter<? super LifecycleEvent>> iterator = mLifecycleEmitters.iterator();
                         while (iterator.hasNext()) {
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java b/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java
index 4ad7d59..09316d8 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java
@@ -58,7 +58,7 @@
     @Override
     public Flowable<String> messages() {
         Flowable<String> flowable = Flowable.<String>create(mMessagesEmitters::add, BackpressureStrategy.BUFFER)
-                .doOnCancel(() -> {
+                .doFinally(() -> {
                     Iterator<FlowableEmitter<? super String>> iterator = mMessagesEmitters.iterator();
                     while (iterator.hasNext()) {
                         if (iterator.next().isCancelled()) iterator.remove();
@@ -165,7 +165,7 @@ private void emitMessage(String stompMessage) {
     @Override
     public Flowable<LifecycleEvent> getLifecycleReceiver() {
         return Flowable.<LifecycleEvent>create(mLifecycleEmitters::add, BackpressureStrategy.BUFFER)
-                .doOnCancel(() -> {
+                .doFinally(() -> {
                     synchronized (mLifecycleLock) {
                         Iterator<FlowableEmitter<? super LifecycleEvent>> iterator = mLifecycleEmitters.iterator();
                         while (iterator.hasNext()) {
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java b/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
index f127f41..3c42156 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
@@ -35,7 +35,7 @@ public class StompClient {
 
     private Disposable mMessagesDisposable;
     private Disposable mLifecycleDisposable;
-    private Map<String, Set<FlowableEmitter<? super StompMessage>>> mEmitters = Collections.synchronizedMap(new HashMap<>());
+    private final Map<String, Set<FlowableEmitter<? super StompMessage>>> mEmitters = Collections.synchronizedMap(new HashMap<>());
     private List<ConnectableFlowable<Void>> mWaitConnectionFlowables;
     private final ConnectionProvider mConnectionProvider;
     private HashMap<String, String> mTopics;
@@ -179,7 +179,7 @@ public Flowable<StompMessage> topic(String destinationPath, List<StompHeader> he
                emittersSet.add(emitter);
            }
        }, BackpressureStrategy.BUFFER)
-           .doOnCancel(() -> {
+           .doFinally(() -> {
                synchronized (mEmitters) {
                    Iterator<String> mapIterator = mEmitters.keySet().iterator();
                    while (mapIterator.hasNext()) {

From f5d191e8bed301a14caf8910f39edbb62fca9569 Mon Sep 17 00:00:00 2001
From: NaikSoftware <naiksav4enko@gmail.com>
Date: Tue, 3 Apr 2018 19:47:06 +0300
Subject: [PATCH 061/110] Change group

---
 lib/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/build.gradle b/lib/build.gradle
index 57a627a..30c7296 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
 
-group='com.github.forresthopkinsa'
+group='com.github.NaikSoftware'
 
 android {
     compileSdkVersion 25

From 0b18b8631bdb3f9b7eb78b1c8da9f723381167f7 Mon Sep 17 00:00:00 2001
From: NaikSoftware <naiksav4enko@gmail.com>
Date: Tue, 3 Apr 2018 20:41:18 +0300
Subject: [PATCH 062/110] Refactor

---
 build.gradle                                  |  2 +
 example-client/build.gradle                   |  5 +-
 lib/build.gradle                              | 13 ++--
 .../stomp/AbstractConnectionProvider.java     | 34 +++++----
 .../stomp/ConnectionProvider.java             |  9 ++-
 .../stomp/client/StompClient.java             | 70 +++++++++----------
 6 files changed, 69 insertions(+), 64 deletions(-)

diff --git a/build.gradle b/build.gradle
index be064ef..ff57bcc 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,6 +6,7 @@ buildscript {
         maven {
             url "https://maven.google.com"
         }
+        google()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.0.1'
@@ -20,6 +21,7 @@ allprojects {
     repositories {
         jcenter()
         maven { url "https://jitpack.io" }
+        google()
     }
 }
 
diff --git a/example-client/build.gradle b/example-client/build.gradle
index 6133d79..69361c2 100644
--- a/example-client/build.gradle
+++ b/example-client/build.gradle
@@ -1,9 +1,8 @@
 apply plugin: 'com.android.application'
-apply plugin: 'me.tatarka.retrolambda'
 
 android {
     compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    buildToolsVersion '26.0.2'
 
     defaultConfig {
         applicationId "ua.naiksoftware.stompclientexample"
@@ -29,7 +28,7 @@ dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     testCompile 'junit:junit:4.12'
     compile 'com.android.support:appcompat-v7:25.3.1'
-    compile 'org.java-websocket:java-websocket:1.3.2'
+    compile 'org.java-websocket:Java-WebSocket:1.3.6'
     compile 'com.android.support:recyclerview-v7:25.3.1'
     compile 'io.reactivex.rxjava2:rxandroid:2.0.1'
     compile 'com.squareup.retrofit2:converter-gson:2.3.0'
diff --git a/lib/build.gradle b/lib/build.gradle
index 30c7296..d5707fc 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -28,15 +28,12 @@ android {
 
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    testCompile 'junit:junit:4.12'
-    compile 'io.reactivex:rxjava:1.3.0'
-    compile 'net.sourceforge.streamsupport:streamsupport:1.5.5'
-    compile 'net.sourceforge.streamsupport:streamsupport-cfuture:1.5.5'
+    implementation "io.reactivex.rxjava2:rxjava:2.1.8"
     // Supported transports
-    compile 'org.java-websocket:Java-WebSocket:1.3.6'
-    compile 'com.squareup.okhttp3:okhttp:3.8.1'
-    implementation 'com.android.support:support-annotations:24.2.0'
+    compileOnly 'org.java-websocket:Java-WebSocket:1.3.6'
+    compileOnly 'com.squareup.okhttp3:okhttp:3.9.1'
+    
+    implementation 'com.android.support:support-annotations:27.1.0'
 }
 
 task sourcesJar(type: Jar) {
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/AbstractConnectionProvider.java b/lib/src/main/java/ua/naiksoftware/stomp/AbstractConnectionProvider.java
index 9e2982b..8ca003c 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/AbstractConnectionProvider.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/AbstractConnectionProvider.java
@@ -6,10 +6,13 @@
 
 import java.util.concurrent.TimeUnit;
 
-import rx.Completable;
-import rx.Observable;
-import rx.subjects.BehaviorSubject;
-import rx.subjects.PublishSubject;
+import io.reactivex.BackpressureStrategy;
+import io.reactivex.Completable;
+import io.reactivex.CompletableSource;
+import io.reactivex.Flowable;
+import io.reactivex.Observable;
+import io.reactivex.subjects.BehaviorSubject;
+import io.reactivex.subjects.PublishSubject;
 
 /**
  * Created by forresthopkinsa on 8/8/2017.
@@ -30,7 +33,7 @@ abstract class AbstractConnectionProvider implements ConnectionProvider {
     AbstractConnectionProvider() {
         mLifecycleStream = PublishSubject.create();
         mMessagesStream = PublishSubject.create();
-        mConnectionStream = BehaviorSubject.create(false);
+        mConnectionStream = BehaviorSubject.create();
     }
 
     @NonNull
@@ -51,12 +54,11 @@ public Observable<String> messages() {
 
     @Override
     public Completable disconnect() {
-        Observable<Boolean> ex = Observable.error(new IllegalStateException("Attempted to disconnect when already disconnected"));
+        CompletableSource ex = Completable.error(new IllegalStateException("Attempted to disconnect when already disconnected"));
 
         Completable block = mConnectionStream
-                .first(isConnected -> isConnected)
-                .timeout(1, TimeUnit.SECONDS, ex)
-                .toCompletable();
+                .filter(connected -> connected).firstOrError().toCompletable()
+                .timeout(1, TimeUnit.SECONDS, ex);
 
         return Completable
                 .fromAction(this::rawDisconnect)
@@ -64,12 +66,11 @@ public Completable disconnect() {
     }
 
     private Completable initSocket() {
-        Observable<Boolean> ex = Observable.error(new IllegalStateException("Attempted to connect when already connected"));
+        CompletableSource ex = Completable.error(new IllegalStateException("Attempted to connect when already connected"));
 
         Completable block = mConnectionStream
-                .first(isConnected -> !isConnected)
-                .timeout(1, TimeUnit.SECONDS, ex)
-                .toCompletable();
+                .filter(connected -> !connected).firstOrError().toCompletable()
+                .timeout(1, TimeUnit.SECONDS, ex);
 
         return Completable
                 .fromAction(this::createWebSocketConnection)
@@ -140,7 +141,12 @@ void emitMessage(String stompMessage) {
 
     @NonNull
     @Override
-    public Observable<LifecycleEvent> getLifecycleReceiver() {
+    public Observable<LifecycleEvent> lifecycle() {
         return mLifecycleStream;
     }
+
+    @Override
+    public Flowable<Boolean> connected() {
+        return mConnectionStream.toFlowable(BackpressureStrategy.LATEST);
+    }
 }
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/ConnectionProvider.java b/lib/src/main/java/ua/naiksoftware/stomp/ConnectionProvider.java
index 0d18ac0..505c033 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/ConnectionProvider.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/ConnectionProvider.java
@@ -1,7 +1,8 @@
 package ua.naiksoftware.stomp;
 
-import rx.Completable;
-import rx.Observable;
+import io.reactivex.Completable;
+import io.reactivex.Flowable;
+import io.reactivex.Observable;
 
 /**
  * Created by naik on 05.05.16.
@@ -23,7 +24,7 @@ public interface ConnectionProvider {
     /**
      * Subscribe this for receive #LifecycleEvent events
      */
-    Observable<LifecycleEvent> getLifecycleReceiver();
+    Observable<LifecycleEvent> lifecycle();
 
     /**
      * Disconnects from server. This is basically a Callable.
@@ -32,4 +33,6 @@ public interface ConnectionProvider {
     Completable disconnect();
 
     Completable setHeartbeat(int ms);
+
+    Flowable<Boolean> connected();
 }
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java b/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
index 78df5d8..7c6db80 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
@@ -10,13 +10,12 @@
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 
-import java8.util.StringJoiner;
-import java8.util.concurrent.CompletableFuture;
-import rx.Completable;
-import rx.Observable;
-import rx.Subscription;
-import rx.schedulers.Schedulers;
-import rx.subjects.PublishSubject;
+import io.reactivex.BackpressureStrategy;
+import io.reactivex.Completable;
+import io.reactivex.CompletableSource;
+import io.reactivex.Flowable;
+import io.reactivex.disposables.Disposable;
+import io.reactivex.subjects.PublishSubject;
 import ua.naiksoftware.stomp.ConnectionProvider;
 import ua.naiksoftware.stomp.LifecycleEvent;
 import ua.naiksoftware.stomp.StompHeader;
@@ -39,12 +38,10 @@ public class StompClient {
     private boolean legacyWhitespace;
 
     private PublishSubject<StompMessage> mMessageStream;
-    private CompletableFuture<Boolean> mConnectionFuture;
-    private Completable mConnectionComplete;
-    private ConcurrentHashMap<String, Observable<StompMessage>> mStreamMap;
+    private ConcurrentHashMap<String, Flowable<StompMessage>> mStreamMap;
     private Parser parser;
-    private Subscription lifecycleSub;
-    private Subscription messagesSubscription;
+    private Disposable mLifecycleDisposable;
+    private Disposable mMessagesDisposable;
     private List<StompHeader> mHeaders;
     private int heartbeat;
 
@@ -52,15 +49,9 @@ public StompClient(ConnectionProvider connectionProvider) {
         mConnectionProvider = connectionProvider;
         mMessageStream = PublishSubject.create();
         mStreamMap = new ConcurrentHashMap<>();
-        resetStatus();
         parser = Parser.NONE;
     }
 
-    private void resetStatus() {
-        mConnectionFuture = new CompletableFuture<>();
-        mConnectionComplete = Completable.fromFuture(mConnectionFuture).subscribeOn(Schedulers.newThread());
-    }
-
     public enum Parser {
         NONE,
         RABBITMQ
@@ -109,7 +100,7 @@ public void connect(@Nullable List<StompHeader> _headers) {
         mHeaders = _headers;
 
         if (mConnected) return;
-        lifecycleSub = lifecycle()
+        mLifecycleDisposable = mConnectionProvider.lifecycle()
                 .subscribe(lifecycleEvent -> {
                     switch (lifecycleEvent.getType()) {
                         case OPENED:
@@ -134,14 +125,14 @@ public void connect(@Nullable List<StompHeader> _headers) {
                 });
 
         isConnecting = true;
-        messagesSubscription = mConnectionProvider.messages()
+        mMessagesDisposable = mConnectionProvider.messages()
                 .map(StompMessage::from)
                 .doOnNext(this::callSubscribers)
                 .filter(msg -> msg.getStompCommand().equals(StompCommand.CONNECTED))
                 .subscribe(stompMessage -> {
                     mConnected = true;
                     isConnecting = false;
-                    mConnectionFuture.complete(true);
+//                    mConnectionFuture.complete(true);
                 });
     }
 
@@ -166,37 +157,42 @@ public Completable send(String destination, String data) {
 
     public Completable send(@NonNull StompMessage stompMessage) {
         Completable completable = mConnectionProvider.send(stompMessage.compile(legacyWhitespace));
-        return completable.startWith(mConnectionComplete);
+        CompletableSource connectionComplete = mConnectionProvider.connected()
+                .filter(isConnected -> isConnected)
+                .firstOrError().toCompletable();
+        return completable
+                .startWith(mConnectionProvider.disconnect())
+                .startWith(connectionComplete);
     }
 
     private void callSubscribers(StompMessage stompMessage) {
         mMessageStream.onNext(stompMessage);
     }
 
-    public Observable<LifecycleEvent> lifecycle() {
-        return mConnectionProvider.getLifecycleReceiver();
+    public Flowable<LifecycleEvent> lifecycle() {
+        return mConnectionProvider.lifecycle().toFlowable(BackpressureStrategy.BUFFER);
     }
 
     public void disconnect() {
-        resetStatus();
-        lifecycleSub.unsubscribe();
-        messagesSubscription.unsubscribe();
+        mLifecycleDisposable.dispose();
+        mMessagesDisposable.dispose();
         mConnectionProvider.disconnect().subscribe(() -> mConnected = false);
     }
 
-    public Observable<StompMessage> topic(String destinationPath) {
+    public Flowable<StompMessage> topic(String destinationPath) {
         return topic(destinationPath, null);
     }
 
-    public Observable<StompMessage> topic(@NonNull String destPath, List<StompHeader> headerList) {
+    public Flowable<StompMessage> topic(@NonNull String destPath, List<StompHeader> headerList) {
         if (destPath == null)
-            return Observable.error(new IllegalArgumentException("Topic path cannot be null"));
+            return Flowable.error(new IllegalArgumentException("Topic path cannot be null"));
         else if (!mStreamMap.containsKey(destPath))
             mStreamMap.put(destPath,
                     mMessageStream
                             .filter(msg -> matches(destPath, msg))
-                            .doOnSubscribe(() -> subscribePath(destPath, headerList).subscribe())
-                            .doOnUnsubscribe(() -> unsubscribePath(destPath).subscribe())
+                            .toFlowable(BackpressureStrategy.BUFFER)
+                            .doOnSubscribe(disposable -> subscribePath(destPath, headerList).subscribe())
+                            .doFinally(() -> unsubscribePath(destPath).subscribe())
                             .share()
             );
         return mStreamMap.get(destPath);
@@ -250,10 +246,12 @@ private boolean matches(String path, StompMessage msg) {
                     }
                 }
                 // at this point, 'transformed' looks like ["lorem", "ipsum", "[^.]+", "sit"]
-                StringJoiner sj = new StringJoiner("\\.");
-                for (String s : transformed)
-                    sj.add(s);
-                String join = sj.toString();
+                StringBuilder sb = new StringBuilder();
+                for (String s : transformed) {
+                    if (sb.length() > 0) sb.append("\\.");
+                    sb.append(s);
+                }
+                String join = sb.toString();
                 // join = "lorem\.ipsum\.[^.]+\.sit"
 
                 ret = dest.matches(join);

From 0348606ff669f6aeaae42d512e70289482b69dbd Mon Sep 17 00:00:00 2001
From: NaikSoftware <naiksav4enko@gmail.com>
Date: Tue, 3 Apr 2018 20:49:34 +0300
Subject: [PATCH 063/110] Fix example

---
 .../stompclientexample/ExampleRepository.java      |  3 ++-
 .../stompclientexample/MainActivity.java           | 14 ++++++--------
 .../ua/naiksoftware/stomp/client/StompClient.java  |  1 -
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/example-client/src/main/java/ua/naiksoftware/stompclientexample/ExampleRepository.java b/example-client/src/main/java/ua/naiksoftware/stompclientexample/ExampleRepository.java
index b3beb47..19aeab5 100644
--- a/example-client/src/main/java/ua/naiksoftware/stompclientexample/ExampleRepository.java
+++ b/example-client/src/main/java/ua/naiksoftware/stompclientexample/ExampleRepository.java
@@ -1,5 +1,6 @@
 package ua.naiksoftware.stompclientexample;
 
+import io.reactivex.Completable;
 import io.reactivex.Flowable;
 import retrofit2.http.POST;
 import retrofit2.http.Query;
@@ -10,5 +11,5 @@
 public interface ExampleRepository {
 
     @POST("hello-convert-and-send")
-    Flowable<Void> sendRestEcho(@Query("msg") String message);
+    Completable sendRestEcho(@Query("msg") String message);
 }
diff --git a/example-client/src/main/java/ua/naiksoftware/stompclientexample/MainActivity.java b/example-client/src/main/java/ua/naiksoftware/stompclientexample/MainActivity.java
index 55ae725..9fdcc57 100644
--- a/example-client/src/main/java/ua/naiksoftware/stompclientexample/MainActivity.java
+++ b/example-client/src/main/java/ua/naiksoftware/stompclientexample/MainActivity.java
@@ -11,15 +11,13 @@
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 
-import org.java_websocket.WebSocket;
-
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Locale;
 
-import io.reactivex.FlowableTransformer;
+import io.reactivex.CompletableTransformer;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.Disposable;
 import io.reactivex.schedulers.Schedulers;
@@ -56,7 +54,7 @@ public void disconnectStomp(View view) {
     }
 
     public void connectStomp(View view) {
-        mStompClient = Stomp.over(WebSocket.class, "ws://" + ANDROID_EMULATOR_LOCALHOST
+        mStompClient = Stomp.over(Stomp.ConnectionProvider.JWS, "ws://" + ANDROID_EMULATOR_LOCALHOST
                 + ":" + RestClient.SERVER_PORT + "/example-endpoint/websocket");
 
         mStompClient.lifecycle()
@@ -91,7 +89,7 @@ public void connectStomp(View view) {
     public void sendEchoViaStomp(View v) {
         mStompClient.send("/topic/hello-msg-mapping", "Echo STOMP " + mTimeFormat.format(new Date()))
                 .compose(applySchedulers())
-                .subscribe(aVoid -> {
+                .subscribe(() -> {
                     Log.d(TAG, "STOMP echo send successfully");
                 }, throwable -> {
                     Log.e(TAG, "Error send STOMP echo", throwable);
@@ -103,7 +101,7 @@ public void sendEchoViaRest(View v) {
         mRestPingDisposable = RestClient.getInstance().getExampleRepository()
                 .sendRestEcho("Echo REST " + mTimeFormat.format(new Date()))
                 .compose(applySchedulers())
-                .subscribe(aVoid -> {
+                .subscribe(() -> {
                     Log.d(TAG, "REST echo send successfully");
                 }, throwable -> {
                     Log.e(TAG, "Error send REST echo", throwable);
@@ -122,8 +120,8 @@ private void toast(String text) {
         Toast.makeText(this, text, Toast.LENGTH_SHORT).show();
     }
 
-    protected <T> FlowableTransformer<T, T> applySchedulers() {
-        return tFlowable -> tFlowable
+    protected CompletableTransformer applySchedulers() {
+        return upstream -> upstream
                 .unsubscribeOn(Schedulers.newThread())
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread());
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java b/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
index 7c6db80..f03ea50 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
@@ -132,7 +132,6 @@ public void connect(@Nullable List<StompHeader> _headers) {
                 .subscribe(stompMessage -> {
                     mConnected = true;
                     isConnecting = false;
-//                    mConnectionFuture.complete(true);
                 });
     }
 

From 2bf78e05c2e8d281e041a9877aa75025be3e23e0 Mon Sep 17 00:00:00 2001
From: NaikSoftware <naiksav4enko@gmail.com>
Date: Tue, 3 Apr 2018 21:02:02 +0300
Subject: [PATCH 064/110] Fix def value

---
 .../java/ua/naiksoftware/stomp/AbstractConnectionProvider.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/main/java/ua/naiksoftware/stomp/AbstractConnectionProvider.java b/lib/src/main/java/ua/naiksoftware/stomp/AbstractConnectionProvider.java
index 8ca003c..4f089e2 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/AbstractConnectionProvider.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/AbstractConnectionProvider.java
@@ -33,7 +33,7 @@ abstract class AbstractConnectionProvider implements ConnectionProvider {
     AbstractConnectionProvider() {
         mLifecycleStream = PublishSubject.create();
         mMessagesStream = PublishSubject.create();
-        mConnectionStream = BehaviorSubject.create();
+        mConnectionStream = BehaviorSubject.createDefault(false);
     }
 
     @NonNull

From 5d4b938697b8cac8b3d958565cec812fd69f1273 Mon Sep 17 00:00:00 2001
From: NaikSoftware <naiksav4enko@gmail.com>
Date: Tue, 3 Apr 2018 21:04:09 +0300
Subject: [PATCH 065/110] Fix def value

---
 lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java b/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
index f03ea50..72e62e4 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
@@ -175,7 +175,7 @@ public Flowable<LifecycleEvent> lifecycle() {
     public void disconnect() {
         mLifecycleDisposable.dispose();
         mMessagesDisposable.dispose();
-        mConnectionProvider.disconnect().subscribe(() -> mConnected = false);
+        mConnectionProvider.disconnect().subscribe(() -> mConnected = false, e -> Log.e(tag, "Disconnect error", e));
     }
 
     public Flowable<StompMessage> topic(String destinationPath) {

From 18990db65ec2fbf215e42283f197d39d9d185e8f Mon Sep 17 00:00:00 2001
From: NaikSoftware <naiksav4enko@gmail.com>
Date: Tue, 3 Apr 2018 21:16:05 +0300
Subject: [PATCH 066/110] Fix send

---
 lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java b/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
index 72e62e4..9f7a8f7 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
@@ -160,7 +160,6 @@ public Completable send(@NonNull StompMessage stompMessage) {
                 .filter(isConnected -> isConnected)
                 .firstOrError().toCompletable();
         return completable
-                .startWith(mConnectionProvider.disconnect())
                 .startWith(connectionComplete);
     }
 

From d67eaeb6d50111ac6ec9c5edad452c9fe1693487 Mon Sep 17 00:00:00 2001
From: NaikSoftware <naiksav4enko@gmail.com>
Date: Tue, 3 Apr 2018 22:21:19 +0300
Subject: [PATCH 067/110] Fix subscribing

---
 .../stomp/AbstractConnectionProvider.java     | 33 ++-----------------
 .../stomp/ConnectionProvider.java             |  2 --
 .../stomp/OkHttpConnectionProvider.java       |  1 -
 .../stomp/WebSocketsConnectionProvider.java   |  1 -
 .../stomp/client/StompClient.java             | 29 ++++++++++++----
 5 files changed, 24 insertions(+), 42 deletions(-)

diff --git a/lib/src/main/java/ua/naiksoftware/stomp/AbstractConnectionProvider.java b/lib/src/main/java/ua/naiksoftware/stomp/AbstractConnectionProvider.java
index 4f089e2..bd1e2f8 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/AbstractConnectionProvider.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/AbstractConnectionProvider.java
@@ -4,14 +4,8 @@
 import android.support.annotation.Nullable;
 import android.util.Log;
 
-import java.util.concurrent.TimeUnit;
-
-import io.reactivex.BackpressureStrategy;
 import io.reactivex.Completable;
-import io.reactivex.CompletableSource;
-import io.reactivex.Flowable;
 import io.reactivex.Observable;
-import io.reactivex.subjects.BehaviorSubject;
 import io.reactivex.subjects.PublishSubject;
 
 /**
@@ -28,12 +22,10 @@ abstract class AbstractConnectionProvider implements ConnectionProvider {
     private final PublishSubject<LifecycleEvent> mLifecycleStream;
     @NonNull
     private final PublishSubject<String> mMessagesStream;
-    final BehaviorSubject<Boolean> mConnectionStream;
 
     AbstractConnectionProvider() {
         mLifecycleStream = PublishSubject.create();
         mMessagesStream = PublishSubject.create();
-        mConnectionStream = BehaviorSubject.createDefault(false);
     }
 
     @NonNull
@@ -54,27 +46,13 @@ public Observable<String> messages() {
 
     @Override
     public Completable disconnect() {
-        CompletableSource ex = Completable.error(new IllegalStateException("Attempted to disconnect when already disconnected"));
-
-        Completable block = mConnectionStream
-                .filter(connected -> connected).firstOrError().toCompletable()
-                .timeout(1, TimeUnit.SECONDS, ex);
-
         return Completable
-                .fromAction(this::rawDisconnect)
-                .startWith(block);
+                .fromAction(this::rawDisconnect);
     }
 
     private Completable initSocket() {
-        CompletableSource ex = Completable.error(new IllegalStateException("Attempted to connect when already connected"));
-
-        Completable block = mConnectionStream
-                .filter(connected -> !connected).firstOrError().toCompletable()
-                .timeout(1, TimeUnit.SECONDS, ex);
-
         return Completable
-                .fromAction(this::createWebSocketConnection)
-                .startWith(block);
+                .fromAction(this::createWebSocketConnection);
     }
 
     // Doesn't do anything at all, only here as a stub
@@ -130,8 +108,6 @@ public Completable send(String stompMessage) {
     void emitLifecycleEvent(@NonNull LifecycleEvent lifecycleEvent) {
         Log.d(TAG, "Emit lifecycle event: " + lifecycleEvent.getType().name());
         mLifecycleStream.onNext(lifecycleEvent);
-        if (lifecycleEvent.getType().equals(LifecycleEvent.Type.CLOSED))
-            mConnectionStream.onNext(false);
     }
 
     void emitMessage(String stompMessage) {
@@ -144,9 +120,4 @@ void emitMessage(String stompMessage) {
     public Observable<LifecycleEvent> lifecycle() {
         return mLifecycleStream;
     }
-
-    @Override
-    public Flowable<Boolean> connected() {
-        return mConnectionStream.toFlowable(BackpressureStrategy.LATEST);
-    }
 }
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/ConnectionProvider.java b/lib/src/main/java/ua/naiksoftware/stomp/ConnectionProvider.java
index 505c033..58fb826 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/ConnectionProvider.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/ConnectionProvider.java
@@ -33,6 +33,4 @@ public interface ConnectionProvider {
     Completable disconnect();
 
     Completable setHeartbeat(int ms);
-
-    Flowable<Boolean> connected();
 }
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java b/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java
index 9046400..a7be2e3 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java
@@ -93,7 +93,6 @@ public void onClosing(final WebSocket webSocket, final int code, final String re
                 }
 
         );
-        mConnectionStream.onNext(true);
     }
 
     @Override
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java b/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java
index 9ee4b16..eeadc81 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java
@@ -110,7 +110,6 @@ public void onError(Exception ex) {
 
         mWebSocketClient.connect();
         haveConnection = true;
-        mConnectionStream.onNext(true);
     }
 
     @Override
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java b/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
index 9f7a8f7..ff4c199 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
@@ -15,6 +15,7 @@
 import io.reactivex.CompletableSource;
 import io.reactivex.Flowable;
 import io.reactivex.disposables.Disposable;
+import io.reactivex.subjects.BehaviorSubject;
 import io.reactivex.subjects.PublishSubject;
 import ua.naiksoftware.stomp.ConnectionProvider;
 import ua.naiksoftware.stomp.LifecycleEvent;
@@ -39,6 +40,7 @@ public class StompClient {
 
     private PublishSubject<StompMessage> mMessageStream;
     private ConcurrentHashMap<String, Flowable<StompMessage>> mStreamMap;
+    private final BehaviorSubject<Boolean> mConnectionStream;
     private Parser parser;
     private Disposable mLifecycleDisposable;
     private Disposable mMessagesDisposable;
@@ -49,6 +51,7 @@ public StompClient(ConnectionProvider connectionProvider) {
         mConnectionProvider = connectionProvider;
         mMessageStream = PublishSubject.create();
         mStreamMap = new ConcurrentHashMap<>();
+        mConnectionStream = BehaviorSubject.createDefault(false);
         parser = Parser.NONE;
     }
 
@@ -113,12 +116,12 @@ public void connect(@Nullable List<StompHeader> _headers) {
                             break;
 
                         case CLOSED:
-                            mConnected = false;
+                            setConnected(false);
                             isConnecting = false;
                             break;
 
                         case ERROR:
-                            mConnected = false;
+                            setConnected(false);
                             isConnecting = false;
                             break;
                     }
@@ -130,17 +133,24 @@ public void connect(@Nullable List<StompHeader> _headers) {
                 .doOnNext(this::callSubscribers)
                 .filter(msg -> msg.getStompCommand().equals(StompCommand.CONNECTED))
                 .subscribe(stompMessage -> {
-                    mConnected = true;
+                    setConnected(true);
                     isConnecting = false;
+
                 });
     }
 
+    private void setConnected(boolean connected) {
+        mConnected = connected;
+        mConnectionStream.onNext(mConnected);
+    }
+
     /**
      * Disconnect from server, and then reconnect with the last-used headers
      */
     public void reconnect() {
-        disconnect();
-        connect(mHeaders);
+        disconnectCompletable()
+                .subscribe(() -> connect(mHeaders),
+                        e -> Log.e(tag, "Disconnect error", e));
     }
 
     public Completable send(String destination) {
@@ -156,7 +166,7 @@ public Completable send(String destination, String data) {
 
     public Completable send(@NonNull StompMessage stompMessage) {
         Completable completable = mConnectionProvider.send(stompMessage.compile(legacyWhitespace));
-        CompletableSource connectionComplete = mConnectionProvider.connected()
+        CompletableSource connectionComplete = mConnectionStream
                 .filter(isConnected -> isConnected)
                 .firstOrError().toCompletable();
         return completable
@@ -172,9 +182,14 @@ public Flowable<LifecycleEvent> lifecycle() {
     }
 
     public void disconnect() {
+        disconnectCompletable().subscribe(() -> {}, e -> Log.e(tag, "Disconnect error", e));
+    }
+
+    public Completable disconnectCompletable() {
         mLifecycleDisposable.dispose();
         mMessagesDisposable.dispose();
-        mConnectionProvider.disconnect().subscribe(() -> mConnected = false, e -> Log.e(tag, "Disconnect error", e));
+        return mConnectionProvider.disconnect()
+                .doOnComplete(() -> setConnected(false));
     }
 
     public Flowable<StompMessage> topic(String destinationPath) {

From c17b1972efe4d7fefb5b88183b335cfb8d5dc970 Mon Sep 17 00:00:00 2001
From: NaikSoftware <naiksav4enko@gmail.com>
Date: Tue, 26 Jun 2018 18:03:49 +0300
Subject: [PATCH 068/110] Fix disconnect before connect

---
 .../java/ua/naiksoftware/stomp/client/StompClient.java    | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java b/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
index ff4c199..e83a477 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
@@ -186,8 +186,12 @@ public void disconnect() {
     }
 
     public Completable disconnectCompletable() {
-        mLifecycleDisposable.dispose();
-        mMessagesDisposable.dispose();
+        if (mLifecycleDisposable != null) {
+            mLifecycleDisposable.dispose();
+        }
+        if (mMessagesDisposable != null) {
+            mMessagesDisposable.dispose();
+        }
         return mConnectionProvider.disconnect()
                 .doOnComplete(() -> setConnected(false));
     }

From d4b9043b1df3d210bb769a01a8f997c75d1de0a7 Mon Sep 17 00:00:00 2001
From: NaikSoftware <naiksav4enko@gmail.com>
Date: Mon, 9 Jul 2018 14:11:18 +0300
Subject: [PATCH 069/110] Fix NPE on disconnect

---
 .../java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java b/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java
index a7be2e3..c10fc26 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java
@@ -37,7 +37,9 @@ class OkHttpConnectionProvider extends AbstractConnectionProvider {
     @NonNull
     @Override
     public void rawDisconnect() {
-        openedSocked.close(1000, "");
+        if (openedSocked != null) {
+            openedSocked.close(1000, "");
+        }
     }
 
     @Override

From 7dc86a96a71774cbb605c8a4a6e89867fb7db3bc Mon Sep 17 00:00:00 2001
From: GuilhermeJ <Ubivisnb11>
Date: Thu, 12 Jul 2018 16:54:47 -0300
Subject: [PATCH 070/110] JWS disconnects blocking

---
 .../naiksoftware/stomp/WebSocketsConnectionProvider.java   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java b/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java
index eeadc81..f345dcf 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java
@@ -48,7 +48,12 @@ class WebSocketsConnectionProvider extends AbstractConnectionProvider {
 
     @Override
     public void rawDisconnect() {
-        mWebSocketClient.close();
+        while(!mWebSocketClient.isClosed()) {
+            try {
+                mWebSocketClient.closeBlocking();
+                break;
+            } catch (InterruptedException ignored) { }
+        }
     }
 
     @Override

From 9c3d7ff05e8c52fe7aa6399f1a81bf14720bca3b Mon Sep 17 00:00:00 2001
From: GuilhermeJ <Ubivisnb11>
Date: Thu, 12 Jul 2018 19:46:56 -0300
Subject: [PATCH 071/110] OkHTTP disconnects blocking

---
 .../stomp/OkHttpConnectionProvider.java       | 133 +++++++++++-------
 1 file changed, 86 insertions(+), 47 deletions(-)

diff --git a/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java b/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java
index c10fc26..e2c127c 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java
@@ -4,10 +4,15 @@
 import android.support.annotation.Nullable;
 import android.util.Log;
 
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 
+import io.reactivex.Completable;
+import io.reactivex.CompletableEmitter;
+import io.reactivex.CompletableOnSubscribe;
 import okhttp3.Headers;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
@@ -27,6 +32,9 @@ class OkHttpConnectionProvider extends AbstractConnectionProvider {
     @Nullable
     private WebSocket openedSocked;
 
+    @Nullable
+    private CompletableWebSocketListener currentListener;
+
     OkHttpConnectionProvider(String uri, @Nullable Map<String, String> connectHttpHeaders, OkHttpClient okHttpClient) {
         super();
         mUri = uri;
@@ -34,11 +42,12 @@ class OkHttpConnectionProvider extends AbstractConnectionProvider {
         mOkHttpClient = okHttpClient;
     }
 
-    @NonNull
     @Override
     public void rawDisconnect() {
         if (openedSocked != null) {
             openedSocked.close(1000, "");
+            if (currentListener != null)
+                currentListener.getCompletable().blockingAwait();
         }
     }
 
@@ -49,52 +58,10 @@ void createWebSocketConnection() {
 
         addConnectionHeadersToBuilder(requestBuilder, mConnectHttpHeaders);
 
-        openedSocked = mOkHttpClient.newWebSocket(requestBuilder.build(),
-                new WebSocketListener() {
-                    @Override
-                    public void onOpen(WebSocket webSocket, @NonNull Response response) {
-                        LifecycleEvent openEvent = new LifecycleEvent(LifecycleEvent.Type.OPENED);
-
-                        TreeMap<String, String> headersAsMap = headersAsMap(response);
-
-                        openEvent.setHandshakeResponseHeaders(headersAsMap);
-                        emitLifecycleEvent(openEvent);
-                    }
-
-                    @Override
-                    public void onMessage(WebSocket webSocket, String text) {
-                        if (text.equals("\n"))
-                            Log.d(tag, "RECEIVED HEARTBEAT");
-                        else
-                            emitMessage(text);
-                    }
-
-                    @Override
-                    public void onMessage(WebSocket webSocket, @NonNull ByteString bytes) {
-                        emitMessage(bytes.utf8());
-                    }
-
-                    @Override
-                    public void onClosed(WebSocket webSocket, int code, String reason) {
-                        openedSocked = null;
-                        emitLifecycleEvent(new LifecycleEvent(LifecycleEvent.Type.CLOSED));
-                    }
-
-                    @Override
-                    public void onFailure(WebSocket webSocket, Throwable t, Response response) {
-                        // in OkHttp, a Failure is equivalent to a JWS-Error *and* a JWS-Close
-                        emitLifecycleEvent(new LifecycleEvent(LifecycleEvent.Type.ERROR, new Exception(t)));
-                        openedSocked = null;
-                        emitLifecycleEvent(new LifecycleEvent(LifecycleEvent.Type.CLOSED));
-                    }
-
-                    @Override
-                    public void onClosing(final WebSocket webSocket, final int code, final String reason) {
-                        webSocket.close(code, reason);
-                    }
-                }
-
-        );
+        currentListener = new CompletableWebSocketListener();
+
+        openedSocked = mOkHttpClient
+                .newWebSocket(requestBuilder.build(), currentListener);
     }
 
     @Override
@@ -123,4 +90,76 @@ private void addConnectionHeadersToBuilder(@NonNull Request.Builder requestBuild
             requestBuilder.addHeader(headerEntry.getKey(), headerEntry.getValue());
         }
     }
+
+    private class CompletableWebSocketListener extends WebSocketListener implements CompletableOnSubscribe {
+        private List<CompletableEmitter> mEmitters = new ArrayList<>();
+        private Completable mCompletable = Completable.create(this);
+
+        @Override
+        public void onOpen(WebSocket webSocket, @NonNull Response response) {
+            LifecycleEvent openEvent = new LifecycleEvent(LifecycleEvent.Type.OPENED);
+
+            TreeMap<String, String> headersAsMap = headersAsMap(response);
+
+            openEvent.setHandshakeResponseHeaders(headersAsMap);
+            emitLifecycleEvent(openEvent);
+        }
+
+        @Override
+        public void onMessage(WebSocket webSocket, String text) {
+            if (text.equals("\n"))
+                Log.d(tag, "RECEIVED HEARTBEAT");
+            else
+                emitMessage(text);
+        }
+
+        @Override
+        public void onMessage(WebSocket webSocket, @NonNull ByteString bytes) {
+            emitMessage(bytes.utf8());
+        }
+
+        @Override
+        public void onClosed(WebSocket webSocket, int code, String reason) {
+            openedSocked = null;
+            emitLifecycleEvent(new LifecycleEvent(LifecycleEvent.Type.CLOSED));
+            launchCloseEvent();
+        }
+
+        @Override
+        public void onFailure(WebSocket webSocket, Throwable t, Response response) {
+            // in OkHttp, a Failure is equivalent to a JWS-Error *and* a JWS-Close
+            emitLifecycleEvent(new LifecycleEvent(LifecycleEvent.Type.ERROR, new Exception(t)));
+            openedSocked = null;
+            emitLifecycleEvent(new LifecycleEvent(LifecycleEvent.Type.CLOSED));
+            launchErrorEvent(t);
+        }
+
+        @Override
+        public void onClosing(final WebSocket webSocket, final int code, final String reason) {
+            webSocket.close(code, reason);
+        }
+
+        @Override
+        public void subscribe(CompletableEmitter emitter) {
+            mEmitters.add(emitter);
+        }
+
+        private Completable getCompletable(){
+            return mCompletable;
+        }
+
+        private void launchCloseEvent(){
+            for (CompletableEmitter emitter : mEmitters) {
+                if(!emitter.isDisposed())
+                    emitter.onComplete();
+            }
+        }
+
+        private void launchErrorEvent(Throwable t){
+            for (CompletableEmitter emitter : mEmitters) {
+                if(!emitter.isDisposed())
+                    emitter.onError(t);
+            }
+        }
+    }
 }

From 4b392f3a9e47c938270f2dd16e0b7887d0b5481f Mon Sep 17 00:00:00 2001
From: GuilhermeJ <Ubivisnb11>
Date: Thu, 12 Jul 2018 19:59:03 -0300
Subject: [PATCH 072/110] Better encapsulation of completable

---
 .../ua/naiksoftware/stomp/OkHttpConnectionProvider.java     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java b/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java
index e2c127c..d518f55 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java
@@ -47,7 +47,7 @@ public void rawDisconnect() {
         if (openedSocked != null) {
             openedSocked.close(1000, "");
             if (currentListener != null)
-                currentListener.getCompletable().blockingAwait();
+                currentListener.awaitCloseBlocking();
         }
     }
 
@@ -144,8 +144,8 @@ public void subscribe(CompletableEmitter emitter) {
             mEmitters.add(emitter);
         }
 
-        private Completable getCompletable(){
-            return mCompletable;
+        private void awaitCloseBlocking(){
+            mCompletable.blockingAwait();
         }
 
         private void launchCloseEvent(){

From 36a0cfc8256ca86d9687e661a6fa274d836856f3 Mon Sep 17 00:00:00 2001
From: GuilhermeJ <Ubivisnb11>
Date: Mon, 16 Jul 2018 15:29:24 -0300
Subject: [PATCH 073/110] Better treatment of InterruptionException in blocking
 method

---
 .../stomp/WebSocketsConnectionProvider.java            | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java b/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java
index f345dcf..92e1151 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java
@@ -48,11 +48,11 @@ class WebSocketsConnectionProvider extends AbstractConnectionProvider {
 
     @Override
     public void rawDisconnect() {
-        while(!mWebSocketClient.isClosed()) {
-            try {
-                mWebSocketClient.closeBlocking();
-                break;
-            } catch (InterruptedException ignored) { }
+        try {
+            mWebSocketClient.closeBlocking();
+        } catch (InterruptedException e) {
+            Log.e(TAG, "Thread interrupted while waiting for Websocket closing: ", e);
+            throw new RuntimeException(e);
         }
     }
 

From 1a5368f9a158f377b9d38333fcbd2453aa8626ef Mon Sep 17 00:00:00 2001
From: GuilhermeJ <Ubivisnb11>
Date: Mon, 16 Jul 2018 15:44:13 -0300
Subject: [PATCH 074/110] Using CompletableSource in the place of
 CompletableOnSubscribe

---
 .../stomp/OkHttpConnectionProvider.java       | 51 +++++++++----------
 1 file changed, 25 insertions(+), 26 deletions(-)

diff --git a/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java b/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java
index d518f55..06f6657 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java
@@ -11,8 +11,8 @@
 import java.util.TreeMap;
 
 import io.reactivex.Completable;
-import io.reactivex.CompletableEmitter;
-import io.reactivex.CompletableOnSubscribe;
+import io.reactivex.CompletableObserver;
+import io.reactivex.CompletableSource;
 import okhttp3.Headers;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
@@ -30,10 +30,10 @@ class OkHttpConnectionProvider extends AbstractConnectionProvider {
     private final String tag = OkHttpConnectionProvider.class.getSimpleName();
 
     @Nullable
-    private WebSocket openedSocked;
+    private WebSocket openSocket;
 
     @Nullable
-    private CompletableWebSocketListener currentListener;
+    private CompletableWebSocketListener socketListener;
 
     OkHttpConnectionProvider(String uri, @Nullable Map<String, String> connectHttpHeaders, OkHttpClient okHttpClient) {
         super();
@@ -44,10 +44,10 @@ class OkHttpConnectionProvider extends AbstractConnectionProvider {
 
     @Override
     public void rawDisconnect() {
-        if (openedSocked != null) {
-            openedSocked.close(1000, "");
-            if (currentListener != null)
-                currentListener.awaitCloseBlocking();
+        if (openSocket != null) {
+            openSocket.close(1000, "");
+            if (socketListener != null)
+                socketListener.awaitCloseBlocking();
         }
     }
 
@@ -58,21 +58,21 @@ void createWebSocketConnection() {
 
         addConnectionHeadersToBuilder(requestBuilder, mConnectHttpHeaders);
 
-        currentListener = new CompletableWebSocketListener();
+        socketListener = new CompletableWebSocketListener();
 
-        openedSocked = mOkHttpClient
-                .newWebSocket(requestBuilder.build(), currentListener);
+        openSocket = mOkHttpClient
+                .newWebSocket(requestBuilder.build(), socketListener);
     }
 
     @Override
     void rawSend(String stompMessage) {
-        openedSocked.send(stompMessage);
+        openSocket.send(stompMessage);
     }
 
     @Nullable
     @Override
     Object getSocket() {
-        return openedSocked;
+        return openSocket;
     }
 
     @NonNull
@@ -91,9 +91,10 @@ private void addConnectionHeadersToBuilder(@NonNull Request.Builder requestBuild
         }
     }
 
-    private class CompletableWebSocketListener extends WebSocketListener implements CompletableOnSubscribe {
-        private List<CompletableEmitter> mEmitters = new ArrayList<>();
-        private Completable mCompletable = Completable.create(this);
+    // Class for a WS Listener that completes after the socket closes
+    private class CompletableWebSocketListener extends WebSocketListener implements CompletableSource {
+        private List<CompletableObserver> mObservers = new ArrayList<>();
+        private Completable mCompletable = Completable.wrap(this);
 
         @Override
         public void onOpen(WebSocket webSocket, @NonNull Response response) {
@@ -120,7 +121,7 @@ public void onMessage(WebSocket webSocket, @NonNull ByteString bytes) {
 
         @Override
         public void onClosed(WebSocket webSocket, int code, String reason) {
-            openedSocked = null;
+            openSocket = null;
             emitLifecycleEvent(new LifecycleEvent(LifecycleEvent.Type.CLOSED));
             launchCloseEvent();
         }
@@ -129,7 +130,7 @@ public void onClosed(WebSocket webSocket, int code, String reason) {
         public void onFailure(WebSocket webSocket, Throwable t, Response response) {
             // in OkHttp, a Failure is equivalent to a JWS-Error *and* a JWS-Close
             emitLifecycleEvent(new LifecycleEvent(LifecycleEvent.Type.ERROR, new Exception(t)));
-            openedSocked = null;
+            openSocket = null;
             emitLifecycleEvent(new LifecycleEvent(LifecycleEvent.Type.CLOSED));
             launchErrorEvent(t);
         }
@@ -140,8 +141,8 @@ public void onClosing(final WebSocket webSocket, final int code, final String re
         }
 
         @Override
-        public void subscribe(CompletableEmitter emitter) {
-            mEmitters.add(emitter);
+        public void subscribe (CompletableObserver observer) {
+            mObservers.add(observer);
         }
 
         private void awaitCloseBlocking(){
@@ -149,16 +150,14 @@ private void awaitCloseBlocking(){
         }
 
         private void launchCloseEvent(){
-            for (CompletableEmitter emitter : mEmitters) {
-                if(!emitter.isDisposed())
-                    emitter.onComplete();
+            for (CompletableObserver observer : mObservers) {
+                observer.onComplete();
             }
         }
 
         private void launchErrorEvent(Throwable t){
-            for (CompletableEmitter emitter : mEmitters) {
-                if(!emitter.isDisposed())
-                    emitter.onError(t);
+            for (CompletableObserver observer : mObservers) {
+                    observer.onError(t);
             }
         }
     }

From 4428c5d3661f5ffb376f5523c8523d61c630fb21 Mon Sep 17 00:00:00 2001
From: NaikSoftware <naiksav4enko@gmail.com>
Date: Fri, 3 Aug 2018 17:43:07 +0300
Subject: [PATCH 075/110] Add extra logs

---
 .../stomp/AbstractConnectionProvider.java            |  2 ++
 .../naiksoftware/stomp/OkHttpConnectionProvider.java | 12 ++++++++++--
 .../ua/naiksoftware/stomp/client/StompClient.java    | 12 +++++++++++-
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/lib/src/main/java/ua/naiksoftware/stomp/AbstractConnectionProvider.java b/lib/src/main/java/ua/naiksoftware/stomp/AbstractConnectionProvider.java
index bd1e2f8..3b59e10 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/AbstractConnectionProvider.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/AbstractConnectionProvider.java
@@ -31,6 +31,7 @@ abstract class AbstractConnectionProvider implements ConnectionProvider {
     @NonNull
     @Override
     public Observable<String> messages() {
+        Log.d(TAG, "messages()");
         return mMessagesStream.startWith(initSocket().toObservable());
     }
 
@@ -51,6 +52,7 @@ public Completable disconnect() {
     }
 
     private Completable initSocket() {
+        Log.d(TAG, "innitSocket");
         return Completable
                 .fromAction(this::createWebSocketConnection);
     }
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java b/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java
index c10fc26..5916378 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java
@@ -1,5 +1,6 @@
 package ua.naiksoftware.stomp;
 
+import android.nfc.Tag;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.util.Log;
@@ -18,11 +19,12 @@
 
 class OkHttpConnectionProvider extends AbstractConnectionProvider {
 
+    public static final String TAG = "OkHttpConnProvider";
+
     private final String mUri;
     @NonNull
     private final Map<String, String> mConnectHttpHeaders;
     private final OkHttpClient mOkHttpClient;
-    private final String tag = OkHttpConnectionProvider.class.getSimpleName();
 
     @Nullable
     private WebSocket openedSocked;
@@ -44,6 +46,7 @@ public void rawDisconnect() {
 
     @Override
     void createWebSocketConnection() {
+        Log.d(TAG, "createWebSocketConnection");
         Request.Builder requestBuilder = new Request.Builder()
                 .url(mUri);
 
@@ -53,6 +56,7 @@ void createWebSocketConnection() {
                 new WebSocketListener() {
                     @Override
                     public void onOpen(WebSocket webSocket, @NonNull Response response) {
+                        Log.d(TAG, "onOpen");
                         LifecycleEvent openEvent = new LifecycleEvent(LifecycleEvent.Type.OPENED);
 
                         TreeMap<String, String> headersAsMap = headersAsMap(response);
@@ -64,7 +68,7 @@ public void onOpen(WebSocket webSocket, @NonNull Response response) {
                     @Override
                     public void onMessage(WebSocket webSocket, String text) {
                         if (text.equals("\n"))
-                            Log.d(tag, "RECEIVED HEARTBEAT");
+                            Log.d(TAG, "RECEIVED HEARTBEAT");
                         else
                             emitMessage(text);
                     }
@@ -76,6 +80,7 @@ public void onMessage(WebSocket webSocket, @NonNull ByteString bytes) {
 
                     @Override
                     public void onClosed(WebSocket webSocket, int code, String reason) {
+                        Log.d(TAG, "onClosed (nullify socket)");
                         openedSocked = null;
                         emitLifecycleEvent(new LifecycleEvent(LifecycleEvent.Type.CLOSED));
                     }
@@ -83,6 +88,7 @@ public void onClosed(WebSocket webSocket, int code, String reason) {
                     @Override
                     public void onFailure(WebSocket webSocket, Throwable t, Response response) {
                         // in OkHttp, a Failure is equivalent to a JWS-Error *and* a JWS-Close
+                        Log.d(TAG, "onFailure (nullify socket)");
                         emitLifecycleEvent(new LifecycleEvent(LifecycleEvent.Type.ERROR, new Exception(t)));
                         openedSocked = null;
                         emitLifecycleEvent(new LifecycleEvent(LifecycleEvent.Type.CLOSED));
@@ -90,11 +96,13 @@ public void onFailure(WebSocket webSocket, Throwable t, Response response) {
 
                     @Override
                     public void onClosing(final WebSocket webSocket, final int code, final String reason) {
+                        Log.d(TAG, "onClosing");
                         webSocket.close(code, reason);
                     }
                 }
 
         );
+        Log.d(TAG, "Socket inited " + openedSocked);
     }
 
     @Override
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java b/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
index e83a477..b4add1c 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
@@ -100,13 +100,20 @@ public void connect() {
      * @param _headers HTTP headers to send in the INITIAL REQUEST, i.e. during the protocol upgrade
      */
     public void connect(@Nullable List<StompHeader> _headers) {
+
+        Log.d(TAG, "Connect");
+
         mHeaders = _headers;
 
-        if (mConnected) return;
+        if (mConnected) {
+            Log.d(TAG, "Already connected, ignore");
+            return;
+        }
         mLifecycleDisposable = mConnectionProvider.lifecycle()
                 .subscribe(lifecycleEvent -> {
                     switch (lifecycleEvent.getType()) {
                         case OPENED:
+                            Log.d(TAG, "Socket connected, send connect command to stomp");
                             List<StompHeader> headers = new ArrayList<>();
                             headers.add(new StompHeader(StompHeader.VERSION, SUPPORTED_VERSIONS));
                             headers.add(new StompHeader(StompHeader.HEART_BEAT, "0," + heartbeat));
@@ -116,17 +123,20 @@ public void connect(@Nullable List<StompHeader> _headers) {
                             break;
 
                         case CLOSED:
+                            Log.d(TAG, "Socket closed");
                             setConnected(false);
                             isConnecting = false;
                             break;
 
                         case ERROR:
+                            Log.d(TAG, "Socket closed with error");
                             setConnected(false);
                             isConnecting = false;
                             break;
                     }
                 });
 
+        Log.d(TAG, "Subscribe to messages for create connection");
         isConnecting = true;
         mMessagesDisposable = mConnectionProvider.messages()
                 .map(StompMessage::from)

From 51aaec46eed7ffde436903c46738e538952ca45a Mon Sep 17 00:00:00 2001
From: NaikSoftware <naiksav4enko@gmail.com>
Date: Fri, 3 Aug 2018 18:30:19 +0300
Subject: [PATCH 076/110] Fix fast disconnect/reconnect

---
 .../ua/naiksoftware/stomp/AbstractConnectionProvider.java | 2 --
 .../ua/naiksoftware/stomp/OkHttpConnectionProvider.java   | 8 ++------
 .../java/ua/naiksoftware/stomp/client/StompClient.java    | 2 --
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/lib/src/main/java/ua/naiksoftware/stomp/AbstractConnectionProvider.java b/lib/src/main/java/ua/naiksoftware/stomp/AbstractConnectionProvider.java
index 3b59e10..bd1e2f8 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/AbstractConnectionProvider.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/AbstractConnectionProvider.java
@@ -31,7 +31,6 @@ abstract class AbstractConnectionProvider implements ConnectionProvider {
     @NonNull
     @Override
     public Observable<String> messages() {
-        Log.d(TAG, "messages()");
         return mMessagesStream.startWith(initSocket().toObservable());
     }
 
@@ -52,7 +51,6 @@ public Completable disconnect() {
     }
 
     private Completable initSocket() {
-        Log.d(TAG, "innitSocket");
         return Completable
                 .fromAction(this::createWebSocketConnection);
     }
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java b/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java
index 5916378..2fac210 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java
@@ -46,7 +46,6 @@ public void rawDisconnect() {
 
     @Override
     void createWebSocketConnection() {
-        Log.d(TAG, "createWebSocketConnection");
         Request.Builder requestBuilder = new Request.Builder()
                 .url(mUri);
 
@@ -56,7 +55,6 @@ void createWebSocketConnection() {
                 new WebSocketListener() {
                     @Override
                     public void onOpen(WebSocket webSocket, @NonNull Response response) {
-                        Log.d(TAG, "onOpen");
                         LifecycleEvent openEvent = new LifecycleEvent(LifecycleEvent.Type.OPENED);
 
                         TreeMap<String, String> headersAsMap = headersAsMap(response);
@@ -80,15 +78,15 @@ public void onMessage(WebSocket webSocket, @NonNull ByteString bytes) {
 
                     @Override
                     public void onClosed(WebSocket webSocket, int code, String reason) {
-                        Log.d(TAG, "onClosed (nullify socket)");
+                        if (webSocket != openedSocked) return;
                         openedSocked = null;
                         emitLifecycleEvent(new LifecycleEvent(LifecycleEvent.Type.CLOSED));
                     }
 
                     @Override
                     public void onFailure(WebSocket webSocket, Throwable t, Response response) {
+                        if (webSocket != openedSocked) return;
                         // in OkHttp, a Failure is equivalent to a JWS-Error *and* a JWS-Close
-                        Log.d(TAG, "onFailure (nullify socket)");
                         emitLifecycleEvent(new LifecycleEvent(LifecycleEvent.Type.ERROR, new Exception(t)));
                         openedSocked = null;
                         emitLifecycleEvent(new LifecycleEvent(LifecycleEvent.Type.CLOSED));
@@ -96,13 +94,11 @@ public void onFailure(WebSocket webSocket, Throwable t, Response response) {
 
                     @Override
                     public void onClosing(final WebSocket webSocket, final int code, final String reason) {
-                        Log.d(TAG, "onClosing");
                         webSocket.close(code, reason);
                     }
                 }
 
         );
-        Log.d(TAG, "Socket inited " + openedSocked);
     }
 
     @Override
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java b/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
index b4add1c..8a543e2 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
@@ -113,7 +113,6 @@ public void connect(@Nullable List<StompHeader> _headers) {
                 .subscribe(lifecycleEvent -> {
                     switch (lifecycleEvent.getType()) {
                         case OPENED:
-                            Log.d(TAG, "Socket connected, send connect command to stomp");
                             List<StompHeader> headers = new ArrayList<>();
                             headers.add(new StompHeader(StompHeader.VERSION, SUPPORTED_VERSIONS));
                             headers.add(new StompHeader(StompHeader.HEART_BEAT, "0," + heartbeat));
@@ -136,7 +135,6 @@ public void connect(@Nullable List<StompHeader> _headers) {
                     }
                 });
 
-        Log.d(TAG, "Subscribe to messages for create connection");
         isConnecting = true;
         mMessagesDisposable = mConnectionProvider.messages()
                 .map(StompMessage::from)

From d129dbc24d56040525cc947fef6b6c541273141a Mon Sep 17 00:00:00 2001
From: Nickolay Savchenko <naiksav4enko@gmail.com>
Date: Fri, 3 Aug 2018 21:18:40 +0300
Subject: [PATCH 077/110] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 38fa3e0..c61019d 100644
--- a/README.md
+++ b/README.md
@@ -71,7 +71,7 @@ Check out the full example server https://github.com/NaikSoftware/stomp-protocol
  
  // ...
  
- mStompClient = Stomp.over(WebSocket.class, "ws://10.0.2.2:8080/example-endpoint/websocket");
+ mStompClient = Stomp.over(Stomp.ConnectionProvider.OKHTTP, "ws://10.0.2.2:8080/example-endpoint/websocket");
  mStompClient.connect();
   
  mStompClient.topic("/topic/greetings").subscribe(topicMessage -> {

From 053ee33012951b751063df8036da09167b7a5108 Mon Sep 17 00:00:00 2001
From: NaikSoftware <naiksav4enko@gmail.com>
Date: Fri, 3 Aug 2018 21:28:12 +0300
Subject: [PATCH 078/110] Update libs

---
 lib/build.gradle | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/build.gradle b/lib/build.gradle
index d5707fc..ca50e13 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -28,12 +28,12 @@ android {
 
 
 dependencies {
-    implementation "io.reactivex.rxjava2:rxjava:2.1.8"
+    implementation "io.reactivex.rxjava2:rxjava:2.1.15"
     // Supported transports
     compileOnly 'org.java-websocket:Java-WebSocket:1.3.6'
-    compileOnly 'com.squareup.okhttp3:okhttp:3.9.1'
+    compileOnly 'com.squareup.okhttp3:okhttp:3.10.0'
     
-    implementation 'com.android.support:support-annotations:27.1.0'
+    implementation 'com.android.support:support-annotations:27.1.1'
 }
 
 task sourcesJar(type: Jar) {

From 6e5ea6397385d3bf29e7e2d890beba72b0d23ffd Mon Sep 17 00:00:00 2001
From: Nickolay Savchenko <savchenko@river-soft.net>
Date: Tue, 4 Dec 2018 17:14:54 +0200
Subject: [PATCH 079/110] Update dependencies

---
 example-client/build.gradle | 10 +++++-----
 lib/build.gradle            |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/example-client/build.gradle b/example-client/build.gradle
index 69361c2..cdd5e53 100644
--- a/example-client/build.gradle
+++ b/example-client/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion '26.0.2'
+    compileSdkVersion 28
+    buildToolsVersion '28.0.3'
 
     defaultConfig {
         applicationId "ua.naiksoftware.stompclientexample"
         minSdkVersion 16
-        targetSdkVersion 25
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
     }
@@ -27,9 +27,9 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     testCompile 'junit:junit:4.12'
-    compile 'com.android.support:appcompat-v7:25.3.1'
+    compile 'com.android.support:appcompat-v7:28.0.0'
     compile 'org.java-websocket:Java-WebSocket:1.3.6'
-    compile 'com.android.support:recyclerview-v7:25.3.1'
+    compile 'com.android.support:recyclerview-v7:28.0.0'
     compile 'io.reactivex.rxjava2:rxandroid:2.0.1'
     compile 'com.squareup.retrofit2:converter-gson:2.3.0'
     compile 'com.squareup.retrofit2:adapter-rxjava2:2.3.0'
diff --git a/lib/build.gradle b/lib/build.gradle
index ca50e13..295111d 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -4,7 +4,7 @@ apply plugin: 'com.github.dcendents.android-maven'
 group='com.github.NaikSoftware'
 
 android {
-    compileSdkVersion 25
+    compileSdkVersion 28
 
     defaultConfig {
         minSdkVersion 16
@@ -33,7 +33,7 @@ dependencies {
     compileOnly 'org.java-websocket:Java-WebSocket:1.3.6'
     compileOnly 'com.squareup.okhttp3:okhttp:3.10.0'
     
-    implementation 'com.android.support:support-annotations:27.1.1'
+    implementation 'com.android.support:support-annotations:28.0.0'
 }
 
 task sourcesJar(type: Jar) {

From 1fe63f1755995a1ab9eb95a6e2b3c34d0e2dee79 Mon Sep 17 00:00:00 2001
From: Nickolay Savchenko <savchenko@river-soft.net>
Date: Tue, 4 Dec 2018 18:24:22 +0200
Subject: [PATCH 080/110] Add test_server module

---
 .idea/gradle.xml                              |  2 +
 .idea/misc.xml                                | 21 +++++++---
 .idea/modules.xml                             |  3 +-
 .idea/runConfigurations.xml                   | 12 ------
 README.md                                     |  2 +-
 .../stompclientexample/ApplicationTest.java   | 13 -------
 .../naiksoftware/stomp/ExampleUnitTest.java   | 15 --------
 settings.gradle                               |  2 +-
 test-server/README.md                         |  5 +++
 test-server/build.gradle                      | 38 +++++++++++++++++++
 .../ua/naiksoftware/test_server/Main.groovy   | 13 +++++++
 .../test_server/config/WebSocketConfig.groovy | 37 ++++++++++++++++++
 .../controller/SocketController.groovy        | 35 +++++++++++++++++
 .../test_server/model/EchoModel.groovy        | 12 ++++++
 .../test_server/service/SocketService.groovy  | 24 ++++++++++++
 .../src/main/resources/application.properties |  4 ++
 16 files changed, 190 insertions(+), 48 deletions(-)
 delete mode 100644 .idea/runConfigurations.xml
 delete mode 100644 example-client/src/androidTest/java/ua/naiksoftware/stompclientexample/ApplicationTest.java
 delete mode 100644 lib/src/test/java/ua/naiksoftware/stomp/ExampleUnitTest.java
 create mode 100644 test-server/README.md
 create mode 100644 test-server/build.gradle
 create mode 100644 test-server/src/main/groovy/ua/naiksoftware/test_server/Main.groovy
 create mode 100644 test-server/src/main/groovy/ua/naiksoftware/test_server/config/WebSocketConfig.groovy
 create mode 100644 test-server/src/main/groovy/ua/naiksoftware/test_server/controller/SocketController.groovy
 create mode 100644 test-server/src/main/groovy/ua/naiksoftware/test_server/model/EchoModel.groovy
 create mode 100644 test-server/src/main/groovy/ua/naiksoftware/test_server/service/SocketService.groovy
 create mode 100644 test-server/src/main/resources/application.properties

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index e9273c1..101d509 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -5,11 +5,13 @@
       <GradleProjectSettings>
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="1.8" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/example-client" />
             <option value="$PROJECT_DIR$/lib" />
+            <option value="$PROJECT_DIR$/test-server" />
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 4c9d020..2001d5e 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,33 +1,44 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="EntryPointsManager">
-    <entry_points version="2.0" />
+  <component name="JavaScriptSettings">
+    <option name="languageLevel" value="ES6" />
   </component>
   <component name="NullableNotNullManager">
     <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
     <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
     <option name="myNullables">
       <value>
-        <list size="4">
+        <list size="10">
           <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
           <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
           <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
           <item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
+          <item index="4" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
+          <item index="5" class="java.lang.String" itemvalue="androidx.annotation.Nullable" />
+          <item index="6" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNullable" />
+          <item index="7" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.Nullable" />
+          <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableDecl" />
+          <item index="9" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableType" />
         </list>
       </value>
     </option>
     <option name="myNotNulls">
       <value>
-        <list size="4">
+        <list size="9">
           <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
           <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
           <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
           <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
+          <item index="4" class="java.lang.String" itemvalue="androidx.annotation.NonNull" />
+          <item index="5" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNonNull" />
+          <item index="6" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.NonNull" />
+          <item index="7" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullDecl" />
+          <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullType" />
         </list>
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="JDK" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/.idea/modules.xml b/.idea/modules.xml
index c265543..8170861 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,9 +2,10 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/StompProtocolAndroid.iml" filepath="$PROJECT_DIR$/StompProtocolAndroid.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/StompProtocolAndroid.iml" filepath="$PROJECT_DIR$/.idea/StompProtocolAndroid.iml" />
       <module fileurl="file://$PROJECT_DIR$/example-client/example-client.iml" filepath="$PROJECT_DIR$/example-client/example-client.iml" />
       <module fileurl="file://$PROJECT_DIR$/lib/lib.iml" filepath="$PROJECT_DIR$/lib/lib.iml" />
+      <module fileurl="file://$PROJECT_DIR$/test-server/test-server.iml" filepath="$PROJECT_DIR$/test-server/test-server.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
deleted file mode 100644
index 7f68460..0000000
--- a/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/README.md b/README.md
index c61019d..81374f5 100644
--- a/README.md
+++ b/README.md
@@ -46,7 +46,7 @@ class WebSocketConfig extends AbstractWebSocketMessageBrokerConfigurer {
 
 **SocketController.groovy**
 ``` groovy
-@Log4j
+@Slf4j
 @RestController
 class SocketController {
 
diff --git a/example-client/src/androidTest/java/ua/naiksoftware/stompclientexample/ApplicationTest.java b/example-client/src/androidTest/java/ua/naiksoftware/stompclientexample/ApplicationTest.java
deleted file mode 100644
index 3a0f4c2..0000000
--- a/example-client/src/androidTest/java/ua/naiksoftware/stompclientexample/ApplicationTest.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package ua.naiksoftware.stompclientexample;
-
-import android.app.Application;
-import android.test.ApplicationTestCase;
-
-/**
- * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
- */
-public class ApplicationTest extends ApplicationTestCase<Application> {
-    public ApplicationTest() {
-        super(Application.class);
-    }
-}
\ No newline at end of file
diff --git a/lib/src/test/java/ua/naiksoftware/stomp/ExampleUnitTest.java b/lib/src/test/java/ua/naiksoftware/stomp/ExampleUnitTest.java
deleted file mode 100644
index 3b89b15..0000000
--- a/lib/src/test/java/ua/naiksoftware/stomp/ExampleUnitTest.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package ua.naiksoftware.stomp;
-
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * To work on unit tests, switch the Test Artifact in the Build Variants view.
- */
-public class ExampleUnitTest {
-    @Test
-    public void addition_isCorrect() throws Exception {
-        assertEquals(4, 2 + 2);
-    }
-}
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index e5b9f10..7b57977 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-include ':example-client', ':lib'
+include ':example-client', ':lib', ':test-server'
diff --git a/test-server/README.md b/test-server/README.md
new file mode 100644
index 0000000..e4a5bc7
--- /dev/null
+++ b/test-server/README.md
@@ -0,0 +1,5 @@
+# Example backend with STOMP
+
+Backend for project https://github.com/NaikSoftware/StompProtocolAndroid/tree/master/example-client
+
+You need configure MQ server before (for example RabbitMQ or ActiveMQ)
\ No newline at end of file
diff --git a/test-server/build.gradle b/test-server/build.gradle
new file mode 100644
index 0000000..df19f3a
--- /dev/null
+++ b/test-server/build.gradle
@@ -0,0 +1,38 @@
+group 'ua.naiksoftware.example_server'
+version '1.0-SNAPSHOT'
+
+buildscript {
+
+    ext {
+        springBootVersion = '2.0.6.RELEASE'
+        springCloudVersion = 'Finchley.SR1'
+    }
+    
+    repositories {
+        mavenCentral()
+    }
+    dependencies {
+        classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}")
+    }
+}
+
+apply plugin: 'groovy'
+apply plugin: 'org.springframework.boot'
+apply plugin: 'io.spring.dependency-management'
+
+sourceCompatibility = JavaVersion.VERSION_1_8
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    compile("org.springframework.boot:spring-boot-starter-websocket")
+    compile 'org.codehaus.groovy:groovy-all:2.4.15'
+}
+
+dependencyManagement {
+    imports {
+        mavenBom "org.springframework.cloud:spring-cloud-dependencies:${springCloudVersion}"
+    }
+}
diff --git a/test-server/src/main/groovy/ua/naiksoftware/test_server/Main.groovy b/test-server/src/main/groovy/ua/naiksoftware/test_server/Main.groovy
new file mode 100644
index 0000000..1809f9d
--- /dev/null
+++ b/test-server/src/main/groovy/ua/naiksoftware/test_server/Main.groovy
@@ -0,0 +1,13 @@
+package ua.naiksoftware.test_server
+
+import org.springframework.boot.SpringApplication
+import org.springframework.boot.autoconfigure.SpringBootApplication
+
+@SpringBootApplication
+class Main {
+
+    static void main(String[] args) {
+        SpringApplication.run(Main.class, args);
+    }
+
+}
\ No newline at end of file
diff --git a/test-server/src/main/groovy/ua/naiksoftware/test_server/config/WebSocketConfig.groovy b/test-server/src/main/groovy/ua/naiksoftware/test_server/config/WebSocketConfig.groovy
new file mode 100644
index 0000000..2a8a96c
--- /dev/null
+++ b/test-server/src/main/groovy/ua/naiksoftware/test_server/config/WebSocketConfig.groovy
@@ -0,0 +1,37 @@
+package ua.naiksoftware.test_server.config
+
+
+import org.springframework.context.annotation.Configuration
+import org.springframework.messaging.simp.config.MessageBrokerRegistry
+import org.springframework.web.socket.config.annotation.AbstractWebSocketMessageBrokerConfigurer
+import org.springframework.web.socket.config.annotation.EnableWebSocket
+import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker
+import org.springframework.web.socket.config.annotation.StompEndpointRegistry
+import org.springframework.web.socket.config.annotation.WebSocketTransportRegistration
+
+/**
+ * Created by naik on 04.05.16.
+ */
+@Configuration
+@EnableWebSocket
+@EnableWebSocketMessageBroker
+class WebSocketConfig extends AbstractWebSocketMessageBrokerConfigurer {
+
+    @Override
+    void configureMessageBroker(MessageBrokerRegistry config) {
+        config.enableSimpleBroker("/topic", "/queue", "/exchange");
+//        config.enableStompBrokerRelay("/topic", "/queue", "/exchange"); // Uncomment for external message broker (ActiveMQ, RabbitMQ)
+        config.setApplicationDestinationPrefixes("/topic", "/queue"); // prefix in client queries
+        config.setUserDestinationPrefix("/user");
+    }
+
+    @Override
+    void registerStompEndpoints(StompEndpointRegistry registry) {
+        registry.addEndpoint("/example-endpoint").withSockJS()
+    }
+
+    @Override
+    void configureWebSocketTransport(WebSocketTransportRegistration registration) {
+        registration.setMessageSizeLimit(8 * 1024);
+    }
+}
diff --git a/test-server/src/main/groovy/ua/naiksoftware/test_server/controller/SocketController.groovy b/test-server/src/main/groovy/ua/naiksoftware/test_server/controller/SocketController.groovy
new file mode 100644
index 0000000..112ca2a
--- /dev/null
+++ b/test-server/src/main/groovy/ua/naiksoftware/test_server/controller/SocketController.groovy
@@ -0,0 +1,35 @@
+package ua.naiksoftware.test_server.controller
+
+import groovy.util.logging.Slf4j
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.messaging.handler.annotation.MessageMapping
+import org.springframework.messaging.handler.annotation.SendTo
+import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RequestMethod
+import org.springframework.web.bind.annotation.RequestParam
+import org.springframework.web.bind.annotation.RestController
+import ua.naiksoftware.test_server.model.EchoModel
+import ua.naiksoftware.test_server.service.SocketService
+
+/**
+ * Created by Naik on 23.02.17.
+ */
+@Slf4j
+@RestController
+class SocketController {
+
+    @Autowired
+    SocketService socketService
+
+    @MessageMapping('/hello-msg-mapping')
+    @SendTo('/topic/greetings')
+    EchoModel echoMessageMapping(String message) {
+        log.debug("React to hello-msg-mapping")
+        return new EchoModel(message.trim())
+    }
+
+    @RequestMapping(value = '/hello-convert-and-send', method = RequestMethod.POST)
+    void echoConvertAndSend(@RequestParam('msg') String message) {
+        socketService.echoMessage(message)
+    }
+}
diff --git a/test-server/src/main/groovy/ua/naiksoftware/test_server/model/EchoModel.groovy b/test-server/src/main/groovy/ua/naiksoftware/test_server/model/EchoModel.groovy
new file mode 100644
index 0000000..3b16687
--- /dev/null
+++ b/test-server/src/main/groovy/ua/naiksoftware/test_server/model/EchoModel.groovy
@@ -0,0 +1,12 @@
+package ua.naiksoftware.test_server.model
+
+/**
+ * Created by Naik on 23.02.17.
+ */
+class EchoModel {
+
+    EchoModel(String echo) {
+        this.echo = echo
+    }
+    String echo;
+}
diff --git a/test-server/src/main/groovy/ua/naiksoftware/test_server/service/SocketService.groovy b/test-server/src/main/groovy/ua/naiksoftware/test_server/service/SocketService.groovy
new file mode 100644
index 0000000..d4ff983
--- /dev/null
+++ b/test-server/src/main/groovy/ua/naiksoftware/test_server/service/SocketService.groovy
@@ -0,0 +1,24 @@
+package ua.naiksoftware.test_server.service
+
+import groovy.util.logging.Slf4j
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.messaging.simp.SimpMessagingTemplate
+import org.springframework.stereotype.Service
+import ua.naiksoftware.test_server.model.EchoModel
+
+/**
+ * Created by Naik on 23.02.17.
+ */
+@Slf4j
+@Service
+class SocketService {
+
+    @Autowired
+    private SimpMessagingTemplate simpTemplate;
+
+    def echoMessage(String message) {
+        log.debug("Start convertAndSend ${new Date()}")
+        simpTemplate.convertAndSend('/topic/greetings', new EchoModel(message))
+        log.debug("End convertAndSend ${new Date()}")
+    }
+}
diff --git a/test-server/src/main/resources/application.properties b/test-server/src/main/resources/application.properties
new file mode 100644
index 0000000..8fa6760
--- /dev/null
+++ b/test-server/src/main/resources/application.properties
@@ -0,0 +1,4 @@
+spring.jackson.deserialization.accept_empty_string_as_null_object=true
+spring.jackson.property-naming-strategy=CAMEL_CASE_TO_LOWER_CASE_WITH_UNDERSCORES
+spring.jackson.serialization.write_char_arrays_as_json_arrays=true
+spring.jackson.serialization-inclusion=NON_NULL
\ No newline at end of file

From 01681dd2644b4040d3fb2898b998bd834cc8108f Mon Sep 17 00:00:00 2001
From: Nickolay Savchenko <savchenko@river-soft.net>
Date: Tue, 4 Dec 2018 20:04:10 +0200
Subject: [PATCH 081/110] Update

---
 build.gradle                                  |  2 +-
 gradle/wrapper/gradle-wrapper.properties      |  2 +-
 test-server/build.gradle                      | 18 ++++++++--
 .../src/test/groovy/BaseContextLoader.groovy  | 33 +++++++++++++++++++
 4 files changed, 50 insertions(+), 5 deletions(-)
 create mode 100644 test-server/src/test/groovy/BaseContextLoader.groovy

diff --git a/build.gradle b/build.gradle
index ff57bcc..6303650 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,7 +9,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.2.1'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index d72e173..f06581d 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
diff --git a/test-server/build.gradle b/test-server/build.gradle
index df19f3a..d05f9c8 100644
--- a/test-server/build.gradle
+++ b/test-server/build.gradle
@@ -1,5 +1,5 @@
-group 'ua.naiksoftware.example_server'
-version '1.0-SNAPSHOT'
+group 'ua.naiksoftware.test_server'
+version '1.0'
 
 buildscript {
 
@@ -27,8 +27,15 @@ repositories {
 }
 
 dependencies {
-    compile("org.springframework.boot:spring-boot-starter-websocket")
+    compile 'org.springframework.boot:spring-boot-starter-websocket'
+    compile 'org.springframework.boot:spring-boot-starter-web'
     compile 'org.codehaus.groovy:groovy-all:2.4.15'
+
+    testCompile 'org.springframework.boot:spring-boot-starter-test'
+    testCompile 'org.springframework.security:spring-security-test'
+    testCompile 'org.testcontainers:testcontainers:1.8.0'
+    testCompile 'org.spockframework:spock-core:1.1-groovy-2.4'
+    testCompile 'org.spockframework:spock-spring:1.1-groovy-2.4'
 }
 
 dependencyManagement {
@@ -36,3 +43,8 @@ dependencyManagement {
         mavenBom "org.springframework.cloud:spring-cloud-dependencies:${springCloudVersion}"
     }
 }
+
+bootJar {
+    destinationDir = new File("./build/artifacts")
+}
+
diff --git a/test-server/src/test/groovy/BaseContextLoader.groovy b/test-server/src/test/groovy/BaseContextLoader.groovy
new file mode 100644
index 0000000..52d1753
--- /dev/null
+++ b/test-server/src/test/groovy/BaseContextLoader.groovy
@@ -0,0 +1,33 @@
+import org.springframework.boot.test.context.SpringBootTest
+import org.springframework.context.ApplicationContextInitializer
+import org.springframework.context.ConfigurableApplicationContext
+import org.springframework.test.context.ActiveProfiles
+import org.springframework.test.context.ContextConfiguration
+import org.testcontainers.containers.BindMode
+import org.testcontainers.containers.GenericContainer
+import org.testcontainers.containers.wait.strategy.Wait
+import spock.lang.Shared
+import spock.lang.Specification
+import ua.naiksoftware.test_server.Main
+
+@ActiveProfiles(['test'])
+@SpringBootTest(classes = Main.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+@ContextConfiguration(initializers = BaseContextLoader.class)
+class BaseContextLoader extends Specification implements ApplicationContextInitializer<ConfigurableApplicationContext> {
+
+    @Shared
+    static GenericContainer testServer
+
+    @Override
+    void initialize(ConfigurableApplicationContext configurableApplicationContext) {
+
+        new ProcessBuilder('./gradlew bootJar')
+                .start().waitForProcessOutput(System.out as Appendable, System.err as Appendable)
+
+        testServer = new GenericContainer('openjdk:8-jre-alpine')
+                .withClasspathResourceMapping('./build/artifacts/test-server-1.0.jar', '/app.jar', BindMode.READ_ONLY)
+                .withCommand('java -jar /app.jar')
+                .waitingFor(Wait.forHttp('/health'))
+                .withExposedPorts(80)
+    }
+}

From 63c74ad1f24146ab20c47a9464ed45ea376bbf86 Mon Sep 17 00:00:00 2001
From: Nickolay Savchenko <savchenko@river-soft.net>
Date: Tue, 4 Dec 2018 21:02:30 +0200
Subject: [PATCH 082/110] Move tests

---
 .idea/compiler.xml                            | 22 ---------
 .idea/copyright/profiles_settings.xml         |  3 --
 .idea/gradle.xml                              |  3 +-
 .idea/misc.xml                                | 46 ++-----------------
 .idea/modules.xml                             | 11 -----
 build.gradle                                  | 30 ------------
 example-client/build.gradle                   | 20 ++++++++
 lib/build.gradle                              | 23 ++++++++++
 .../naiksoftware/stomp/Configuration.groovy   | 25 ++++++++++
 .../naiksoftware/stomp/ConnectionTests.groovy | 20 ++++++++
 test-server/build.gradle                      |  7 +--
 .../src/test/groovy/BaseContextLoader.groovy  | 33 -------------
 12 files changed, 93 insertions(+), 150 deletions(-)
 delete mode 100644 .idea/compiler.xml
 delete mode 100644 .idea/copyright/profiles_settings.xml
 delete mode 100644 .idea/modules.xml
 delete mode 100644 build.gradle
 create mode 100644 lib/src/test/groovy/ua/naiksoftware/stomp/Configuration.groovy
 create mode 100644 lib/src/test/groovy/ua/naiksoftware/stomp/ConnectionTests.groovy
 delete mode 100644 test-server/src/test/groovy/BaseContextLoader.groovy

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
deleted file mode 100644
index 96cc43e..0000000
--- a/.idea/compiler.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <resourceExtensions />
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-      <entry name="!?*.aj" />
-    </wildcardResourcePatterns>
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-    </annotationProcessing>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index e7bedf3..0000000
--- a/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 101d509..0e08791 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -5,7 +5,6 @@
       <GradleProjectSettings>
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="1.8" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
@@ -14,7 +13,7 @@
             <option value="$PROJECT_DIR$/test-server" />
           </set>
         </option>
-        <option name="resolveModulePerSourceSet" value="false" />
+        <option name="useQualifiedModuleNames" value="true" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 2001d5e..bc8d0a3 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,47 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="JavaScriptSettings">
-    <option name="languageLevel" value="ES6" />
-  </component>
-  <component name="NullableNotNullManager">
-    <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
-    <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
-    <option name="myNullables">
-      <value>
-        <list size="10">
-          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
-          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
-          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
-          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
-          <item index="4" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
-          <item index="5" class="java.lang.String" itemvalue="androidx.annotation.Nullable" />
-          <item index="6" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNullable" />
-          <item index="7" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.Nullable" />
-          <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableDecl" />
-          <item index="9" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableType" />
-        </list>
-      </value>
-    </option>
-    <option name="myNotNulls">
-      <value>
-        <list size="9">
-          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
-          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
-          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
-          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
-          <item index="4" class="java.lang.String" itemvalue="androidx.annotation.NonNull" />
-          <item index="5" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNonNull" />
-          <item index="6" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.NonNull" />
-          <item index="7" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullDecl" />
-          <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullType" />
-        </list>
-      </value>
-    </option>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/build/classes" />
-  </component>
-  <component name="ProjectType">
-    <option name="id" value="Android" />
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index 8170861..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/StompProtocolAndroid.iml" filepath="$PROJECT_DIR$/.idea/StompProtocolAndroid.iml" />
-      <module fileurl="file://$PROJECT_DIR$/example-client/example-client.iml" filepath="$PROJECT_DIR$/example-client/example-client.iml" />
-      <module fileurl="file://$PROJECT_DIR$/lib/lib.iml" filepath="$PROJECT_DIR$/lib/lib.iml" />
-      <module fileurl="file://$PROJECT_DIR$/test-server/test-server.iml" filepath="$PROJECT_DIR$/test-server/test-server.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
deleted file mode 100644
index 6303650..0000000
--- a/build.gradle
+++ /dev/null
@@ -1,30 +0,0 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-
-buildscript {
-    repositories {
-        jcenter()
-        maven {
-            url "https://maven.google.com"
-        }
-        google()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
-
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
-    }
-}
-
-allprojects {
-    repositories {
-        jcenter()
-        maven { url "https://jitpack.io" }
-        google()
-    }
-}
-
-task clean(type: Delete) {
-    delete rootProject.buildDir
-}
diff --git a/example-client/build.gradle b/example-client/build.gradle
index cdd5e53..c1eaa7f 100644
--- a/example-client/build.gradle
+++ b/example-client/build.gradle
@@ -1,3 +1,23 @@
+buildscript {
+    repositories {
+        jcenter()
+        maven {
+            url "https://maven.google.com"
+        }
+        google()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
+    }
+}
+
+repositories {
+    jcenter()
+    maven { url "https://jitpack.io" }
+    google()
+}
+
 apply plugin: 'com.android.application'
 
 android {
diff --git a/lib/build.gradle b/lib/build.gradle
index 295111d..061a955 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -1,3 +1,22 @@
+buildscript {
+    repositories {
+        jcenter()
+        maven {
+            url "https://maven.google.com"
+        }
+        google()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
+    }
+}
+
+repositories {
+    jcenter()
+    google()
+}
+
 apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
 
@@ -34,6 +53,10 @@ dependencies {
     compileOnly 'com.squareup.okhttp3:okhttp:3.10.0'
     
     implementation 'com.android.support:support-annotations:28.0.0'
+
+    testImplementation 'org.testcontainers:testcontainers:1.8.0'
+    testImplementation 'org.spockframework:spock-core:1.1-groovy-2.4'
+    testImplementation 'org.spockframework:spock-spring:1.1-groovy-2.4'
 }
 
 task sourcesJar(type: Jar) {
diff --git a/lib/src/test/groovy/ua/naiksoftware/stomp/Configuration.groovy b/lib/src/test/groovy/ua/naiksoftware/stomp/Configuration.groovy
new file mode 100644
index 0000000..73680e1
--- /dev/null
+++ b/lib/src/test/groovy/ua/naiksoftware/stomp/Configuration.groovy
@@ -0,0 +1,25 @@
+package ua.naiksoftware.stomp
+
+import org.testcontainers.containers.BindMode
+import org.testcontainers.containers.GenericContainer
+import org.testcontainers.containers.wait.strategy.Wait
+import spock.lang.Shared
+import spock.lang.Specification
+
+class Configuration extends Specification implements ApplicationContextInitializer<ConfigurableApplicationContext> {
+
+    @Shared
+    static GenericContainer testServer = setupServer()
+
+    GenericContainer setupServer() {
+
+        new ProcessBuilder('./gradlew bootJar')
+                .start().waitForProcessOutput(System.out as Appendable, System.err as Appendable)
+
+        return new GenericContainer('openjdk:8-jre-alpine')
+                .withClasspathResourceMapping('./build/artifacts/test-server-1.0.jar', '/app.jar', BindMode.READ_ONLY)
+                .withCommand('java -jar /app.jar')
+                .waitingFor(Wait.forHttp('/health'))
+                .withExposedPorts(80)
+    }
+}
\ No newline at end of file
diff --git a/lib/src/test/groovy/ua/naiksoftware/stomp/ConnectionTests.groovy b/lib/src/test/groovy/ua/naiksoftware/stomp/ConnectionTests.groovy
new file mode 100644
index 0000000..3ac8dd8
--- /dev/null
+++ b/lib/src/test/groovy/ua/naiksoftware/stomp/ConnectionTests.groovy
@@ -0,0 +1,20 @@
+package ua.naiksoftware.stomp
+
+import ua.naiksoftware.stomp.Configuration
+import ua.naiksoftware.stomp.Stomp
+
+class ConnectionTests extends Configuration {
+
+    def "connection must be recreated when reconnect"() {
+        given:
+        def client = Stomp.over(Stomp.ConnectionProvider.OKHTTP, 'localhost/websocket')
+        client.connect()
+
+        when:
+        client.disconnect()
+
+        then:
+        client.isConnected() == false
+        client.isConnecting() == false
+    }
+}
diff --git a/test-server/build.gradle b/test-server/build.gradle
index d05f9c8..7a4fbc4 100644
--- a/test-server/build.gradle
+++ b/test-server/build.gradle
@@ -21,6 +21,7 @@ apply plugin: 'org.springframework.boot'
 apply plugin: 'io.spring.dependency-management'
 
 sourceCompatibility = JavaVersion.VERSION_1_8
+targetCompatibility = JavaVersion.VERSION_1_8
 
 repositories {
     mavenCentral()
@@ -30,12 +31,6 @@ dependencies {
     compile 'org.springframework.boot:spring-boot-starter-websocket'
     compile 'org.springframework.boot:spring-boot-starter-web'
     compile 'org.codehaus.groovy:groovy-all:2.4.15'
-
-    testCompile 'org.springframework.boot:spring-boot-starter-test'
-    testCompile 'org.springframework.security:spring-security-test'
-    testCompile 'org.testcontainers:testcontainers:1.8.0'
-    testCompile 'org.spockframework:spock-core:1.1-groovy-2.4'
-    testCompile 'org.spockframework:spock-spring:1.1-groovy-2.4'
 }
 
 dependencyManagement {
diff --git a/test-server/src/test/groovy/BaseContextLoader.groovy b/test-server/src/test/groovy/BaseContextLoader.groovy
deleted file mode 100644
index 52d1753..0000000
--- a/test-server/src/test/groovy/BaseContextLoader.groovy
+++ /dev/null
@@ -1,33 +0,0 @@
-import org.springframework.boot.test.context.SpringBootTest
-import org.springframework.context.ApplicationContextInitializer
-import org.springframework.context.ConfigurableApplicationContext
-import org.springframework.test.context.ActiveProfiles
-import org.springframework.test.context.ContextConfiguration
-import org.testcontainers.containers.BindMode
-import org.testcontainers.containers.GenericContainer
-import org.testcontainers.containers.wait.strategy.Wait
-import spock.lang.Shared
-import spock.lang.Specification
-import ua.naiksoftware.test_server.Main
-
-@ActiveProfiles(['test'])
-@SpringBootTest(classes = Main.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@ContextConfiguration(initializers = BaseContextLoader.class)
-class BaseContextLoader extends Specification implements ApplicationContextInitializer<ConfigurableApplicationContext> {
-
-    @Shared
-    static GenericContainer testServer
-
-    @Override
-    void initialize(ConfigurableApplicationContext configurableApplicationContext) {
-
-        new ProcessBuilder('./gradlew bootJar')
-                .start().waitForProcessOutput(System.out as Appendable, System.err as Appendable)
-
-        testServer = new GenericContainer('openjdk:8-jre-alpine')
-                .withClasspathResourceMapping('./build/artifacts/test-server-1.0.jar', '/app.jar', BindMode.READ_ONLY)
-                .withCommand('java -jar /app.jar')
-                .waitingFor(Wait.forHttp('/health'))
-                .withExposedPorts(80)
-    }
-}

From 13f3c1bdc8e9db009aeec1d8a3c4838d84db8cba Mon Sep 17 00:00:00 2001
From: Nickolay Savchenko <savchenko@river-soft.net>
Date: Wed, 5 Dec 2018 16:20:06 +0200
Subject: [PATCH 083/110] Fix startup test server

---
 example-client/build.gradle                   | 18 +++++------
 lib/build.gradle                              | 15 ++++++++--
 .../naiksoftware/stomp/Configuration.groovy   | 24 +++++++++++----
 .../naiksoftware/stomp/ConnectionTests.groovy | 30 +++++++++++++++----
 test-server/build.gradle                      |  3 +-
 .../src/main/resources/application.properties |  2 ++
 6 files changed, 67 insertions(+), 25 deletions(-)

diff --git a/example-client/build.gradle b/example-client/build.gradle
index c1eaa7f..0fb3220 100644
--- a/example-client/build.gradle
+++ b/example-client/build.gradle
@@ -45,14 +45,12 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    testCompile 'junit:junit:4.12'
-    compile 'com.android.support:appcompat-v7:28.0.0'
-    compile 'org.java-websocket:Java-WebSocket:1.3.6'
-    compile 'com.android.support:recyclerview-v7:28.0.0'
-    compile 'io.reactivex.rxjava2:rxandroid:2.0.1'
-    compile 'com.squareup.retrofit2:converter-gson:2.3.0'
-    compile 'com.squareup.retrofit2:adapter-rxjava2:2.3.0'
-    compile 'com.squareup.retrofit2:retrofit:2.3.0'
-    compile project(':lib')
+    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'org.java-websocket:Java-WebSocket:1.3.6'
+    implementation 'com.android.support:recyclerview-v7:28.0.0'
+    implementation 'io.reactivex.rxjava2:rxandroid:2.0.1'
+    implementation 'com.squareup.retrofit2:converter-gson:2.3.0'
+    implementation 'com.squareup.retrofit2:adapter-rxjava2:2.3.0'
+    implementation 'com.squareup.retrofit2:retrofit:2.3.0'
+    implementation project(':lib')
 }
diff --git a/lib/build.gradle b/lib/build.gradle
index 061a955..0455fb5 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -9,6 +9,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:3.2.1'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
+        classpath 'org.codehaus.groovy:groovy-android-gradle-plugin:2.0.0'
     }
 }
 
@@ -19,6 +20,7 @@ repositories {
 
 apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
+apply plugin: 'groovyx.android'
 
 group='com.github.NaikSoftware'
 
@@ -43,20 +45,27 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+
+    testOptions {
+        unitTests.returnDefaultValues = true
+    }
 }
 
 
 dependencies {
     implementation "io.reactivex.rxjava2:rxjava:2.1.15"
     // Supported transports
-    compileOnly 'org.java-websocket:Java-WebSocket:1.3.6'
-    compileOnly 'com.squareup.okhttp3:okhttp:3.10.0'
+    api 'org.java-websocket:Java-WebSocket:1.3.6'
+    api 'com.squareup.okhttp3:okhttp:3.10.0'
     
     implementation 'com.android.support:support-annotations:28.0.0'
 
+    testImplementation "com.andrewreitz:spock-android:2.0.0"
     testImplementation 'org.testcontainers:testcontainers:1.8.0'
     testImplementation 'org.spockframework:spock-core:1.1-groovy-2.4'
-    testImplementation 'org.spockframework:spock-spring:1.1-groovy-2.4'
+    testImplementation 'org.java-websocket:Java-WebSocket:1.3.6'
+    testImplementation 'com.squareup.okhttp3:okhttp:3.10.0'
+    testImplementation 'ch.qos.logback:logback-classic:1.2.3'
 }
 
 task sourcesJar(type: Jar) {
diff --git a/lib/src/test/groovy/ua/naiksoftware/stomp/Configuration.groovy b/lib/src/test/groovy/ua/naiksoftware/stomp/Configuration.groovy
index 73680e1..61c0219 100644
--- a/lib/src/test/groovy/ua/naiksoftware/stomp/Configuration.groovy
+++ b/lib/src/test/groovy/ua/naiksoftware/stomp/Configuration.groovy
@@ -1,25 +1,37 @@
 package ua.naiksoftware.stomp
 
+import com.andrewreitz.spock.android.AndroidSpecification
+import groovy.util.logging.Slf4j
 import org.testcontainers.containers.BindMode
 import org.testcontainers.containers.GenericContainer
+import org.testcontainers.containers.output.OutputFrame
 import org.testcontainers.containers.wait.strategy.Wait
 import spock.lang.Shared
 import spock.lang.Specification
 
-class Configuration extends Specification implements ApplicationContextInitializer<ConfigurableApplicationContext> {
+import java.util.function.Consumer
+
+class Configuration extends AndroidSpecification {
 
     @Shared
     static GenericContainer testServer = setupServer()
 
-    GenericContainer setupServer() {
+    static GenericContainer setupServer() {
 
-        new ProcessBuilder('./gradlew bootJar')
+        def projectRoot = new File('../')
+        new ProcessBuilder(['./gradlew', 'test-server:bootJar'])
+                .directory(projectRoot)
                 .start().waitForProcessOutput(System.out as Appendable, System.err as Appendable)
 
-        return new GenericContainer('openjdk:8-jre-alpine')
-                .withClasspathResourceMapping('./build/artifacts/test-server-1.0.jar', '/app.jar', BindMode.READ_ONLY)
+        def testServerPath = new File(projectRoot.getAbsoluteFile().getParentFile().getParent(),
+                'test-server/build/artifacts/test-server-1.0.jar').path
+        testServer = new GenericContainer('openjdk:8-jre-alpine')
+                .withFileSystemBind(testServerPath, '/app.jar', BindMode.READ_ONLY)
                 .withCommand('java -jar /app.jar')
-                .waitingFor(Wait.forHttp('/health'))
+                .withLogConsumer({ frame -> println frame.utf8String })
+//                .waitingFor(Wait.forHttp('/health'))
                 .withExposedPorts(80)
+        testServer.start()
+        return testServer
     }
 }
\ No newline at end of file
diff --git a/lib/src/test/groovy/ua/naiksoftware/stomp/ConnectionTests.groovy b/lib/src/test/groovy/ua/naiksoftware/stomp/ConnectionTests.groovy
index 3ac8dd8..6290bd5 100644
--- a/lib/src/test/groovy/ua/naiksoftware/stomp/ConnectionTests.groovy
+++ b/lib/src/test/groovy/ua/naiksoftware/stomp/ConnectionTests.groovy
@@ -1,20 +1,40 @@
 package ua.naiksoftware.stomp
 
+import groovy.util.logging.Log4j
+import groovy.util.logging.Slf4j
+import io.reactivex.Flowable
+import io.reactivex.annotations.NonNull
+import io.reactivex.functions.Predicate
+import io.reactivex.subscribers.TestSubscriber
+import org.testcontainers.containers.GenericContainer
+import spock.lang.Shared
 import ua.naiksoftware.stomp.Configuration
 import ua.naiksoftware.stomp.Stomp
 
+import java.util.concurrent.TimeUnit
+
 class ConnectionTests extends Configuration {
 
-    def "connection must be recreated when reconnect"() {
+    def "connection must be opened"() {
         given:
-        def client = Stomp.over(Stomp.ConnectionProvider.OKHTTP, 'localhost/websocket')
+        def client = Stomp.over(Stomp.ConnectionProvider.OKHTTP,
+                'http://' + Configuration.testServer.getContainerIpAddress()
+                        + ':' + Configuration.testServer.getMappedPort(80) + '/websocket')
         client.connect()
+        def testSubscriber = new TestSubscriber<LifecycleEvent>()
 
         when:
-        client.disconnect()
+        client.lifecycle().subscribe(testSubscriber)
 
         then:
-        client.isConnected() == false
-        client.isConnecting() == false
+        testSubscriber.awaitCount(1).assertValue((Predicate) { event ->
+            if (event.exception) {
+                event.exception.printStackTrace()
+            }
+            assert event.type == LifecycleEvent.Type.OPENED
+        })
+
+//        cleanup:
+//        client.disconnect()
     }
 }
diff --git a/test-server/build.gradle b/test-server/build.gradle
index 7a4fbc4..08c0f3c 100644
--- a/test-server/build.gradle
+++ b/test-server/build.gradle
@@ -30,6 +30,7 @@ repositories {
 dependencies {
     compile 'org.springframework.boot:spring-boot-starter-websocket'
     compile 'org.springframework.boot:spring-boot-starter-web'
+    compile 'ch.qos.logback:logback-classic:1.2.3'
     compile 'org.codehaus.groovy:groovy-all:2.4.15'
 }
 
@@ -40,6 +41,6 @@ dependencyManagement {
 }
 
 bootJar {
-    destinationDir = new File("./build/artifacts")
+    destinationDir = project.file("build/artifacts")
 }
 
diff --git a/test-server/src/main/resources/application.properties b/test-server/src/main/resources/application.properties
index 8fa6760..8b32467 100644
--- a/test-server/src/main/resources/application.properties
+++ b/test-server/src/main/resources/application.properties
@@ -1,3 +1,5 @@
+server.port=80
+
 spring.jackson.deserialization.accept_empty_string_as_null_object=true
 spring.jackson.property-naming-strategy=CAMEL_CASE_TO_LOWER_CASE_WITH_UNDERSCORES
 spring.jackson.serialization.write_char_arrays_as_json_arrays=true

From c889db4d8d74b10e6dd9a3d8bad6a6832465c3be Mon Sep 17 00:00:00 2001
From: Nickolay Savchenko <savchenko@river-soft.net>
Date: Wed, 5 Dec 2018 17:50:16 +0200
Subject: [PATCH 084/110] Fix tests

---
 .../ua/naiksoftware/stomp/ConnectionTests.groovy       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/src/test/groovy/ua/naiksoftware/stomp/ConnectionTests.groovy b/lib/src/test/groovy/ua/naiksoftware/stomp/ConnectionTests.groovy
index 6290bd5..5200c30 100644
--- a/lib/src/test/groovy/ua/naiksoftware/stomp/ConnectionTests.groovy
+++ b/lib/src/test/groovy/ua/naiksoftware/stomp/ConnectionTests.groovy
@@ -18,8 +18,8 @@ class ConnectionTests extends Configuration {
     def "connection must be opened"() {
         given:
         def client = Stomp.over(Stomp.ConnectionProvider.OKHTTP,
-                'http://' + Configuration.testServer.getContainerIpAddress()
-                        + ':' + Configuration.testServer.getMappedPort(80) + '/websocket')
+                'ws://' + Configuration.testServer.getContainerIpAddress()
+                        + ':' + Configuration.testServer.getMappedPort(80) + '/example-endpoint/websocket')
         client.connect()
         def testSubscriber = new TestSubscriber<LifecycleEvent>()
 
@@ -31,10 +31,10 @@ class ConnectionTests extends Configuration {
             if (event.exception) {
                 event.exception.printStackTrace()
             }
-            assert event.type == LifecycleEvent.Type.OPENED
+            return event.type == LifecycleEvent.Type.OPENED
         })
 
-//        cleanup:
-//        client.disconnect()
+        cleanup:
+        client.disconnect()
     }
 }

From cff4f89889e1f4310ea19444e2e1e7372160cb0b Mon Sep 17 00:00:00 2001
From: Nickolay Savchenko <savchenko@river-soft.net>
Date: Sat, 29 Dec 2018 18:26:42 +0200
Subject: [PATCH 085/110] Merge luisalves00 heartbeat support

---
 lib/build.gradle                              |   2 +-
 .../stomp/AbstractConnectionProvider.java     | 170 +++++++++++++++++-
 .../stomp/ConnectionProvider.java             |  15 +-
 .../ua/naiksoftware/stomp/LifecycleEvent.java |   2 +-
 .../stomp/OkHttpConnectionProvider.java       |   6 +-
 .../stomp/client/StompClient.java             |  39 +++-
 .../stomp/StompClientIntegrationTest.java     |  97 ++++++++++
 7 files changed, 309 insertions(+), 22 deletions(-)
 create mode 100644 lib/src/test/java/ua/naiksoftware/stomp/StompClientIntegrationTest.java

diff --git a/lib/build.gradle b/lib/build.gradle
index 0455fb5..ffcecc6 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -56,7 +56,7 @@ dependencies {
     implementation "io.reactivex.rxjava2:rxjava:2.1.15"
     // Supported transports
     api 'org.java-websocket:Java-WebSocket:1.3.6'
-    api 'com.squareup.okhttp3:okhttp:3.10.0'
+    api 'com.squareup.okhttp3:okhttp:3.11.0'
     
     implementation 'com.android.support:support-annotations:28.0.0'
 
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/AbstractConnectionProvider.java b/lib/src/main/java/ua/naiksoftware/stomp/AbstractConnectionProvider.java
index bd1e2f8..7f54cd5 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/AbstractConnectionProvider.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/AbstractConnectionProvider.java
@@ -4,9 +4,16 @@
 import android.support.annotation.Nullable;
 import android.util.Log;
 
+import java.util.concurrent.TimeUnit;
+
 import io.reactivex.Completable;
 import io.reactivex.Observable;
+import io.reactivex.Scheduler;
+import io.reactivex.disposables.Disposable;
+import io.reactivex.schedulers.Schedulers;
 import io.reactivex.subjects.PublishSubject;
+import ua.naiksoftware.stomp.client.StompCommand;
+import ua.naiksoftware.stomp.client.StompMessage;
 
 /**
  * Created by forresthopkinsa on 8/8/2017.
@@ -18,6 +25,16 @@ abstract class AbstractConnectionProvider implements ConnectionProvider {
 
     private static final String TAG = AbstractConnectionProvider.class.getSimpleName();
 
+    private transient Disposable clientSendHeartBeatTask;
+    private transient Disposable serverCheckHeartBeatTask;
+    private Scheduler scheduler;
+
+    private int serverHeartbeat = 0;
+    private int clientHeartbeat = 0;
+
+    private transient long lastServerHeartBeat = 0;
+
+
     @NonNull
     private final PublishSubject<LifecycleEvent> mLifecycleStream;
     @NonNull
@@ -46,6 +63,11 @@ public Observable<String> messages() {
 
     @Override
     public Completable disconnect() {
+        if (clientSendHeartBeatTask != null) {
+            clientSendHeartBeatTask.dispose();
+        }
+        scheduler.shutdown();
+        Log.d(TAG, "Shutting down heart-beat scheduler...");
         return Completable
                 .fromAction(this::rawDisconnect);
     }
@@ -55,11 +77,6 @@ private Completable initSocket() {
                 .fromAction(this::createWebSocketConnection);
     }
 
-    // Doesn't do anything at all, only here as a stub
-    public Completable setHeartbeat(int ms) {
-        return Completable.complete();
-    }
-
     /**
      * Most important method: connects to websocket and notifies program of messages.
      * <p>
@@ -111,8 +128,24 @@ void emitLifecycleEvent(@NonNull LifecycleEvent lifecycleEvent) {
     }
 
     void emitMessage(String stompMessage) {
-        Log.d(TAG, "Emit STOMP message: " + stompMessage);
-        mMessagesStream.onNext(stompMessage);
+        //TODO: Why we don't publish a StompMessage, instead of String? will this connection provider work with other protocol?
+        final StompMessage sm = StompMessage.from(stompMessage);
+        if (StompCommand.CONNECTED.equals(sm.getStompCommand())) {
+            heartBeatHandshake(sm.findHeader(StompHeader.HEART_BEAT));
+        } else if (StompCommand.SEND.equals(sm.getStompCommand())) {
+            abortClientHeartBeatSend();
+        } else if (StompCommand.MESSAGE.equals(sm.getStompCommand())) {
+            //a MESSAGE works as an hear-beat too.
+            abortServerHeartBeatCheck();
+        }
+
+        if (stompMessage.equals("\n")) {
+            Log.d(TAG, "<<< PONG");
+            abortServerHeartBeatCheck();
+        } else {
+            Log.d(TAG, "Receive STOMP message: " + stompMessage);
+            mMessagesStream.onNext(stompMessage);
+        }
     }
 
     @NonNull
@@ -120,4 +153,127 @@ void emitMessage(String stompMessage) {
     public Observable<LifecycleEvent> lifecycle() {
         return mLifecycleStream;
     }
+
+    /**
+     * Analise heart-beat sent from server (if any), to adjust the frequency.
+     * Startup the heart-beat logic.
+     *
+     * @param heartBeatHeader
+     */
+    private void heartBeatHandshake(final String heartBeatHeader) {
+        if (heartBeatHeader != null) {
+            // The heart-beat header is OPTIONAL
+            final String[] heartbeats = heartBeatHeader.split(",");
+            if (clientHeartbeat > 0) {
+                //there will be heart-beats every MAX(<cx>,<sy>) milliseconds
+                clientHeartbeat = Math.max(clientHeartbeat, Integer.parseInt(heartbeats[1]));
+            }
+            if (serverHeartbeat > 0) {
+                //there will be heart-beats every MAX(<cx>,<sy>) milliseconds
+                serverHeartbeat = Math.max(serverHeartbeat, Integer.parseInt(heartbeats[0]));
+            }
+        }
+        if (clientHeartbeat > 0 || serverHeartbeat > 0) {
+            scheduler = Schedulers.io();
+
+            if (clientHeartbeat > 0) {
+                //client MUST/WANT send heart-beat
+                Log.d(TAG, "Client will send heart-beat every " + clientHeartbeat + " ms");
+                scheduleClientHeartBeat();
+            }
+            if (serverHeartbeat > 0) {
+                Log.d(TAG, "Client will listen to server heart-beat every " + serverHeartbeat + " ms");
+                //client WANT to listen to server heart-beat
+                scheduleServerHeartBeatCheck();
+            }
+        }
+    }
+
+    protected void scheduleServerHeartBeatCheck() {
+        if (serverHeartbeat > 0 && scheduler != null) {
+            Log.d(TAG, "Scheduling server heart-beat to be checked in " + serverHeartbeat + " ms");
+            //add some slack on the check
+            serverCheckHeartBeatTask = scheduler.scheduleDirect(() ->
+                    checkServerHeartBeat(), serverHeartbeat, TimeUnit.MILLISECONDS);
+        }
+    }
+
+    private void checkServerHeartBeat() {
+        if (serverHeartbeat > 0) {
+            final long now = System.currentTimeMillis();
+            //use a forgiving boundary as some heart beats can be delayed or lost.
+            final long boundary = now - (3 * serverHeartbeat);
+            //we need to check because the task could failed to abort
+            if (lastServerHeartBeat < boundary) {
+                Log.d(TAG, "It's a sad day ;( Server didn't send heart-beat on time. Last received at '" + lastServerHeartBeat + "' and now is '" + now + "'");
+                final LifecycleEvent failedServerHeartBeat = new LifecycleEvent(LifecycleEvent.Type.FAILED_SERVER_HEARTBEAT);
+                emitLifecycleEvent(failedServerHeartBeat);
+            } else {
+                Log.d(TAG, "We were checking and server sent heart-beat on time. So well-behaved :)");
+                lastServerHeartBeat = System.currentTimeMillis();
+            }
+        }
+    }
+
+    /**
+     * Used to abort the server heart-beat check.
+     */
+    private void abortServerHeartBeatCheck() {
+        lastServerHeartBeat = System.currentTimeMillis();
+        Log.d(TAG, "Aborted last check because server sent heart-beat on time ('" + lastServerHeartBeat + "'). So well-behaved :)");
+        if (serverCheckHeartBeatTask != null) {
+            serverCheckHeartBeatTask.dispose();
+        }
+        scheduleServerHeartBeatCheck();
+    }
+
+    /**
+     * Schedule a client heart-beat if clientHeartbeat > 0.
+     */
+    public void scheduleClientHeartBeat() {
+        if (clientHeartbeat > 0 && scheduler != null) {
+            Log.d(TAG, "Scheduling client heart-beat to be sent in " + clientHeartbeat + " ms");
+            clientSendHeartBeatTask = scheduler.scheduleDirect(() ->
+                    sendClientHeartBeat(), clientHeartbeat, TimeUnit.MILLISECONDS);
+        }
+    }
+
+    /**
+     * Send the raw heart-beat to the server.
+     */
+    private void sendClientHeartBeat() {
+        this.rawSend("\r\n");
+        Log.d(TAG, "PING >>>");
+        //schedule next client heart beat
+        this.scheduleClientHeartBeat();
+    }
+
+    /**
+     * Used when we have a scheduled heart-beat and we send a new message to the server.
+     * The new message will work as an heart-beat so we can abort current one and schedule another
+     */
+    private void abortClientHeartBeatSend() {
+        if (clientSendHeartBeatTask != null) {
+            clientSendHeartBeatTask.dispose();
+        }
+        scheduleClientHeartBeat();
+    }
+
+    /**
+     * Set the server heart-beat
+     *
+     * @param ms milliseconds
+     */
+    public void setServerHeartbeat(int ms) {
+        this.serverHeartbeat = ms;
+    }
+
+    /**
+     * Set the client heart-beat
+     *
+     * @param ms milliseconds
+     */
+    public void setClientHeartbeat(int ms) {
+        this.clientHeartbeat = ms;
+    }
 }
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/ConnectionProvider.java b/lib/src/main/java/ua/naiksoftware/stomp/ConnectionProvider.java
index 58fb826..094e8c2 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/ConnectionProvider.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/ConnectionProvider.java
@@ -32,5 +32,18 @@ public interface ConnectionProvider {
      */
     Completable disconnect();
 
-    Completable setHeartbeat(int ms);
+    /**
+     * Set the server heart-beat
+     *
+     * @param ms milliseconds
+     */
+    void setServerHeartbeat(int ms);
+
+    /**
+     * Set the client heart-beat
+     *
+     * @param ms milliseconds
+     */
+    void setClientHeartbeat(int ms);
+
 }
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/LifecycleEvent.java b/lib/src/main/java/ua/naiksoftware/stomp/LifecycleEvent.java
index d8aec43..5e527fe 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/LifecycleEvent.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/LifecycleEvent.java
@@ -9,7 +9,7 @@
 public class LifecycleEvent {
 
     public enum Type {
-        OPENED, CLOSED, ERROR
+        OPENED, CLOSED, ERROR, FAILED_SERVER_HEARTBEAT;
     }
 
     private final Type mType;
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java b/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java
index ffd67ca..a09ca41 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java
@@ -63,10 +63,8 @@ public void onOpen(WebSocket webSocket, @NonNull Response response) {
 
                     @Override
                     public void onMessage(WebSocket webSocket, String text) {
-                        if (text.equals("\n"))
-                            Log.d(TAG, "RECEIVED HEARTBEAT");
-                        else
-                            emitMessage(text);
+                        Log.d(TAG, "onMessage: " + text);
+                        emitMessage(text);
                     }
 
                     @Override
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java b/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
index 8a543e2..9888863 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
@@ -45,7 +45,9 @@ public class StompClient {
     private Disposable mLifecycleDisposable;
     private Disposable mMessagesDisposable;
     private List<StompHeader> mHeaders;
-    private int heartbeat;
+
+    private int serverHeartbeat = 0;
+    private int clientHeartbeat = 0;
 
     public StompClient(ConnectionProvider connectionProvider) {
         mConnectionProvider = connectionProvider;
@@ -82,9 +84,23 @@ public void setParser(Parser parser) {
      *
      * @param ms heartbeat time in milliseconds
      */
-    public void setHeartbeat(int ms) {
-        heartbeat = ms;
-        mConnectionProvider.setHeartbeat(ms).subscribe();
+    public StompClient withServerHeartbeat(int ms) {
+        mConnectionProvider.setServerHeartbeat(ms);
+        this.serverHeartbeat = ms;
+        return this;
+    }
+
+    /**
+     * Sets the heartbeat interval that client propose to send.
+     * <p>
+     * Not very useful yet, because we don't have any heartbeat logic on our side.
+     *
+     * @param ms heartbeat time in milliseconds
+     */
+    public StompClient withClientHeartbeat(int ms) {
+        mConnectionProvider.setClientHeartbeat(ms);
+        this.clientHeartbeat = ms;
+        return this;
     }
 
     /**
@@ -115,7 +131,7 @@ public void connect(@Nullable List<StompHeader> _headers) {
                         case OPENED:
                             List<StompHeader> headers = new ArrayList<>();
                             headers.add(new StompHeader(StompHeader.VERSION, SUPPORTED_VERSIONS));
-                            headers.add(new StompHeader(StompHeader.HEART_BEAT, "0," + heartbeat));
+                            headers.add(new StompHeader(StompHeader.HEART_BEAT, clientHeartbeat + "," + serverHeartbeat));
                             if (_headers != null) headers.addAll(_headers);
                             mConnectionProvider.send(new StompMessage(StompCommand.CONNECT, headers, null).compile(legacyWhitespace))
                                     .subscribe();
@@ -132,6 +148,11 @@ public void connect(@Nullable List<StompHeader> _headers) {
                             setConnected(false);
                             isConnecting = false;
                             break;
+
+                        case FAILED_SERVER_HEARTBEAT:
+                            Log.d(TAG, "Server failed to send heart-beat in time.");
+                            break;
+
                     }
                 });
 
@@ -143,7 +164,6 @@ public void connect(@Nullable List<StompHeader> _headers) {
                 .subscribe(stompMessage -> {
                     setConnected(true);
                     isConnecting = false;
-
                 });
     }
 
@@ -173,7 +193,8 @@ public Completable send(String destination, String data) {
     }
 
     public Completable send(@NonNull StompMessage stompMessage) {
-        Completable completable = mConnectionProvider.send(stompMessage.compile(legacyWhitespace));
+        Completable completable = mConnectionProvider.send(stompMessage.compile(legacyWhitespace))
+                .doOnError(t -> t.printStackTrace());
         CompletableSource connectionComplete = mConnectionStream
                 .filter(isConnected -> isConnected)
                 .firstOrError().toCompletable();
@@ -201,7 +222,9 @@ public Completable disconnectCompletable() {
             mMessagesDisposable.dispose();
         }
         return mConnectionProvider.disconnect()
-                .doOnComplete(() -> setConnected(false));
+                .doOnComplete(() -> {
+                    setConnected(false);
+                });
     }
 
     public Flowable<StompMessage> topic(String destinationPath) {
diff --git a/lib/src/test/java/ua/naiksoftware/stomp/StompClientIntegrationTest.java b/lib/src/test/java/ua/naiksoftware/stomp/StompClientIntegrationTest.java
new file mode 100644
index 0000000..b1dbe46
--- /dev/null
+++ b/lib/src/test/java/ua/naiksoftware/stomp/StompClientIntegrationTest.java
@@ -0,0 +1,97 @@
+package ua.naiksoftware.stomp;
+
+import android.util.Log;
+
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mockito;
+import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import ua.naiksoftware.stomp.client.StompClient;
+
+import static java.util.concurrent.TimeUnit.MINUTES;
+import static org.awaitility.Awaitility.await;
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertEquals;
+import static org.mockito.ArgumentMatchers.anyString;
+
+
+@RunWith(PowerMockRunner.class)
+@PrepareForTest({Log.class})
+@PowerMockIgnore("javax.net.ssl.*")
+public class StompClientIntegrationTest {
+
+    private static final String TAG = StompClientIntegrationTest.class.getSimpleName();
+
+    @BeforeClass
+    public static void init() {
+        PowerMockito.mockStatic(Log.class);
+        Mockito.when(Log.i(anyString(), anyString())).then(i ->  {System.out.println((String) i.getArgument(0) + " --> " + (String) i.getArgument(1) ); return null; });
+        Mockito.when(Log.w(anyString(), anyString())).then(i ->  {System.out.println((String) i.getArgument(0) + " --> " + (String) i.getArgument(1) ); return null; });
+        Mockito.when(Log.d(anyString(), anyString())).then(i ->  {System.out.println((String) i.getArgument(0) + " --> " + (String) i.getArgument(1) ); return null; });
+        Mockito.when(Log.e(anyString(), anyString())).then(i ->  {System.out.println((String) i.getArgument(0) + " --> " + (String) i.getArgument(1) ); return null; });
+
+        //TODO: bootstap a spring boot test server, so we can run tests.
+    }
+
+    @AfterClass
+    public static void terminate() {
+        //TODO: teardown  a spring boot test server, so we can run tests.
+    }
+
+
+    @Test
+    public void callWebsocket() {
+        //TODO: uncomment and create proper testing.
+
+//        final List<String> messages = new ArrayList<>();
+//
+//        final Map<String, String> connectHttpHeaders = new HashMap<>();
+//        connectHttpHeaders.put("Authorization", "Basic bHVhbDpwYXNz");
+//
+//        final StompClient mStompClient = Stomp.over(Stomp.ConnectionProvider.OKHTTP, "ws://localhost:8080/notifications/websocket", connectHttpHeaders);
+//        //don't care...but server will force it
+//        mStompClient.withClientHeartbeat(10000).withServerHeartbeat(10000);
+//
+//        mStompClient.topic("/topic/notification/system/demo/username/lual").subscribe(topicMessage -> {
+//           Log.i(TAG,topicMessage.getPayload());
+//           messages.add(topicMessage.getPayload());
+//        });
+//
+//        mStompClient.lifecycle().subscribe(lifecycleEvent -> {
+//            switch (lifecycleEvent.getType()) {
+//
+//                case OPENED:
+//                    Log.i(TAG,"Stomp connection opened");
+//                    break;
+//
+//                case ERROR:
+//                    Log.i(TAG,"Error " + lifecycleEvent.getException());
+//                    break;
+//
+//                case CLOSED:
+//                    Log.i(TAG,"Stomp connection closed");
+//                    break;
+//            }
+//        });
+//
+//        mStompClient.connect();
+//
+//        await().atMost(5, MINUTES).until( messages::size, is(10));
+//
+//        mStompClient.disconnect();
+      }
+
+
+}
\ No newline at end of file

From d272400ca9138f8d87bf7bffd38ea0918f518cbd Mon Sep 17 00:00:00 2001
From: Nickolay Savchenko <savchenko@river-soft.net>
Date: Sat, 29 Dec 2018 18:40:21 +0200
Subject: [PATCH 086/110] Merge akuhtz fixes

---
 .gitignore                                    |  3 +-
 .idea/gradle.xml                              |  2 +-
 .idea/misc.xml                                | 35 ++++++++++++++-
 example-client/build.gradle                   | 28 +++---------
 .../stompclientexample/MainActivity.java      | 43 +++++++++++++++++--
 lib/build.gradle                              | 22 +---------
 .../stomp/AbstractConnectionProvider.java     | 21 +++++++--
 .../stomp/ConnectionProvider.java             |  1 -
 .../ua/naiksoftware/stomp/LifecycleEvent.java |  2 +-
 .../ua/naiksoftware/stomp/StompHeader.java    |  2 +-
 .../stomp/WebSocketsConnectionProvider.java   |  3 ++
 .../stomp/client/StompClient.java             | 14 +++---
 test-server/build.gradle                      |  2 +-
 .../test_server/config/WebSocketConfig.groovy | 14 ++++--
 .../src/main/resources/application.properties |  6 ++-
 15 files changed, 131 insertions(+), 67 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9a4a2d1..a13729d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,5 @@
 .idea
 .DS_Store
 /build
-/captures
\ No newline at end of file
+/captures
+test-server/build
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 0e08791..804e5a0 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -13,7 +13,7 @@
             <option value="$PROJECT_DIR$/test-server" />
           </set>
         </option>
-        <option name="useQualifiedModuleNames" value="true" />
+        <option name="resolveModulePerSourceSet" value="false" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index bc8d0a3..b0c7b20 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,7 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="NullableNotNullManager">
+    <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
+    <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
+    <option name="myNullables">
+      <value>
+        <list size="7">
+          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
+          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
+          <item index="2" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
+          <item index="3" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
+          <item index="4" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
+          <item index="5" class="java.lang.String" itemvalue="androidx.annotation.Nullable" />
+          <item index="6" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNullable" />
+        </list>
+      </value>
+    </option>
+    <option name="myNotNulls">
+      <value>
+        <list size="6">
+          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
+          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
+          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
+          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
+          <item index="4" class="java.lang.String" itemvalue="androidx.annotation.NonNull" />
+          <item index="5" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNonNull" />
+        </list>
+      </value>
+    </option>
+  </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
+    <output url="file://$PROJECT_DIR$/build/classes" />
+  </component>
+  <component name="ProjectType">
+    <option name="id" value="Android" />
   </component>
 </project>
\ No newline at end of file
diff --git a/example-client/build.gradle b/example-client/build.gradle
index 0fb3220..507e163 100644
--- a/example-client/build.gradle
+++ b/example-client/build.gradle
@@ -1,28 +1,9 @@
-buildscript {
-    repositories {
-        jcenter()
-        maven {
-            url "https://maven.google.com"
-        }
-        google()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
-    }
-}
-
-repositories {
-    jcenter()
-    maven { url "https://jitpack.io" }
-    google()
-}
 
 apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 28
-    buildToolsVersion '28.0.3'
+    //buildToolsVersion '28.0.3'
 
     defaultConfig {
         applicationId "ua.naiksoftware.stompclientexample"
@@ -48,7 +29,12 @@ dependencies {
     implementation 'com.android.support:appcompat-v7:28.0.0'
     implementation 'org.java-websocket:Java-WebSocket:1.3.6'
     implementation 'com.android.support:recyclerview-v7:28.0.0'
-    implementation 'io.reactivex.rxjava2:rxandroid:2.0.1'
+
+    // RxJava
+    // implementation 'io.reactivex.rxjava2:rxandroid:2.0.1'
+    implementation 'io.reactivex.rxjava2:rxjava:2.1.15'
+    implementation 'io.reactivex.rxjava2:rxandroid:2.0.2'
+
     implementation 'com.squareup.retrofit2:converter-gson:2.3.0'
     implementation 'com.squareup.retrofit2:adapter-rxjava2:2.3.0'
     implementation 'com.squareup.retrofit2:retrofit:2.3.0'
diff --git a/example-client/src/main/java/ua/naiksoftware/stompclientexample/MainActivity.java b/example-client/src/main/java/ua/naiksoftware/stompclientexample/MainActivity.java
index 9fdcc57..a249e9b 100644
--- a/example-client/src/main/java/ua/naiksoftware/stompclientexample/MainActivity.java
+++ b/example-client/src/main/java/ua/naiksoftware/stompclientexample/MainActivity.java
@@ -19,9 +19,11 @@
 
 import io.reactivex.CompletableTransformer;
 import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.CompositeDisposable;
 import io.reactivex.disposables.Disposable;
 import io.reactivex.schedulers.Schedulers;
 import ua.naiksoftware.stomp.Stomp;
+import ua.naiksoftware.stomp.StompHeader;
 import ua.naiksoftware.stomp.client.StompClient;
 
 import static ua.naiksoftware.stompclientexample.RestClient.ANDROID_EMULATOR_LOCALHOST;
@@ -38,6 +40,8 @@ public class MainActivity extends AppCompatActivity {
     private RecyclerView mRecyclerView;
     private Gson mGson = new GsonBuilder().create();
 
+    private CompositeDisposable compositeDisposable;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -51,13 +55,32 @@ protected void onCreate(Bundle savedInstanceState) {
 
     public void disconnectStomp(View view) {
         mStompClient.disconnect();
+
+        if (compositeDisposable != null) {
+            compositeDisposable.dispose();
+
+            compositeDisposable = null;
+        }
     }
 
+    public static final String LOGIN = "login";
+
+    public static final String PASSCODE = "passcode";
+
     public void connectStomp(View view) {
+
+        List<StompHeader> headers = new ArrayList<>();
+        headers.add(new StompHeader(LOGIN, "guest"));
+        headers.add(new StompHeader(PASSCODE, "guest"));
+
         mStompClient = Stomp.over(Stomp.ConnectionProvider.JWS, "ws://" + ANDROID_EMULATOR_LOCALHOST
                 + ":" + RestClient.SERVER_PORT + "/example-endpoint/websocket");
 
-        mStompClient.lifecycle()
+        mStompClient.withClientHeartbeat(30000).withServerHeartbeat(30000);
+
+        compositeDisposable = new CompositeDisposable();
+
+        Disposable dispLifecycle = mStompClient.lifecycle()
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(lifecycleEvent -> {
@@ -71,11 +94,17 @@ public void connectStomp(View view) {
                             break;
                         case CLOSED:
                             toast("Stomp connection closed");
+                            break;
+                        case FAILED_SERVER_HEARTBEAT:
+                            toast("Stomp failed server heartbeat");
+                            break;
                     }
                 });
 
+        compositeDisposable.add(dispLifecycle);
+
         // Receive greetings
-        mStompClient.topic("/topic/greetings")
+        Disposable dispTopic = mStompClient.topic("/topic/greetings")
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(topicMessage -> {
@@ -83,7 +112,9 @@ public void connectStomp(View view) {
                     addItem(mGson.fromJson(topicMessage.getPayload(), EchoModel.class));
                 });
 
-        mStompClient.connect();
+        compositeDisposable.add(dispTopic);
+
+        mStompClient.connect(headers);
     }
 
     public void sendEchoViaStomp(View v) {
@@ -130,6 +161,12 @@ protected CompletableTransformer applySchedulers() {
     @Override
     protected void onDestroy() {
         mStompClient.disconnect();
+
+        if (compositeDisposable != null) {
+            compositeDisposable.dispose();
+            compositeDisposable = null;
+        }
+
         if (mRestPingDisposable != null) mRestPingDisposable.dispose();
         super.onDestroy();
     }
diff --git a/lib/build.gradle b/lib/build.gradle
index ffcecc6..4a02474 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -1,22 +1,3 @@
-buildscript {
-    repositories {
-        jcenter()
-        maven {
-            url "https://maven.google.com"
-        }
-        google()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
-        classpath 'org.codehaus.groovy:groovy-android-gradle-plugin:2.0.0'
-    }
-}
-
-repositories {
-    jcenter()
-    google()
-}
 
 apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
@@ -25,7 +6,7 @@ apply plugin: 'groovyx.android'
 group='com.github.NaikSoftware'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 27
 
     defaultConfig {
         minSdkVersion 16
@@ -54,6 +35,7 @@ android {
 
 dependencies {
     implementation "io.reactivex.rxjava2:rxjava:2.1.15"
+
     // Supported transports
     api 'org.java-websocket:Java-WebSocket:1.3.6'
     api 'com.squareup.okhttp3:okhttp:3.11.0'
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/AbstractConnectionProvider.java b/lib/src/main/java/ua/naiksoftware/stomp/AbstractConnectionProvider.java
index 7f54cd5..da8ef7e 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/AbstractConnectionProvider.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/AbstractConnectionProvider.java
@@ -66,8 +66,16 @@ public Completable disconnect() {
         if (clientSendHeartBeatTask != null) {
             clientSendHeartBeatTask.dispose();
         }
-        scheduler.shutdown();
-        Log.d(TAG, "Shutting down heart-beat scheduler...");
+
+        if (serverCheckHeartBeatTask != null) {
+            serverCheckHeartBeatTask.dispose();
+        }
+
+        lastServerHeartBeat = 0;
+
+        // TODO shutdown Schedulers.io() is not a good idea
+//        scheduler.shutdown();
+
         return Completable
                 .fromAction(this::rawDisconnect);
     }
@@ -130,7 +138,9 @@ void emitLifecycleEvent(@NonNull LifecycleEvent lifecycleEvent) {
     void emitMessage(String stompMessage) {
         //TODO: Why we don't publish a StompMessage, instead of String? will this connection provider work with other protocol?
         final StompMessage sm = StompMessage.from(stompMessage);
+
         if (StompCommand.CONNECTED.equals(sm.getStompCommand())) {
+            Log.d(TAG, "<<< CONNECTED");
             heartBeatHandshake(sm.findHeader(StompHeader.HEART_BEAT));
         } else if (StompCommand.SEND.equals(sm.getStompCommand())) {
             abortClientHeartBeatSend();
@@ -175,7 +185,6 @@ private void heartBeatHandshake(final String heartBeatHeader) {
         }
         if (clientHeartbeat > 0 || serverHeartbeat > 0) {
             scheduler = Schedulers.io();
-
             if (clientHeartbeat > 0) {
                 //client MUST/WANT send heart-beat
                 Log.d(TAG, "Client will send heart-beat every " + clientHeartbeat + " ms");
@@ -185,13 +194,17 @@ private void heartBeatHandshake(final String heartBeatHeader) {
                 Log.d(TAG, "Client will listen to server heart-beat every " + serverHeartbeat + " ms");
                 //client WANT to listen to server heart-beat
                 scheduleServerHeartBeatCheck();
+
+                // initialize the server heartbeat
+                lastServerHeartBeat = System.currentTimeMillis();
             }
         }
     }
 
     protected void scheduleServerHeartBeatCheck() {
         if (serverHeartbeat > 0 && scheduler != null) {
-            Log.d(TAG, "Scheduling server heart-beat to be checked in " + serverHeartbeat + " ms");
+            final long now = System.currentTimeMillis();
+            Log.d(TAG, "Scheduling server heart-beat to be checked in " + serverHeartbeat + " ms and now is '" + now + "'");
             //add some slack on the check
             serverCheckHeartBeatTask = scheduler.scheduleDirect(() ->
                     checkServerHeartBeat(), serverHeartbeat, TimeUnit.MILLISECONDS);
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/ConnectionProvider.java b/lib/src/main/java/ua/naiksoftware/stomp/ConnectionProvider.java
index 094e8c2..d11f881 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/ConnectionProvider.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/ConnectionProvider.java
@@ -45,5 +45,4 @@ public interface ConnectionProvider {
      * @param ms milliseconds
      */
     void setClientHeartbeat(int ms);
-
 }
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/LifecycleEvent.java b/lib/src/main/java/ua/naiksoftware/stomp/LifecycleEvent.java
index 5e527fe..badcda4 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/LifecycleEvent.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/LifecycleEvent.java
@@ -9,7 +9,7 @@
 public class LifecycleEvent {
 
     public enum Type {
-        OPENED, CLOSED, ERROR, FAILED_SERVER_HEARTBEAT;
+        OPENED, CLOSED, ERROR, FAILED_SERVER_HEARTBEAT
     }
 
     private final Type mType;
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/StompHeader.java b/lib/src/main/java/ua/naiksoftware/stomp/StompHeader.java
index 9b45440..bf87273 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/StompHeader.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/StompHeader.java
@@ -5,7 +5,7 @@
  */
 public class StompHeader {
 
-    public static final String VERSION = "version";
+    public static final String VERSION = "accept-version";
     public static final String HEART_BEAT = "heart-beat";
     public static final String DESTINATION = "destination";
     public static final String CONTENT_TYPE = "content-type";
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java b/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java
index 92e1151..0d2a3e4 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java
@@ -93,6 +93,9 @@ public void onClose(int code, String reason, boolean remote) {
                 Log.d(TAG, "onClose: code=" + code + " reason=" + reason + " remote=" + remote);
                 haveConnection = false;
                 emitLifecycleEvent(new LifecycleEvent(LifecycleEvent.Type.CLOSED));
+
+                Log.d(TAG, "Disconnect after close.");
+                disconnect();
             }
 
             @Override
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java b/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
index 9888863..aa4de32 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
@@ -28,7 +28,7 @@ public class StompClient {
 
     private static final String TAG = StompClient.class.getSimpleName();
 
-    public static final String SUPPORTED_VERSIONS = "1.1,1.0";
+    public static final String SUPPORTED_VERSIONS = "1.1,1.2";
     public static final String DEFAULT_ACK = "auto";
 
     private final String tag = StompClient.class.getSimpleName();
@@ -197,7 +197,7 @@ public Completable send(@NonNull StompMessage stompMessage) {
                 .doOnError(t -> t.printStackTrace());
         CompletableSource connectionComplete = mConnectionStream
                 .filter(isConnected -> isConnected)
-                .firstOrError().toCompletable();
+                .firstOrError().ignoreElement();
         return completable
                 .startWith(connectionComplete);
     }
@@ -212,6 +212,12 @@ public Flowable<LifecycleEvent> lifecycle() {
 
     public void disconnect() {
         disconnectCompletable().subscribe(() -> {}, e -> Log.e(tag, "Disconnect error", e));
+        if(mStreamMap != null && !mStreamMap.isEmpty()){
+            mStreamMap.clear();
+        }
+        if(mTopics != null && !mTopics.isEmpty()){
+            mTopics.clear();
+        }
     }
 
     public Completable disconnectCompletable() {
@@ -222,9 +228,7 @@ public Completable disconnectCompletable() {
             mMessagesDisposable.dispose();
         }
         return mConnectionProvider.disconnect()
-                .doOnComplete(() -> {
-                    setConnected(false);
-                });
+                .doOnComplete(() -> setConnected(false));
     }
 
     public Flowable<StompMessage> topic(String destinationPath) {
diff --git a/test-server/build.gradle b/test-server/build.gradle
index 08c0f3c..ccfae21 100644
--- a/test-server/build.gradle
+++ b/test-server/build.gradle
@@ -4,7 +4,7 @@ version '1.0'
 buildscript {
 
     ext {
-        springBootVersion = '2.0.6.RELEASE'
+        springBootVersion = '2.1.1.RELEASE'
         springCloudVersion = 'Finchley.SR1'
     }
     
diff --git a/test-server/src/main/groovy/ua/naiksoftware/test_server/config/WebSocketConfig.groovy b/test-server/src/main/groovy/ua/naiksoftware/test_server/config/WebSocketConfig.groovy
index 2a8a96c..7215b0a 100644
--- a/test-server/src/main/groovy/ua/naiksoftware/test_server/config/WebSocketConfig.groovy
+++ b/test-server/src/main/groovy/ua/naiksoftware/test_server/config/WebSocketConfig.groovy
@@ -3,10 +3,11 @@ package ua.naiksoftware.test_server.config
 
 import org.springframework.context.annotation.Configuration
 import org.springframework.messaging.simp.config.MessageBrokerRegistry
-import org.springframework.web.socket.config.annotation.AbstractWebSocketMessageBrokerConfigurer
+import org.springframework.scheduling.concurrent.DefaultManagedTaskScheduler
 import org.springframework.web.socket.config.annotation.EnableWebSocket
 import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker
 import org.springframework.web.socket.config.annotation.StompEndpointRegistry
+import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer
 import org.springframework.web.socket.config.annotation.WebSocketTransportRegistration
 
 /**
@@ -15,11 +16,16 @@ import org.springframework.web.socket.config.annotation.WebSocketTransportRegist
 @Configuration
 @EnableWebSocket
 @EnableWebSocketMessageBroker
-class WebSocketConfig extends AbstractWebSocketMessageBrokerConfigurer {
+class WebSocketConfig implements WebSocketMessageBrokerConfigurer {
 
     @Override
     void configureMessageBroker(MessageBrokerRegistry config) {
-        config.enableSimpleBroker("/topic", "/queue", "/exchange");
+
+        long[] heartbeat = [ 30000, 30000 ];
+        config.enableSimpleBroker("/topic", "/queue", "/exchange")
+            .setTaskScheduler(new DefaultManagedTaskScheduler()) // enable heartbeats
+            .setHeartbeatValue(heartbeat); // enable heartbeats
+
 //        config.enableStompBrokerRelay("/topic", "/queue", "/exchange"); // Uncomment for external message broker (ActiveMQ, RabbitMQ)
         config.setApplicationDestinationPrefixes("/topic", "/queue"); // prefix in client queries
         config.setUserDestinationPrefix("/user");
@@ -27,7 +33,7 @@ class WebSocketConfig extends AbstractWebSocketMessageBrokerConfigurer {
 
     @Override
     void registerStompEndpoints(StompEndpointRegistry registry) {
-        registry.addEndpoint("/example-endpoint").withSockJS()
+        registry.addEndpoint("/example-endpoint").setAllowedOrigins("*").withSockJS()
     }
 
     @Override
diff --git a/test-server/src/main/resources/application.properties b/test-server/src/main/resources/application.properties
index 8b32467..d905eee 100644
--- a/test-server/src/main/resources/application.properties
+++ b/test-server/src/main/resources/application.properties
@@ -1,6 +1,8 @@
-server.port=80
+server.port=8080
 
 spring.jackson.deserialization.accept_empty_string_as_null_object=true
 spring.jackson.property-naming-strategy=CAMEL_CASE_TO_LOWER_CASE_WITH_UNDERSCORES
 spring.jackson.serialization.write_char_arrays_as_json_arrays=true
-spring.jackson.serialization-inclusion=NON_NULL
\ No newline at end of file
+spring.jackson.serialization-inclusion=NON_NULL
+
+logging.level.org.springframework.web=DEBUG
\ No newline at end of file

From bb315edfd9d1c5164f94644fb0f232ba0870a993 Mon Sep 17 00:00:00 2001
From: Nickolay Savchenko <savchenko@river-soft.net>
Date: Sat, 29 Dec 2018 18:52:04 +0200
Subject: [PATCH 087/110] Fix buildscripts

---
 example-client/build.gradle | 25 ++++++++++++++++++++++---
 lib/build.gradle            | 23 +++++++++++++++++++++--
 2 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/example-client/build.gradle b/example-client/build.gradle
index 507e163..8b54e85 100644
--- a/example-client/build.gradle
+++ b/example-client/build.gradle
@@ -1,3 +1,22 @@
+buildscript {
+    repositories {
+        jcenter()
+        maven {
+            url "https://maven.google.com"
+        }
+        google()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
+    }
+}
+
+repositories {
+    jcenter()
+    maven { url "https://jitpack.io" }
+    google()
+}
 
 apply plugin: 'com.android.application'
 
@@ -35,8 +54,8 @@ dependencies {
     implementation 'io.reactivex.rxjava2:rxjava:2.1.15'
     implementation 'io.reactivex.rxjava2:rxandroid:2.0.2'
 
-    implementation 'com.squareup.retrofit2:converter-gson:2.3.0'
-    implementation 'com.squareup.retrofit2:adapter-rxjava2:2.3.0'
-    implementation 'com.squareup.retrofit2:retrofit:2.3.0'
+    implementation 'com.squareup.retrofit2:converter-gson:2.4.0'
+    implementation 'com.squareup.retrofit2:adapter-rxjava2:2.4.0'
+    implementation 'com.squareup.retrofit2:retrofit:2.4.0'
     implementation project(':lib')
 }
diff --git a/lib/build.gradle b/lib/build.gradle
index 4a02474..ba278f1 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -1,3 +1,22 @@
+buildscript {
+    repositories {
+        jcenter()
+        maven {
+            url "https://maven.google.com"
+        }
+        google()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
+        classpath 'org.codehaus.groovy:groovy-android-gradle-plugin:2.0.0'
+    }
+}
+
+repositories {
+    jcenter()
+    google()
+}
 
 apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
@@ -6,7 +25,7 @@ apply plugin: 'groovyx.android'
 group='com.github.NaikSoftware'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     defaultConfig {
         minSdkVersion 16
@@ -46,7 +65,7 @@ dependencies {
     testImplementation 'org.testcontainers:testcontainers:1.8.0'
     testImplementation 'org.spockframework:spock-core:1.1-groovy-2.4'
     testImplementation 'org.java-websocket:Java-WebSocket:1.3.6'
-    testImplementation 'com.squareup.okhttp3:okhttp:3.10.0'
+    testImplementation 'com.squareup.okhttp3:okhttp:3.11.0'
     testImplementation 'ch.qos.logback:logback-classic:1.2.3'
 }
 

From 2f0477b8e764b7e3cab0aab3d26e367494d0c3c9 Mon Sep 17 00:00:00 2001
From: Nickolay Savchenko <savchenko@river-soft.net>
Date: Sat, 29 Dec 2018 19:16:11 +0200
Subject: [PATCH 088/110] Fix build

---
 example-client/build.gradle                   |  3 +-
 example-client/gradle.properties              |  2 +
 example-client/src/main/AndroidManifest.xml   | 19 ++--
 .../stompclientexample/MainActivity.java      |  8 +-
 .../stompclientexample/SimpleAdapter.java     |  3 +-
 .../src/main/res/layout/activity_main.xml     |  2 +-
 .../stompclientexample/ExampleUnitTest.java   | 15 ---
 .../stomp/StompClientIntegrationTest.java     | 97 -------------------
 8 files changed, 21 insertions(+), 128 deletions(-)
 create mode 100644 example-client/gradle.properties
 delete mode 100644 example-client/src/test/java/ua/naiksoftware/stompclientexample/ExampleUnitTest.java
 delete mode 100644 lib/src/test/java/ua/naiksoftware/stomp/StompClientIntegrationTest.java

diff --git a/example-client/build.gradle b/example-client/build.gradle
index 8b54e85..ea145fa 100644
--- a/example-client/build.gradle
+++ b/example-client/build.gradle
@@ -45,7 +45,8 @@ android {
 }
 
 dependencies {
-    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'androidx.recyclerview:recyclerview:1.0.0'
     implementation 'org.java-websocket:Java-WebSocket:1.3.6'
     implementation 'com.android.support:recyclerview-v7:28.0.0'
 
diff --git a/example-client/gradle.properties b/example-client/gradle.properties
new file mode 100644
index 0000000..d015431
--- /dev/null
+++ b/example-client/gradle.properties
@@ -0,0 +1,2 @@
+android.useAndroidX=true
+android.enableJetifier=true
\ No newline at end of file
diff --git a/example-client/src/main/AndroidManifest.xml b/example-client/src/main/AndroidManifest.xml
index 8acdccd..5a65fcc 100644
--- a/example-client/src/main/AndroidManifest.xml
+++ b/example-client/src/main/AndroidManifest.xml
@@ -1,20 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="ua.naiksoftware.stompclientexample">
+    xmlns:tools="http://schemas.android.com/tools"
+    package="ua.naiksoftware.stompclientexample">
 
-    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.INTERNET" />
 
     <application
-            android:allowBackup="true"
-            android:icon="@mipmap/ic_launcher"
-            android:label="@string/app_name"
-            android:supportsRtl="true"
-            android:theme="@style/AppTheme">
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme">
         <activity android:name="ua.naiksoftware.stompclientexample.MainActivity">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
+                <action android:name="android.intent.action.MAIN" />
 
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
     </application>
diff --git a/example-client/src/main/java/ua/naiksoftware/stompclientexample/MainActivity.java b/example-client/src/main/java/ua/naiksoftware/stompclientexample/MainActivity.java
index a249e9b..df5e3b9 100644
--- a/example-client/src/main/java/ua/naiksoftware/stompclientexample/MainActivity.java
+++ b/example-client/src/main/java/ua/naiksoftware/stompclientexample/MainActivity.java
@@ -1,9 +1,6 @@
 package ua.naiksoftware.stompclientexample;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
 import android.util.Log;
 import android.view.View;
 import android.widget.Toast;
@@ -17,6 +14,9 @@
 import java.util.List;
 import java.util.Locale;
 
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import io.reactivex.CompletableTransformer;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.CompositeDisposable;
@@ -46,7 +46,7 @@ public class MainActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
-        mRecyclerView = (RecyclerView) findViewById(R.id.recycler_view);
+        mRecyclerView = findViewById(R.id.recycler_view);
         mAdapter = new SimpleAdapter(mDataSet);
         mAdapter.setHasStableIds(true);
         mRecyclerView.setAdapter(mAdapter);
diff --git a/example-client/src/main/java/ua/naiksoftware/stompclientexample/SimpleAdapter.java b/example-client/src/main/java/ua/naiksoftware/stompclientexample/SimpleAdapter.java
index f546409..52947fc 100644
--- a/example-client/src/main/java/ua/naiksoftware/stompclientexample/SimpleAdapter.java
+++ b/example-client/src/main/java/ua/naiksoftware/stompclientexample/SimpleAdapter.java
@@ -1,6 +1,5 @@
 package ua.naiksoftware.stompclientexample;
 
-import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -8,6 +7,8 @@
 
 import java.util.List;
 
+import androidx.recyclerview.widget.RecyclerView;
+
 /**
  * Created by Naik on 24.02.17.
  */
diff --git a/example-client/src/main/res/layout/activity_main.xml b/example-client/src/main/res/layout/activity_main.xml
index 0596fa9..4c68891 100644
--- a/example-client/src/main/res/layout/activity_main.xml
+++ b/example-client/src/main/res/layout/activity_main.xml
@@ -62,7 +62,7 @@
 
     </LinearLayout>
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recycler_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/example-client/src/test/java/ua/naiksoftware/stompclientexample/ExampleUnitTest.java b/example-client/src/test/java/ua/naiksoftware/stompclientexample/ExampleUnitTest.java
deleted file mode 100644
index 4795c29..0000000
--- a/example-client/src/test/java/ua/naiksoftware/stompclientexample/ExampleUnitTest.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package ua.naiksoftware.stompclientexample;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * To work on unit tests, switch the Test Artifact in the Build Variants view.
- */
-public class ExampleUnitTest {
-    @Test
-    public void addition_isCorrect() throws Exception {
-        assertEquals(4, 2 + 2);
-    }
-}
\ No newline at end of file
diff --git a/lib/src/test/java/ua/naiksoftware/stomp/StompClientIntegrationTest.java b/lib/src/test/java/ua/naiksoftware/stomp/StompClientIntegrationTest.java
deleted file mode 100644
index b1dbe46..0000000
--- a/lib/src/test/java/ua/naiksoftware/stomp/StompClientIntegrationTest.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package ua.naiksoftware.stomp;
-
-import android.util.Log;
-
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mockito;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PowerMockIgnore;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import ua.naiksoftware.stomp.client.StompClient;
-
-import static java.util.concurrent.TimeUnit.MINUTES;
-import static org.awaitility.Awaitility.await;
-import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertEquals;
-import static org.mockito.ArgumentMatchers.anyString;
-
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({Log.class})
-@PowerMockIgnore("javax.net.ssl.*")
-public class StompClientIntegrationTest {
-
-    private static final String TAG = StompClientIntegrationTest.class.getSimpleName();
-
-    @BeforeClass
-    public static void init() {
-        PowerMockito.mockStatic(Log.class);
-        Mockito.when(Log.i(anyString(), anyString())).then(i ->  {System.out.println((String) i.getArgument(0) + " --> " + (String) i.getArgument(1) ); return null; });
-        Mockito.when(Log.w(anyString(), anyString())).then(i ->  {System.out.println((String) i.getArgument(0) + " --> " + (String) i.getArgument(1) ); return null; });
-        Mockito.when(Log.d(anyString(), anyString())).then(i ->  {System.out.println((String) i.getArgument(0) + " --> " + (String) i.getArgument(1) ); return null; });
-        Mockito.when(Log.e(anyString(), anyString())).then(i ->  {System.out.println((String) i.getArgument(0) + " --> " + (String) i.getArgument(1) ); return null; });
-
-        //TODO: bootstap a spring boot test server, so we can run tests.
-    }
-
-    @AfterClass
-    public static void terminate() {
-        //TODO: teardown  a spring boot test server, so we can run tests.
-    }
-
-
-    @Test
-    public void callWebsocket() {
-        //TODO: uncomment and create proper testing.
-
-//        final List<String> messages = new ArrayList<>();
-//
-//        final Map<String, String> connectHttpHeaders = new HashMap<>();
-//        connectHttpHeaders.put("Authorization", "Basic bHVhbDpwYXNz");
-//
-//        final StompClient mStompClient = Stomp.over(Stomp.ConnectionProvider.OKHTTP, "ws://localhost:8080/notifications/websocket", connectHttpHeaders);
-//        //don't care...but server will force it
-//        mStompClient.withClientHeartbeat(10000).withServerHeartbeat(10000);
-//
-//        mStompClient.topic("/topic/notification/system/demo/username/lual").subscribe(topicMessage -> {
-//           Log.i(TAG,topicMessage.getPayload());
-//           messages.add(topicMessage.getPayload());
-//        });
-//
-//        mStompClient.lifecycle().subscribe(lifecycleEvent -> {
-//            switch (lifecycleEvent.getType()) {
-//
-//                case OPENED:
-//                    Log.i(TAG,"Stomp connection opened");
-//                    break;
-//
-//                case ERROR:
-//                    Log.i(TAG,"Error " + lifecycleEvent.getException());
-//                    break;
-//
-//                case CLOSED:
-//                    Log.i(TAG,"Stomp connection closed");
-//                    break;
-//            }
-//        });
-//
-//        mStompClient.connect();
-//
-//        await().atMost(5, MINUTES).until( messages::size, is(10));
-//
-//        mStompClient.disconnect();
-      }
-
-
-}
\ No newline at end of file

From 41552a546209018d4cf9a571fd919644ec21e6f6 Mon Sep 17 00:00:00 2001
From: Nickolay Savchenko <naiksav4enko@gmail.com>
Date: Tue, 8 Jan 2019 00:59:28 +0200
Subject: [PATCH 089/110] Update README.md

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index 81374f5..130da41 100644
--- a/README.md
+++ b/README.md
@@ -65,7 +65,6 @@ Check out the full example server https://github.com/NaikSoftware/stomp-protocol
 
 **Basic usage**
 ``` java
- import org.java_websocket.WebSocket;
 
  private StompClient mStompClient;
  

From e4d52e9da53ee1a61b7c470778f8bf5b1f25b917 Mon Sep 17 00:00:00 2001
From: Nickolay Savchenko <naiksav4enko@gmail.com>
Date: Wed, 16 Jan 2019 20:28:45 +0200
Subject: [PATCH 090/110] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 130da41..2c3c806 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ repositories {
     maven { url "https://jitpack.io" }
 }
 dependencies {
-    compile 'com.github.NaikSoftware:StompProtocolAndroid:{latest version}'
+    implementation 'com.github.NaikSoftware:StompProtocolAndroid:{latest version}'
 }
 ```
 

From a2570f5220c48b9d548b52f8080eae6a7fcba7ac Mon Sep 17 00:00:00 2001
From: Naik <naiksav4enko@gmail.com>
Date: Sun, 20 Jan 2019 23:42:42 +0200
Subject: [PATCH 091/110] Refactor packages

---
 .idea/misc.xml                                      | 12 +++++++++---
 example-client/build.gradle                         | 13 +++++--------
 .../stompclientexample/MainActivity.java            |  4 ++--
 lib/build.gradle                                    | 11 ++++-------
 lib/src/main/java/ua/naiksoftware/stomp/Stomp.java  |  5 +++--
 .../stomp/{client => }/StompClient.java             | 10 ++++++----
 .../stomp/{ => dto}/LifecycleEvent.java             |  2 +-
 .../stomp/{client => dto}/StompCommand.java         |  2 +-
 .../naiksoftware/stomp/{ => dto}/StompHeader.java   |  2 +-
 .../stomp/{client => dto}/StompMessage.java         |  4 +---
 .../{ => provider}/AbstractConnectionProvider.java  | 12 +++++++-----
 .../stomp/{ => provider}/ConnectionProvider.java    |  4 ++--
 .../{ => provider}/OkHttpConnectionProvider.java    |  7 ++++---
 .../WebSocketsConnectionProvider.java               |  7 ++++---
 .../ua/naiksoftware/stomp/ConnectionTests.groovy    | 12 ++----------
 15 files changed, 52 insertions(+), 55 deletions(-)
 rename lib/src/main/java/ua/naiksoftware/stomp/{client => }/StompClient.java (97%)
 rename lib/src/main/java/ua/naiksoftware/stomp/{ => dto}/LifecycleEvent.java (97%)
 rename lib/src/main/java/ua/naiksoftware/stomp/{client => dto}/StompCommand.java (92%)
 rename lib/src/main/java/ua/naiksoftware/stomp/{ => dto}/StompHeader.java (95%)
 rename lib/src/main/java/ua/naiksoftware/stomp/{client => dto}/StompMessage.java (97%)
 rename lib/src/main/java/ua/naiksoftware/stomp/{ => provider}/AbstractConnectionProvider.java (96%)
 rename lib/src/main/java/ua/naiksoftware/stomp/{ => provider}/ConnectionProvider.java (91%)
 rename lib/src/main/java/ua/naiksoftware/stomp/{ => provider}/OkHttpConnectionProvider.java (93%)
 rename lib/src/main/java/ua/naiksoftware/stomp/{ => provider}/WebSocketsConnectionProvider.java (94%)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index b0c7b20..6dfa535 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -5,7 +5,7 @@
     <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
     <option name="myNullables">
       <value>
-        <list size="7">
+        <list size="10">
           <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
           <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
           <item index="2" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
@@ -13,23 +13,29 @@
           <item index="4" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
           <item index="5" class="java.lang.String" itemvalue="androidx.annotation.Nullable" />
           <item index="6" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNullable" />
+          <item index="7" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.Nullable" />
+          <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableDecl" />
+          <item index="9" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableType" />
         </list>
       </value>
     </option>
     <option name="myNotNulls">
       <value>
-        <list size="6">
+        <list size="9">
           <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
           <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
           <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
           <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
           <item index="4" class="java.lang.String" itemvalue="androidx.annotation.NonNull" />
           <item index="5" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNonNull" />
+          <item index="6" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.NonNull" />
+          <item index="7" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullDecl" />
+          <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullType" />
         </list>
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/example-client/build.gradle b/example-client/build.gradle
index ea145fa..f78cbbf 100644
--- a/example-client/build.gradle
+++ b/example-client/build.gradle
@@ -49,14 +49,11 @@ dependencies {
     implementation 'androidx.recyclerview:recyclerview:1.0.0'
     implementation 'org.java-websocket:Java-WebSocket:1.3.6'
     implementation 'com.android.support:recyclerview-v7:28.0.0'
-
     // RxJava
-    // implementation 'io.reactivex.rxjava2:rxandroid:2.0.1'
-    implementation 'io.reactivex.rxjava2:rxjava:2.1.15'
-    implementation 'io.reactivex.rxjava2:rxandroid:2.0.2'
-
-    implementation 'com.squareup.retrofit2:converter-gson:2.4.0'
-    implementation 'com.squareup.retrofit2:adapter-rxjava2:2.4.0'
-    implementation 'com.squareup.retrofit2:retrofit:2.4.0'
+    implementation 'io.reactivex.rxjava2:rxjava:2.2.5'
+    implementation 'io.reactivex.rxjava2:rxandroid:2.1.0'
+    implementation 'com.squareup.retrofit2:converter-gson:2.5.0'
+    implementation 'com.squareup.retrofit2:adapter-rxjava2:2.5.0'
+    implementation 'com.squareup.retrofit2:retrofit:2.5.0'
     implementation project(':lib')
 }
diff --git a/example-client/src/main/java/ua/naiksoftware/stompclientexample/MainActivity.java b/example-client/src/main/java/ua/naiksoftware/stompclientexample/MainActivity.java
index df5e3b9..a40111e 100644
--- a/example-client/src/main/java/ua/naiksoftware/stompclientexample/MainActivity.java
+++ b/example-client/src/main/java/ua/naiksoftware/stompclientexample/MainActivity.java
@@ -23,8 +23,8 @@
 import io.reactivex.disposables.Disposable;
 import io.reactivex.schedulers.Schedulers;
 import ua.naiksoftware.stomp.Stomp;
-import ua.naiksoftware.stomp.StompHeader;
-import ua.naiksoftware.stomp.client.StompClient;
+import ua.naiksoftware.stomp.dto.StompHeader;
+import ua.naiksoftware.stomp.StompClient;
 
 import static ua.naiksoftware.stompclientexample.RestClient.ANDROID_EMULATOR_LOCALHOST;
 
diff --git a/lib/build.gradle b/lib/build.gradle
index ba278f1..c65ae51 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -53,19 +53,16 @@ android {
 
 
 dependencies {
-    implementation "io.reactivex.rxjava2:rxjava:2.1.15"
-
+    implementation 'io.reactivex.rxjava2:rxjava:2.2.5'
     // Supported transports
     api 'org.java-websocket:Java-WebSocket:1.3.6'
-    api 'com.squareup.okhttp3:okhttp:3.11.0'
-    
+    api 'com.squareup.okhttp3:okhttp:3.12.1'
     implementation 'com.android.support:support-annotations:28.0.0'
-
-    testImplementation "com.andrewreitz:spock-android:2.0.0"
+    testImplementation 'com.andrewreitz:spock-android:2.0.0'
     testImplementation 'org.testcontainers:testcontainers:1.8.0'
     testImplementation 'org.spockframework:spock-core:1.1-groovy-2.4'
     testImplementation 'org.java-websocket:Java-WebSocket:1.3.6'
-    testImplementation 'com.squareup.okhttp3:okhttp:3.11.0'
+    testImplementation 'com.squareup.okhttp3:okhttp:3.12.1'
     testImplementation 'ch.qos.logback:logback-classic:1.2.3'
 }
 
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/Stomp.java b/lib/src/main/java/ua/naiksoftware/stomp/Stomp.java
index f64d60d..db65635 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/Stomp.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/Stomp.java
@@ -6,7 +6,8 @@
 import java.util.Map;
 
 import okhttp3.OkHttpClient;
-import ua.naiksoftware.stomp.client.StompClient;
+import ua.naiksoftware.stomp.provider.OkHttpConnectionProvider;
+import ua.naiksoftware.stomp.provider.WebSocketsConnectionProvider;
 
 /**
  * Supported overlays:
@@ -62,7 +63,7 @@ public static StompClient over(@NonNull ConnectionProvider connectionProvider, S
         throw new IllegalArgumentException("ConnectionProvider type not supported: " + connectionProvider.toString());
     }
 
-    private static StompClient createStompClient(ua.naiksoftware.stomp.ConnectionProvider connectionProvider) {
+    private static StompClient createStompClient(ua.naiksoftware.stomp.provider.ConnectionProvider connectionProvider) {
         return new StompClient(connectionProvider);
     }
 
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java b/lib/src/main/java/ua/naiksoftware/stomp/StompClient.java
similarity index 97%
rename from lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
rename to lib/src/main/java/ua/naiksoftware/stomp/StompClient.java
index aa4de32..552fec5 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/StompClient.java
@@ -1,4 +1,4 @@
-package ua.naiksoftware.stomp.client;
+package ua.naiksoftware.stomp;
 
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
@@ -17,9 +17,11 @@
 import io.reactivex.disposables.Disposable;
 import io.reactivex.subjects.BehaviorSubject;
 import io.reactivex.subjects.PublishSubject;
-import ua.naiksoftware.stomp.ConnectionProvider;
-import ua.naiksoftware.stomp.LifecycleEvent;
-import ua.naiksoftware.stomp.StompHeader;
+import ua.naiksoftware.stomp.dto.StompCommand;
+import ua.naiksoftware.stomp.dto.StompMessage;
+import ua.naiksoftware.stomp.provider.ConnectionProvider;
+import ua.naiksoftware.stomp.dto.LifecycleEvent;
+import ua.naiksoftware.stomp.dto.StompHeader;
 
 /**
  * Created by naik on 05.05.16.
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/LifecycleEvent.java b/lib/src/main/java/ua/naiksoftware/stomp/dto/LifecycleEvent.java
similarity index 97%
rename from lib/src/main/java/ua/naiksoftware/stomp/LifecycleEvent.java
rename to lib/src/main/java/ua/naiksoftware/stomp/dto/LifecycleEvent.java
index badcda4..019d331 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/LifecycleEvent.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/dto/LifecycleEvent.java
@@ -1,4 +1,4 @@
-package ua.naiksoftware.stomp;
+package ua.naiksoftware.stomp.dto;
 
 
 import java.util.TreeMap;
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/client/StompCommand.java b/lib/src/main/java/ua/naiksoftware/stomp/dto/StompCommand.java
similarity index 92%
rename from lib/src/main/java/ua/naiksoftware/stomp/client/StompCommand.java
rename to lib/src/main/java/ua/naiksoftware/stomp/dto/StompCommand.java
index ca35194..029a197 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/client/StompCommand.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/dto/StompCommand.java
@@ -1,4 +1,4 @@
-package ua.naiksoftware.stomp.client;
+package ua.naiksoftware.stomp.dto;
 
 /**
  * Created by naik on 05.05.16.
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/StompHeader.java b/lib/src/main/java/ua/naiksoftware/stomp/dto/StompHeader.java
similarity index 95%
rename from lib/src/main/java/ua/naiksoftware/stomp/StompHeader.java
rename to lib/src/main/java/ua/naiksoftware/stomp/dto/StompHeader.java
index bf87273..5221cde 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/StompHeader.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/dto/StompHeader.java
@@ -1,4 +1,4 @@
-package ua.naiksoftware.stomp;
+package ua.naiksoftware.stomp.dto;
 
 /**
  * Created by naik on 05.05.16.
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/client/StompMessage.java b/lib/src/main/java/ua/naiksoftware/stomp/dto/StompMessage.java
similarity index 97%
rename from lib/src/main/java/ua/naiksoftware/stomp/client/StompMessage.java
rename to lib/src/main/java/ua/naiksoftware/stomp/dto/StompMessage.java
index c5c2dda..32898dd 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/client/StompMessage.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/dto/StompMessage.java
@@ -1,4 +1,4 @@
-package ua.naiksoftware.stomp.client;
+package ua.naiksoftware.stomp.dto;
 
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
@@ -10,8 +10,6 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import ua.naiksoftware.stomp.StompHeader;
-
 /**
  * Created by naik on 05.05.16.
  */
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/AbstractConnectionProvider.java b/lib/src/main/java/ua/naiksoftware/stomp/provider/AbstractConnectionProvider.java
similarity index 96%
rename from lib/src/main/java/ua/naiksoftware/stomp/AbstractConnectionProvider.java
rename to lib/src/main/java/ua/naiksoftware/stomp/provider/AbstractConnectionProvider.java
index da8ef7e..aea6d3a 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/AbstractConnectionProvider.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/provider/AbstractConnectionProvider.java
@@ -1,4 +1,4 @@
-package ua.naiksoftware.stomp;
+package ua.naiksoftware.stomp.provider;
 
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
@@ -12,8 +12,10 @@
 import io.reactivex.disposables.Disposable;
 import io.reactivex.schedulers.Schedulers;
 import io.reactivex.subjects.PublishSubject;
-import ua.naiksoftware.stomp.client.StompCommand;
-import ua.naiksoftware.stomp.client.StompMessage;
+import ua.naiksoftware.stomp.dto.LifecycleEvent;
+import ua.naiksoftware.stomp.dto.StompHeader;
+import ua.naiksoftware.stomp.dto.StompCommand;
+import ua.naiksoftware.stomp.dto.StompMessage;
 
 /**
  * Created by forresthopkinsa on 8/8/2017.
@@ -21,7 +23,7 @@
  * Created because there was a lot of shared code between JWS and OkHttp connection providers.
  */
 
-abstract class AbstractConnectionProvider implements ConnectionProvider {
+public abstract class AbstractConnectionProvider implements ConnectionProvider {
 
     private static final String TAG = AbstractConnectionProvider.class.getSimpleName();
 
@@ -40,7 +42,7 @@ abstract class AbstractConnectionProvider implements ConnectionProvider {
     @NonNull
     private final PublishSubject<String> mMessagesStream;
 
-    AbstractConnectionProvider() {
+    public AbstractConnectionProvider() {
         mLifecycleStream = PublishSubject.create();
         mMessagesStream = PublishSubject.create();
     }
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/ConnectionProvider.java b/lib/src/main/java/ua/naiksoftware/stomp/provider/ConnectionProvider.java
similarity index 91%
rename from lib/src/main/java/ua/naiksoftware/stomp/ConnectionProvider.java
rename to lib/src/main/java/ua/naiksoftware/stomp/provider/ConnectionProvider.java
index d11f881..4f7fa1d 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/ConnectionProvider.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/provider/ConnectionProvider.java
@@ -1,8 +1,8 @@
-package ua.naiksoftware.stomp;
+package ua.naiksoftware.stomp.provider;
 
 import io.reactivex.Completable;
-import io.reactivex.Flowable;
 import io.reactivex.Observable;
+import ua.naiksoftware.stomp.dto.LifecycleEvent;
 
 /**
  * Created by naik on 05.05.16.
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java b/lib/src/main/java/ua/naiksoftware/stomp/provider/OkHttpConnectionProvider.java
similarity index 93%
rename from lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java
rename to lib/src/main/java/ua/naiksoftware/stomp/provider/OkHttpConnectionProvider.java
index a09ca41..e2898c9 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/provider/OkHttpConnectionProvider.java
@@ -1,4 +1,4 @@
-package ua.naiksoftware.stomp;
+package ua.naiksoftware.stomp.provider;
 
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
@@ -15,8 +15,9 @@
 import okhttp3.WebSocket;
 import okhttp3.WebSocketListener;
 import okio.ByteString;
+import ua.naiksoftware.stomp.dto.LifecycleEvent;
 
-class OkHttpConnectionProvider extends AbstractConnectionProvider {
+public class OkHttpConnectionProvider extends AbstractConnectionProvider {
 
     public static final String TAG = "OkHttpConnProvider";
 
@@ -28,7 +29,7 @@ class OkHttpConnectionProvider extends AbstractConnectionProvider {
     @Nullable
     private WebSocket openSocket;
 
-    OkHttpConnectionProvider(String uri, @Nullable Map<String, String> connectHttpHeaders, OkHttpClient okHttpClient) {
+    public OkHttpConnectionProvider(String uri, @Nullable Map<String, String> connectHttpHeaders, OkHttpClient okHttpClient) {
         super();
         mUri = uri;
         mConnectHttpHeaders = connectHttpHeaders != null ? connectHttpHeaders : new HashMap<>();
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java b/lib/src/main/java/ua/naiksoftware/stomp/provider/WebSocketsConnectionProvider.java
similarity index 94%
rename from lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java
rename to lib/src/main/java/ua/naiksoftware/stomp/provider/WebSocketsConnectionProvider.java
index 0d2a3e4..0483b6b 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/provider/WebSocketsConnectionProvider.java
@@ -1,4 +1,4 @@
-package ua.naiksoftware.stomp;
+package ua.naiksoftware.stomp.provider;
 
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
@@ -10,6 +10,7 @@
 import org.java_websocket.exceptions.InvalidDataException;
 import org.java_websocket.handshake.ClientHandshake;
 import org.java_websocket.handshake.ServerHandshake;
+import ua.naiksoftware.stomp.dto.LifecycleEvent;
 
 import java.net.URI;
 import java.util.HashMap;
@@ -24,7 +25,7 @@
  * Created by naik on 05.05.16.
  */
 
-class WebSocketsConnectionProvider extends AbstractConnectionProvider {
+public class WebSocketsConnectionProvider extends AbstractConnectionProvider {
 
     private static final String TAG = WebSocketsConnectionProvider.class.getSimpleName();
 
@@ -41,7 +42,7 @@ class WebSocketsConnectionProvider extends AbstractConnectionProvider {
      *
      * @param connectHttpHeaders may be null
      */
-    WebSocketsConnectionProvider(String uri, @Nullable Map<String, String> connectHttpHeaders) {
+    public WebSocketsConnectionProvider(String uri, @Nullable Map<String, String> connectHttpHeaders) {
         mUri = uri;
         mConnectHttpHeaders = connectHttpHeaders != null ? connectHttpHeaders : new HashMap<>();
     }
diff --git a/lib/src/test/groovy/ua/naiksoftware/stomp/ConnectionTests.groovy b/lib/src/test/groovy/ua/naiksoftware/stomp/ConnectionTests.groovy
index 5200c30..be8f22e 100644
--- a/lib/src/test/groovy/ua/naiksoftware/stomp/ConnectionTests.groovy
+++ b/lib/src/test/groovy/ua/naiksoftware/stomp/ConnectionTests.groovy
@@ -1,17 +1,9 @@
 package ua.naiksoftware.stomp
 
-import groovy.util.logging.Log4j
-import groovy.util.logging.Slf4j
-import io.reactivex.Flowable
-import io.reactivex.annotations.NonNull
+
 import io.reactivex.functions.Predicate
 import io.reactivex.subscribers.TestSubscriber
-import org.testcontainers.containers.GenericContainer
-import spock.lang.Shared
-import ua.naiksoftware.stomp.Configuration
-import ua.naiksoftware.stomp.Stomp
-
-import java.util.concurrent.TimeUnit
+import ua.naiksoftware.stomp.dto.LifecycleEvent
 
 class ConnectionTests extends Configuration {
 

From fc6fc14907cac9d84c18945826767301a24f1dc3 Mon Sep 17 00:00:00 2001
From: Naik <naiksav4enko@gmail.com>
Date: Mon, 21 Jan 2019 01:20:08 +0200
Subject: [PATCH 092/110] Extract PathMatcher and add tests

---
 example-client/build.gradle                   |  2 +-
 gradle/wrapper/gradle-wrapper.properties      |  4 +-
 lib/build.gradle                              |  4 +-
 .../ua/naiksoftware/stomp/StompClient.java    | 91 ++++---------------
 .../naiksoftware/stomp/dto/StompHeader.java   |  5 +
 .../naiksoftware/stomp/dto/StompMessage.java  |  9 ++
 .../stomp/pathmatcher/PathMatcher.java        |  8 ++
 .../stomp/pathmatcher/RabbitPathMatcher.java  | 51 +++++++++++
 .../stomp/pathmatcher/SimplePathMatcher.java  | 14 +++
 .../naiksoftware/stomp/Configuration.groovy   |  3 +-
 .../naiksoftware/stomp/ConnectionTests.groovy |  2 +-
 .../stomp/PathMatcherTests.groovy             | 28 ++++++
 12 files changed, 141 insertions(+), 80 deletions(-)
 create mode 100644 lib/src/main/java/ua/naiksoftware/stomp/pathmatcher/PathMatcher.java
 create mode 100644 lib/src/main/java/ua/naiksoftware/stomp/pathmatcher/RabbitPathMatcher.java
 create mode 100644 lib/src/main/java/ua/naiksoftware/stomp/pathmatcher/SimplePathMatcher.java
 create mode 100644 lib/src/test/groovy/ua/naiksoftware/stomp/PathMatcherTests.groovy

diff --git a/example-client/build.gradle b/example-client/build.gradle
index f78cbbf..efb5036 100644
--- a/example-client/build.gradle
+++ b/example-client/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
     }
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index f06581d..d4af6f6 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Sep 05 08:26:08 MST 2017
+#Sun Jan 20 23:59:55 EET 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
diff --git a/lib/build.gradle b/lib/build.gradle
index c65ae51..067e4a2 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
         classpath 'org.codehaus.groovy:groovy-android-gradle-plugin:2.0.0'
     }
@@ -59,7 +59,7 @@ dependencies {
     api 'com.squareup.okhttp3:okhttp:3.12.1'
     implementation 'com.android.support:support-annotations:28.0.0'
     testImplementation 'com.andrewreitz:spock-android:2.0.0'
-    testImplementation 'org.testcontainers:testcontainers:1.8.0'
+    testImplementation 'org.testcontainers:testcontainers:1.10.5'
     testImplementation 'org.spockframework:spock-core:1.1-groovy-2.4'
     testImplementation 'org.java-websocket:Java-WebSocket:1.3.6'
     testImplementation 'com.squareup.okhttp3:okhttp:3.12.1'
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/StompClient.java b/lib/src/main/java/ua/naiksoftware/stomp/StompClient.java
index 552fec5..962d455 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/StompClient.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/StompClient.java
@@ -19,6 +19,8 @@
 import io.reactivex.subjects.PublishSubject;
 import ua.naiksoftware.stomp.dto.StompCommand;
 import ua.naiksoftware.stomp.dto.StompMessage;
+import ua.naiksoftware.stomp.pathmatcher.PathMatcher;
+import ua.naiksoftware.stomp.pathmatcher.SimplePathMatcher;
 import ua.naiksoftware.stomp.provider.ConnectionProvider;
 import ua.naiksoftware.stomp.dto.LifecycleEvent;
 import ua.naiksoftware.stomp.dto.StompHeader;
@@ -43,7 +45,7 @@ public class StompClient {
     private PublishSubject<StompMessage> mMessageStream;
     private ConcurrentHashMap<String, Flowable<StompMessage>> mStreamMap;
     private final BehaviorSubject<Boolean> mConnectionStream;
-    private Parser parser;
+    private PathMatcher pathMatcher;
     private Disposable mLifecycleDisposable;
     private Disposable mMessagesDisposable;
     private List<StompHeader> mHeaders;
@@ -56,27 +58,7 @@ public StompClient(ConnectionProvider connectionProvider) {
         mMessageStream = PublishSubject.create();
         mStreamMap = new ConcurrentHashMap<>();
         mConnectionStream = BehaviorSubject.createDefault(false);
-        parser = Parser.NONE;
-    }
-
-    public enum Parser {
-        NONE,
-        RABBITMQ
-    }
-
-    /**
-     * Set the wildcard parser for Topic subscription.
-     * <p>
-     * Right now, the only options are NONE and RABBITMQ.
-     * <p>
-     * When set to RABBITMQ, topic subscription allows for RMQ-style wildcards.
-     * <p>
-     * See more info <a href="https://www.rabbitmq.com/tutorials/tutorial-five-java.html">here</a>.
-     *
-     * @param parser Set to NONE by default
-     */
-    public void setParser(Parser parser) {
-        this.parser = parser;
+        pathMatcher = new SimplePathMatcher();
     }
 
     /**
@@ -243,7 +225,7 @@ public Flowable<StompMessage> topic(@NonNull String destPath, List<StompHeader>
         else if (!mStreamMap.containsKey(destPath))
             mStreamMap.put(destPath,
                     mMessageStream
-                            .filter(msg -> matches(destPath, msg))
+                            .filter(msg -> pathMatcher.matches(destPath, msg))
                             .toFlowable(BackpressureStrategy.BUFFER)
                             .doOnSubscribe(disposable -> subscribePath(destPath, headerList).subscribe())
                             .doFinally(() -> unsubscribePath(destPath).subscribe())
@@ -267,56 +249,19 @@ public void setLegacyWhitespace(boolean legacyWhitespace) {
         this.legacyWhitespace = legacyWhitespace;
     }
 
-    private boolean matches(String path, StompMessage msg) {
-        String dest = msg.findHeader(StompHeader.DESTINATION);
-        if (dest == null) return false;
-        boolean ret;
-
-        switch (parser) {
-            case NONE:
-                ret = path.equals(dest);
-                break;
-
-            case RABBITMQ:
-                // for example string "lorem.ipsum.*.sit":
-
-                // split it up into ["lorem", "ipsum", "*", "sit"]
-                String[] split = path.split("\\.");
-                ArrayList<String> transformed = new ArrayList<>();
-                // check for wildcards and replace with corresponding regex
-                for (String s : split) {
-                    switch (s) {
-                        case "*":
-                            transformed.add("[^.]+");
-                            break;
-                        case "#":
-                            // TODO: make this work with zero-word
-                            // e.g. "lorem.#.dolor" should ideally match "lorem.dolor"
-                            transformed.add(".*");
-                            break;
-                        default:
-                            transformed.add(s);
-                            break;
-                    }
-                }
-                // at this point, 'transformed' looks like ["lorem", "ipsum", "[^.]+", "sit"]
-                StringBuilder sb = new StringBuilder();
-                for (String s : transformed) {
-                    if (sb.length() > 0) sb.append("\\.");
-                    sb.append(s);
-                }
-                String join = sb.toString();
-                // join = "lorem\.ipsum\.[^.]+\.sit"
-
-                ret = dest.matches(join);
-                break;
-
-            default:
-                ret = false;
-                break;
-        }
-
-        return ret;
+    /**
+     * Set the wildcard or other matcher for Topic subscription.
+     * <p>
+     * Right now, the only options are simple, rmq supported.
+     * But you can write you own matcher by implementing {@link PathMatcher}
+     * <p>
+     * When set to {@link ua.naiksoftware.stomp.pathmatcher.RabbitPathMatcher}, topic subscription allows for RMQ-style wildcards.
+     * <p>
+     *
+     * @param pathMatcher Set to {@link SimplePathMatcher} by default
+     */
+    public void setPathMatcher(PathMatcher pathMatcher) {
+        this.pathMatcher = pathMatcher;
     }
 
     private Completable subscribePath(String destinationPath, @Nullable List<StompHeader> headerList) {
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/dto/StompHeader.java b/lib/src/main/java/ua/naiksoftware/stomp/dto/StompHeader.java
index 5221cde..583e295 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/dto/StompHeader.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/dto/StompHeader.java
@@ -28,4 +28,9 @@ public String getKey() {
     public String getValue() {
         return mValue;
     }
+
+    @Override
+    public String toString() {
+        return "StompHeader{" + mKey + '=' + mValue + '}';
+    }
 }
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/dto/StompMessage.java b/lib/src/main/java/ua/naiksoftware/stomp/dto/StompMessage.java
index 32898dd..15a0fea 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/dto/StompMessage.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/dto/StompMessage.java
@@ -93,4 +93,13 @@ public static StompMessage from(@Nullable String data) {
 
         return new StompMessage(command, headers, payload);
     }
+
+    @Override
+    public String toString() {
+        return "StompMessage{" +
+                "command='" + mStompCommand + '\'' +
+                ", headers=" + mStompHeaders +
+                ", payload='" + mPayload + '\'' +
+                '}';
+    }
 }
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/pathmatcher/PathMatcher.java b/lib/src/main/java/ua/naiksoftware/stomp/pathmatcher/PathMatcher.java
new file mode 100644
index 0000000..e5343b6
--- /dev/null
+++ b/lib/src/main/java/ua/naiksoftware/stomp/pathmatcher/PathMatcher.java
@@ -0,0 +1,8 @@
+package ua.naiksoftware.stomp.pathmatcher;
+
+import ua.naiksoftware.stomp.dto.StompMessage;
+
+public interface PathMatcher {
+
+    boolean matches(String path, StompMessage msg);
+}
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/pathmatcher/RabbitPathMatcher.java b/lib/src/main/java/ua/naiksoftware/stomp/pathmatcher/RabbitPathMatcher.java
new file mode 100644
index 0000000..1ee2b25
--- /dev/null
+++ b/lib/src/main/java/ua/naiksoftware/stomp/pathmatcher/RabbitPathMatcher.java
@@ -0,0 +1,51 @@
+package ua.naiksoftware.stomp.pathmatcher;
+
+import ua.naiksoftware.stomp.dto.StompHeader;
+import ua.naiksoftware.stomp.dto.StompMessage;
+
+import java.util.ArrayList;
+
+public class RabbitPathMatcher implements PathMatcher {
+
+    /**
+     * RMQ-style wildcards.
+     * See more info <a href="https://www.rabbitmq.com/tutorials/tutorial-five-java.html">here</a>.
+     */
+    @Override
+    public boolean matches(String path, StompMessage msg) {
+        String dest = msg.findHeader(StompHeader.DESTINATION);
+        if (dest == null) return false;
+
+        // for example string "lorem.ipsum.*.sit":
+
+        // split it up into ["lorem", "ipsum", "*", "sit"]
+        String[] split = path.split("\\.");
+        ArrayList<String> transformed = new ArrayList<>();
+        // check for wildcards and replace with corresponding regex
+        for (String s : split) {
+            switch (s) {
+                case "*":
+                    transformed.add("[^.]+");
+                    break;
+                case "#":
+                    // TODO: make this work with zero-word
+                    // e.g. "lorem.#.dolor" should ideally match "lorem.dolor"
+                    transformed.add(".*");
+                    break;
+                default:
+                    transformed.add(s.replaceAll("\\*", ".*"));
+                    break;
+            }
+        }
+        // at this point, 'transformed' looks like ["lorem", "ipsum", "[^.]+", "sit"]
+        StringBuilder sb = new StringBuilder();
+        for (String s : transformed) {
+            if (sb.length() > 0) sb.append("\\.");
+            sb.append(s);
+        }
+        String join = sb.toString();
+        // join = "lorem\.ipsum\.[^.]+\.sit"
+
+        return dest.matches(join);
+    }
+}
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/pathmatcher/SimplePathMatcher.java b/lib/src/main/java/ua/naiksoftware/stomp/pathmatcher/SimplePathMatcher.java
new file mode 100644
index 0000000..34611d5
--- /dev/null
+++ b/lib/src/main/java/ua/naiksoftware/stomp/pathmatcher/SimplePathMatcher.java
@@ -0,0 +1,14 @@
+package ua.naiksoftware.stomp.pathmatcher;
+
+import ua.naiksoftware.stomp.dto.StompHeader;
+import ua.naiksoftware.stomp.dto.StompMessage;
+
+public class SimplePathMatcher implements PathMatcher {
+
+    @Override
+    public boolean matches(String path, StompMessage msg) {
+        String dest = msg.findHeader(StompHeader.DESTINATION);
+        if (dest == null) return false;
+        else return path.equals(dest);
+    }
+}
diff --git a/lib/src/test/groovy/ua/naiksoftware/stomp/Configuration.groovy b/lib/src/test/groovy/ua/naiksoftware/stomp/Configuration.groovy
index 61c0219..da6b5ee 100644
--- a/lib/src/test/groovy/ua/naiksoftware/stomp/Configuration.groovy
+++ b/lib/src/test/groovy/ua/naiksoftware/stomp/Configuration.groovy
@@ -5,6 +5,7 @@ import groovy.util.logging.Slf4j
 import org.testcontainers.containers.BindMode
 import org.testcontainers.containers.GenericContainer
 import org.testcontainers.containers.output.OutputFrame
+import org.testcontainers.containers.startupcheck.StartupCheckStrategy
 import org.testcontainers.containers.wait.strategy.Wait
 import spock.lang.Shared
 import spock.lang.Specification
@@ -30,7 +31,7 @@ class Configuration extends AndroidSpecification {
                 .withCommand('java -jar /app.jar')
                 .withLogConsumer({ frame -> println frame.utf8String })
 //                .waitingFor(Wait.forHttp('/health'))
-                .withExposedPorts(80)
+                .withExposedPorts(8080)
         testServer.start()
         return testServer
     }
diff --git a/lib/src/test/groovy/ua/naiksoftware/stomp/ConnectionTests.groovy b/lib/src/test/groovy/ua/naiksoftware/stomp/ConnectionTests.groovy
index be8f22e..6dfbe8f 100644
--- a/lib/src/test/groovy/ua/naiksoftware/stomp/ConnectionTests.groovy
+++ b/lib/src/test/groovy/ua/naiksoftware/stomp/ConnectionTests.groovy
@@ -11,7 +11,7 @@ class ConnectionTests extends Configuration {
         given:
         def client = Stomp.over(Stomp.ConnectionProvider.OKHTTP,
                 'ws://' + Configuration.testServer.getContainerIpAddress()
-                        + ':' + Configuration.testServer.getMappedPort(80) + '/example-endpoint/websocket')
+                        + ':' + Configuration.testServer.getFirstMappedPort() + '/example-endpoint/websocket')
         client.connect()
         def testSubscriber = new TestSubscriber<LifecycleEvent>()
 
diff --git a/lib/src/test/groovy/ua/naiksoftware/stomp/PathMatcherTests.groovy b/lib/src/test/groovy/ua/naiksoftware/stomp/PathMatcherTests.groovy
new file mode 100644
index 0000000..f37fa40
--- /dev/null
+++ b/lib/src/test/groovy/ua/naiksoftware/stomp/PathMatcherTests.groovy
@@ -0,0 +1,28 @@
+package ua.naiksoftware.stomp
+
+import ua.naiksoftware.stomp.dto.StompCommand
+import ua.naiksoftware.stomp.dto.StompHeader
+import ua.naiksoftware.stomp.dto.StompMessage
+import ua.naiksoftware.stomp.pathmatcher.RabbitPathMatcher
+
+class PathMatcherTests extends Configuration {
+
+    def "rmq-style matcher must return expected value"() {
+        given:
+        def matcher = new RabbitPathMatcher()
+
+        expect:
+        matcher.matches(path, message(dest)) == value
+
+        where:
+        path              |          dest          | value
+        'lorem/*/ipsum'   | 'lorem/any/ipsum'      | true
+        'lorem/*/ipsum'   | 'lorem/ipsum'          | false
+        'lorem/*/prefix*' | 'lorem/ipsum/prefix123'| true
+        'lorem/*/pref*3'  | 'lorem/ipsum/prefix123'| true
+    }
+
+    def message(String dest) {
+        return new StompMessage(StompCommand.MESSAGE, [new StompHeader(StompHeader.DESTINATION, dest)], null)
+    }
+}

From 2e09a2c2998b8443c75768038ee477bc51a53160 Mon Sep 17 00:00:00 2001
From: Naik <naiksav4enko@gmail.com>
Date: Mon, 21 Jan 2019 01:37:46 +0200
Subject: [PATCH 093/110] Fix leak in example

---
 .../java/ua/naiksoftware/stompclientexample/MainActivity.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/example-client/src/main/java/ua/naiksoftware/stompclientexample/MainActivity.java b/example-client/src/main/java/ua/naiksoftware/stompclientexample/MainActivity.java
index a40111e..a342bf6 100644
--- a/example-client/src/main/java/ua/naiksoftware/stompclientexample/MainActivity.java
+++ b/example-client/src/main/java/ua/naiksoftware/stompclientexample/MainActivity.java
@@ -118,14 +118,14 @@ public void connectStomp(View view) {
     }
 
     public void sendEchoViaStomp(View v) {
-        mStompClient.send("/topic/hello-msg-mapping", "Echo STOMP " + mTimeFormat.format(new Date()))
+        compositeDisposable.add(mStompClient.send("/topic/hello-msg-mapping", "Echo STOMP " + mTimeFormat.format(new Date()))
                 .compose(applySchedulers())
                 .subscribe(() -> {
                     Log.d(TAG, "STOMP echo send successfully");
                 }, throwable -> {
                     Log.e(TAG, "Error send STOMP echo", throwable);
                     toast(throwable.getMessage());
-                });
+                }));
     }
 
     public void sendEchoViaRest(View v) {

From 9c361ab83bf8028ce9eb45d61cec26df2485d444 Mon Sep 17 00:00:00 2001
From: Naik <naiksav4enko@gmail.com>
Date: Mon, 21 Jan 2019 01:48:43 +0200
Subject: [PATCH 094/110] Fix build files

---
 example-client/build.gradle | 1 -
 lib/build.gradle            | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/example-client/build.gradle b/example-client/build.gradle
index efb5036..606c87c 100644
--- a/example-client/build.gradle
+++ b/example-client/build.gradle
@@ -8,7 +8,6 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.3.0'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
     }
 }
 
diff --git a/lib/build.gradle b/lib/build.gradle
index 067e4a2..be24a6c 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.3.0'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
         classpath 'org.codehaus.groovy:groovy-android-gradle-plugin:2.0.0'
     }
 }

From 9d10ff1aa318696b07ffb9f722a468e24068c7cc Mon Sep 17 00:00:00 2001
From: Naik <naiksav4enko@gmail.com>
Date: Mon, 21 Jan 2019 02:05:53 +0200
Subject: [PATCH 095/110] Fix build on jitpack.io

---
 gradlew | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/gradlew b/gradlew
index 9d82f78..a538ef4 100755
--- a/gradlew
+++ b/gradlew
@@ -6,6 +6,11 @@
 ##
 ##############################################################################
 
+
+# Hack for accapting license on jitpack.io
+yes | $ANDROID_HOME/tools/bin/sdkmanager "platforms;android-28"
+yes | $ANDROID_HOME/tools/bin/sdkmanager "build-tools;28.0.3"
+
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS=""
 

From de511b05fd4b89d59faee37bff1bdb0f4899f901 Mon Sep 17 00:00:00 2001
From: Naik <naiksav4enko@gmail.com>
Date: Mon, 21 Jan 2019 02:59:39 +0200
Subject: [PATCH 096/110] Clean logs

---
 .../ua/naiksoftware/stomp/provider/OkHttpConnectionProvider.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/src/main/java/ua/naiksoftware/stomp/provider/OkHttpConnectionProvider.java b/lib/src/main/java/ua/naiksoftware/stomp/provider/OkHttpConnectionProvider.java
index e2898c9..7be2389 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/provider/OkHttpConnectionProvider.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/provider/OkHttpConnectionProvider.java
@@ -64,7 +64,6 @@ public void onOpen(WebSocket webSocket, @NonNull Response response) {
 
                     @Override
                     public void onMessage(WebSocket webSocket, String text) {
-                        Log.d(TAG, "onMessage: " + text);
                         emitMessage(text);
                     }
 

From d73fb265ca3611bf624122aad6090a0053ee8113 Mon Sep 17 00:00:00 2001
From: Nickolay Savchenko <savchenko@river-soft.net>
Date: Tue, 5 Feb 2019 20:55:47 +0200
Subject: [PATCH 097/110] Fix leaks on disconnect

---
 example-client/build.gradle                   |  3 +-
 example-client/src/main/AndroidManifest.xml   |  3 +-
 .../stompclientexample/MainActivity.java      | 25 ++++----
 .../main/res/xml/network_security_config.xml  |  6 ++
 lib/src/main/AndroidManifest.xml              |  2 +-
 .../ua/naiksoftware/stomp/StompClient.java    | 58 +++++++++++--------
 6 files changed, 57 insertions(+), 40 deletions(-)
 create mode 100644 example-client/src/main/res/xml/network_security_config.xml

diff --git a/example-client/build.gradle b/example-client/build.gradle
index 606c87c..18d6a09 100644
--- a/example-client/build.gradle
+++ b/example-client/build.gradle
@@ -46,7 +46,8 @@ android {
 dependencies {
     implementation 'androidx.appcompat:appcompat:1.0.2'
     implementation 'androidx.recyclerview:recyclerview:1.0.0'
-    implementation 'org.java-websocket:Java-WebSocket:1.3.6'
+//    implementation 'org.java-websocket:Java-WebSocket:1.3.6'
+    implementation 'com.squareup.okhttp3:okhttp:3.12.1'
     implementation 'com.android.support:recyclerview-v7:28.0.0'
     // RxJava
     implementation 'io.reactivex.rxjava2:rxjava:2.2.5'
diff --git a/example-client/src/main/AndroidManifest.xml b/example-client/src/main/AndroidManifest.xml
index 5a65fcc..616d00b 100644
--- a/example-client/src/main/AndroidManifest.xml
+++ b/example-client/src/main/AndroidManifest.xml
@@ -10,7 +10,8 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppTheme"
+        android:networkSecurityConfig="@xml/network_security_config">
         <activity android:name="ua.naiksoftware.stompclientexample.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/example-client/src/main/java/ua/naiksoftware/stompclientexample/MainActivity.java b/example-client/src/main/java/ua/naiksoftware/stompclientexample/MainActivity.java
index a342bf6..7b4de96 100644
--- a/example-client/src/main/java/ua/naiksoftware/stompclientexample/MainActivity.java
+++ b/example-client/src/main/java/ua/naiksoftware/stompclientexample/MainActivity.java
@@ -51,16 +51,13 @@ protected void onCreate(Bundle savedInstanceState) {
         mAdapter.setHasStableIds(true);
         mRecyclerView.setAdapter(mAdapter);
         mRecyclerView.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.VERTICAL, true));
+
+        mStompClient = Stomp.over(Stomp.ConnectionProvider.OKHTTP, "ws://" + ANDROID_EMULATOR_LOCALHOST
+                + ":" + RestClient.SERVER_PORT + "/example-endpoint/websocket");
     }
 
     public void disconnectStomp(View view) {
         mStompClient.disconnect();
-
-        if (compositeDisposable != null) {
-            compositeDisposable.dispose();
-
-            compositeDisposable = null;
-        }
     }
 
     public static final String LOGIN = "login";
@@ -73,11 +70,9 @@ public void connectStomp(View view) {
         headers.add(new StompHeader(LOGIN, "guest"));
         headers.add(new StompHeader(PASSCODE, "guest"));
 
-        mStompClient = Stomp.over(Stomp.ConnectionProvider.JWS, "ws://" + ANDROID_EMULATOR_LOCALHOST
-                + ":" + RestClient.SERVER_PORT + "/example-endpoint/websocket");
-
         mStompClient.withClientHeartbeat(30000).withServerHeartbeat(30000);
 
+        clearSubscriptions();
         compositeDisposable = new CompositeDisposable();
 
         Disposable dispLifecycle = mStompClient.lifecycle()
@@ -94,6 +89,7 @@ public void connectStomp(View view) {
                             break;
                         case CLOSED:
                             toast("Stomp connection closed");
+                            clearSubscriptions();
                             break;
                         case FAILED_SERVER_HEARTBEAT:
                             toast("Stomp failed server heartbeat");
@@ -158,14 +154,17 @@ protected CompletableTransformer applySchedulers() {
                 .observeOn(AndroidSchedulers.mainThread());
     }
 
-    @Override
-    protected void onDestroy() {
-        mStompClient.disconnect();
-
+    private void clearSubscriptions() {
         if (compositeDisposable != null) {
             compositeDisposable.dispose();
+
             compositeDisposable = null;
         }
+    }
+
+    @Override
+    protected void onDestroy() {
+        mStompClient.disconnect();
 
         if (mRestPingDisposable != null) mRestPingDisposable.dispose();
         super.onDestroy();
diff --git a/example-client/src/main/res/xml/network_security_config.xml b/example-client/src/main/res/xml/network_security_config.xml
new file mode 100644
index 0000000..eb7159c
--- /dev/null
+++ b/example-client/src/main/res/xml/network_security_config.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <domain-config cleartextTrafficPermitted="true">
+        <domain includeSubdomains="true">10.0.2.2</domain>
+    </domain-config>
+</network-security-config>
\ No newline at end of file
diff --git a/lib/src/main/AndroidManifest.xml b/lib/src/main/AndroidManifest.xml
index d651998..58c8122 100644
--- a/lib/src/main/AndroidManifest.xml
+++ b/lib/src/main/AndroidManifest.xml
@@ -1,4 +1,4 @@
-<manifest package="com.github.forresthopkinsa">
+<manifest package="ua.naiksoftware.stomp">
 
     <application />
 
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/StompClient.java b/lib/src/main/java/ua/naiksoftware/stomp/StompClient.java
index 962d455..3103962 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/StompClient.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/StompClient.java
@@ -1,5 +1,6 @@
 package ua.naiksoftware.stomp;
 
+import android.annotation.SuppressLint;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.util.Log;
@@ -55,7 +56,6 @@ public class StompClient {
 
     public StompClient(ConnectionProvider connectionProvider) {
         mConnectionProvider = connectionProvider;
-        mMessageStream = PublishSubject.create();
         mStreamMap = new ConcurrentHashMap<>();
         mConnectionStream = BehaviorSubject.createDefault(false);
         pathMatcher = new SimplePathMatcher();
@@ -123,14 +123,11 @@ public void connect(@Nullable List<StompHeader> _headers) {
 
                         case CLOSED:
                             Log.d(TAG, "Socket closed");
-                            setConnected(false);
-                            isConnecting = false;
+                            disconnect();
                             break;
 
                         case ERROR:
                             Log.d(TAG, "Socket closed with error");
-                            setConnected(false);
-                            isConnecting = false;
                             break;
 
                         case FAILED_SERVER_HEARTBEAT:
@@ -143,7 +140,7 @@ public void connect(@Nullable List<StompHeader> _headers) {
         isConnecting = true;
         mMessagesDisposable = mConnectionProvider.messages()
                 .map(StompMessage::from)
-                .doOnNext(this::callSubscribers)
+                .doOnNext(getMessageStream()::onNext)
                 .filter(msg -> msg.getStompCommand().equals(StompCommand.CONNECTED))
                 .subscribe(stompMessage -> {
                     setConnected(true);
@@ -151,6 +148,13 @@ public void connect(@Nullable List<StompHeader> _headers) {
                 });
     }
 
+    private PublishSubject<StompMessage> getMessageStream() {
+        if (mMessageStream == null || mMessageStream.hasComplete()) {
+            mMessageStream = PublishSubject.create();
+        }
+        return mMessageStream;
+    }
+
     private void setConnected(boolean connected) {
         mConnected = connected;
         mConnectionStream.onNext(mConnected);
@@ -159,6 +163,7 @@ private void setConnected(boolean connected) {
     /**
      * Disconnect from server, and then reconnect with the last-used headers
      */
+    @SuppressLint("CheckResult")
     public void reconnect() {
         disconnectCompletable()
                 .subscribe(() -> connect(mHeaders),
@@ -186,33 +191,33 @@ public Completable send(@NonNull StompMessage stompMessage) {
                 .startWith(connectionComplete);
     }
 
-    private void callSubscribers(StompMessage stompMessage) {
-        mMessageStream.onNext(stompMessage);
-    }
-
     public Flowable<LifecycleEvent> lifecycle() {
         return mConnectionProvider.lifecycle().toFlowable(BackpressureStrategy.BUFFER);
     }
 
     public void disconnect() {
-        disconnectCompletable().subscribe(() -> {}, e -> Log.e(tag, "Disconnect error", e));
-        if(mStreamMap != null && !mStreamMap.isEmpty()){
-            mStreamMap.clear();
-        }
-        if(mTopics != null && !mTopics.isEmpty()){
-            mTopics.clear();
+        if (!mConnected) {
+            Log.d(TAG, "Skip disconnect, already not connected");
+            return;
         }
+        disconnectCompletable().subscribe(() -> {}, e -> Log.e(tag, "Disconnect error", e));
     }
 
     public Completable disconnectCompletable() {
-        if (mLifecycleDisposable != null) {
-            mLifecycleDisposable.dispose();
-        }
-        if (mMessagesDisposable != null) {
-            mMessagesDisposable.dispose();
-        }
         return mConnectionProvider.disconnect()
-                .doOnComplete(() -> setConnected(false));
+                .doOnComplete(() -> {
+                    setConnected(false);
+                    isConnecting = false;
+                    if (mLifecycleDisposable != null) {
+                        mLifecycleDisposable.dispose();
+                    }
+                    if (mMessagesDisposable != null) {
+                        mMessagesDisposable.dispose();
+                    }
+                    if (mMessageStream != null && !mMessageStream.hasComplete()) {
+                        mMessageStream.onComplete();
+                    }
+                });
     }
 
     public Flowable<StompMessage> topic(String destinationPath) {
@@ -224,7 +229,7 @@ public Flowable<StompMessage> topic(@NonNull String destPath, List<StompHeader>
             return Flowable.error(new IllegalArgumentException("Topic path cannot be null"));
         else if (!mStreamMap.containsKey(destPath))
             mStreamMap.put(destPath,
-                    mMessageStream
+                    getMessageStream()
                             .filter(msg -> pathMatcher.matches(destPath, msg))
                             .toFlowable(BackpressureStrategy.BUFFER)
                             .doOnSubscribe(disposable -> subscribePath(destPath, headerList).subscribe())
@@ -294,6 +299,11 @@ private Completable unsubscribePath(String dest) {
 
         Log.d(TAG, "Unsubscribe path: " + dest + " id: " + topicId);
 
+        if (!mConnected) {
+            Log.d(TAG, "Not connected, skip sending Unsubscribe frame to " + dest);
+            return Completable.complete();
+        }
+
         return send(new StompMessage(StompCommand.UNSUBSCRIBE,
                 Collections.singletonList(new StompHeader(StompHeader.ID, topicId)), null));
     }

From 0d503ff6347af1bc9b5190c7bc0c3a796c1b3a94 Mon Sep 17 00:00:00 2001
From: Nickolay Savchenko <savchenko@river-soft.net>
Date: Wed, 6 Feb 2019 17:53:38 +0200
Subject: [PATCH 098/110] Bug fixes

---
 .../stompclientexample/MainActivity.java      |   1 +
 .../ua/naiksoftware/stomp/StompClient.java    | 159 ++++++++++--------
 2 files changed, 88 insertions(+), 72 deletions(-)

diff --git a/example-client/src/main/java/ua/naiksoftware/stompclientexample/MainActivity.java b/example-client/src/main/java/ua/naiksoftware/stompclientexample/MainActivity.java
index 7b4de96..c0ca7d8 100644
--- a/example-client/src/main/java/ua/naiksoftware/stompclientexample/MainActivity.java
+++ b/example-client/src/main/java/ua/naiksoftware/stompclientexample/MainActivity.java
@@ -114,6 +114,7 @@ public void connectStomp(View view) {
     }
 
     public void sendEchoViaStomp(View v) {
+        if (!mStompClient.isConnected()) return;
         compositeDisposable.add(mStompClient.send("/topic/hello-msg-mapping", "Echo STOMP " + mTimeFormat.format(new Date()))
                 .compose(applySchedulers())
                 .subscribe(() -> {
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/StompClient.java b/lib/src/main/java/ua/naiksoftware/stomp/StompClient.java
index 3103962..c888311 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/StompClient.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/StompClient.java
@@ -36,28 +36,30 @@ public class StompClient {
     public static final String SUPPORTED_VERSIONS = "1.1,1.2";
     public static final String DEFAULT_ACK = "auto";
 
-    private final String tag = StompClient.class.getSimpleName();
-    private final ConnectionProvider mConnectionProvider;
-    private ConcurrentHashMap<String, String> mTopics;
-    private boolean mConnected;
+    private final ConnectionProvider connectionProvider;
+    private ConcurrentHashMap<String, String> topics;
+    private boolean isConnected;
     private boolean isConnecting;
+    private boolean isDisconnecting;
     private boolean legacyWhitespace;
 
-    private PublishSubject<StompMessage> mMessageStream;
-    private ConcurrentHashMap<String, Flowable<StompMessage>> mStreamMap;
-    private final BehaviorSubject<Boolean> mConnectionStream;
+    private PublishSubject<StompMessage> messageStream;
+    private ConcurrentHashMap<String, Flowable<StompMessage>> streamMap;
+    private final BehaviorSubject<Boolean> connectionStream;
     private PathMatcher pathMatcher;
-    private Disposable mLifecycleDisposable;
-    private Disposable mMessagesDisposable;
-    private List<StompHeader> mHeaders;
+    private Disposable lifecycleDisposable;
+    private Disposable messagesDisposable;
+    private PublishSubject<LifecycleEvent> lifecyclePublishSubject;
+    private List<StompHeader> headers;
 
     private int serverHeartbeat = 0;
     private int clientHeartbeat = 0;
 
     public StompClient(ConnectionProvider connectionProvider) {
-        mConnectionProvider = connectionProvider;
-        mStreamMap = new ConcurrentHashMap<>();
-        mConnectionStream = BehaviorSubject.createDefault(false);
+        this.connectionProvider = connectionProvider;
+        streamMap = new ConcurrentHashMap<>();
+        connectionStream = BehaviorSubject.createDefault(false);
+        lifecyclePublishSubject = PublishSubject.create();
         pathMatcher = new SimplePathMatcher();
     }
 
@@ -69,7 +71,7 @@ public StompClient(ConnectionProvider connectionProvider) {
      * @param ms heartbeat time in milliseconds
      */
     public StompClient withServerHeartbeat(int ms) {
-        mConnectionProvider.setServerHeartbeat(ms);
+        connectionProvider.setServerHeartbeat(ms);
         this.serverHeartbeat = ms;
         return this;
     }
@@ -82,7 +84,7 @@ public StompClient withServerHeartbeat(int ms) {
      * @param ms heartbeat time in milliseconds
      */
     public StompClient withClientHeartbeat(int ms) {
-        mConnectionProvider.setClientHeartbeat(ms);
+        connectionProvider.setClientHeartbeat(ms);
         this.clientHeartbeat = ms;
         return this;
     }
@@ -103,13 +105,13 @@ public void connect(@Nullable List<StompHeader> _headers) {
 
         Log.d(TAG, "Connect");
 
-        mHeaders = _headers;
+        headers = _headers;
 
-        if (mConnected) {
+        if (isConnected) {
             Log.d(TAG, "Already connected, ignore");
             return;
         }
-        mLifecycleDisposable = mConnectionProvider.lifecycle()
+        lifecycleDisposable = connectionProvider.lifecycle()
                 .subscribe(lifecycleEvent -> {
                     switch (lifecycleEvent.getType()) {
                         case OPENED:
@@ -117,57 +119,55 @@ public void connect(@Nullable List<StompHeader> _headers) {
                             headers.add(new StompHeader(StompHeader.VERSION, SUPPORTED_VERSIONS));
                             headers.add(new StompHeader(StompHeader.HEART_BEAT, clientHeartbeat + "," + serverHeartbeat));
                             if (_headers != null) headers.addAll(_headers);
-                            mConnectionProvider.send(new StompMessage(StompCommand.CONNECT, headers, null).compile(legacyWhitespace))
-                                    .subscribe();
+                            connectionProvider.send(new StompMessage(StompCommand.CONNECT, headers, null).compile(legacyWhitespace))
+                                    .subscribe(() -> {
+                                        lifecyclePublishSubject.onNext(lifecycleEvent);
+                                    });
                             break;
 
                         case CLOSED:
                             Log.d(TAG, "Socket closed");
-                            disconnect();
+                            if (!isDisconnecting) {
+                                disconnect();
+                            }
+                            isConnecting = false;
+                            setConnected(false);
                             break;
 
                         case ERROR:
                             Log.d(TAG, "Socket closed with error");
+                            lifecyclePublishSubject.onNext(lifecycleEvent);
                             break;
 
                         case FAILED_SERVER_HEARTBEAT:
-                            Log.d(TAG, "Server failed to send heart-beat in time.");
+                            Log.d(TAG, "Server failed to send heart-beat in time");
+                            lifecyclePublishSubject.onNext(lifecycleEvent);
                             break;
 
                     }
                 });
 
         isConnecting = true;
-        mMessagesDisposable = mConnectionProvider.messages()
+        messagesDisposable = connectionProvider.messages()
                 .map(StompMessage::from)
                 .doOnNext(getMessageStream()::onNext)
                 .filter(msg -> msg.getStompCommand().equals(StompCommand.CONNECTED))
                 .subscribe(stompMessage -> {
-                    setConnected(true);
                     isConnecting = false;
+                    setConnected(true);
                 });
     }
 
     private PublishSubject<StompMessage> getMessageStream() {
-        if (mMessageStream == null || mMessageStream.hasComplete()) {
-            mMessageStream = PublishSubject.create();
+        if (messageStream == null || messageStream.hasComplete()) {
+            messageStream = PublishSubject.create();
         }
-        return mMessageStream;
+        return messageStream;
     }
 
     private void setConnected(boolean connected) {
-        mConnected = connected;
-        mConnectionStream.onNext(mConnected);
-    }
-
-    /**
-     * Disconnect from server, and then reconnect with the last-used headers
-     */
-    @SuppressLint("CheckResult")
-    public void reconnect() {
-        disconnectCompletable()
-                .subscribe(() -> connect(mHeaders),
-                        e -> Log.e(tag, "Disconnect error", e));
+        isConnected = connected;
+        connectionStream.onNext(isConnected);
     }
 
     public Completable send(String destination) {
@@ -182,9 +182,9 @@ public Completable send(String destination, String data) {
     }
 
     public Completable send(@NonNull StompMessage stompMessage) {
-        Completable completable = mConnectionProvider.send(stompMessage.compile(legacyWhitespace))
-                .doOnError(t -> t.printStackTrace());
-        CompletableSource connectionComplete = mConnectionStream
+        Completable completable = connectionProvider.send(stompMessage.compile(legacyWhitespace))
+                .doOnError(Throwable::printStackTrace);
+        CompletableSource connectionComplete = connectionStream
                 .filter(isConnected -> isConnected)
                 .firstOrError().ignoreElement();
         return completable
@@ -192,31 +192,46 @@ public Completable send(@NonNull StompMessage stompMessage) {
     }
 
     public Flowable<LifecycleEvent> lifecycle() {
-        return mConnectionProvider.lifecycle().toFlowable(BackpressureStrategy.BUFFER);
+        return lifecyclePublishSubject.toFlowable(BackpressureStrategy.BUFFER);
+    }
+
+    /**
+     * Disconnect from server, and then reconnect with the last-used headers
+     */
+    @SuppressLint("CheckResult")
+    public void reconnect() {
+        disconnectCompletable()
+                .subscribe(() -> connect(headers),
+                        e -> Log.e(TAG, "Disconnect error", e));
     }
 
+    @SuppressLint("CheckResult")
     public void disconnect() {
-        if (!mConnected) {
-            Log.d(TAG, "Skip disconnect, already not connected");
-            return;
-        }
-        disconnectCompletable().subscribe(() -> {}, e -> Log.e(tag, "Disconnect error", e));
+        disconnectCompletable().subscribe(() -> { }, e -> Log.e(TAG, "Disconnect error", e));
     }
 
     public Completable disconnectCompletable() {
-        return mConnectionProvider.disconnect()
-                .doOnComplete(() -> {
-                    setConnected(false);
-                    isConnecting = false;
-                    if (mLifecycleDisposable != null) {
-                        mLifecycleDisposable.dispose();
-                    }
-                    if (mMessagesDisposable != null) {
-                        mMessagesDisposable.dispose();
-                    }
-                    if (mMessageStream != null && !mMessageStream.hasComplete()) {
-                        mMessageStream.onComplete();
-                    }
+        if (!isConnected && !isConnecting) {
+            Log.d(TAG, "Skip disconnect, already not connected");
+            return Completable.complete();
+        }
+
+        if (lifecycleDisposable != null) {
+            lifecycleDisposable.dispose();
+        }
+        if (messagesDisposable != null) {
+            messagesDisposable.dispose();
+        }
+        if (messageStream != null && !messageStream.hasComplete()) {
+            messageStream.onComplete();
+        }
+
+        isDisconnecting = true;
+        return connectionProvider.disconnect()
+                .doFinally(() -> {
+                    isDisconnecting = false;
+                    Log.d(TAG, "Stomp disconnected");
+                    lifecyclePublishSubject.onNext(new LifecycleEvent(LifecycleEvent.Type.CLOSED));
                 });
     }
 
@@ -227,8 +242,8 @@ public Flowable<StompMessage> topic(String destinationPath) {
     public Flowable<StompMessage> topic(@NonNull String destPath, List<StompHeader> headerList) {
         if (destPath == null)
             return Flowable.error(new IllegalArgumentException("Topic path cannot be null"));
-        else if (!mStreamMap.containsKey(destPath))
-            mStreamMap.put(destPath,
+        else if (!streamMap.containsKey(destPath))
+            streamMap.put(destPath,
                     getMessageStream()
                             .filter(msg -> pathMatcher.matches(destPath, msg))
                             .toFlowable(BackpressureStrategy.BUFFER)
@@ -236,7 +251,7 @@ else if (!mStreamMap.containsKey(destPath))
                             .doFinally(() -> unsubscribePath(destPath).subscribe())
                             .share()
             );
-        return mStreamMap.get(destPath);
+        return streamMap.get(destPath);
     }
 
     /**
@@ -272,15 +287,15 @@ public void setPathMatcher(PathMatcher pathMatcher) {
     private Completable subscribePath(String destinationPath, @Nullable List<StompHeader> headerList) {
         String topicId = UUID.randomUUID().toString();
 
-        if (mTopics == null) mTopics = new ConcurrentHashMap<>();
+        if (topics == null) topics = new ConcurrentHashMap<>();
 
         // Only continue if we don't already have a subscription to the topic
-        if (mTopics.containsKey(destinationPath)) {
+        if (topics.containsKey(destinationPath)) {
             Log.d(TAG, "Attempted to subscribe to already-subscribed path!");
             return Completable.complete();
         }
 
-        mTopics.put(destinationPath, topicId);
+        topics.put(destinationPath, topicId);
         List<StompHeader> headers = new ArrayList<>();
         headers.add(new StompHeader(StompHeader.ID, topicId));
         headers.add(new StompHeader(StompHeader.DESTINATION, destinationPath));
@@ -292,14 +307,14 @@ private Completable subscribePath(String destinationPath, @Nullable List<StompHe
 
 
     private Completable unsubscribePath(String dest) {
-        mStreamMap.remove(dest);
+        streamMap.remove(dest);
 
-        String topicId = mTopics.get(dest);
-        mTopics.remove(dest);
+        String topicId = topics.get(dest);
+        topics.remove(dest);
 
         Log.d(TAG, "Unsubscribe path: " + dest + " id: " + topicId);
 
-        if (!mConnected) {
+        if (!isConnected) {
             Log.d(TAG, "Not connected, skip sending Unsubscribe frame to " + dest);
             return Completable.complete();
         }
@@ -309,7 +324,7 @@ private Completable unsubscribePath(String dest) {
     }
 
     public boolean isConnected() {
-        return mConnected;
+        return isConnected;
     }
 
     public boolean isConnecting() {

From 626bd2a56a0f26b5e1df1a8b7f6cef364d4178be Mon Sep 17 00:00:00 2001
From: Nickolay Savchenko <savchenko@river-soft.net>
Date: Wed, 6 Feb 2019 21:26:17 +0200
Subject: [PATCH 099/110] Refactor and bug fix

---
 .../stompclientexample/MainActivity.java      |  17 +-
 .../ua/naiksoftware/stomp/HeartBeatTask.java  | 205 ++++++++++++++++++
 .../ua/naiksoftware/stomp/StompClient.java    | 121 ++++++-----
 .../naiksoftware/stomp/dto/StompMessage.java  |   2 +-
 .../provider/AbstractConnectionProvider.java  | 199 ++---------------
 .../stomp/provider/ConnectionProvider.java    |  14 --
 .../provider/OkHttpConnectionProvider.java    |   6 +-
 .../WebSocketsConnectionProvider.java         |   6 +-
 8 files changed, 302 insertions(+), 268 deletions(-)
 create mode 100644 lib/src/main/java/ua/naiksoftware/stomp/HeartBeatTask.java

diff --git a/example-client/src/main/java/ua/naiksoftware/stompclientexample/MainActivity.java b/example-client/src/main/java/ua/naiksoftware/stompclientexample/MainActivity.java
index c0ca7d8..8962ad2 100644
--- a/example-client/src/main/java/ua/naiksoftware/stompclientexample/MainActivity.java
+++ b/example-client/src/main/java/ua/naiksoftware/stompclientexample/MainActivity.java
@@ -70,10 +70,9 @@ public void connectStomp(View view) {
         headers.add(new StompHeader(LOGIN, "guest"));
         headers.add(new StompHeader(PASSCODE, "guest"));
 
-        mStompClient.withClientHeartbeat(30000).withServerHeartbeat(30000);
+        mStompClient.withClientHeartbeat(1000).withServerHeartbeat(1000);
 
-        clearSubscriptions();
-        compositeDisposable = new CompositeDisposable();
+        resetSubscriptions();
 
         Disposable dispLifecycle = mStompClient.lifecycle()
                 .subscribeOn(Schedulers.io())
@@ -89,7 +88,7 @@ public void connectStomp(View view) {
                             break;
                         case CLOSED:
                             toast("Stomp connection closed");
-                            clearSubscriptions();
+                            resetSubscriptions();
                             break;
                         case FAILED_SERVER_HEARTBEAT:
                             toast("Stomp failed server heartbeat");
@@ -106,6 +105,8 @@ public void connectStomp(View view) {
                 .subscribe(topicMessage -> {
                     Log.d(TAG, "Received " + topicMessage.getPayload());
                     addItem(mGson.fromJson(topicMessage.getPayload(), EchoModel.class));
+                }, throwable -> {
+                    Log.e(TAG, "Error on subscribe topic", throwable);
                 });
 
         compositeDisposable.add(dispTopic);
@@ -114,7 +115,7 @@ public void connectStomp(View view) {
     }
 
     public void sendEchoViaStomp(View v) {
-        if (!mStompClient.isConnected()) return;
+//        if (!mStompClient.isConnected()) return;
         compositeDisposable.add(mStompClient.send("/topic/hello-msg-mapping", "Echo STOMP " + mTimeFormat.format(new Date()))
                 .compose(applySchedulers())
                 .subscribe(() -> {
@@ -155,12 +156,11 @@ protected CompletableTransformer applySchedulers() {
                 .observeOn(AndroidSchedulers.mainThread());
     }
 
-    private void clearSubscriptions() {
+    private void resetSubscriptions() {
         if (compositeDisposable != null) {
             compositeDisposable.dispose();
-
-            compositeDisposable = null;
         }
+        compositeDisposable = new CompositeDisposable();
     }
 
     @Override
@@ -168,6 +168,7 @@ protected void onDestroy() {
         mStompClient.disconnect();
 
         if (mRestPingDisposable != null) mRestPingDisposable.dispose();
+        if (compositeDisposable != null) compositeDisposable.dispose();
         super.onDestroy();
     }
 }
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/HeartBeatTask.java b/lib/src/main/java/ua/naiksoftware/stomp/HeartBeatTask.java
new file mode 100644
index 0000000..84e1ff4
--- /dev/null
+++ b/lib/src/main/java/ua/naiksoftware/stomp/HeartBeatTask.java
@@ -0,0 +1,205 @@
+package ua.naiksoftware.stomp;
+
+import android.support.annotation.Nullable;
+import android.util.Log;
+
+import java.util.concurrent.TimeUnit;
+
+import io.reactivex.Scheduler;
+import io.reactivex.disposables.Disposable;
+import io.reactivex.schedulers.Schedulers;
+import ua.naiksoftware.stomp.dto.StompCommand;
+import ua.naiksoftware.stomp.dto.StompHeader;
+import ua.naiksoftware.stomp.dto.StompMessage;
+
+public class HeartBeatTask {
+
+    private static final String TAG = HeartBeatTask.class.getSimpleName();
+
+    private Scheduler scheduler;
+
+    private int serverHeartbeat = 0;
+    private int clientHeartbeat = 0;
+
+    private transient long lastServerHeartBeat = 0;
+
+    private transient Disposable clientSendHeartBeatTask;
+    private transient Disposable serverCheckHeartBeatTask;
+
+    private FailedListener failedListener;
+    private SendCallback sendCallback;
+
+    public HeartBeatTask(SendCallback sendCallback, @Nullable FailedListener failedListener) {
+        this.failedListener = failedListener;
+        this.sendCallback = sendCallback;
+    }
+
+    public void setServerHeartbeat(int serverHeartbeat) {
+        this.serverHeartbeat = serverHeartbeat;
+    }
+
+    public void setClientHeartbeat(int clientHeartbeat) {
+        this.clientHeartbeat = clientHeartbeat;
+    }
+
+    public int getServerHeartbeat() {
+        return serverHeartbeat;
+    }
+
+    public int getClientHeartbeat() {
+        return clientHeartbeat;
+    }
+
+    public boolean consumeHeartBeat(StompMessage message) {
+        switch (message.getStompCommand()) {
+            case StompCommand.CONNECTED:
+                heartBeatHandshake(message.findHeader(StompHeader.HEART_BEAT));
+                break;
+
+            case StompCommand.SEND:
+                abortClientHeartBeatSend();
+                break;
+
+            case StompCommand.MESSAGE:
+                //a MESSAGE works as an hear-beat too.
+                abortServerHeartBeatCheck();
+                break;
+
+            case StompCommand.UNKNOWN:
+                if ("\n".equals(message.getPayload())) {
+                    Log.d(TAG, "<<< PONG");
+                    abortServerHeartBeatCheck();
+                    return false;
+                }
+                break;
+        }
+        return true;
+    }
+
+    public void shutdown() {
+        if (clientSendHeartBeatTask != null) {
+            clientSendHeartBeatTask.dispose();
+        }
+
+        if (serverCheckHeartBeatTask != null) {
+            serverCheckHeartBeatTask.dispose();
+        }
+
+        lastServerHeartBeat = 0;
+    }
+
+    /**
+     * Analise heart-beat sent from server (if any), to adjust the frequency.
+     * Startup the heart-beat logic.
+     */
+    private void heartBeatHandshake(final String heartBeatHeader) {
+        if (heartBeatHeader != null) {
+            // The heart-beat header is OPTIONAL
+            final String[] heartbeats = heartBeatHeader.split(",");
+            if (clientHeartbeat > 0) {
+                //there will be heart-beats every MAX(<cx>,<sy>) milliseconds
+                clientHeartbeat = Math.max(clientHeartbeat, Integer.parseInt(heartbeats[1]));
+            }
+            if (serverHeartbeat > 0) {
+                //there will be heart-beats every MAX(<cx>,<sy>) milliseconds
+                serverHeartbeat = Math.max(serverHeartbeat, Integer.parseInt(heartbeats[0]));
+            }
+        }
+        if (clientHeartbeat > 0 || serverHeartbeat > 0) {
+            scheduler = Schedulers.io();
+            if (clientHeartbeat > 0) {
+                //client MUST/WANT send heart-beat
+                Log.d(TAG, "Client will send heart-beat every " + clientHeartbeat + " ms");
+                scheduleClientHeartBeat();
+            }
+            if (serverHeartbeat > 0) {
+                Log.d(TAG, "Client will listen to server heart-beat every " + serverHeartbeat + " ms");
+                //client WANT to listen to server heart-beat
+                scheduleServerHeartBeatCheck();
+
+                // initialize the server heartbeat
+                lastServerHeartBeat = System.currentTimeMillis();
+            }
+        }
+    }
+
+    private void scheduleServerHeartBeatCheck() {
+        if (serverHeartbeat > 0 && scheduler != null) {
+            final long now = System.currentTimeMillis();
+            Log.d(TAG, "Scheduling server heart-beat to be checked in " + serverHeartbeat + " ms and now is '" + now + "'");
+            //add some slack on the check
+            serverCheckHeartBeatTask = scheduler.scheduleDirect(() ->
+                    checkServerHeartBeat(), serverHeartbeat, TimeUnit.MILLISECONDS);
+        }
+    }
+
+    private void checkServerHeartBeat() {
+        if (serverHeartbeat > 0) {
+            final long now = System.currentTimeMillis();
+            //use a forgiving boundary as some heart beats can be delayed or lost.
+            final long boundary = now - (3 * serverHeartbeat);
+            //we need to check because the task could failed to abort
+            if (lastServerHeartBeat < boundary) {
+                Log.d(TAG, "It's a sad day ;( Server didn't send heart-beat on time. Last received at '" + lastServerHeartBeat + "' and now is '" + now + "'");
+                if (failedListener != null) {
+                    failedListener.onServerHeartBeatFailed();
+                }
+            } else {
+                Log.d(TAG, "We were checking and server sent heart-beat on time. So well-behaved :)");
+                lastServerHeartBeat = System.currentTimeMillis();
+            }
+        }
+    }
+
+    /**
+     * Used to abort the server heart-beat check.
+     */
+    private void abortServerHeartBeatCheck() {
+        lastServerHeartBeat = System.currentTimeMillis();
+        Log.d(TAG, "Aborted last check because server sent heart-beat on time ('" + lastServerHeartBeat + "'). So well-behaved :)");
+        if (serverCheckHeartBeatTask != null) {
+            serverCheckHeartBeatTask.dispose();
+        }
+        scheduleServerHeartBeatCheck();
+    }
+
+    /**
+     * Schedule a client heart-beat if clientHeartbeat > 0.
+     */
+    private void scheduleClientHeartBeat() {
+        if (clientHeartbeat > 0 && scheduler != null) {
+            Log.d(TAG, "Scheduling client heart-beat to be sent in " + clientHeartbeat + " ms");
+            clientSendHeartBeatTask = scheduler.scheduleDirect(() ->
+                    sendClientHeartBeat(), clientHeartbeat, TimeUnit.MILLISECONDS);
+        }
+    }
+
+    /**
+     * Send the raw heart-beat to the server.
+     */
+    private void sendClientHeartBeat() {
+        sendCallback.sendClientHeartBeat("\r\n");
+        Log.d(TAG, "PING >>>");
+        //schedule next client heart beat
+        this.scheduleClientHeartBeat();
+    }
+
+    /**
+     * Used when we have a scheduled heart-beat and we send a new message to the server.
+     * The new message will work as an heart-beat so we can abort current one and schedule another
+     */
+    private void abortClientHeartBeatSend() {
+        if (clientSendHeartBeatTask != null) {
+            clientSendHeartBeatTask.dispose();
+        }
+        scheduleClientHeartBeat();
+    }
+
+    public interface FailedListener {
+        void onServerHeartBeatFailed();
+    }
+
+    public interface SendCallback {
+        void sendClientHeartBeat(String pingMessage);
+    }
+}
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/StompClient.java b/lib/src/main/java/ua/naiksoftware/stomp/StompClient.java
index c888311..7b26db1 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/StompClient.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/StompClient.java
@@ -40,7 +40,7 @@ public class StompClient {
     private ConcurrentHashMap<String, String> topics;
     private boolean isConnected;
     private boolean isConnecting;
-    private boolean isDisconnecting;
+    private boolean forceClose;
     private boolean legacyWhitespace;
 
     private PublishSubject<StompMessage> messageStream;
@@ -51,9 +51,7 @@ public class StompClient {
     private Disposable messagesDisposable;
     private PublishSubject<LifecycleEvent> lifecyclePublishSubject;
     private List<StompHeader> headers;
-
-    private int serverHeartbeat = 0;
-    private int clientHeartbeat = 0;
+    private HeartBeatTask heartBeatTask;
 
     public StompClient(ConnectionProvider connectionProvider) {
         this.connectionProvider = connectionProvider;
@@ -61,6 +59,9 @@ public StompClient(ConnectionProvider connectionProvider) {
         connectionStream = BehaviorSubject.createDefault(false);
         lifecyclePublishSubject = PublishSubject.create();
         pathMatcher = new SimplePathMatcher();
+        heartBeatTask = new HeartBeatTask(this::sendHeartBeat, () -> {
+            lifecyclePublishSubject.onNext(new LifecycleEvent(LifecycleEvent.Type.FAILED_SERVER_HEARTBEAT));
+        });
     }
 
     /**
@@ -71,8 +72,7 @@ public StompClient(ConnectionProvider connectionProvider) {
      * @param ms heartbeat time in milliseconds
      */
     public StompClient withServerHeartbeat(int ms) {
-        connectionProvider.setServerHeartbeat(ms);
-        this.serverHeartbeat = ms;
+        heartBeatTask.setServerHeartbeat(ms);
         return this;
     }
 
@@ -84,8 +84,7 @@ public StompClient withServerHeartbeat(int ms) {
      * @param ms heartbeat time in milliseconds
      */
     public StompClient withClientHeartbeat(int ms) {
-        connectionProvider.setClientHeartbeat(ms);
-        this.clientHeartbeat = ms;
+        heartBeatTask.setClientHeartbeat(ms);
         return this;
     }
 
@@ -105,7 +104,7 @@ public void connect(@Nullable List<StompHeader> _headers) {
 
         Log.d(TAG, "Connect");
 
-        headers = _headers;
+        this.headers = _headers;
 
         if (isConnected) {
             Log.d(TAG, "Already connected, ignore");
@@ -117,8 +116,11 @@ public void connect(@Nullable List<StompHeader> _headers) {
                         case OPENED:
                             List<StompHeader> headers = new ArrayList<>();
                             headers.add(new StompHeader(StompHeader.VERSION, SUPPORTED_VERSIONS));
-                            headers.add(new StompHeader(StompHeader.HEART_BEAT, clientHeartbeat + "," + serverHeartbeat));
+                            headers.add(new StompHeader(StompHeader.HEART_BEAT,
+                                    heartBeatTask.getClientHeartbeat() + "," + heartBeatTask.getServerHeartbeat()));
+
                             if (_headers != null) headers.addAll(_headers);
+
                             connectionProvider.send(new StompMessage(StompCommand.CONNECT, headers, null).compile(legacyWhitespace))
                                     .subscribe(() -> {
                                         lifecyclePublishSubject.onNext(lifecycleEvent);
@@ -127,29 +129,21 @@ public void connect(@Nullable List<StompHeader> _headers) {
 
                         case CLOSED:
                             Log.d(TAG, "Socket closed");
-                            if (!isDisconnecting) {
-                                disconnect();
-                            }
-                            isConnecting = false;
-                            setConnected(false);
+                            forceClose = true;
+                            disconnect();
                             break;
 
                         case ERROR:
                             Log.d(TAG, "Socket closed with error");
                             lifecyclePublishSubject.onNext(lifecycleEvent);
                             break;
-
-                        case FAILED_SERVER_HEARTBEAT:
-                            Log.d(TAG, "Server failed to send heart-beat in time");
-                            lifecyclePublishSubject.onNext(lifecycleEvent);
-                            break;
-
                     }
                 });
 
         isConnecting = true;
         messagesDisposable = connectionProvider.messages()
                 .map(StompMessage::from)
+                .filter(heartBeatTask::consumeHeartBeat)
                 .doOnNext(getMessageStream()::onNext)
                 .filter(msg -> msg.getStompCommand().equals(StompCommand.CONNECTED))
                 .subscribe(stompMessage -> {
@@ -182,8 +176,7 @@ public Completable send(String destination, String data) {
     }
 
     public Completable send(@NonNull StompMessage stompMessage) {
-        Completable completable = connectionProvider.send(stompMessage.compile(legacyWhitespace))
-                .doOnError(Throwable::printStackTrace);
+        Completable completable = connectionProvider.send(stompMessage.compile(legacyWhitespace));
         CompletableSource connectionComplete = connectionStream
                 .filter(isConnected -> isConnected)
                 .firstOrError().ignoreElement();
@@ -191,6 +184,16 @@ public Completable send(@NonNull StompMessage stompMessage) {
                 .startWith(connectionComplete);
     }
 
+    @SuppressLint("CheckResult")
+    private void sendHeartBeat(@NonNull String pingMessage) {
+        Completable completable = connectionProvider.send(pingMessage);
+        CompletableSource connectionComplete = connectionStream
+                .filter(isConnected -> isConnected)
+                .firstOrError().ignoreElement();
+        completable.startWith(connectionComplete)
+                .subscribe(() -> {}, Throwable::printStackTrace);
+    }
+
     public Flowable<LifecycleEvent> lifecycle() {
         return lifecyclePublishSubject.toFlowable(BackpressureStrategy.BUFFER);
     }
@@ -216,6 +219,8 @@ public Completable disconnectCompletable() {
             return Completable.complete();
         }
 
+        heartBeatTask.shutdown();
+
         if (lifecycleDisposable != null) {
             lifecycleDisposable.dispose();
         }
@@ -226,11 +231,12 @@ public Completable disconnectCompletable() {
             messageStream.onComplete();
         }
 
-        isDisconnecting = true;
         return connectionProvider.disconnect()
                 .doFinally(() -> {
-                    isDisconnecting = false;
                     Log.d(TAG, "Stomp disconnected");
+                    forceClose = false;
+                    isConnecting = false;
+                    setConnected(false);
                     lifecyclePublishSubject.onNext(new LifecycleEvent(LifecycleEvent.Type.CLOSED));
                 });
     }
@@ -254,36 +260,6 @@ else if (!streamMap.containsKey(destPath))
         return streamMap.get(destPath);
     }
 
-    /**
-     * Reverts to the old frame formatting, which included two newlines between the message body
-     * and the end-of-frame marker.
-     * <p>
-     * Legacy: Body\n\n^@
-     * <p>
-     * Default: Body^@
-     *
-     * @param legacyWhitespace whether to append an extra two newlines
-     * @see <a href="http://stomp.github.io/stomp-specification-1.2.html#STOMP_Frames">The STOMP spec</a>
-     */
-    public void setLegacyWhitespace(boolean legacyWhitespace) {
-        this.legacyWhitespace = legacyWhitespace;
-    }
-
-    /**
-     * Set the wildcard or other matcher for Topic subscription.
-     * <p>
-     * Right now, the only options are simple, rmq supported.
-     * But you can write you own matcher by implementing {@link PathMatcher}
-     * <p>
-     * When set to {@link ua.naiksoftware.stomp.pathmatcher.RabbitPathMatcher}, topic subscription allows for RMQ-style wildcards.
-     * <p>
-     *
-     * @param pathMatcher Set to {@link SimplePathMatcher} by default
-     */
-    public void setPathMatcher(PathMatcher pathMatcher) {
-        this.pathMatcher = pathMatcher;
-    }
-
     private Completable subscribePath(String destinationPath, @Nullable List<StompHeader> headerList) {
         String topicId = UUID.randomUUID().toString();
 
@@ -314,6 +290,11 @@ private Completable unsubscribePath(String dest) {
 
         Log.d(TAG, "Unsubscribe path: " + dest + " id: " + topicId);
 
+        if (forceClose) {
+            Log.d(TAG, "Force close, skip sending Unsubscribe frame to " + dest);
+            return Completable.complete();
+        }
+
         if (!isConnected) {
             Log.d(TAG, "Not connected, skip sending Unsubscribe frame to " + dest);
             return Completable.complete();
@@ -323,6 +304,21 @@ private Completable unsubscribePath(String dest) {
                 Collections.singletonList(new StompHeader(StompHeader.ID, topicId)), null));
     }
 
+    /**
+     * Set the wildcard or other matcher for Topic subscription.
+     * <p>
+     * Right now, the only options are simple, rmq supported.
+     * But you can write you own matcher by implementing {@link PathMatcher}
+     * <p>
+     * When set to {@link ua.naiksoftware.stomp.pathmatcher.RabbitPathMatcher}, topic subscription allows for RMQ-style wildcards.
+     * <p>
+     *
+     * @param pathMatcher Set to {@link SimplePathMatcher} by default
+     */
+    public void setPathMatcher(PathMatcher pathMatcher) {
+        this.pathMatcher = pathMatcher;
+    }
+
     public boolean isConnected() {
         return isConnected;
     }
@@ -330,4 +326,19 @@ public boolean isConnected() {
     public boolean isConnecting() {
         return isConnecting;
     }
+
+    /**
+     * Reverts to the old frame formatting, which included two newlines between the message body
+     * and the end-of-frame marker.
+     * <p>
+     * Legacy: Body\n\n^@
+     * <p>
+     * Default: Body^@
+     *
+     * @param legacyWhitespace whether to append an extra two newlines
+     * @see <a href="http://stomp.github.io/stomp-specification-1.2.html#STOMP_Frames">The STOMP spec</a>
+     */
+    public void setLegacyWhitespace(boolean legacyWhitespace) {
+        this.legacyWhitespace = legacyWhitespace;
+    }
 }
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/dto/StompMessage.java b/lib/src/main/java/ua/naiksoftware/stomp/dto/StompMessage.java
index 15a0fea..60ccb91 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/dto/StompMessage.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/dto/StompMessage.java
@@ -86,7 +86,7 @@ public static StompMessage from(@Nullable String data) {
             headers.add(new StompHeader(matcher.group(1), matcher.group(2)));
         }
 
-        reader.skip("\\s");
+        reader.skip("\n\n");
 
         reader.useDelimiter(TERMINATE_MESSAGE_SYMBOL);
         String payload = reader.hasNext() ? reader.next() : null;
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/provider/AbstractConnectionProvider.java b/lib/src/main/java/ua/naiksoftware/stomp/provider/AbstractConnectionProvider.java
index aea6d3a..b9b1ef5 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/provider/AbstractConnectionProvider.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/provider/AbstractConnectionProvider.java
@@ -8,8 +8,6 @@
 
 import io.reactivex.Completable;
 import io.reactivex.Observable;
-import io.reactivex.Scheduler;
-import io.reactivex.disposables.Disposable;
 import io.reactivex.schedulers.Schedulers;
 import io.reactivex.subjects.PublishSubject;
 import ua.naiksoftware.stomp.dto.LifecycleEvent;
@@ -27,30 +25,20 @@ public abstract class AbstractConnectionProvider implements ConnectionProvider {
 
     private static final String TAG = AbstractConnectionProvider.class.getSimpleName();
 
-    private transient Disposable clientSendHeartBeatTask;
-    private transient Disposable serverCheckHeartBeatTask;
-    private Scheduler scheduler;
-
-    private int serverHeartbeat = 0;
-    private int clientHeartbeat = 0;
-
-    private transient long lastServerHeartBeat = 0;
-
-
     @NonNull
-    private final PublishSubject<LifecycleEvent> mLifecycleStream;
+    private final PublishSubject<LifecycleEvent> lifecycleStream;
     @NonNull
-    private final PublishSubject<String> mMessagesStream;
+    private final PublishSubject<String> messagesStream;
 
     public AbstractConnectionProvider() {
-        mLifecycleStream = PublishSubject.create();
-        mMessagesStream = PublishSubject.create();
+        lifecycleStream = PublishSubject.create();
+        messagesStream = PublishSubject.create();
     }
 
     @NonNull
     @Override
     public Observable<String> messages() {
-        return mMessagesStream.startWith(initSocket().toObservable());
+        return messagesStream.startWith(initSocket().toObservable());
     }
 
     /**
@@ -61,23 +49,10 @@ public Observable<String> messages() {
      * webSocket.close();
      * </pre>
      */
-    abstract void rawDisconnect();
+    protected abstract void rawDisconnect();
 
     @Override
     public Completable disconnect() {
-        if (clientSendHeartBeatTask != null) {
-            clientSendHeartBeatTask.dispose();
-        }
-
-        if (serverCheckHeartBeatTask != null) {
-            serverCheckHeartBeatTask.dispose();
-        }
-
-        lastServerHeartBeat = 0;
-
-        // TODO shutdown Schedulers.io() is not a good idea
-//        scheduler.shutdown();
-
         return Completable
                 .fromAction(this::rawDisconnect);
     }
@@ -92,7 +67,7 @@ private Completable initSocket() {
      * <p>
      * See implementations in OkHttpConnectionProvider and WebSocketsConnectionProvider.
      */
-    abstract void createWebSocketConnection();
+    protected abstract void createWebSocketConnection();
 
     @NonNull
     @Override
@@ -118,7 +93,7 @@ public Completable send(String stompMessage) {
      *
      * @param stompMessage message to send
      */
-    abstract void rawSend(String stompMessage);
+    protected abstract void rawSend(String stompMessage);
 
     /**
      * Get socket object.
@@ -130,165 +105,21 @@ public Completable send(String stompMessage) {
      * </pre>
      */
     @Nullable
-    abstract Object getSocket();
+    protected abstract Object getSocket();
 
-    void emitLifecycleEvent(@NonNull LifecycleEvent lifecycleEvent) {
+    protected void emitLifecycleEvent(@NonNull LifecycleEvent lifecycleEvent) {
         Log.d(TAG, "Emit lifecycle event: " + lifecycleEvent.getType().name());
-        mLifecycleStream.onNext(lifecycleEvent);
+        lifecycleStream.onNext(lifecycleEvent);
     }
 
-    void emitMessage(String stompMessage) {
-        //TODO: Why we don't publish a StompMessage, instead of String? will this connection provider work with other protocol?
-        final StompMessage sm = StompMessage.from(stompMessage);
-
-        if (StompCommand.CONNECTED.equals(sm.getStompCommand())) {
-            Log.d(TAG, "<<< CONNECTED");
-            heartBeatHandshake(sm.findHeader(StompHeader.HEART_BEAT));
-        } else if (StompCommand.SEND.equals(sm.getStompCommand())) {
-            abortClientHeartBeatSend();
-        } else if (StompCommand.MESSAGE.equals(sm.getStompCommand())) {
-            //a MESSAGE works as an hear-beat too.
-            abortServerHeartBeatCheck();
-        }
-
-        if (stompMessage.equals("\n")) {
-            Log.d(TAG, "<<< PONG");
-            abortServerHeartBeatCheck();
-        } else {
-            Log.d(TAG, "Receive STOMP message: " + stompMessage);
-            mMessagesStream.onNext(stompMessage);
-        }
+    protected void emitMessage(String stompMessage) {
+        Log.d(TAG, "Receive STOMP message: " + stompMessage);
+        messagesStream.onNext(stompMessage);
     }
 
     @NonNull
     @Override
     public Observable<LifecycleEvent> lifecycle() {
-        return mLifecycleStream;
-    }
-
-    /**
-     * Analise heart-beat sent from server (if any), to adjust the frequency.
-     * Startup the heart-beat logic.
-     *
-     * @param heartBeatHeader
-     */
-    private void heartBeatHandshake(final String heartBeatHeader) {
-        if (heartBeatHeader != null) {
-            // The heart-beat header is OPTIONAL
-            final String[] heartbeats = heartBeatHeader.split(",");
-            if (clientHeartbeat > 0) {
-                //there will be heart-beats every MAX(<cx>,<sy>) milliseconds
-                clientHeartbeat = Math.max(clientHeartbeat, Integer.parseInt(heartbeats[1]));
-            }
-            if (serverHeartbeat > 0) {
-                //there will be heart-beats every MAX(<cx>,<sy>) milliseconds
-                serverHeartbeat = Math.max(serverHeartbeat, Integer.parseInt(heartbeats[0]));
-            }
-        }
-        if (clientHeartbeat > 0 || serverHeartbeat > 0) {
-            scheduler = Schedulers.io();
-            if (clientHeartbeat > 0) {
-                //client MUST/WANT send heart-beat
-                Log.d(TAG, "Client will send heart-beat every " + clientHeartbeat + " ms");
-                scheduleClientHeartBeat();
-            }
-            if (serverHeartbeat > 0) {
-                Log.d(TAG, "Client will listen to server heart-beat every " + serverHeartbeat + " ms");
-                //client WANT to listen to server heart-beat
-                scheduleServerHeartBeatCheck();
-
-                // initialize the server heartbeat
-                lastServerHeartBeat = System.currentTimeMillis();
-            }
-        }
-    }
-
-    protected void scheduleServerHeartBeatCheck() {
-        if (serverHeartbeat > 0 && scheduler != null) {
-            final long now = System.currentTimeMillis();
-            Log.d(TAG, "Scheduling server heart-beat to be checked in " + serverHeartbeat + " ms and now is '" + now + "'");
-            //add some slack on the check
-            serverCheckHeartBeatTask = scheduler.scheduleDirect(() ->
-                    checkServerHeartBeat(), serverHeartbeat, TimeUnit.MILLISECONDS);
-        }
-    }
-
-    private void checkServerHeartBeat() {
-        if (serverHeartbeat > 0) {
-            final long now = System.currentTimeMillis();
-            //use a forgiving boundary as some heart beats can be delayed or lost.
-            final long boundary = now - (3 * serverHeartbeat);
-            //we need to check because the task could failed to abort
-            if (lastServerHeartBeat < boundary) {
-                Log.d(TAG, "It's a sad day ;( Server didn't send heart-beat on time. Last received at '" + lastServerHeartBeat + "' and now is '" + now + "'");
-                final LifecycleEvent failedServerHeartBeat = new LifecycleEvent(LifecycleEvent.Type.FAILED_SERVER_HEARTBEAT);
-                emitLifecycleEvent(failedServerHeartBeat);
-            } else {
-                Log.d(TAG, "We were checking and server sent heart-beat on time. So well-behaved :)");
-                lastServerHeartBeat = System.currentTimeMillis();
-            }
-        }
-    }
-
-    /**
-     * Used to abort the server heart-beat check.
-     */
-    private void abortServerHeartBeatCheck() {
-        lastServerHeartBeat = System.currentTimeMillis();
-        Log.d(TAG, "Aborted last check because server sent heart-beat on time ('" + lastServerHeartBeat + "'). So well-behaved :)");
-        if (serverCheckHeartBeatTask != null) {
-            serverCheckHeartBeatTask.dispose();
-        }
-        scheduleServerHeartBeatCheck();
-    }
-
-    /**
-     * Schedule a client heart-beat if clientHeartbeat > 0.
-     */
-    public void scheduleClientHeartBeat() {
-        if (clientHeartbeat > 0 && scheduler != null) {
-            Log.d(TAG, "Scheduling client heart-beat to be sent in " + clientHeartbeat + " ms");
-            clientSendHeartBeatTask = scheduler.scheduleDirect(() ->
-                    sendClientHeartBeat(), clientHeartbeat, TimeUnit.MILLISECONDS);
-        }
-    }
-
-    /**
-     * Send the raw heart-beat to the server.
-     */
-    private void sendClientHeartBeat() {
-        this.rawSend("\r\n");
-        Log.d(TAG, "PING >>>");
-        //schedule next client heart beat
-        this.scheduleClientHeartBeat();
-    }
-
-    /**
-     * Used when we have a scheduled heart-beat and we send a new message to the server.
-     * The new message will work as an heart-beat so we can abort current one and schedule another
-     */
-    private void abortClientHeartBeatSend() {
-        if (clientSendHeartBeatTask != null) {
-            clientSendHeartBeatTask.dispose();
-        }
-        scheduleClientHeartBeat();
-    }
-
-    /**
-     * Set the server heart-beat
-     *
-     * @param ms milliseconds
-     */
-    public void setServerHeartbeat(int ms) {
-        this.serverHeartbeat = ms;
-    }
-
-    /**
-     * Set the client heart-beat
-     *
-     * @param ms milliseconds
-     */
-    public void setClientHeartbeat(int ms) {
-        this.clientHeartbeat = ms;
+        return lifecycleStream;
     }
 }
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/provider/ConnectionProvider.java b/lib/src/main/java/ua/naiksoftware/stomp/provider/ConnectionProvider.java
index 4f7fa1d..bfac8ee 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/provider/ConnectionProvider.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/provider/ConnectionProvider.java
@@ -31,18 +31,4 @@ public interface ConnectionProvider {
      * Automatically emits Lifecycle.CLOSE
      */
     Completable disconnect();
-
-    /**
-     * Set the server heart-beat
-     *
-     * @param ms milliseconds
-     */
-    void setServerHeartbeat(int ms);
-
-    /**
-     * Set the client heart-beat
-     *
-     * @param ms milliseconds
-     */
-    void setClientHeartbeat(int ms);
 }
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/provider/OkHttpConnectionProvider.java b/lib/src/main/java/ua/naiksoftware/stomp/provider/OkHttpConnectionProvider.java
index 7be2389..3846b49 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/provider/OkHttpConnectionProvider.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/provider/OkHttpConnectionProvider.java
@@ -44,7 +44,7 @@ public void rawDisconnect() {
     }
 
     @Override
-    void createWebSocketConnection() {
+    protected void createWebSocketConnection() {
         Request.Builder requestBuilder = new Request.Builder()
                 .url(mUri);
 
@@ -96,13 +96,13 @@ public void onClosing(final WebSocket webSocket, final int code, final String re
     }
 
     @Override
-    void rawSend(String stompMessage) {
+    protected void rawSend(String stompMessage) {
         openSocket.send(stompMessage);
     }
 
     @Nullable
     @Override
-    Object getSocket() {
+    protected Object getSocket() {
         return openSocket;
     }
 
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/provider/WebSocketsConnectionProvider.java b/lib/src/main/java/ua/naiksoftware/stomp/provider/WebSocketsConnectionProvider.java
index 0483b6b..3a1e8cb 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/provider/WebSocketsConnectionProvider.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/provider/WebSocketsConnectionProvider.java
@@ -58,7 +58,7 @@ public void rawDisconnect() {
     }
 
     @Override
-    void createWebSocketConnection() {
+    protected void createWebSocketConnection() {
         if (haveConnection)
             throw new IllegalStateException("Already have connection to web socket");
 
@@ -122,12 +122,12 @@ public void onError(Exception ex) {
     }
 
     @Override
-    void rawSend(String stompMessage) {
+    protected void rawSend(String stompMessage) {
         mWebSocketClient.send(stompMessage);
     }
 
     @Override
-    Object getSocket() {
+    protected Object getSocket() {
         return mWebSocketClient;
     }
 }

From c8e6d727f2f65d8a698783b6b6fbecc4ac2ba838 Mon Sep 17 00:00:00 2001
From: Nickolay Savchenko <savchenko@river-soft.net>
Date: Wed, 6 Feb 2019 22:56:18 +0200
Subject: [PATCH 100/110] Fixes

---
 .../stompclientexample/MainActivity.java      |  6 +-
 .../ua/naiksoftware/stomp/StompClient.java    | 67 +++++--------------
 .../provider/AbstractConnectionProvider.java  |  2 +-
 3 files changed, 22 insertions(+), 53 deletions(-)

diff --git a/example-client/src/main/java/ua/naiksoftware/stompclientexample/MainActivity.java b/example-client/src/main/java/ua/naiksoftware/stompclientexample/MainActivity.java
index 8962ad2..491138c 100644
--- a/example-client/src/main/java/ua/naiksoftware/stompclientexample/MainActivity.java
+++ b/example-client/src/main/java/ua/naiksoftware/stompclientexample/MainActivity.java
@@ -54,6 +54,8 @@ protected void onCreate(Bundle savedInstanceState) {
 
         mStompClient = Stomp.over(Stomp.ConnectionProvider.OKHTTP, "ws://" + ANDROID_EMULATOR_LOCALHOST
                 + ":" + RestClient.SERVER_PORT + "/example-endpoint/websocket");
+
+        resetSubscriptions();
     }
 
     public void disconnectStomp(View view) {
@@ -96,7 +98,7 @@ public void connectStomp(View view) {
                     }
                 });
 
-        compositeDisposable.add(dispLifecycle);
+//        compositeDisposable.add(dispLifecycle);
 
         // Receive greetings
         Disposable dispTopic = mStompClient.topic("/topic/greetings")
@@ -109,7 +111,7 @@ public void connectStomp(View view) {
                     Log.e(TAG, "Error on subscribe topic", throwable);
                 });
 
-        compositeDisposable.add(dispTopic);
+//        compositeDisposable.add(dispTopic);
 
         mStompClient.connect(headers);
     }
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/StompClient.java b/lib/src/main/java/ua/naiksoftware/stomp/StompClient.java
index 7b26db1..eb0ff6c 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/StompClient.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/StompClient.java
@@ -38,14 +38,11 @@ public class StompClient {
 
     private final ConnectionProvider connectionProvider;
     private ConcurrentHashMap<String, String> topics;
-    private boolean isConnected;
-    private boolean isConnecting;
-    private boolean forceClose;
     private boolean legacyWhitespace;
 
-    private PublishSubject<StompMessage> messageStream;
+    private final PublishSubject<StompMessage> messageStream;
+    private BehaviorSubject<Boolean> connectionStream;
     private ConcurrentHashMap<String, Flowable<StompMessage>> streamMap;
-    private final BehaviorSubject<Boolean> connectionStream;
     private PathMatcher pathMatcher;
     private Disposable lifecycleDisposable;
     private Disposable messagesDisposable;
@@ -56,7 +53,7 @@ public class StompClient {
     public StompClient(ConnectionProvider connectionProvider) {
         this.connectionProvider = connectionProvider;
         streamMap = new ConcurrentHashMap<>();
-        connectionStream = BehaviorSubject.createDefault(false);
+        messageStream = PublishSubject.create();
         lifecyclePublishSubject = PublishSubject.create();
         pathMatcher = new SimplePathMatcher();
         heartBeatTask = new HeartBeatTask(this::sendHeartBeat, () -> {
@@ -106,7 +103,7 @@ public void connect(@Nullable List<StompHeader> _headers) {
 
         this.headers = _headers;
 
-        if (isConnected) {
+        if (isConnected()) {
             Log.d(TAG, "Already connected, ignore");
             return;
         }
@@ -129,7 +126,7 @@ public void connect(@Nullable List<StompHeader> _headers) {
 
                         case CLOSED:
                             Log.d(TAG, "Socket closed");
-                            forceClose = true;
+                            getConnectionStream().onNext(false);
                             disconnect();
                             break;
 
@@ -140,28 +137,21 @@ public void connect(@Nullable List<StompHeader> _headers) {
                     }
                 });
 
-        isConnecting = true;
         messagesDisposable = connectionProvider.messages()
                 .map(StompMessage::from)
                 .filter(heartBeatTask::consumeHeartBeat)
-                .doOnNext(getMessageStream()::onNext)
+                .doOnNext(messageStream::onNext)
                 .filter(msg -> msg.getStompCommand().equals(StompCommand.CONNECTED))
                 .subscribe(stompMessage -> {
-                    isConnecting = false;
-                    setConnected(true);
+                    getConnectionStream().onNext(true);
                 });
     }
 
-    private PublishSubject<StompMessage> getMessageStream() {
-        if (messageStream == null || messageStream.hasComplete()) {
-            messageStream = PublishSubject.create();
+    private BehaviorSubject<Boolean> getConnectionStream() {
+        if (connectionStream == null || connectionStream.hasComplete()) {
+            connectionStream = BehaviorSubject.createDefault(false);
         }
-        return messageStream;
-    }
-
-    private void setConnected(boolean connected) {
-        isConnected = connected;
-        connectionStream.onNext(isConnected);
+        return connectionStream;
     }
 
     public Completable send(String destination) {
@@ -177,9 +167,9 @@ public Completable send(String destination, String data) {
 
     public Completable send(@NonNull StompMessage stompMessage) {
         Completable completable = connectionProvider.send(stompMessage.compile(legacyWhitespace));
-        CompletableSource connectionComplete = connectionStream
+        CompletableSource connectionComplete = getConnectionStream()
                 .filter(isConnected -> isConnected)
-                .firstOrError().ignoreElement();
+                .firstElement().ignoreElement();
         return completable
                 .startWith(connectionComplete);
     }
@@ -187,7 +177,7 @@ public Completable send(@NonNull StompMessage stompMessage) {
     @SuppressLint("CheckResult")
     private void sendHeartBeat(@NonNull String pingMessage) {
         Completable completable = connectionProvider.send(pingMessage);
-        CompletableSource connectionComplete = connectionStream
+        CompletableSource connectionComplete = getConnectionStream()
                 .filter(isConnected -> isConnected)
                 .firstOrError().ignoreElement();
         completable.startWith(connectionComplete)
@@ -214,10 +204,6 @@ public void disconnect() {
     }
 
     public Completable disconnectCompletable() {
-        if (!isConnected && !isConnecting) {
-            Log.d(TAG, "Skip disconnect, already not connected");
-            return Completable.complete();
-        }
 
         heartBeatTask.shutdown();
 
@@ -227,16 +213,11 @@ public Completable disconnectCompletable() {
         if (messagesDisposable != null) {
             messagesDisposable.dispose();
         }
-        if (messageStream != null && !messageStream.hasComplete()) {
-            messageStream.onComplete();
-        }
 
         return connectionProvider.disconnect()
                 .doFinally(() -> {
                     Log.d(TAG, "Stomp disconnected");
-                    forceClose = false;
-                    isConnecting = false;
-                    setConnected(false);
+                    getConnectionStream().onComplete();
                     lifecyclePublishSubject.onNext(new LifecycleEvent(LifecycleEvent.Type.CLOSED));
                 });
     }
@@ -250,7 +231,7 @@ public Flowable<StompMessage> topic(@NonNull String destPath, List<StompHeader>
             return Flowable.error(new IllegalArgumentException("Topic path cannot be null"));
         else if (!streamMap.containsKey(destPath))
             streamMap.put(destPath,
-                    getMessageStream()
+                    messageStream
                             .filter(msg -> pathMatcher.matches(destPath, msg))
                             .toFlowable(BackpressureStrategy.BUFFER)
                             .doOnSubscribe(disposable -> subscribePath(destPath, headerList).subscribe())
@@ -290,16 +271,6 @@ private Completable unsubscribePath(String dest) {
 
         Log.d(TAG, "Unsubscribe path: " + dest + " id: " + topicId);
 
-        if (forceClose) {
-            Log.d(TAG, "Force close, skip sending Unsubscribe frame to " + dest);
-            return Completable.complete();
-        }
-
-        if (!isConnected) {
-            Log.d(TAG, "Not connected, skip sending Unsubscribe frame to " + dest);
-            return Completable.complete();
-        }
-
         return send(new StompMessage(StompCommand.UNSUBSCRIBE,
                 Collections.singletonList(new StompHeader(StompHeader.ID, topicId)), null));
     }
@@ -320,11 +291,7 @@ public void setPathMatcher(PathMatcher pathMatcher) {
     }
 
     public boolean isConnected() {
-        return isConnected;
-    }
-
-    public boolean isConnecting() {
-        return isConnecting;
+        return getConnectionStream().getValue();
     }
 
     /**
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/provider/AbstractConnectionProvider.java b/lib/src/main/java/ua/naiksoftware/stomp/provider/AbstractConnectionProvider.java
index b9b1ef5..c0f938e 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/provider/AbstractConnectionProvider.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/provider/AbstractConnectionProvider.java
@@ -74,7 +74,7 @@ private Completable initSocket() {
     public Completable send(String stompMessage) {
         return Completable.fromCallable(() -> {
             if (getSocket() == null) {
-                throw new IllegalStateException("Not connected yet");
+                throw new IllegalStateException("Not connected");
             } else {
                 Log.d(TAG, "Send STOMP message: " + stompMessage);
                 rawSend(stompMessage);

From 2e4f12ea6f4b52b0f6efe65fba2f052956b78247 Mon Sep 17 00:00:00 2001
From: Nickolay Savchenko <savchenko@river-soft.net>
Date: Thu, 7 Feb 2019 14:59:08 +0200
Subject: [PATCH 101/110] Fixed message stream

---
 .../ua/naiksoftware/stomp/StompClient.java    | 32 ++++++++++++-------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/lib/src/main/java/ua/naiksoftware/stomp/StompClient.java b/lib/src/main/java/ua/naiksoftware/stomp/StompClient.java
index eb0ff6c..f7b2036 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/StompClient.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/StompClient.java
@@ -40,7 +40,7 @@ public class StompClient {
     private ConcurrentHashMap<String, String> topics;
     private boolean legacyWhitespace;
 
-    private final PublishSubject<StompMessage> messageStream;
+    private PublishSubject<StompMessage> messageStream;
     private BehaviorSubject<Boolean> connectionStream;
     private ConcurrentHashMap<String, Flowable<StompMessage>> streamMap;
     private PathMatcher pathMatcher;
@@ -53,7 +53,6 @@ public class StompClient {
     public StompClient(ConnectionProvider connectionProvider) {
         this.connectionProvider = connectionProvider;
         streamMap = new ConcurrentHashMap<>();
-        messageStream = PublishSubject.create();
         lifecyclePublishSubject = PublishSubject.create();
         pathMatcher = new SimplePathMatcher();
         heartBeatTask = new HeartBeatTask(this::sendHeartBeat, () -> {
@@ -126,7 +125,6 @@ public void connect(@Nullable List<StompHeader> _headers) {
 
                         case CLOSED:
                             Log.d(TAG, "Socket closed");
-                            getConnectionStream().onNext(false);
                             disconnect();
                             break;
 
@@ -140,20 +138,27 @@ public void connect(@Nullable List<StompHeader> _headers) {
         messagesDisposable = connectionProvider.messages()
                 .map(StompMessage::from)
                 .filter(heartBeatTask::consumeHeartBeat)
-                .doOnNext(messageStream::onNext)
+                .doOnNext(getMessageStream()::onNext)
                 .filter(msg -> msg.getStompCommand().equals(StompCommand.CONNECTED))
                 .subscribe(stompMessage -> {
                     getConnectionStream().onNext(true);
                 });
     }
 
-    private BehaviorSubject<Boolean> getConnectionStream() {
+    synchronized private BehaviorSubject<Boolean> getConnectionStream() {
         if (connectionStream == null || connectionStream.hasComplete()) {
             connectionStream = BehaviorSubject.createDefault(false);
         }
         return connectionStream;
     }
 
+    synchronized private PublishSubject<StompMessage> getMessageStream() {
+        if (messageStream == null || messageStream.hasComplete()) {
+            messageStream = PublishSubject.create();
+        }
+        return messageStream;
+    }
+
     public Completable send(String destination) {
         return send(destination, null);
     }
@@ -179,9 +184,10 @@ private void sendHeartBeat(@NonNull String pingMessage) {
         Completable completable = connectionProvider.send(pingMessage);
         CompletableSource connectionComplete = getConnectionStream()
                 .filter(isConnected -> isConnected)
-                .firstOrError().ignoreElement();
+                .firstElement().ignoreElement();
         completable.startWith(connectionComplete)
-                .subscribe(() -> {}, Throwable::printStackTrace);
+                .onErrorComplete()
+                .subscribe();
     }
 
     public Flowable<LifecycleEvent> lifecycle() {
@@ -200,7 +206,8 @@ public void reconnect() {
 
     @SuppressLint("CheckResult")
     public void disconnect() {
-        disconnectCompletable().subscribe(() -> { }, e -> Log.e(TAG, "Disconnect error", e));
+        disconnectCompletable().subscribe(() -> {
+        }, e -> Log.e(TAG, "Disconnect error", e));
     }
 
     public Completable disconnectCompletable() {
@@ -218,6 +225,7 @@ public Completable disconnectCompletable() {
                 .doFinally(() -> {
                     Log.d(TAG, "Stomp disconnected");
                     getConnectionStream().onComplete();
+                    getMessageStream().onComplete();
                     lifecyclePublishSubject.onNext(new LifecycleEvent(LifecycleEvent.Type.CLOSED));
                 });
     }
@@ -231,12 +239,12 @@ public Flowable<StompMessage> topic(@NonNull String destPath, List<StompHeader>
             return Flowable.error(new IllegalArgumentException("Topic path cannot be null"));
         else if (!streamMap.containsKey(destPath))
             streamMap.put(destPath,
-                    messageStream
+                    subscribePath(destPath, headerList).andThen(
+                    getMessageStream()
                             .filter(msg -> pathMatcher.matches(destPath, msg))
                             .toFlowable(BackpressureStrategy.BUFFER)
-                            .doOnSubscribe(disposable -> subscribePath(destPath, headerList).subscribe())
                             .doFinally(() -> unsubscribePath(destPath).subscribe())
-                            .share()
+                            .share())
             );
         return streamMap.get(destPath);
     }
@@ -272,7 +280,7 @@ private Completable unsubscribePath(String dest) {
         Log.d(TAG, "Unsubscribe path: " + dest + " id: " + topicId);
 
         return send(new StompMessage(StompCommand.UNSUBSCRIBE,
-                Collections.singletonList(new StompHeader(StompHeader.ID, topicId)), null));
+                Collections.singletonList(new StompHeader(StompHeader.ID, topicId)), null)).onErrorComplete();
     }
 
     /**

From f5c64842b3b93c0f0e9033538fbb9f3d05803ffa Mon Sep 17 00:00:00 2001
From: Nickolay Savchenko <savchenko@river-soft.net>
Date: Thu, 7 Feb 2019 15:57:57 +0200
Subject: [PATCH 102/110] Fixed heartbeat

---
 .../stompclientexample/MainActivity.java      |  4 ++--
 .../ua/naiksoftware/stomp/HeartBeatTask.java  | 19 +++++++++++--------
 .../ua/naiksoftware/stomp/StompClient.java    |  1 +
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/example-client/src/main/java/ua/naiksoftware/stompclientexample/MainActivity.java b/example-client/src/main/java/ua/naiksoftware/stompclientexample/MainActivity.java
index 491138c..fd35cde 100644
--- a/example-client/src/main/java/ua/naiksoftware/stompclientexample/MainActivity.java
+++ b/example-client/src/main/java/ua/naiksoftware/stompclientexample/MainActivity.java
@@ -98,7 +98,7 @@ public void connectStomp(View view) {
                     }
                 });
 
-//        compositeDisposable.add(dispLifecycle);
+        compositeDisposable.add(dispLifecycle);
 
         // Receive greetings
         Disposable dispTopic = mStompClient.topic("/topic/greetings")
@@ -111,7 +111,7 @@ public void connectStomp(View view) {
                     Log.e(TAG, "Error on subscribe topic", throwable);
                 });
 
-//        compositeDisposable.add(dispTopic);
+        compositeDisposable.add(dispTopic);
 
         mStompClient.connect(headers);
     }
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/HeartBeatTask.java b/lib/src/main/java/ua/naiksoftware/stomp/HeartBeatTask.java
index 84e1ff4..0ce86a7 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/HeartBeatTask.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/HeartBeatTask.java
@@ -21,6 +21,9 @@ public class HeartBeatTask {
     private int serverHeartbeat = 0;
     private int clientHeartbeat = 0;
 
+    private int serverHeartbeatNew = 0;
+    private int clientHeartbeatNew = 0;
+
     private transient long lastServerHeartBeat = 0;
 
     private transient Disposable clientSendHeartBeatTask;
@@ -35,19 +38,19 @@ public HeartBeatTask(SendCallback sendCallback, @Nullable FailedListener failedL
     }
 
     public void setServerHeartbeat(int serverHeartbeat) {
-        this.serverHeartbeat = serverHeartbeat;
+        this.serverHeartbeatNew = serverHeartbeat;
     }
 
     public void setClientHeartbeat(int clientHeartbeat) {
-        this.clientHeartbeat = clientHeartbeat;
+        this.clientHeartbeatNew = clientHeartbeat;
     }
 
     public int getServerHeartbeat() {
-        return serverHeartbeat;
+        return serverHeartbeatNew;
     }
 
     public int getClientHeartbeat() {
-        return clientHeartbeat;
+        return clientHeartbeatNew;
     }
 
     public boolean consumeHeartBeat(StompMessage message) {
@@ -96,13 +99,13 @@ private void heartBeatHandshake(final String heartBeatHeader) {
         if (heartBeatHeader != null) {
             // The heart-beat header is OPTIONAL
             final String[] heartbeats = heartBeatHeader.split(",");
-            if (clientHeartbeat > 0) {
+            if (clientHeartbeatNew > 0) {
                 //there will be heart-beats every MAX(<cx>,<sy>) milliseconds
-                clientHeartbeat = Math.max(clientHeartbeat, Integer.parseInt(heartbeats[1]));
+                clientHeartbeat = Math.max(clientHeartbeatNew, Integer.parseInt(heartbeats[1]));
             }
-            if (serverHeartbeat > 0) {
+            if (serverHeartbeatNew > 0) {
                 //there will be heart-beats every MAX(<cx>,<sy>) milliseconds
-                serverHeartbeat = Math.max(serverHeartbeat, Integer.parseInt(heartbeats[0]));
+                serverHeartbeat = Math.max(serverHeartbeatNew, Integer.parseInt(heartbeats[0]));
             }
         }
         if (clientHeartbeat > 0 || serverHeartbeat > 0) {
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/StompClient.java b/lib/src/main/java/ua/naiksoftware/stomp/StompClient.java
index f7b2036..cf9363a 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/StompClient.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/StompClient.java
@@ -119,6 +119,7 @@ public void connect(@Nullable List<StompHeader> _headers) {
 
                             connectionProvider.send(new StompMessage(StompCommand.CONNECT, headers, null).compile(legacyWhitespace))
                                     .subscribe(() -> {
+                                        Log.d(TAG, "Publish open");
                                         lifecyclePublishSubject.onNext(lifecycleEvent);
                                     });
                             break;

From 7fb1a59311389e93d5f07436ea48014adbe53253 Mon Sep 17 00:00:00 2001
From: Nickolay Savchenko <savchenko@river-soft.net>
Date: Thu, 7 Feb 2019 17:00:47 +0200
Subject: [PATCH 103/110] Fix disconnect

---
 lib/src/main/java/ua/naiksoftware/stomp/StompClient.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/src/main/java/ua/naiksoftware/stomp/StompClient.java b/lib/src/main/java/ua/naiksoftware/stomp/StompClient.java
index cf9363a..f995ed6 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/StompClient.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/StompClient.java
@@ -126,6 +126,7 @@ public void connect(@Nullable List<StompHeader> _headers) {
 
                         case CLOSED:
                             Log.d(TAG, "Socket closed");
+                            getConnectionStream().onNext(false);
                             disconnect();
                             break;
 

From 93e747b7e62d2735186f4861aa1117188287909f Mon Sep 17 00:00:00 2001
From: Nickolay Savchenko <savchenko@river-soft.net>
Date: Thu, 7 Feb 2019 17:36:26 +0200
Subject: [PATCH 104/110] Revert

---
 lib/src/main/java/ua/naiksoftware/stomp/StompClient.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/src/main/java/ua/naiksoftware/stomp/StompClient.java b/lib/src/main/java/ua/naiksoftware/stomp/StompClient.java
index f995ed6..cf9363a 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/StompClient.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/StompClient.java
@@ -126,7 +126,6 @@ public void connect(@Nullable List<StompHeader> _headers) {
 
                         case CLOSED:
                             Log.d(TAG, "Socket closed");
-                            getConnectionStream().onNext(false);
                             disconnect();
                             break;
 

From 1003a329e7bc4fa423262da8313c5427d09992be Mon Sep 17 00:00:00 2001
From: Nickolay Savchenko <savchenko@river-soft.net>
Date: Thu, 7 Feb 2019 18:26:48 +0200
Subject: [PATCH 105/110] Add logs

---
 lib/src/main/java/ua/naiksoftware/stomp/StompClient.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/src/main/java/ua/naiksoftware/stomp/StompClient.java b/lib/src/main/java/ua/naiksoftware/stomp/StompClient.java
index cf9363a..3b2be91 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/StompClient.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/StompClient.java
@@ -174,7 +174,11 @@ public Completable send(String destination, String data) {
     public Completable send(@NonNull StompMessage stompMessage) {
         Completable completable = connectionProvider.send(stompMessage.compile(legacyWhitespace));
         CompletableSource connectionComplete = getConnectionStream()
-                .filter(isConnected -> isConnected)
+//                .filter(isConnected -> isConnected)
+                .filter(isConnected -> {
+                    Log.d(TAG, "Send " + stompMessage + "filtered " + isConnected);
+                    return isConnected;
+                })
                 .firstElement().ignoreElement();
         return completable
                 .startWith(connectionComplete);

From e71248f169682e528302111ab276174263dfa278 Mon Sep 17 00:00:00 2001
From: Nickolay Savchenko <savchenko@river-soft.net>
Date: Thu, 7 Feb 2019 18:49:19 +0200
Subject: [PATCH 106/110] Fix unsubscribe

---
 lib/src/main/java/ua/naiksoftware/stomp/StompClient.java | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/lib/src/main/java/ua/naiksoftware/stomp/StompClient.java b/lib/src/main/java/ua/naiksoftware/stomp/StompClient.java
index 3b2be91..a16ecde 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/StompClient.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/StompClient.java
@@ -174,11 +174,7 @@ public Completable send(String destination, String data) {
     public Completable send(@NonNull StompMessage stompMessage) {
         Completable completable = connectionProvider.send(stompMessage.compile(legacyWhitespace));
         CompletableSource connectionComplete = getConnectionStream()
-//                .filter(isConnected -> isConnected)
-                .filter(isConnected -> {
-                    Log.d(TAG, "Send " + stompMessage + "filtered " + isConnected);
-                    return isConnected;
-                })
+                .filter(isConnected -> isConnected)
                 .firstElement().ignoreElement();
         return completable
                 .startWith(connectionComplete);
@@ -248,8 +244,7 @@ else if (!streamMap.containsKey(destPath))
                     getMessageStream()
                             .filter(msg -> pathMatcher.matches(destPath, msg))
                             .toFlowable(BackpressureStrategy.BUFFER)
-                            .doFinally(() -> unsubscribePath(destPath).subscribe())
-                            .share())
+                            .share()).doFinally(() -> unsubscribePath(destPath).subscribe())
             );
         return streamMap.get(destPath);
     }

From a8cf4338ebf00ff40b1c6370d2812a361eb0f0cb Mon Sep 17 00:00:00 2001
From: Jordan Turgeon <jordan.turgeon@lightshipworks.com>
Date: Thu, 2 May 2019 12:21:37 -0700
Subject: [PATCH 107/110] #142 Fixed multiple topic subscription errors

---
 .../java/ua/naiksoftware/stomp/StompClient.java     | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/lib/src/main/java/ua/naiksoftware/stomp/StompClient.java b/lib/src/main/java/ua/naiksoftware/stomp/StompClient.java
index a16ecde..ca872ff 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/StompClient.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/StompClient.java
@@ -240,11 +240,12 @@ public Flowable<StompMessage> topic(@NonNull String destPath, List<StompHeader>
             return Flowable.error(new IllegalArgumentException("Topic path cannot be null"));
         else if (!streamMap.containsKey(destPath))
             streamMap.put(destPath,
-                    subscribePath(destPath, headerList).andThen(
+                    Completable.defer(() -> subscribePath(destPath, headerList)).andThen(
                     getMessageStream()
                             .filter(msg -> pathMatcher.matches(destPath, msg))
                             .toFlowable(BackpressureStrategy.BUFFER)
-                            .share()).doFinally(() -> unsubscribePath(destPath).subscribe())
+                            .doFinally(() -> unsubscribePath(destPath).subscribe())
+                            .share())
             );
         return streamMap.get(destPath);
     }
@@ -267,7 +268,8 @@ private Completable subscribePath(String destinationPath, @Nullable List<StompHe
         headers.add(new StompHeader(StompHeader.ACK, DEFAULT_ACK));
         if (headerList != null) headers.addAll(headerList);
         return send(new StompMessage(StompCommand.SUBSCRIBE,
-                headers, null));
+                headers, null))
+                .doOnError(throwable -> unsubscribePath(destinationPath).subscribe());
     }
 
 
@@ -275,6 +277,11 @@ private Completable unsubscribePath(String dest) {
         streamMap.remove(dest);
 
         String topicId = topics.get(dest);
+
+        if (topicId == null) {
+            return Completable.complete();
+        }
+
         topics.remove(dest);
 
         Log.d(TAG, "Unsubscribe path: " + dest + " id: " + topicId);

From 9208f87ce1ab3fa6326501dce529901a45f68b72 Mon Sep 17 00:00:00 2001
From: Laurent Peters <lape@hms-networks.com>
Date: Wed, 10 Jun 2020 18:35:23 +0200
Subject: [PATCH 108/110] #171: add a PathMatcher based on the subscription
 header

---
 .../java/ua/naiksoftware/stomp/StompClient.java  |  7 +++++++
 .../pathmatcher/SubscriptionPathMatcher.java     | 16 ++++++++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 lib/src/main/java/ua/naiksoftware/stomp/pathmatcher/SubscriptionPathMatcher.java

diff --git a/lib/src/main/java/ua/naiksoftware/stomp/StompClient.java b/lib/src/main/java/ua/naiksoftware/stomp/StompClient.java
index a16ecde..755cc23 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/StompClient.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/StompClient.java
@@ -316,4 +316,11 @@ public boolean isConnected() {
     public void setLegacyWhitespace(boolean legacyWhitespace) {
         this.legacyWhitespace = legacyWhitespace;
     }
+    
+    /** returns the to topic (subscription id) corresponding to a given destination  
+     * @param dest the destination
+     * @return the topic (subscription id) or null if no topic corresponds to the destination */
+    public String getTopicId(String dest) {
+        return topics.get(dest);
+    }
 }
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/pathmatcher/SubscriptionPathMatcher.java b/lib/src/main/java/ua/naiksoftware/stomp/pathmatcher/SubscriptionPathMatcher.java
new file mode 100644
index 0000000..13bcb1d
--- /dev/null
+++ b/lib/src/main/java/ua/naiksoftware/stomp/pathmatcher/SubscriptionPathMatcher.java
@@ -0,0 +1,16 @@
+package ua.naiksoftware.stomp.pathmatcher;
+
+import ua.naiksoftware.stomp.dto.StompHeader;
+import ua.naiksoftware.stomp.dto.StompMessage;
+
+public class SubscriptionPathMatcher implements PathMatcher {
+
+    @Override
+    public boolean matches(String path, StompMessage msg) {
+       // Compare subscription
+        String pathSubscription = stompClient.getTopicId(path);
+        if (pathSubscription == null) return false;
+        String subscription = msg.findHeader(StompHeader.SUBSCRIPTION);
+        return pathSubscription.equals(subscription);
+    }
+}

From e5f07c2bc8543e47b78f1ecf013aa5c0c2deb213 Mon Sep 17 00:00:00 2001
From: Zac <zac.gillerat@hotmail.com>
Date: Sat, 13 Jun 2020 20:18:30 +1000
Subject: [PATCH 109/110] Handled/Prevented the crash caused by an
 OnErrorNotImplementedException which itself was caused by a
 NoSuchElementException when parsing stomp messages.

---
 lib/src/main/java/ua/naiksoftware/stomp/StompClient.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/src/main/java/ua/naiksoftware/stomp/StompClient.java b/lib/src/main/java/ua/naiksoftware/stomp/StompClient.java
index a16ecde..fe172f7 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/StompClient.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/StompClient.java
@@ -143,6 +143,8 @@ public void connect(@Nullable List<StompHeader> _headers) {
                 .filter(msg -> msg.getStompCommand().equals(StompCommand.CONNECTED))
                 .subscribe(stompMessage -> {
                     getConnectionStream().onNext(true);
+                }, onError -> {
+                    Log.e(TAG, "Error parsing message", onError);
                 });
     }
 

From dc6f12c5dc8dedb45b8b307279f35bdd93388006 Mon Sep 17 00:00:00 2001
From: Laurent Peters <lape@hms-networks.com>
Date: Tue, 30 Jun 2020 17:32:52 +0200
Subject: [PATCH 110/110] fix #171: fix compilation problems

---
 .../main/java/ua/naiksoftware/stomp/dto/StompHeader.java  | 1 +
 .../stomp/pathmatcher/SubscriptionPathMatcher.java        | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/lib/src/main/java/ua/naiksoftware/stomp/dto/StompHeader.java b/lib/src/main/java/ua/naiksoftware/stomp/dto/StompHeader.java
index 583e295..3846909 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/dto/StompHeader.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/dto/StompHeader.java
@@ -8,6 +8,7 @@ public class StompHeader {
     public static final String VERSION = "accept-version";
     public static final String HEART_BEAT = "heart-beat";
     public static final String DESTINATION = "destination";
+    public static final String SUBSCRIPTION = "subscription";
     public static final String CONTENT_TYPE = "content-type";
     public static final String MESSAGE_ID = "message-id";
     public static final String ID = "id";
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/pathmatcher/SubscriptionPathMatcher.java b/lib/src/main/java/ua/naiksoftware/stomp/pathmatcher/SubscriptionPathMatcher.java
index 13bcb1d..8886201 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/pathmatcher/SubscriptionPathMatcher.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/pathmatcher/SubscriptionPathMatcher.java
@@ -1,10 +1,18 @@
 package ua.naiksoftware.stomp.pathmatcher;
 
+import ua.naiksoftware.stomp.StompClient;
 import ua.naiksoftware.stomp.dto.StompHeader;
+import ua.naiksoftware.stomp.dto.StompHeader.*;
 import ua.naiksoftware.stomp.dto.StompMessage;
 
 public class SubscriptionPathMatcher implements PathMatcher {
 
+    private final  StompClient stompClient;
+
+    public SubscriptionPathMatcher(StompClient stompClient) {
+        this.stompClient = stompClient;
+    }
+
     @Override
     public boolean matches(String path, StompMessage msg) {
        // Compare subscription