fix(BroadcastReceiver): register our BroadcastReceivers as RECEIVER_N…

…OT_EXPORTED on Upside Down Cake onwards
bugsnag · Jul 20, 2023 · 0bc338e · 0bc338e
1 parent 34f88d3
commit 0bc338e
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 9 deletions.
diff --git a/bugsnag-android-core/dsl-json b/bugsnag-android-core/dsl-json
diff --git a/bugsnag-android-core/src/main/java/com/bugsnag/android/ContextExtensions.kt b/bugsnag-android-core/src/main/java/com/bugsnag/android/ContextExtensions.kt
@@ -7,6 +7,7 @@ import android.content.Intent
 import android.content.IntentFilter
 import android.location.LocationManager
 import android.net.ConnectivityManager
+import android.os.Build
 import android.os.RemoteException
 import android.os.storage.StorageManager
 import java.lang.RuntimeException
@@ -21,7 +22,11 @@ internal fun Context.registerReceiverSafe(
     logger: Logger? = null
 ): Intent? {
     try {
-        return registerReceiver(receiver, filter)
+        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+            registerReceiver(receiver, filter, Context.RECEIVER_NOT_EXPORTED)
+        } else {
+            registerReceiver(receiver, filter)
+        }
     } catch (exc: SecurityException) {
         logger?.w("Failed to register receiver", exc)
     } catch (exc: RemoteException) {

diff --git a/bugsnag-android-core/src/main/java/com/bugsnag/android/PluginClient.kt b/bugsnag-android-core/src/main/java/com/bugsnag/android/PluginClient.kt
@@ -34,7 +34,7 @@ internal class PluginClient(
     private fun instantiatePlugin(clz: String, isWarningEnabled: Boolean): Plugin? {
         return try {
             val pluginClz = Class.forName(clz)
-            pluginClz.newInstance() as Plugin
+            pluginClz.getDeclaredConstructor().newInstance() as Plugin
         } catch (exc: ClassNotFoundException) {
             if (isWarningEnabled) {
                 logger.d("Plugin '$clz' is not on the classpath - functionality will not be enabled.")

diff --git a/bugsnag-android-core/src/main/java/com/bugsnag/android/SystemBroadcastReceiver.kt b/bugsnag-android-core/src/main/java/com/bugsnag/android/SystemBroadcastReceiver.kt
@@ -66,6 +66,7 @@ internal class SystemBroadcastReceiver(
     ) {
         val extras = intent.extras
         extras?.keySet()?.forEach { key ->
+            @Suppress("DEPRECATION")
             val valObj = extras[key] ?: return@forEach
             val strVal = valObj.toString()
             if (isAndroidKey(key)) { // shorten the Intent action

diff --git a/bugsnag-android-core/src/test/java/com/bugsnag/android/JsonWriterTest.java b/bugsnag-android-core/src/test/java/com/bugsnag/android/JsonWriterTest.java
@@ -204,17 +204,17 @@ public void testTopLevelValueTypes() throws IOException { // method monkey-patch
         JsonWriter jsonWriter = new JsonWriter(stringWriter);
         jsonWriter.beginArray();
         try {
-            jsonWriter.value(new Double(Double.NaN));
+            jsonWriter.value(Double.valueOf(Double.NaN));
             fail();
         } catch (IllegalArgumentException expected) {
         }
         try {
-            jsonWriter.value(new Double(Double.NEGATIVE_INFINITY));
+            jsonWriter.value(Double.valueOf(Double.NEGATIVE_INFINITY));
             fail();
         } catch (IllegalArgumentException expected) {
         }
         try {
-            jsonWriter.value(new Double(Double.POSITIVE_INFINITY));
+            jsonWriter.value(Double.valueOf(Double.POSITIVE_INFINITY));
             fail();
         } catch (IllegalArgumentException expected) {
         }

diff --git a/bugsnag-android-core/src/test/java/com/bugsnag/android/SystemBroadcastReceiverTest.kt b/bugsnag-android-core/src/test/java/com/bugsnag/android/SystemBroadcastReceiverTest.kt
@@ -47,6 +47,7 @@ class SystemBroadcastReceiverTest {
         `when`(intent.action).thenReturn("SomeTitle")
         `when`(intent.extras).thenReturn(bundle)
         `when`(bundle.keySet()).thenReturn(setOf("foo"))
+        @Suppress("DEPRECATION")
         `when`(bundle.get("foo")).thenReturn(setOf("bar"))
 
         val receiver = SystemBroadcastReceiver(client, NoopLogger)

diff --git a/buildSrc/src/main/kotlin/com/bugsnag/android/Versions.kt b/buildSrc/src/main/kotlin/com/bugsnag/android/Versions.kt
@@ -8,7 +8,7 @@ import org.gradle.api.JavaVersion
 object Versions {
     // Note minSdkVersion must be >=21 for 64 bit architectures
     val minSdkVersion = 14
-    val compileSdkVersion = 31
+    val compileSdkVersion = 34
     val ndk = "23.1.7779620"
     val java = JavaVersion.VERSION_1_7
     val kotlin = "1.4.32"

diff --git a/examples/sdk-app-example/app/build.gradle b/examples/sdk-app-example/app/build.gradle
@@ -2,13 +2,13 @@ apply plugin: "com.android.application"
 apply plugin: "kotlin-android"
 
 android {
-    compileSdkVersion 31
+    compileSdk 34
     ndkVersion "17.2.4988734"
 
     defaultConfig {
         applicationId "com.example.bugsnag.android"
         minSdkVersion 14
-        targetSdkVersion 31
+        targetSdkVersion 34
         versionCode 1
         versionName "1.0"
     }