From 1d66dd937bf0fc15e8b6b02cf472cd89c1d69dca Mon Sep 17 00:00:00 2001
From: "B. Petersen" <r10s@b44t.com>
Date: Tue, 19 Jun 2018 17:38:27 +0200
Subject: [PATCH] always start threads on app start (Timer.onReceive() may try
 it again, however)

---
 .../src/main/java/com/b44t/messenger/ApplicationLoader.java | 6 +++---
 .../com/b44t/messenger/Components/ForegroundDetector.java   | 4 ++--
 .../src/main/java/com/b44t/messenger/ScreenReceiver.java    | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/MessengerProj/src/main/java/com/b44t/messenger/ApplicationLoader.java b/MessengerProj/src/main/java/com/b44t/messenger/ApplicationLoader.java
index cb4f24519..5525ec124 100644
--- a/MessengerProj/src/main/java/com/b44t/messenger/ApplicationLoader.java
+++ b/MessengerProj/src/main/java/com/b44t/messenger/ApplicationLoader.java
@@ -219,7 +219,7 @@ public class ApplicationLoader extends Application {
         // open() should be called before MessagesController.getInstance() as this also initilizes directories based upon getBlobdir().
         File dbfile = new File(getFilesDirFixed(), "messenger.db");
         MrMailbox.open(dbfile.getAbsolutePath());
-        if( MrMailbox.isConfigured()!=0 && ApplicationLoader.getPermanentPush() ) {
+        if( MrMailbox.isConfigured()!=0 /*&& ApplicationLoader.getPermanentPush()*/ ) {
             //ApplicationLoader.imapForeground = true;
             ApplicationLoader.startThreads();
         }
@@ -395,12 +395,12 @@ public class ApplicationLoader extends Application {
         }
     }
 
-    public static void scheduleStopImapThread()
+    /*public static void scheduleStopImapThread()
     {
         //Log.i("DeltaChat", "IMAP-thread scheduled to stop.");
 
         //imapForeground = false;
         //MrMailbox.interruptIdle();
 
-    }
+    }*/
 }
diff --git a/MessengerProj/src/main/java/com/b44t/messenger/Components/ForegroundDetector.java b/MessengerProj/src/main/java/com/b44t/messenger/Components/ForegroundDetector.java
index f654c684e..f92508de2 100644
--- a/MessengerProj/src/main/java/com/b44t/messenger/Components/ForegroundDetector.java
+++ b/MessengerProj/src/main/java/com/b44t/messenger/Components/ForegroundDetector.java
@@ -99,9 +99,9 @@ public class ForegroundDetector implements Application.ActivityLifecycleCallback
             enterBackgroundTime = System.currentTimeMillis();
             wasInBackground = true;
 
-            if( !ApplicationLoader.getPermanentPush() ) {
+            /*if( !ApplicationLoader.getPermanentPush() ) {
                 ApplicationLoader.scheduleStopImapThread();;
-            }
+            }*/
         }
         else {
             Log.i("DeltaChat", String.format("Not yet switched to background, %d activities left", refs));
diff --git a/MessengerProj/src/main/java/com/b44t/messenger/ScreenReceiver.java b/MessengerProj/src/main/java/com/b44t/messenger/ScreenReceiver.java
index 61b40735e..052f25c46 100644
--- a/MessengerProj/src/main/java/com/b44t/messenger/ScreenReceiver.java
+++ b/MessengerProj/src/main/java/com/b44t/messenger/ScreenReceiver.java
@@ -37,9 +37,9 @@ public class ScreenReceiver extends BroadcastReceiver {
             ApplicationLoader.isScreenOn = false;
 
             // also stop the idle-thread when the screen goes off, this is not always in sync with the ForegroundDetector
-            if( !ApplicationLoader.getPermanentPush() ) {
+            /*if( !ApplicationLoader.getPermanentPush() ) {
                 ApplicationLoader.scheduleStopImapThread();
-            }
+            }*/
         } else if (intent.getAction().equals(Intent.ACTION_SCREEN_ON)) {
             MrMailbox.log_i("DeltaChat", "-------------------- Screen on --------------------");
             ApplicationLoader.isScreenOn = true;