diff --git a/src/org/thoughtcrime/securesms/connect/ApplicationDcContext.java b/src/org/thoughtcrime/securesms/connect/ApplicationDcContext.java index 1597bda7e..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,21 +81,7 @@ 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) { - - } - - 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 deleted file mode 100644 index 1ecd947f4..000000000 --- a/src/org/thoughtcrime/securesms/connect/ScreenReceiver.java +++ /dev/null @@ -1,26 +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; - 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)); - } - } -}