Merge 0b10611 into 897fb06

sdk/src/androidTest/java/com/bugsnag/android/ClientTest.java

@@ -10,6 +10,7 @@
 
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.os.Build;
 import android.os.Bundle;
 import android.support.test.InstrumentationRegistry;
 import android.support.test.filters.SmallTest;
@@ -334,4 +335,29 @@ public void testDeviceDataSummary() {
         assertNotEquals(client.getDeviceDataSummary(), deviceData);
     }
 
+    @Test
+    public void testPopulateDeviceMetadata() {
+        Client client = generateClient();
+        MetaData metaData = new MetaData();
+        Map<String, Object> app = metaData.getTab("device");
+        assertEquals(0, app.size());
+
+        client.populateDeviceMetaData(metaData);
+        assertEquals(14, app.size());
+
+        assertNotNull(app.get("batteryLevel"));
+        assertNotNull(app.get("charging"));
+        assertNotNull(app.get("locationStatus"));
+        assertNotNull(app.get("networkAccess"));
+        assertNotNull(app.get("time"));
+        assertNotNull(app.get("brand"));
+        assertNotNull(app.get("apiLevel"));
+        assertNotNull(app.get("osBuild"));
+        assertNotNull(app.get("locale"));
+        assertNotNull(app.get("screenDensity"));
+        assertNotNull(app.get("dpi"));
+        assertNotNull(app.get("emulator"));
+        assertNotNull(app.get("screenResolution"));
+        assertNotNull(app.get("cpuAbi"));
+    }
 }

sdk/src/androidTest/java/com/bugsnag/android/DeviceDataSummaryTest.java

@@ -1,5 +1,6 @@
 package com.bugsnag.android;
 
+import static com.bugsnag.android.BugsnagTestUtils.generateClient;
 import static com.bugsnag.android.BugsnagTestUtils.streamableToJson;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -11,6 +12,7 @@
 
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -25,7 +27,13 @@ public class DeviceDataSummaryTest {
 
     @Before
     public void setUp() throws Exception {
-        deviceData = new DeviceDataSummary();
+        DeviceDataCollector deviceDataCollector = new DeviceDataCollector(generateClient());
+        deviceData = deviceDataCollector.generateDeviceDataSummary();
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        Async.cancelTasks();
     }
 
     @Test

sdk/src/androidTest/java/com/bugsnag/android/DeviceDataTest.java

@@ -1,5 +1,6 @@
 package com.bugsnag.android;
 
+import static com.bugsnag.android.BugsnagTestUtils.generateClient;
 import static com.bugsnag.android.BugsnagTestUtils.getSharedPrefs;
 import static com.bugsnag.android.BugsnagTestUtils.streamableToJson;
 import static org.junit.Assert.assertEquals;
@@ -13,6 +14,7 @@
 
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -28,8 +30,13 @@ public class DeviceDataTest {
 
     @Before
     public void setUp() throws Exception {
-        SharedPreferences sharedPref = getSharedPrefs(InstrumentationRegistry.getContext());
-        deviceData = new DeviceData(InstrumentationRegistry.getContext(), sharedPref);
+        DeviceDataCollector deviceDataCollector = new DeviceDataCollector(generateClient());
+        deviceData = deviceDataCollector.generateDeviceData();
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        Async.cancelTasks();
     }
 
     @Test

sdk/src/androidTest/java/com/bugsnag/android/ErrorTest.java

@@ -1,5 +1,6 @@
 package com.bugsnag.android;
 
+import static com.bugsnag.android.BugsnagTestUtils.generateClient;
 import static com.bugsnag.android.BugsnagTestUtils.generateSession;
 import static com.bugsnag.android.BugsnagTestUtils.generateSessionTracker;
 import static com.bugsnag.android.BugsnagTestUtils.streamableToJson;
@@ -18,6 +19,7 @@
 
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -44,6 +46,11 @@ public void setUp() throws Exception {
         error = new Error.Builder(config, exception, null).build();
     }
 
+    @After
+    public void tearDown() throws Exception {
+        Async.cancelTasks();
+    }
+
     @Test
     public void testShouldIgnoreClass() {
         config.setIgnoreClasses(new String[]{"java.io.IOException"});
@@ -375,8 +382,8 @@ public void testErrorMetaData() {
 
     @Test
     public void testSetDeviceId() throws Throwable {
-        Context context = InstrumentationRegistry.getContext();
-        DeviceData deviceData = new DeviceData(context, BugsnagTestUtils.getSharedPrefs(context));
+        DeviceDataCollector deviceDataCollector = new DeviceDataCollector(generateClient());
+        DeviceData deviceData = deviceDataCollector.generateDeviceData();
         error.setDeviceData(deviceData);
         assertEquals(deviceData, error.getDeviceData());
 

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

@@ -62,14 +62,16 @@ public class Client extends Observable implements Observer {
 
     @NonNull
     protected final Configuration config;
-    private final Context appContext;
+    final Context appContext;
 
     @NonNull
     protected final AppData appData;
 
     @NonNull
     protected final DeviceData deviceData;
 
+    DeviceDataCollector deviceDataCollector;
+
     @NonNull
     final Breadcrumbs breadcrumbs;
 
@@ -83,7 +85,7 @@ public class Client extends Observable implements Observer {
 
     private final EventReceiver eventReceiver;
     final SessionTracker sessionTracker;
-    private SharedPreferences sharedPref;
+    SharedPreferences sharedPrefs;
 
     /**
      * Initialize a Bugsnag client
@@ -143,10 +145,11 @@ public Client(@NonNull Context androidContext, @NonNull Configuration configurat
         eventReceiver = new EventReceiver(this);
 
         // Set up and collect constant app and device diagnostics
-        sharedPref = appContext.getSharedPreferences(SHARED_PREF_KEY, Context.MODE_PRIVATE);
+        sharedPrefs = appContext.getSharedPreferences(SHARED_PREF_KEY, Context.MODE_PRIVATE);
 
+        deviceDataCollector = new DeviceDataCollector(this);
         appData = new AppData(appContext, config, sessionTracker);
-        deviceData = new DeviceData(appContext, sharedPref);
+        deviceData = deviceDataCollector.generateDeviceData();
 
         // Set up breadcrumbs
         breadcrumbs = new Breadcrumbs();
@@ -156,9 +159,9 @@ public Client(@NonNull Context androidContext, @NonNull Configuration configurat
 
         if (config.getPersistUserBetweenSessions()) {
             // Check to see if a user was stored in the SharedPreferences
-            user.setId(sharedPref.getString(USER_ID_KEY, deviceData.getId()));
-            user.setName(sharedPref.getString(USER_NAME_KEY, null));
-            user.setEmail(sharedPref.getString(USER_EMAIL_KEY, null));
+            user.setId(sharedPrefs.getString(USER_ID_KEY, deviceData.getId()));
+            user.setName(sharedPrefs.getString(USER_NAME_KEY, null));
+            user.setEmail(sharedPrefs.getString(USER_EMAIL_KEY, null));
         } else {
             user.setId(deviceData.getId());
         }
@@ -573,13 +576,18 @@ public AppDataSummary getAppDataSummary() {
     @NonNull
     @InternalApi
     public DeviceData getDeviceData() {
-        return new DeviceData(appContext, sharedPref);
+        return deviceDataCollector.generateDeviceData();
     }
 
     @NonNull
     @InternalApi
     public DeviceDataSummary getDeviceDataSummary() {
-        return new DeviceDataSummary();
+        return deviceDataCollector.generateDeviceDataSummary();
+    }
+
+    @InternalApi
+    public void populateDeviceMetaData(@NonNull MetaData metaData) {
+        deviceDataCollector.populateDeviceMetaData(metaData);
     }
 
     /**
@@ -930,12 +938,14 @@ void notify(@NonNull Error error,
         }
 
         // Capture the state of the app and device and attach diagnostics to the error
+        DeviceData errorDeviceData = deviceDataCollector.generateDeviceData();
+        error.setDeviceData(errorDeviceData);
+        deviceDataCollector.populateDeviceMetaData(error.getMetaData());
+
         error.setAppData(appData);
-        error.setDeviceData(deviceData);
 
         // add additional info that belongs in metadata
         appData.addAppMetaData(error.getMetaData());
-        deviceData.addDeviceMetaData(error.getMetaData());
 
         // Attach breadcrumbs to the error
         error.setBreadcrumbs(breadcrumbs);