some fix

Author: shiyinghan

app/build.gradle

@@ -72,5 +72,5 @@ dependencies {
     androidTestImplementation deps.espresso
 
     implementation project(path: ':mqtt')
-//    implementation 'com.github.shiyinghan:MqttAndroid:1.0.0'
+//    implementation 'com.github.shiyinghan:MqttAndroid:1.0.1'
 }

mqtt/proguard-rules.pro

@@ -15,6 +15,3 @@
 #-keepclassmembers class fqcn.of.javascript.interface.for.webview {
 #   public *;
 #}
-
--keep class org.eclipse.paho.client.mqttv3.internal.* { *; }
--keep class org.eclipse.paho.client.mqttv3.spi.* { *; }

mqtt/src/main/java/com/shiyinghan/mqtt/android/service/AlarmPingSender.java

@@ -27,7 +27,7 @@
  *
  * @see MqttPingSender
  */
-class AlarmPingSender implements MqttPingSender {
+public class AlarmPingSender implements MqttPingSender {
     // Identifier for Intents, log messages, etc..
     private static final String TAG = AlarmPingSender.class.getSimpleName();
 

mqtt/src/main/java/com/shiyinghan/mqtt/android/service/MqttAndroidClient.java

@@ -350,9 +350,11 @@ public void onFailure(IMqttToken asyncActionToken, Throwable throwable) {
                 }
             };
 
+            // if myClient is null, then create a new connection
             if (myClient == null) {
-                // if myClient is null, then create a new connection
-                alarmPingSender = new AlarmPingSender(mqttService);
+                if (alarmPingSender == null) {
+                    alarmPingSender = new AlarmPingSender(mqttService);
+                }
                 myClient = new MqttAsyncClient(serverURI, clientId, persistence, alarmPingSender);
                 myClient.setCallback(new MqttCallbackExtendedAndroid());
             }
@@ -1724,6 +1726,10 @@ private void releaseWakeLock() {
         }
     }
 
+    public void setAlarmPingSender(AlarmPingSender alarmPingSender) {
+        this.alarmPingSender = alarmPingSender;
+    }
+
     /**
      * identify the callback to be invoked when making tracing calls back into
      * the Activity