优化mqtt 链接状态维护机制。尝试减少crash风险

diff --git a/app/src/main/java/com/ic/protocols/protocol_mqtt_client.java b/app/src/main/java/com/ic/protocols/protocol_mqtt_client.java
index fcbc851..e5b61e3 100644 (file)
--- a/app/src/main/java/com/ic/protocols/protocol_mqtt_client.java
+++ b/app/src/main/java/com/ic/protocols/protocol_mqtt_client.java
@@ -60,8 +60,8 @@ public class protocol_mqtt_client {
 \r
         switch (msg.arg1) {\r
             case MQTTConnectionConstants.STATE_NONE:\r
-                if (mqttCallbackInterface!= null)\r
-                    mqttCallbackInterface.onMqttDisconnected();\r
+//                if (mqttCallbackInterface!= null)\r
+//                    mqttCallbackInterface.onMqttDisconnected();\r
                 break;\r
             case MQTTConnectionConstants.STATE_CONNECTING:\r
                 break;\r

diff --git a/app/src/main/java/se/wetcat/qatja/android/QatjaService.java b/app/src/main/java/se/wetcat/qatja/android/QatjaService.java
index 2c3822d..237f7a0 100644 (file)
--- a/app/src/main/java/se/wetcat/qatja/android/QatjaService.java
+++ b/app/src/main/java/se/wetcat/qatja/android/QatjaService.java
@@ -1187,9 +1187,11 @@ public class QatjaService extends Service {
         } catch (IOException e) {
           if (DEBUG)
             ICLogger.e("disconnected (this is fine, expected almost)", e);
-          if(!e.getCause().getMessage().contains("ECONNABORTED")) {
             connectionLost();
-          }
+          break;
+        } catch (NullPointerException e){
+          ICLogger.e("null pointer fond ",e);
+          connectionLost();
           break;
         }
       }

diff --git a/dNSCache/dNSCache.iml b/dNSCache/dNSCache.iml
index 8d78d7a..4e8c3eb 100644 (file)
--- a/dNSCache/dNSCache.iml
+++ b/dNSCache/dNSCache.iml
@@ -31,16 +31,16 @@
     <output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/classes" />\r
     <exclude-output />\r
     <content url="file://$MODULE_DIR$">\r
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />\r
       <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />\r
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />\r
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />\r
       <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />\r
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" generated="true" />\r
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" generated="true" />\r
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />\r
       <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugAndroidTest/out" isTestSource="true" generated="true" />\r
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />\r
       <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />\r
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />\r
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />\r
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" />\r
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" generated="true" />\r
       <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugUnitTest/out" isTestSource="true" generated="true" />\r