From 1bfb4981bf97f19e1d1e8e16c19bab8cf0ae2ac8 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Sun, 18 Dec 2016 22:25:45 +0100
Subject: don't reconnect accout when system reports no internet connection

---
 .../java/de/pixart/messenger/services/XmppConnectionService.java  | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/main')

diff --git a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
index 99167fa94..8b7459b9e 100644
--- a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
+++ b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
@@ -3048,7 +3048,8 @@ public class XmppConnectionService extends Service {
                 connection = createConnection(account);
                 account.setXmppConnection(connection);
             }
-            if (!account.isOptionSet(Account.OPTION_DISABLED)) {
+            boolean hasInternet = hasInternetConnection();
+            if (!account.isOptionSet(Account.OPTION_DISABLED) && hasInternet) {
                 if (!force) {
                     disconnect(account, false);
                 }
@@ -3059,10 +3060,13 @@ public class XmppConnectionService extends Service {
                 thread.start();
                 scheduleWakeUpCall(Config.CONNECT_DISCO_TIMEOUT, account.getUuid().hashCode());
             } else {
-                disconnect(account, force || account.getTrueStatus().isError());
+                disconnect(account, force || account.getTrueStatus().isError() || !hasInternet);
                 account.getRoster().clearPresences();
                 connection.resetEverything();
                 account.getAxolotlService().resetBrokenness();
+                if (!hasInternet) {
+                    account.setStatus(Account.State.NO_INTERNET);
+                }
             }
         }
     }
-- 
cgit v1.2.3