Merge pull request #413 from bugsnag/strictmode-fixes

Strictmode fixes

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 4.X.X (TBD)
+
+### Bug fixes
+
+* Cache result of device root check
+  [#411](https://github.com/bugsnag/bugsnag-android/pull/411)
+
+* Prevent unnecessary free disk calculations on initialisation
+ [#409](https://github.com/bugsnag/bugsnag-android/pull/409)
+
 ## 4.10.0 (2019-01-07)
 
 * Improve kotlin support by allowing property access

ndk/src/main/java/com/bugsnag/android/ndk/NativeBridge.java

@@ -217,21 +217,26 @@ private void handleInstallMessage(Object arg) {
                 return;
             }
             String reportPath = reportDirectory + UUID.randomUUID().toString() + ".crash";
-            String[] abis = (String[])NativeInterface.getDeviceData().get("cpuAbi");
-            boolean is32bit = true;
-            for (String abi : abis) {
-                if (abi.contains("64")) {
-                    is32bit = false;
-                    break;
-                }
-            }
-            install(reportPath, true, Build.VERSION.SDK_INT, is32bit);
+            install(reportPath, true, Build.VERSION.SDK_INT, is32bit());
             installed.set(true);
         } finally {
             lock.unlock();
         }
     }
 
+    private boolean is32bit() {
+        String[] abis = NativeInterface.getCpuAbi();
+
+        boolean is32bit = true;
+        for (String abi : abis) {
+            if (abi.contains("64")) {
+                is32bit = false;
+                break;
+            }
+        }
+        return is32bit;
+    }
+
     private void handleAddBreadcrumb(Object arg) {
         if (arg instanceof Breadcrumb) {
             Breadcrumb crumb = (Breadcrumb) arg;

sdk/src/androidTest/AndroidManifest.xml

@@ -8,4 +8,12 @@
 
   <application android:label="Bugsnag Android Tests"></application>
 
+  <instrumentation
+    android:name="android.support.test.runner.AndroidJUnitRunner"
+    android:targetPackage="com.bugsnag.android">
+    <meta-data
+      android:name="listener"
+      android:value="com.bugsnag.android.TestRunListener" />
+  </instrumentation>
+
 </manifest>

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

@@ -36,11 +36,6 @@ public void setUp() throws Exception {
         this.appData = appData.getAppDataSummary();
     }
 
-    @After
-    public void tearDown() throws Exception {
-        Async.cancelTasks();
-    }
-
     @Test
     public void testVersionCode() {
         assertEquals(1, appData.get("versionCode"));

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

@@ -42,11 +42,6 @@ public void setUp() throws Exception {
         appData = new AppData(client).getAppData();
     }
 
-    @After
-    public void tearDown() throws Exception {
-        Async.cancelTasks();
-    }
-
     @Test
     public void testPackageName() {
         assertEquals("com.bugsnag.android.test", appData.get("packageName"));

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

@@ -34,11 +34,6 @@ public void setUp() throws Exception {
         assertEquals(0, client.breadcrumbs.store.size());
     }
 
-    @After
-    public void tearDown() throws Exception {
-        Async.cancelTasks();
-    }
-
     @Test
     public void noCallback() throws Exception {
         client.leaveBreadcrumb("Hello");

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

@@ -47,7 +47,6 @@ public void deliver(Report report,
     @After
     public void tearDown() throws Exception {
         lastReport = null;
-        Async.cancelTasks();
     }
 
     @Test

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

@@ -29,11 +29,6 @@ public void setUp() throws Exception {
         sessionTracker = new SessionTracker(configuration, null, sessionStore);
     }
 
-    @After
-    public void tearDown() throws Exception {
-        Async.cancelTasks();
-    }
-
     @Test
     public void testLifecycleBreadcrumbCrash() {
         // should not crash with a null client

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

@@ -30,10 +30,6 @@ class BreadcrumbsTest {
         breadcrumbs = Breadcrumbs(config)
     }
 
-    @After
-    fun tearDown() {
-        Async.cancelTasks()
-    }
 
     /**
      * Verifies that the breadcrumb message is truncated after the max limit is reached

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

@@ -33,11 +33,6 @@ public void setUp() throws Exception {
         client = new Client(context, config);
     }
 
-    @After
-    public void tearDown() throws Exception {
-        Async.cancelTasks();
-    }
-
     @Test
     public void testSetReleaseStage() throws Exception {
         client.setReleaseStage("beta");

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

@@ -34,11 +34,6 @@ public void setUp() throws Exception {
         client.setErrorReportApiClient(apiClient);
     }
 
-    @After
-    public void tearDown() throws Exception {
-        Async.cancelTasks();
-    }
-
     @Test
     public void testNotifyBlockingDefaultSeverity() {
         client.notifyBlocking(new RuntimeException("Testing"));

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

@@ -51,7 +51,6 @@ public void setUp() throws Exception {
     @After
     public void tearDown() throws Exception {
         clearSharedPrefs();
-        Async.cancelTasks();
     }
 
     private void clearSharedPrefs() {

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

@@ -26,11 +26,6 @@ public void setUp() throws Exception {
         client = BugsnagTestUtils.generateClient();
     }
 
-    @After
-    public void tearDown() throws Exception {
-        Async.cancelTasks();
-    }
-
     @Test
     public void testClientNotifyModification() throws Exception {
         final Collection<BeforeNotify> beforeNotifyTasks = client.config.getBeforeNotifyTasks();

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

@@ -28,11 +28,6 @@ public void setUp() throws Exception {
         config = new Configuration("api-key");
     }
 
-    @After
-    public void tearDown() throws Exception {
-        Async.cancelTasks();
-    }
-
     @Test
     public void testEndpoints() {
         String notify = "https://notify.myexample.com";

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

@@ -30,11 +30,6 @@ public void setUp() throws Exception {
         deliveryCompat = new DeliveryCompat();
     }
 
-    @After
-    public void tearDown() throws Exception {
-        Async.cancelTasks();
-    }
-
     @SuppressWarnings("deprecation")
     @Test
     public void deliverReport() throws Exception {

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

@@ -33,11 +33,6 @@ public void setUp() throws Exception {
         this.deviceData = deviceData.getDeviceDataSummary();
     }
 
-    @After
-    public void tearDown() throws Exception {
-        Async.cancelTasks();
-    }
-
     @Test
     public void testManufacturer() {
         assertNotNull(deviceData.get("manufacturer"));

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

@@ -33,11 +33,6 @@ public void setUp() throws Exception {
         this.deviceData = deviceData.getDeviceData();
     }
 
-    @After
-    public void tearDown() throws Exception {
-        Async.cancelTasks();
-    }
-
     @Test
     public void testId() {
         assertNotNull(deviceData.get("id"));

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

@@ -26,11 +26,6 @@ public void setUp() throws Exception {
         Bugsnag.init(InstrumentationRegistry.getContext(), "123");
     }
 
-    @After
-    public void tearDown() throws Exception {
-        Async.cancelTasks();
-    }
-
     @SuppressWarnings("deprecation")
     @Test(expected = IllegalArgumentException.class)
     public void testApiClientNullValidation() {

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

@@ -44,11 +44,6 @@ public void setUp() throws Exception {
         error = new Error.Builder(config, exception, null, Thread.currentThread(), false).build();
     }
 
-    @After
-    public void tearDown() throws Exception {
-        Async.cancelTasks();
-    }
-
     @Test
     public void testShouldIgnoreClass() {
         config.setIgnoreClasses(new String[]{"java.io.IOException"});

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

@@ -33,11 +33,6 @@ public void setUp() throws Exception {
         Thread.setDefaultUncaughtExceptionHandler(null);
     }
 
-    @After
-    public void tearDown() throws Exception {
-        Async.cancelTasks();
-    }
-
     @Test
     public void testEnableDisable() {
         Client client = new Client(context, "api-key");

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

@@ -29,11 +29,6 @@ public void setUp() throws Exception {
         config = new Configuration("api-key");
     }
 
-    @After
-    public void tearDown() throws Exception {
-        Async.cancelTasks();
-    }
-
     @Test
     public void testBasicException() throws JSONException, IOException {
         Exceptions exceptions = new Exceptions(config, new RuntimeException("oops"));

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

@@ -43,11 +43,6 @@ public void setUp() throws Exception {
         file.delete();
     }
 
-    @After
-    public void tearDown() throws Exception {
-        Async.cancelTasks();
-    }
-
     @Test
     public void testSaneValues() throws JSONException, IOException {
         final Long nullLong = null;

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

@@ -36,11 +36,6 @@ public void setUp() throws Exception {
         client = BugsnagTestUtils.generateClient();
     }
 
-    @After
-    public void tearDown() throws Exception {
-        Async.cancelTasks();
-    }
-
     @Test
     public void testBasicSerialization() throws JSONException, IOException {
         MetaData metaData = new MetaData();

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

@@ -35,11 +35,6 @@ public void setUp() throws Exception {
         throwable = new RuntimeException("Test");
     }
 
-    @After
-    public void tearDown() throws Exception {
-        Async.cancelTasks();
-    }
-
     @Test
     public void testErrorDefaultMetaData() throws Exception {
         Error error = new Error.Builder(config, throwable, null,

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

@@ -43,11 +43,6 @@ public void setUp() throws Exception {
         client.addObserver(observer);
     }
 
-    @After
-    public void tearDown() throws Exception {
-        Async.cancelTasks();
-    }
-
     @Test
     public void testUpdateMetadataFromClientSendsMessage() {
         MetaData metadata = new MetaData(new HashMap<String, Object>());

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

@@ -36,11 +36,6 @@ public void setUp() throws Exception {
         report = new Report("api-key", error);
     }
 
-    @After
-    public void tearDown() throws Exception {
-        Async.cancelTasks();
-    }
-
     @Test
     public void testInMemoryError() throws JSONException, IOException {
         JSONObject reportJson = streamableToJson(report);

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

@@ -45,7 +45,6 @@ public void setUp() throws Exception {
      */
     @After
     public void tearDown() throws Exception {
-        Async.cancelTasks();
         FileUtils.clearFilesInDir(storageDir);
     }
 

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

@@ -39,11 +39,6 @@ public void setUp() throws Exception {
         user = new User();
     }
 
-    @After
-    public void tearDown() throws Exception {
-        Async.cancelTasks();
-    }
-
     @Test
     public void startNewSession() throws Exception {
         assertNotNull(sessionTracker);

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

@@ -0,0 +1,12 @@
+package com.bugsnag.android
+
+import org.junit.runner.Description
+import org.junit.runner.notification.RunListener
+
+class TestRunListener : RunListener() {
+
+    override fun testFinished(description: Description) {
+        super.testFinished(description)
+        Async.cancelTasks()
+    }
+}

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

@@ -44,7 +44,6 @@ public void setUp() throws Exception {
     @After
     public void tearDown() throws Exception {
         callbackCount = 0;
-        Async.cancelTasks();
     }
 
     @Test

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

@@ -146,7 +146,7 @@ public Client(@NonNull Context androidContext, @NonNull Configuration configurat
         // Set sensible defaults
         setProjectPackages(appContext.getPackageName());
 
-        String deviceId = getStringFromMap("id", deviceData.getDeviceData());
+        String deviceId = deviceData.getId();
 
         if (config.getPersistUserBetweenSessions()) {
             // Check to see if a user was stored in the SharedPreferences