From 4e81600ee7ef2c4d72e7505d520c600ea665d9f7 Mon Sep 17 00:00:00 2001 From: Vu Phan Date: Fri, 17 Sep 2021 16:08:03 +0700 Subject: [PATCH 1/2] fix: make userContext is nullable (#209) --- .../main/java/info/mqtt/android/service/MqttAndroidClient.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/serviceLibrary/src/main/java/info/mqtt/android/service/MqttAndroidClient.kt b/serviceLibrary/src/main/java/info/mqtt/android/service/MqttAndroidClient.kt index 5151ec4a..f9b23176 100755 --- 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) From 27a08613cb901420336662c6a27640f81ec060e9 Mon Sep 17 00:00:00 2001 From: Vu Phan Date: Sat, 18 Sep 2021 03:46:43 +0700 Subject: [PATCH 2/2] fix: correct android test --- .../info/mqtt/android/extsample/activity/ExtendedPublishTest.kt | 2 +- extendedSample/src/main/res/menu/menu_edit_connection.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/extendedSample/src/androidTest/java/info/mqtt/android/extsample/activity/ExtendedPublishTest.kt b/extendedSample/src/androidTest/java/info/mqtt/android/extsample/activity/ExtendedPublishTest.kt index 5811e031..932675ca 100644 --- a/extendedSample/src/androidTest/java/info/mqtt/android/extsample/activity/ExtendedPublishTest.kt +++ b/extendedSample/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 index c49ccf63..b2991408 100644 --- 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" />