Cache results from PackageManager

CHANGELOG.md

@@ -35,6 +35,9 @@
 * Include `app.binaryArch` in all events
   [#1287](https://github.com/bugsnag/bugsnag-android/pull/1287)
 
+* Cache results from PackageManager
+  [#1288](https://github.com/bugsnag/bugsnag-android/pull/1288)
+
 ## 5.9.4 (2021-05-26)
 
 * Unity: add methods for setting autoNotify and autoDetectAnrs

bugsnag-android-core/src/androidTest/java/com/bugsnag/android/BugsnagTestUtils.java

@@ -90,7 +90,7 @@ static ImmutableConfig convert(Configuration config) {
         } catch (IOException ignored) {
             // swallow
         }
-        return ImmutableConfigKt.convertToImmutableConfig(config, null);
+        return ImmutableConfigKt.convertToImmutableConfig(config, null, null, null);
     }
 
     static Device generateDevice() {

bugsnag-android-core/src/androidTest/java/com/bugsnag/android/LastRunInfoStoreTest.kt

@@ -22,7 +22,9 @@ internal class LastRunInfoStoreTest {
         val config = convertToImmutableConfig(
             generateConfiguration().apply {
                 persistenceDirectory = ApplicationProvider.getApplicationContext<Context>().cacheDir
-            }
+            },
+            packageInfo = null,
+            appInfo = null
         )
         file = File(config.persistenceDirectory, "last-run-info")
         file.delete()

bugsnag-android-core/src/main/java/com/bugsnag/android/AppDataCollector.kt

@@ -23,8 +23,8 @@ internal class AppDataCollector(
     var codeBundleId: String? = null
 
     private val packageName: String = appContext.packageName
-    private var packageInfo = packageManager?.getPackageInfo(packageName, 0)
-    private var appInfo: ApplicationInfo? = packageManager?.getApplicationInfo(packageName, 0)
+    private var packageInfo = config.packageInfo
+    private var appInfo: ApplicationInfo? = config.appInfo
     private val bgWorkRestricted = isBackgroundWorkRestricted()
 
     private var binaryArch: String? = null

bugsnag-android-core/src/main/java/com/bugsnag/android/internal/ImmutableConfig.kt

@@ -2,6 +2,7 @@ package com.bugsnag.android.internal
 
 import android.content.Context
 import android.content.pm.ApplicationInfo
+import android.content.pm.PackageInfo
 import android.content.pm.PackageManager
 import androidx.annotation.VisibleForTesting
 import com.bugsnag.android.BreadcrumbType
@@ -47,7 +48,11 @@ data class ImmutableConfig(
     val maxPersistedEvents: Int,
     val maxPersistedSessions: Int,
     val persistenceDirectory: File,
-    val sendLaunchCrashesSynchronously: Boolean
+    val sendLaunchCrashesSynchronously: Boolean,
+
+    // results cached here to avoid unnecessary lookups in Client.
+    val packageInfo: PackageInfo?,
+    val appInfo: ApplicationInfo?
 ) {
 
     @JvmName("getErrorApiDeliveryParams")
@@ -118,9 +123,12 @@ data class ImmutableConfig(
     }
 }
 
+@JvmOverloads
 internal fun convertToImmutableConfig(
     config: Configuration,
-    buildUuid: String? = null
+    buildUuid: String? = null,
+    packageInfo: PackageInfo? = null,
+    appInfo: ApplicationInfo? = null
 ): ImmutableConfig {
     val errorTypes = when {
         config.autoDetectErrors -> config.enabledErrorTypes.copy()
@@ -151,7 +159,9 @@ internal fun convertToImmutableConfig(
         maxPersistedSessions = config.maxPersistedSessions,
         enabledBreadcrumbTypes = config.enabledBreadcrumbTypes?.toSet(),
         persistenceDirectory = config.persistenceDirectory!!,
-        sendLaunchCrashesSynchronously = config.sendLaunchCrashesSynchronously
+        sendLaunchCrashesSynchronously = config.sendLaunchCrashesSynchronously,
+        packageInfo = packageInfo,
+        appInfo = appInfo
     )
 }
 
@@ -208,7 +218,7 @@ internal fun sanitiseConfiguration(
     if (configuration.persistenceDirectory == null) {
         configuration.persistenceDirectory = appContext.cacheDir
     }
-    return convertToImmutableConfig(configuration, buildUuid)
+    return convertToImmutableConfig(configuration, buildUuid, packageInfo, appInfo)
 }
 
 internal const val RELEASE_STAGE_DEVELOPMENT = "development"

bugsnag-android-core/src/test/java/com/bugsnag/android/AppMetadataSerializationTest.kt

@@ -4,7 +4,7 @@ import android.app.ActivityManager
 import android.content.Context
 import android.content.pm.ApplicationInfo
 import android.content.pm.PackageManager
-import com.bugsnag.android.BugsnagTestUtils.convert
+import com.bugsnag.android.internal.convertToImmutableConfig
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.Parameterized
@@ -40,14 +40,14 @@ internal class AppMetadataSerializationTest {
 
             // populate metadata fields
             `when`(sessionTracker.contextActivity).thenReturn("MyActivity")
-            `when`(pm.getApplicationInfo(any(), anyInt())).thenReturn(ApplicationInfo())
             `when`(pm.getApplicationLabel(any())).thenReturn("MyApp")
+            `when`(pm.getApplicationInfo(any(), anyInt())).thenReturn(ApplicationInfo())
 
             // construct AppDataCollector object
             val appData = AppDataCollector(
                 context,
                 pm,
-                convert(config),
+                convertToImmutableConfig(config, null, null, ApplicationInfo()),
                 sessionTracker,
                 am,
                 launchCrashTracker,

bugsnag-plugin-react-native/src/test/java/com/bugsnag/android/TestData.java

@@ -34,7 +34,9 @@ static ImmutableConfig generateConfig() throws IOException {
                 32,
                 32,
                 Files.createTempDirectory("foo").toFile(),
-                true
+                true,
+                null,
+                null
         );
     }