Respect pre-populated fields on Event when notifying

bugsnag-android-core/src/main/java/com/bugsnag/android/Client.java

@@ -613,7 +613,7 @@ public void notify(@NonNull Throwable exc, @Nullable OnErrorCallback onError) {
             HandledState handledState = HandledState.newInstance(REASON_HANDLED_EXCEPTION);
             Metadata metadata = metadataState.getMetadata();
             Event event = new Event(exc, immutableConfig, handledState, metadata, logger);
-            notifyInternal(event, onError);
+            populateAndNotifyAndroidEvent(event, onError);
         } else {
             logNull("notify");
         }
@@ -631,28 +631,11 @@ void notifyUnhandledException(@NonNull Throwable exc, Metadata metadata,
                 = HandledState.newInstance(severityReason, Severity.ERROR, attributeValue);
         Metadata data = Metadata.Companion.merge(metadataState.getMetadata(), metadata);
         Event event = new Event(exc, immutableConfig, handledState, data, logger);
-        notifyInternal(event, null);
+        populateAndNotifyAndroidEvent(event, null);
     }
 
-    void notifyInternal(@NonNull Event event,
-                        @Nullable OnErrorCallback onError) {
-        // Don't notify if this event class should be ignored
-        if (event.shouldDiscardClass()) {
-            return;
-        }
-
-        if (!immutableConfig.shouldNotifyForReleaseStage()) {
-            return;
-        }
-
-        // get session for event
-        Session currentSession = sessionTracker.getCurrentSession();
-
-        if (currentSession != null
-                && (immutableConfig.getAutoTrackSessions() || !currentSession.isAutoCaptured())) {
-            event.setSession(currentSession);
-        }
-
+    void populateAndNotifyAndroidEvent(@NonNull Event event,
+                                       @Nullable OnErrorCallback onError) {
         // Capture the state of the app and device and attach diagnostics to the event
         event.setDevice(deviceDataCollector.generateDeviceWithState(new Date().getTime()));
         event.addMetadata("device", deviceDataCollector.getDeviceMetadata());
@@ -674,6 +657,27 @@ void notifyInternal(@NonNull Event event,
             String context = contextState.getContext();
             event.setContext(context != null ? context : appDataCollector.getActiveScreenClass());
         }
+        notifyInternal(event, onError);
+    }
+
+    void notifyInternal(@NonNull Event event,
+                        @Nullable OnErrorCallback onError) {
+        // Don't notify if this event class should be ignored
+        if (event.shouldDiscardClass()) {
+            return;
+        }
+
+        if (!immutableConfig.shouldNotifyForReleaseStage()) {
+            return;
+        }
+
+        // get session for event
+        Session currentSession = sessionTracker.getCurrentSession();
+
+        if (currentSession != null
+                && (immutableConfig.getAutoTrackSessions() || !currentSession.isAutoCaptured())) {
+            event.setSession(currentSession);
+        }
 
         // Run on error tasks, don't notify if any return false
         if (!callbackState.runOnErrorTasks(event, logger)

bugsnag-plugin-android-anr/src/main/java/com/bugsnag/android/AnrDetailsCollector.kt

@@ -68,7 +68,7 @@ internal class AnrDetailsCollector {
                     }
                 } else {
                     addErrorStateInfo(event, anrDetails)
-                    client.notifyInternal(event, null)
+                    client.populateAndNotifyAndroidEvent(event, null)
                 }
             }
         })