fix #358,#433 [add clientState null check to avoid crash]

hannesa2 · May 14, 2024 · 5bcc028 · 5bcc028
1 parent 1a4724f
commit 5bcc028
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/serviceLibrary/src/main/java/info/mqtt/android/service/ping/AlarmPingSender.kt b/serviceLibrary/src/main/java/info/mqtt/android/service/ping/AlarmPingSender.kt
@@ -29,7 +29,10 @@ internal class AlarmPingSender(val service: MqttService) : MqttPingSender {
     }
 
     override fun start() {
-        schedule(clientComms!!.keepAlive)
+        // add clientState null check to avoid ClientState.getKeepAlive() NPE(#358,#433)
+        clientComms?.clientState?.let {
+            schedule(clientComms!!.keepAlive)
+        }?: Timber.e("FIXME: try to start ping schedule, but clientState null, not able to get keepAlive")
     }
 
     override fun stop() {