v6.11: Fixed deprecated usage of broadcast receivers causing wrong wo…

…rk on Android 14
h-mdm · Nov 10, 2024 · 8af459a · 8af459a
1 parent 976292f
commit 8af459a
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -35,8 +35,8 @@ android {
         applicationId "com.hmdm.launcher"
         minSdkVersion 16
         targetSdkVersion 34
-        versionCode 15100
-        versionName "6.10"
+        versionCode 15110
+        versionName "6.11"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         dataBinding {
             enabled = true

diff --git a/app/src/main/java/com/hmdm/launcher/ui/MainActivity.java b/app/src/main/java/com/hmdm/launcher/ui/MainActivity.java
@@ -382,7 +382,11 @@ public void uncaughtException(Thread t, Throwable e) {
         intentFilter.addAction(BluetoothAdapter.ACTION_STATE_CHANGED);
         intentFilter.addAction(WifiManager.SUPPLICANT_CONNECTION_CHANGE_ACTION);
         intentFilter.addAction(ConnectivityManager.CONNECTIVITY_ACTION);
-        registerReceiver(stateChangeReceiver, intentFilter);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            registerReceiver(stateChangeReceiver, intentFilter, Context.RECEIVER_EXPORTED);
+        } else {
+            registerReceiver(stateChangeReceiver, intentFilter);
+        }
 
         if (!getIntent().getBooleanExtra(Const.RESTORED_ACTIVITY, false)) {
             startAppsAtBoot();

diff --git a/app/src/main/java/com/hmdm/launcher/util/DeviceInfoProvider.java b/app/src/main/java/com/hmdm/launcher/util/DeviceInfoProvider.java
@@ -140,7 +140,9 @@ public static DeviceInfo getDeviceInfo(Context context, boolean queryPermissions
         // Battery
         IntentFilter ifilter = new IntentFilter(Intent.ACTION_BATTERY_CHANGED);
 
-        Intent batteryStatus = context.registerReceiver(null, ifilter);
+        Intent batteryStatus = Build.VERSION.SDK_INT >= Build.VERSION_CODES.O ?
+                context.registerReceiver(null, ifilter, Context.RECEIVER_EXPORTED) :
+                context.registerReceiver(null, ifilter);
         int status = batteryStatus.getIntExtra(BatteryManager.EXTRA_STATUS, -1);
         if (status == BatteryManager.BATTERY_STATUS_CHARGING ||
                 status == BatteryManager.BATTERY_STATUS_FULL) {

diff --git a/app/src/main/java/org/eclipse/paho/android/service/AlarmPingSender.java b/app/src/main/java/org/eclipse/paho/android/service/AlarmPingSender.java
@@ -74,7 +74,11 @@ public void start() {
 		String action = MqttServiceConstants.PING_SENDER
 				+ comms.getClient().getClientId();
 		Log.d(TAG, "Register alarmreceiver to MqttService"+ action);
-		service.registerReceiver(alarmReceiver, new IntentFilter(action));
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+			service.registerReceiver(alarmReceiver, new IntentFilter(action), Context.RECEIVER_NOT_EXPORTED);
+		} else {
+			service.registerReceiver(alarmReceiver, new IntentFilter(action));
+		}
 
 		pendingIntent = PendingIntent.getBroadcast(service, 0, new Intent(
 				action), PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);