Merge pull request #1549 from bugsnag/yousif/PLAT-10016/persist-origi…

…nal-unhandled-events
bugsnag · Apr 19, 2023 · 23bb82c · 23bb82c
2 parents fbe4d51 + d02c20f
commit 23bb82c
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 1 deletion.
diff --git a/Bugsnag/Client/BugsnagClient.m b/Bugsnag/Client/BugsnagClient.m
@@ -794,7 +794,7 @@ - (void)notifyInternal:(BugsnagEvent *_Nonnull)event
 
     event.usage = BSGTelemetryCreateUsage(self.configuration);
 
-    if (event.unhandled) {
+    if (event.handledState.originalUnhandledValue) {
         // Unhandled Javscript exceptions from React Native result in the app being terminated shortly after the
         // call to notifyInternal, so the event needs to be persisted to disk for sending in the next session.
         // The fatal "RCTFatalException" / "Unhandled JS Exception" is explicitly ignored by

diff --git a/Bugsnag/Payload/BugsnagHandledState.h b/Bugsnag/Payload/BugsnagHandledState.h
@@ -48,6 +48,7 @@ BUGSNAG_EXTERN
 
 @property(nonatomic) BOOL unhandled;
 @property(nonatomic) BOOL unhandledOverridden;
+@property(nonatomic, readonly) BOOL originalUnhandledValue;
 @property(nonatomic, readonly) SeverityReasonType severityReasonType;
 @property(nonatomic, readonly) BSGSeverity originalSeverity;
 @property(nonatomic) BSGSeverity currentSeverity;

diff --git a/Bugsnag/Payload/BugsnagHandledState.m b/Bugsnag/Payload/BugsnagHandledState.m
@@ -236,4 +236,8 @@ - (NSDictionary *)toJson {
     return dict;
 }
 
+- (BOOL)originalUnhandledValue {
+    return self.unhandledOverridden ? !self.unhandled : self.unhandled;
+}
+
 @end
diff --git a/Tests/BugsnagTests/BugsnagHandledStateTest.m b/Tests/BugsnagTests/BugsnagHandledStateTest.m
@@ -102,4 +102,22 @@ - (void)testPromiseRejection {
     XCTAssertNil(state.attrValue);
 }
 
+- (void)testOriginalUnhandled {
+    BugsnagHandledState *unhandledState =
+    [BugsnagHandledState handledStateWithSeverityReason:PromiseRejection];
+    XCTAssertTrue(unhandledState.originalUnhandledValue);
+
+    unhandledState.unhandledOverridden = YES;
+    XCTAssertFalse(unhandledState.originalUnhandledValue);
+
+    BugsnagHandledState *handledState =
+    [BugsnagHandledState handledStateWithSeverityReason:HandledError
+                                               severity:BSGSeverityWarning
+                                              attrValue:@"Test"];
+    XCTAssertFalse(handledState.originalUnhandledValue);
+
+    handledState.unhandledOverridden = YES;
+    XCTAssertTrue(handledState.originalUnhandledValue);
+}
+
 @end