Use ContextCompat.registerReceiver

BiglySoftware · Sep 12, 2023 · d545ded · d545ded
1 parent 4b0d6a4
commit d545ded
Showing 1 changed file with 15 additions and 11 deletions.
diff --git a/app/src/coreFlavor/java/com/biglybt/android/client/service/BiglyBTService.java b/app/src/coreFlavor/java/com/biglybt/android/client/service/BiglyBTService.java
@@ -29,6 +29,7 @@
 import androidx.annotation.Nullable;
 import androidx.annotation.WorkerThread;
 import androidx.core.app.NotificationCompat;
+import androidx.core.content.ContextCompat;
 
 import com.biglybt.android.client.*;
 import com.biglybt.android.client.CorePrefs.CorePrefsChangedListener;
@@ -392,6 +393,9 @@ class ScreenReceiver
 		@Override
 		public void onReceive(Context context, Intent intent) {
 			String action = intent.getAction();
+			if (CorePrefs.DEBUG_CORE) {
+				logd("Screen " + action);
+			}
 			if (action == null) {
 				return;
 			}
@@ -1153,7 +1157,11 @@ public void onCreate() {
 		IntentFilter filter = new IntentFilter(Intent.ACTION_SCREEN_ON);
 		filter.addAction(Intent.ACTION_SCREEN_OFF);
 		screenReceiver = new ScreenReceiver();
-		registerReceiver(screenReceiver, filter);
+		Intent intent = ContextCompat.registerReceiver(this, screenReceiver, filter,
+				ContextCompat.RECEIVER_EXPORTED);
+		if (CorePrefs.DEBUG_CORE) {
+			logd("registered Screen intent " + intent);
+		}
 		initChannels(this);
 	}
 
@@ -1712,18 +1720,14 @@ private void enableBatteryMonitoring(@NonNull Context context,
 		if (batteryReceiver != null) {
 			return;
 		}
-		IntentFilter intentFilterConnected = new IntentFilter(
-				Intent.ACTION_POWER_CONNECTED);
-		IntentFilter intentFilterDisconnected = new IntentFilter(
-				Intent.ACTION_POWER_DISCONNECTED);
+		IntentFilter filter = new IntentFilter(Intent.ACTION_POWER_CONNECTED);
+		filter.addAction(Intent.ACTION_POWER_DISCONNECTED);
 
 		batteryReceiver = new BroadcastReceiver() {
 			@Override
 			public void onReceive(Context context, Intent intent) {
-				if (CorePrefs.DEBUG_CORE && intent.getAction() != null) {
-					boolean isConnected = intent.getAction().equals(
-							Intent.ACTION_POWER_CONNECTED);
-					logd("Battery connected? " + isConnected);
+				if (CorePrefs.DEBUG_CORE) {
+					logd("Battery received " + intent.getAction());
 				}
 				Core core = BiglyBTService.this.core;
 				if (core == null) {
@@ -1738,8 +1742,8 @@ public void onReceive(Context context, Intent intent) {
 				}
 			}
 		};
-		context.registerReceiver(batteryReceiver, intentFilterConnected);
-		context.registerReceiver(batteryReceiver, intentFilterDisconnected);
+		ContextCompat.registerReceiver(context, batteryReceiver, filter,
+				ContextCompat.RECEIVER_EXPORTED);
 		if (CorePrefs.DEBUG_CORE) {
 			logd("enableBatteryMonitoring: ");
 		}