From d1d8e3def6ab0d5ce431a7d0e178596466e46684 Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Tue, 21 Apr 2020 12:19:21 +0200 Subject: [PATCH 1/2] show foreground notification unconditionally the foreground notification is an important element that avoids the system from killing the app. in the past, we added the foreground notification when the screen turns off and removed it when the screen turns on again - the reason was that the notification does not annoy users this way. meanwhile, however, it seems that this approach is no longer as reliable as in the past. might be that we are killed before the screen turns off - or that some handlers are not executed by some systems. also meanwhile, even the "allow to run in background" resp. "allow battery consumption" seems to be unreliable on various systems, there are several reports eg. on stackoverflow that apps are killed anyway - but a foreground notification is not known to be killed yet - also as the api contract is about to avoid exactly that. finally, this notification is also a good methor for users to notice if the app gets killed - so that they can blame the system then. therefore, the annoying of the permanent notification is probably the smaller drawback compared to received messages delayed. --- .../thoughtcrime/securesms/connect/ApplicationDcContext.java | 4 +--- .../thoughtcrime/securesms/connect/ForegroundDetector.java | 2 -- src/org/thoughtcrime/securesms/connect/ScreenReceiver.java | 2 -- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/org/thoughtcrime/securesms/connect/ApplicationDcContext.java b/src/org/thoughtcrime/securesms/connect/ApplicationDcContext.java index 1597bda7e..c12aaf4bf 100644 --- a/src/org/thoughtcrime/securesms/connect/ApplicationDcContext.java +++ b/src/org/thoughtcrime/securesms/connect/ApplicationDcContext.java @@ -94,9 +94,7 @@ public class ApplicationDcContext extends DcContext { } - if (!isScreenOn) { - KeepAliveService.startSelf(context); - } + KeepAliveService.startSelf(context); } public void setStockTranslations() { diff --git a/src/org/thoughtcrime/securesms/connect/ForegroundDetector.java b/src/org/thoughtcrime/securesms/connect/ForegroundDetector.java index 76a706b42..1876b9bee 100644 --- a/src/org/thoughtcrime/securesms/connect/ForegroundDetector.java +++ b/src/org/thoughtcrime/securesms/connect/ForegroundDetector.java @@ -36,8 +36,6 @@ public class ForegroundDetector implements Application.ActivityLifecycleCallback @Override public void onActivityStarted(Activity activity) { refs++; - - activity.stopService(new Intent(activity, KeepAliveService.class)); application.dcContext.startThreads(0); } diff --git a/src/org/thoughtcrime/securesms/connect/ScreenReceiver.java b/src/org/thoughtcrime/securesms/connect/ScreenReceiver.java index 1ecd947f4..1a27fa06f 100644 --- a/src/org/thoughtcrime/securesms/connect/ScreenReceiver.java +++ b/src/org/thoughtcrime/securesms/connect/ScreenReceiver.java @@ -15,12 +15,10 @@ public class ScreenReceiver extends BroadcastReceiver { if (intent.getAction().equals(Intent.ACTION_SCREEN_OFF)) { Log.i("DeltaChat", "-------------------- Screen off --------------------"); dcContext.isScreenOn = false; - KeepAliveService.startSelf(context); } else if (intent.getAction().equals(Intent.ACTION_SCREEN_ON)) { Log.i("DeltaChat", "-------------------- Screen on --------------------"); dcContext.isScreenOn = true; - context.stopService(new Intent(context, KeepAliveService.class)); } } } From 9d9fbb6e98d88b36593cb659809d85eb4c55cd8e Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Tue, 21 Apr 2020 12:34:10 +0200 Subject: [PATCH 2/2] remove now unneeded ScreenReceiver --- .../connect/ApplicationDcContext.java | 13 ---------- .../securesms/connect/ScreenReceiver.java | 24 ------------------- 2 files changed, 37 deletions(-) delete mode 100644 src/org/thoughtcrime/securesms/connect/ScreenReceiver.java diff --git a/src/org/thoughtcrime/securesms/connect/ApplicationDcContext.java b/src/org/thoughtcrime/securesms/connect/ApplicationDcContext.java index c12aaf4bf..dcfdfbd8e 100644 --- a/src/org/thoughtcrime/securesms/connect/ApplicationDcContext.java +++ b/src/org/thoughtcrime/securesms/connect/ApplicationDcContext.java @@ -48,7 +48,6 @@ public class ApplicationDcContext extends DcContext { public static final int RECIPIENT_TYPE_CONTACT = 1; public Context context; - public volatile boolean isScreenOn = false; public ApplicationDcContext(Context context) { super("Android "+BuildConfig.VERSION_NAME); @@ -82,18 +81,6 @@ public class ApplicationDcContext extends DcContext { BroadcastReceiver networkStateReceiver = new NetworkStateReceiver(); context.registerReceiver(networkStateReceiver, new IntentFilter(android.net.ConnectivityManager.CONNECTIVITY_ACTION)); - IntentFilter filter = new IntentFilter(Intent.ACTION_SCREEN_ON); - filter.addAction(Intent.ACTION_SCREEN_OFF); - BroadcastReceiver screenReceiver = new ScreenReceiver(); - context.registerReceiver(screenReceiver, filter); - - try { - PowerManager pm = (PowerManager) context.getSystemService(Context.POWER_SERVICE); - isScreenOn = pm.isScreenOn(); - } catch (Exception e) { - - } - KeepAliveService.startSelf(context); } diff --git a/src/org/thoughtcrime/securesms/connect/ScreenReceiver.java b/src/org/thoughtcrime/securesms/connect/ScreenReceiver.java deleted file mode 100644 index 1a27fa06f..000000000 --- a/src/org/thoughtcrime/securesms/connect/ScreenReceiver.java +++ /dev/null @@ -1,24 +0,0 @@ -package org.thoughtcrime.securesms.connect; - -import android.content.BroadcastReceiver; -import android.content.Context; -import android.content.Intent; -import android.util.Log; - -public class ScreenReceiver extends BroadcastReceiver { - - @Override - public void onReceive(Context context, Intent intent) { - - ApplicationDcContext dcContext = DcHelper.getContext(context); - - if (intent.getAction().equals(Intent.ACTION_SCREEN_OFF)) { - Log.i("DeltaChat", "-------------------- Screen off --------------------"); - dcContext.isScreenOn = false; - } - else if (intent.getAction().equals(Intent.ACTION_SCREEN_ON)) { - Log.i("DeltaChat", "-------------------- Screen on --------------------"); - dcContext.isScreenOn = true; - } - } -}