refactor: address review feedback

bugsnag · Feb 19, 2019 · 315a55b · 315a55b
1 parent 0b8a78d
commit 315a55b
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 18 deletions.
diff --git a/sdk/src/androidTest/java/com/bugsnag/android/SessionTest.kt b/sdk/src/androidTest/java/com/bugsnag/android/SessionTest.kt
@@ -21,14 +21,14 @@ class SessionTest {
 
     @Test
     fun handledIncrementCopiesSession() {
-        val copy = session.incrementHandledErrCount()
+        val copy = session.incrementHandledAndCopy()
         assertNotEquals(session, copy)
         validateSessionCopied(copy)
     }
 
     @Test
     fun unhandledIncrementCopiesSession() {
-        val copy = session.incrementUnhandledErrCount()
+        val copy = session.incrementUnhandledAndCopy()
         assertNotEquals(session, copy)
         validateSessionCopied(copy)
     }

diff --git a/sdk/src/androidTest/java/com/bugsnag/android/SessionTrackerTest.java b/sdk/src/androidTest/java/com/bugsnag/android/SessionTrackerTest.java
@@ -2,15 +2,13 @@
 
 import static com.bugsnag.android.BugsnagTestUtils.generateClient;
 import static com.bugsnag.android.BugsnagTestUtils.generateSessionStore;
-import static com.bugsnag.android.BugsnagTestUtils.generateSessionTrackingApiClient;
 import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertFalse;
 import static junit.framework.Assert.assertNotNull;
 import static junit.framework.Assert.assertNull;
 import static junit.framework.Assert.assertTrue;
 import static org.junit.Assert.assertNotEquals;
 
-import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -80,11 +78,11 @@ public void testUniqueSessionIds() throws Exception {
     @Test
     public void testIncrementCounts() throws Exception {
         sessionTracker.startNewSession(new Date(), user, false);
-        sessionTracker.incrementHandledError();
-        sessionTracker.incrementHandledError();
-        sessionTracker.incrementUnhandledError();
-        sessionTracker.incrementUnhandledError();
-        sessionTracker.incrementUnhandledError();
+        sessionTracker.incrementHandledAndCopy();
+        sessionTracker.incrementHandledAndCopy();
+        sessionTracker.incrementUnhandledAndCopy();
+        sessionTracker.incrementUnhandledAndCopy();
+        sessionTracker.incrementUnhandledAndCopy();
 
         Session session = sessionTracker.getCurrentSession();
         assertNotNull(session);

diff --git a/sdk/src/main/java/com/bugsnag/android/Client.java b/sdk/src/main/java/com/bugsnag/android/Client.java
@@ -863,7 +863,7 @@ void notify(@NonNull Error error,
             callback.beforeNotify(report);
         }
 
-        if (sessionTracker.getCurrentSession() != null) {
+        if (!error.getHandledState().isUnhandled() && error.getSession() != null) {
             setChanged();
             notifyObservers(new NativeInterface.Message(
                 NativeInterface.MessageType.NOTIFY_HANDLED, error.getExceptionName()));

diff --git a/sdk/src/main/java/com/bugsnag/android/Error.java b/sdk/src/main/java/com/bugsnag/android/Error.java
@@ -457,9 +457,9 @@ private Session getSession(HandledState handledState) {
             }
             if (config.getAutoCaptureSessions() || !currentSession.isAutoCaptured()) {
                 if (handledState.isUnhandled()) {
-                    reportedSession = sessionTracker.incrementUnhandledError();
+                    reportedSession = sessionTracker.incrementUnhandledAndCopy();
                 } else {
-                    reportedSession = sessionTracker.incrementHandledError();
+                    reportedSession = sessionTracker.incrementHandledAndCopy();
                 }
             }
             return reportedSession;

diff --git a/sdk/src/main/java/com/bugsnag/android/Session.java b/sdk/src/main/java/com/bugsnag/android/Session.java
@@ -63,12 +63,12 @@ int getHandledCount() {
         return handledCount.intValue();
     }
 
-    Session incrementHandledErrCount() {
+    Session incrementHandledAndCopy() {
         handledCount.incrementAndGet();
         return copySession(this);
     }
 
-    Session incrementUnhandledErrCount() {
+    Session incrementUnhandledAndCopy() {
         unhandledCount.incrementAndGet();
         return copySession(this);
     }

diff --git a/sdk/src/main/java/com/bugsnag/android/SessionTracker.java b/sdk/src/main/java/com/bugsnag/android/SessionTracker.java
@@ -144,18 +144,30 @@ Session getCurrentSession() {
         return currentSession.get();
     }
 
-    Session incrementUnhandledError() {
+    /**
+     * Increments the unhandled error count on the current session, then returns a deep-copy
+     * of the current session.
+     *
+     * @return a copy of the current session, or null if no session has been started.
+     */
+    Session incrementUnhandledAndCopy() {
         Session session = currentSession.get();
         if (session != null) {
-            return session.incrementUnhandledErrCount();
+            return session.incrementUnhandledAndCopy();
         }
         return null;
     }
 
-    Session incrementHandledError() {
+    /**
+     * Increments the handled error count on the current session, then returns a deep-copy
+     * of the current session.
+     *
+     * @return a copy of the current session, or null if no session has been started.
+     */
+    Session incrementHandledAndCopy() {
         Session session = currentSession.get();
         if (session != null) {
-            return session.incrementHandledErrCount();
+            return session.incrementHandledAndCopy();
         }
         return null;
     }