From 678fcf8b31700bcd0a7823083459a57d83be30d8 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Thu, 10 May 2018 18:59:17 +0200 Subject: [PATCH] removed dead code + null check --- .../eu/siacs/conversations/generator/MessageGenerator.java | 7 ------- .../conversations/services/XmppConnectionService.java | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java b/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java index f1d6837d5..c541f971f 100644 --- a/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java +++ b/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java @@ -94,13 +94,6 @@ public class MessageGenerator extends AbstractGenerator { return packet; } - public static void addMessageHints(MessagePacket packet) { - packet.addChild("private", "urn:xmpp:carbons:2"); - packet.addChild("no-copy", "urn:xmpp:hints"); - packet.addChild("no-permanent-store", "urn:xmpp:hints"); - packet.addChild("no-permanent-storage", "urn:xmpp:hints"); //do not copy this. this is wrong. it is *store* - } - public MessagePacket generateChat(Message message) { MessagePacket packet = preparePacket(message); String content; diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java index 2739bb5ad..1648988d4 100644 --- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java +++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java @@ -919,7 +919,7 @@ public class XmppConnectionService extends Service { public boolean hasInternetConnection() { final ConnectivityManager cm = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE); try { - final NetworkInfo activeNetwork = cm.getActiveNetworkInfo(); + final NetworkInfo activeNetwork = cm == null ? null : cm.getActiveNetworkInfo(); return activeNetwork != null && activeNetwork.isConnected(); } catch (RuntimeException e) { Log.d(Config.LOGTAG, "unable to check for internet connection", e);