Merge pull request #1328 from bugsnag/PLAT-7027/refactor-strictmode-v…

…iolations

Address pre-existing StrictMode violations

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## TBD
+
+### Bug fixes
+
+* Address pre-existing StrictMode violations
+  [#1328](https://github.com/bugsnag/bugsnag-android/pull/1328)
+
 ## 5.10.1 (2021-07-15)
 
 ### Bug fixes

bugsnag-android-core/detekt-baseline.xml

@@ -7,11 +7,13 @@
     <ID>LongParameterList:AppDataCollector.kt$AppDataCollector$( appContext: Context, private val packageManager: PackageManager?, private val config: ImmutableConfig, private val sessionTracker: SessionTracker, private val activityManager: ActivityManager?, private val launchCrashTracker: LaunchCrashTracker, private val logger: Logger )</ID>
     <ID>LongParameterList:AppWithState.kt$AppWithState$( binaryArch: String?, id: String?, releaseStage: String?, version: String?, codeBundleId: String?, buildUuid: String?, type: String?, versionCode: Number?, /** * The number of milliseconds the application was running before the event occurred */ var duration: Number?, /** * The number of milliseconds the application was running in the foreground before the * event occurred */ var durationInForeground: Number?, /** * Whether the application was in the foreground when the event occurred */ var inForeground: Boolean?, /** * Whether the application was launching when the event occurred */ var isLaunching: Boolean? )</ID>
     <ID>LongParameterList:AppWithState.kt$AppWithState$( config: ImmutableConfig, binaryArch: String?, id: String?, releaseStage: String?, version: String?, codeBundleId: String?, duration: Number?, durationInForeground: Number?, inForeground: Boolean?, isLaunching: Boolean? )</ID>
+    <ID>LongParameterList:DataCollectionModule.kt$DataCollectionModule$( contextModule: ContextModule, configModule: ConfigModule, systemServiceModule: SystemServiceModule, trackerModule: TrackerModule, bgTaskService: BackgroundTaskService, connectivity: Connectivity, deviceId: String? )</ID>
     <ID>LongParameterList:Device.kt$Device$( buildInfo: DeviceBuildInfo, /** * The Application Binary Interface used */ var cpuAbi: Array&lt;String&gt;?, /** * Whether the device has been jailbroken */ var jailbroken: Boolean?, /** * A UUID generated by Bugsnag and used for the individual application on a device */ var id: String?, /** * The IETF language tag of the locale used */ var locale: String?, /** * The total number of bytes of memory on the device */ var totalMemory: Long?, /** * A collection of names and their versions of the primary languages, frameworks or * runtimes that the application is running on */ var runtimeVersions: MutableMap&lt;String, Any&gt;? )</ID>
     <ID>LongParameterList:DeviceBuildInfo.kt$DeviceBuildInfo$( val manufacturer: String?, val model: String?, val osVersion: String?, val apiLevel: Int?, val osBuild: String?, val fingerprint: String?, val tags: String?, val brand: String?, val cpuAbis: Array&lt;String&gt;? )</ID>
-    <ID>LongParameterList:DeviceDataCollector.kt$DeviceDataCollector$( private val connectivity: Connectivity, private val appContext: Context, resources: Resources, private val deviceId: String?, private val buildInfo: DeviceBuildInfo, private val dataDirectory: File, rootDetector: RootDetector, bgTaskService: BackgroundTaskService, private val logger: Logger )</ID>
+    <ID>LongParameterList:DeviceDataCollector.kt$DeviceDataCollector$( private val connectivity: Connectivity, private val appContext: Context, resources: Resources, private val deviceId: String?, private val buildInfo: DeviceBuildInfo, private val dataDirectory: File, rootDetector: RootDetector, private val bgTaskService: BackgroundTaskService, private val logger: Logger )</ID>
     <ID>LongParameterList:DeviceWithState.kt$DeviceWithState$( buildInfo: DeviceBuildInfo, jailbroken: Boolean?, id: String?, locale: String?, totalMemory: Long?, runtimeVersions: MutableMap&lt;String, Any&gt;, /** * The number of free bytes of storage available on the device */ var freeDisk: Long?, /** * The number of free bytes of memory available on the device */ var freeMemory: Long?, /** * The orientation of the device when the event occurred: either portrait or landscape */ var orientation: String?, /** * The timestamp on the device when the event occurred */ var time: Date? )</ID>
     <ID>LongParameterList:EventFilenameInfo.kt$EventFilenameInfo.Companion$( obj: Any, uuid: String = UUID.randomUUID().toString(), apiKey: String?, timestamp: Long = System.currentTimeMillis(), config: ImmutableConfig, isLaunching: Boolean? = null )</ID>
+    <ID>LongParameterList:EventStorageModule.kt$EventStorageModule$( contextModule: ContextModule, configModule: ConfigModule, dataCollectionModule: DataCollectionModule, bgTaskService: BackgroundTaskService, trackerModule: TrackerModule, systemServiceModule: SystemServiceModule, notifier: Notifier )</ID>
     <ID>LongParameterList:StateEvent.kt$StateEvent.Install$( @JvmField val apiKey: String, @JvmField val autoDetectNdkCrashes: Boolean, @JvmField val appVersion: String?, @JvmField val buildUuid: String?, @JvmField val releaseStage: String?, @JvmField val lastRunInfoPath: String, @JvmField val consecutiveLaunchCrashes: Int )</ID>
     <ID>LongParameterList:ThreadState.kt$ThreadState$( stackTraces: MutableMap&lt;java.lang.Thread, Array&lt;StackTraceElement&gt;&gt;, currentThread: java.lang.Thread, exc: Throwable?, isUnhandled: Boolean, projectPackages: Collection&lt;String&gt;, logger: Logger )</ID>
     <ID>MagicNumber:DefaultDelivery.kt$DefaultDelivery$299</ID>
@@ -32,6 +34,7 @@
     <ID>SwallowedException:DeviceDataCollector.kt$DeviceDataCollector$catch (exception: Exception) { logger.w("Could not get locationStatus") }</ID>
     <ID>SwallowedException:DeviceIdStore.kt$DeviceIdStore$catch (exc: OverlappingFileLockException) { Thread.sleep(FILE_LOCK_WAIT_MS) }</ID>
     <ID>SwallowedException:PluginClient.kt$PluginClient$catch (exc: ClassNotFoundException) { logger.d("Plugin '$clz' is not on the classpath - functionality will not be enabled.") null }</ID>
+    <ID>UnnecessaryAbstractClass:DependencyModule.kt$DependencyModule</ID>
     <ID>UnusedPrivateMember:ThreadStateTest.kt$ThreadStateTest$private val configuration = generateImmutableConfig()</ID>
     <ID>VariableNaming:EventInternal.kt$EventInternal$/** * @return user information associated with this Event */ internal var _user = User(null, null, null)</ID>
   </CurrentIssues>

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

@@ -78,7 +78,7 @@ class ClientUserTest {
         client.setUser(USER_ID, USER_EMAIL, USER_NAME)
 
         // Check that the user was persisted
-        val file = File(config.persistenceDirectory, "user-info")
+        val file = File(client.config.persistenceDirectory.value, "user-info")
         val expected = "{\"id\":\"123456\",\"email\":\"[email protected]\",\"name\":\"Mr Test\"}"
         assertEquals(expected, file.readText())
     }
@@ -89,7 +89,7 @@ class ClientUserTest {
         client = Client(context, config)
 
         // Check that the user was not persisted
-        val file = File(config.persistenceDirectory, "user-info")
+        val file = File(client.config.persistenceDirectory.value, "user-info")
         assertEquals("", file.readText())
         client.setUser(USER_ID, USER_EMAIL, USER_NAME)
         assertEquals("", file.readText())

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

@@ -26,7 +26,7 @@ internal class LastRunInfoStoreTest {
             packageInfo = null,
             appInfo = null
         )
-        file = File(config.persistenceDirectory, "last-run-info")
+        file = File(config.persistenceDirectory.value, "last-run-info")
         file.delete()
         lastRunInfoStore = LastRunInfoStore(config)
     }

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

@@ -0,0 +1,36 @@
+package com.bugsnag.android
+
+import com.bugsnag.android.internal.dag.ConfigModule
+import com.bugsnag.android.internal.dag.DependencyModule
+
+/**
+ * A dependency module which constructs the objects that track state in Bugsnag. For example, this
+ * class is responsible for creating classes which track the current breadcrumb/metadata state.
+ */
+internal class BugsnagStateModule(
+    configModule: ConfigModule,
+    configuration: Configuration
+) : DependencyModule() {
+
+    private val cfg = configModule.config
+
+    val clientObservable = ClientObservable()
+
+    val callbackState = configuration.impl.callbackState.copy()
+
+    val contextState = ContextState().apply {
+        if (configuration.context != null) {
+            setManualContext(configuration.context)
+        }
+    }
+
+    val breadcrumbState = BreadcrumbState(cfg.maxBreadcrumbs, callbackState, cfg.logger)
+
+    val metadataState = copyMetadataState(configuration)
+
+    private fun copyMetadataState(configuration: Configuration): MetadataState {
+        // performs deep copy of metadata to preserve immutability of Configuration interface
+        val orig = configuration.impl.metadataState.metadata
+        return configuration.impl.metadataState.copy(metadata = orig.copy())
+    }
+}