Merge pull request #210 from vuptt/fix/make-user-context-nullable

fix: make userContext is nullable (#209)
hannesa2 · Sep 18, 2021 · 3ad24fd · 3ad24fd
2 parents 3932d6f + 27a0861
commit 3ad24fd
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/...edSample/src/androidTest/java/info/mqtt/android/extsample/activity/ExtendedPublishTest.kt b/...edSample/src/androidTest/java/info/mqtt/android/extsample/activity/ExtendedPublishTest.kt
@@ -40,7 +40,7 @@ class ExtendedPublishTest {
             .check(matches(isClosed(Gravity.LEFT))) // Left Drawer should be closed.
             .perform(DrawerActions.open())
         onView(withId(R.id.action_add_connection)).perform(click())
-        onView(withContentDescription(R.string.action_add_connection)).perform(click())
+        onView(withId(R.id.action_save_connection)).perform(click())
 
         Screenshot.takeScreenshot("AddConnect")
 

diff --git a/extendedSample/src/main/res/menu/menu_edit_connection.xml b/extendedSample/src/main/res/menu/menu_edit_connection.xml
@@ -7,7 +7,7 @@
         android:id="@+id/action_save_connection"
         android:icon="@drawable/ic_done"
         android:orderInCategory="100"
-        android:title="@string/action_add_connection"
+        android:title=""
         app:showAsAction="ifRoom" />
 
 </menu>

diff --git a/serviceLibrary/src/main/java/info/mqtt/android/service/MqttAndroidClient.kt b/serviceLibrary/src/main/java/info/mqtt/android/service/MqttAndroidClient.kt
@@ -339,7 +339,7 @@ class MqttAndroidClient(val context: Context, private val serverURI: String, pri
      * @param callback       optional listener that will be notified when the disconnect completes. Use null if not required.
      * @return token used to track and wait for the disconnect to complete. The token will be passed to any callback that has been set.
      */
-    override fun disconnect(quiesceTimeout: Long, userContext: Any, callback: IMqttActionListener): IMqttToken {
+    override fun disconnect(quiesceTimeout: Long, userContext: Any?, callback: IMqttActionListener): IMqttToken {
         val token: IMqttToken = MqttTokenAndroid(this, userContext, callback)
         val activityToken = storeToken(token)
         mqttService!!.disconnect(clientHandle!!, quiesceTimeout, null, activityToken)