Merge 33257a3 into 46e0d23

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

@@ -0,0 +1,38 @@
+package com.bugsnag.android;
+
+import android.content.Context;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+@SmallTest
+public class BreadcrumbLifecycleCrashTest {
+
+    private SessionTracker sessionTracker;
+
+    /**
+     * Creates a SessionTracker with a null client
+     *
+     * @throws Exception if the SessionTracker couldn't be created
+     */
+    @Before
+    public void setUp() throws Exception {
+        Configuration configuration = new Configuration("api-key");
+        Context context = InstrumentationRegistry.getContext();
+        SessionStore sessionStore = new SessionStore(configuration, context);
+        SessionTrackingApiClient apiClient = BugsnagTestUtils.generateSessionTrackingApiClient();
+        sessionTracker = new SessionTracker(configuration, null, sessionStore, apiClient);
+    }
+
+    @Test
+    public void testLifecycleBreadcrumbCrash() {
+        // should not crash with a null client
+        sessionTracker.leaveLifecycleBreadcrumb("FooActivity", "onCreate");
+    }
+
+}

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

@@ -242,7 +242,12 @@ private void leaveBreadcrumb(String activityName, String lifecycleCallback) {
         if (configuration.isAutomaticallyCollectingBreadcrumbs()) {
             Map<String, String> metadata = new HashMap<>();
             metadata.put(KEY_LIFECYCLE_CALLBACK, lifecycleCallback);
-            client.leaveBreadcrumb(activityName, BreadcrumbType.NAVIGATION, metadata);
+
+            try {
+                client.leaveBreadcrumb(activityName, BreadcrumbType.NAVIGATION, metadata);
+            } catch (Exception ex) {
+                Logger.warn("Failed to leave breadcrumb in SessionTracker: " + ex.getMessage());
+            }
         }
     }