From 9d9fbb6e98d88b36593cb659809d85eb4c55cd8e Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Tue, 21 Apr 2020 12:34:10 +0200 Subject: [PATCH] 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; - } - } -}