From febc2d4f3f7b274c4bb83acd86894424f54e9ac0 Mon Sep 17 00:00:00 2001 From: snickersun Date: Mon, 2 Nov 2020 15:48:21 +0800 Subject: [PATCH] =?utf8?q?=E4=BC=98=E5=8C=96mqtt=20=E9=93=BE=E6=8E=A5?= =?utf8?q?=E7=8A=B6=E6=80=81=E7=BB=B4=E6=8A=A4=E6=9C=BA=E5=88=B6=E3=80=82?= =?utf8?q?=E5=B0=9D=E8=AF=95=E5=87=8F=E5=B0=91crash=E9=A3=8E=E9=99=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ic/protocols/protocol_mqtt_client.java | 4 ++-- app/src/main/java/se/wetcat/qatja/android/QatjaService.java | 6 ++++-- dNSCache/dNSCache.iml | 6 +++--- 3 files changed, 9 insertions(+), 7 deletions(-) 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 fcbc8516..e5b61e33 100644 --- 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 { switch (msg.arg1) { case MQTTConnectionConstants.STATE_NONE: - if (mqttCallbackInterface!= null) - mqttCallbackInterface.onMqttDisconnected(); +// if (mqttCallbackInterface!= null) +// mqttCallbackInterface.onMqttDisconnected(); break; case MQTTConnectionConstants.STATE_CONNECTING: break; 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 2c3822df..237f7a06 100644 --- 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 8d78d7a1..4e8c3eb7 100644 --- a/dNSCache/dNSCache.iml +++ b/dNSCache/dNSCache.iml @@ -31,16 +31,16 @@ - + - - + + -- 2.17.1