fix: Catch unexpected exceptions thrown by the alerts monitor (#660)

appium · Feb 17, 2023 · aa22555 · aa22555
1 parent a191d51
commit aa22555
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/WebDriverAgentLib/Utilities/FBAlertsMonitor.m b/WebDriverAgentLib/Utilities/FBAlertsMonitor.m
@@ -11,6 +11,7 @@
 
 #import "FBAlert.h"
 #import "FBApplication.h"
+#import "FBLogger.h"
 #import "XCUIApplication+FBAlert.h"
 
 static const NSTimeInterval FB_MONTORING_INTERVAL = 2.0;
@@ -50,9 +51,16 @@ - (void)scheduleNextTick
   dispatch_async(dispatch_get_main_queue(), ^{
     NSArray<FBApplication *> *activeApps = FBApplication.fb_activeApplications;
     for (FBApplication *activeApp in activeApps) {
-      XCUIElement *alertElement = activeApp.fb_alertElement;
+      XCUIElement *alertElement = nil;
+      @try {
+        alertElement = activeApp.fb_alertElement;
+        if (nil != alertElement) {
+          [self.delegate didDetectAlert:[FBAlert alertWithElement:alertElement]];
+        }
+      } @catch (NSException *e) {
+        [FBLogger logFmt:@"Got an unexpected exception while monitoring alerts: %@\n%@", e.reason, e.callStackSymbols];
+      }
       if (nil != alertElement) {
-        [self.delegate didDetectAlert:[FBAlert alertWithElement:alertElement]];
         break;
       }
     }