Merge 9dc1981 into a68ca6e

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 4.X.X (TBD)
+
+### Bug fixes
+
+* Prevent overwriting config.projectPackages if already set
+  [#428](https://github.com/bugsnag/bugsnag-android/pull/428)
+
 ## 4.11.0 (2019-01-22)
 
 ### Enhancements

sdk/src/androidTest/java/com/bugsnag/android/ProjectPackagesTest.kt

@@ -0,0 +1,26 @@
+package com.bugsnag.android
+
+import android.support.test.InstrumentationRegistry
+import org.junit.Assert.assertArrayEquals
+import org.junit.Assert.assertNull
+import org.junit.Test
+
+class ProjectPackagesTest {
+
+    @Test
+    fun testDefaultProjectPackages() {
+        val configuration = Configuration("api-key")
+        assertNull(configuration.projectPackages)
+
+        val client = Client(InstrumentationRegistry.getContext(), configuration)
+        assertArrayEquals(arrayOf("com.bugsnag.android.test"), client.config.projectPackages)
+    }
+
+    @Test
+    fun testProjectPackagesOverride() {
+        val configuration = Configuration("api-key")
+        configuration.projectPackages = arrayOf("com.foo.example")
+        val client = Client(InstrumentationRegistry.getContext(), configuration)
+        assertArrayEquals(arrayOf("com.foo.example"), client.config.projectPackages)
+    }
+}

sdk/src/main/java/com/bugsnag/android/Client.java

@@ -143,8 +143,10 @@ public Client(@NonNull Context androidContext, @NonNull Configuration configurat
         // Set up breadcrumbs
         breadcrumbs = new Breadcrumbs(configuration);
 
-        // Set sensible defaults
-        setProjectPackages(appContext.getPackageName());
+        // Set sensible defaults if project packages not already set
+        if (config.getProjectPackages() == null) {
+            setProjectPackages(appContext.getPackageName());
+        }
 
         String deviceId = deviceData.getId();