build: Update bugsnag-cocoa dep to v5.22.6

Author: kattrali

CHANGELOG.md

@@ -1,6 +1,20 @@
 Changelog
 =========
 
+## TBD
+
+### Bug fixes
+
+* (iOS) Upgrade bugsnag-cocoa to v5.22.6
+  * Ensure UIKit APIs are not called from background threads when
+    initializing only in the JavaScript layer when using `react-native@0.60+`
+    [#396](https://github.com/bugsnag/bugsnag-react-native/issues/396)
+  * Fix bug in `notifyReleaseStages` where if the release stage of a build was
+    changed after `start()`, only the initial value was used to determine whether
+    to send a report
+    [bugsnag-cocoa#405](https://github.com/bugsnag/bugsnag-cocoa/issues/405)
+    [bugsnag-cocoa#412](https://github.com/bugsnag/bugsnag-cocoa/issues/412)
+
 ## 2.23.1 (2019-09-03)
 
 ### Bug fixes

cocoa/vendor/bugsnag-cocoa/Source/BSGOutOfMemoryWatchdog.m

@@ -293,8 +293,25 @@ - (UIApplicationState)currentAppState {
     if ([BSG_KSSystemInfo isRunningInAppExtension]) {
         return UIApplicationStateActive;
     }
-    UIApplication *app = [UIApplication performSelector:@selector(sharedApplication)];
-    return [app applicationState];
+
+    UIApplicationState(^getState)(void) = ^() {
+        // Calling this API indirectly to avoid a compile-time check that
+        // [UIApplication sharedApplication] is not called from app extensions
+        // (which is handled above)
+        UIApplication *app = [UIApplication performSelector:@selector(sharedApplication)];
+        return [app applicationState];
+    };
+
+    if ([[NSThread currentThread] isMainThread]) {
+        return getState();
+    } else {
+        // [UIApplication sharedApplication] is a main thread-only API
+        __block UIApplicationState state;
+        dispatch_sync(dispatch_get_main_queue(), ^{
+            state = getState();
+        });
+        return state;
+    }
 }
 #endif
 

cocoa/vendor/bugsnag-cocoa/Source/BugsnagConfiguration.m

@@ -143,6 +143,22 @@ - (void)setReleaseStage:(NSString *)newReleaseStage {
     }
 }
 
+@synthesize autoNotify = _autoNotify;
+
+- (BOOL)autoNotify {
+    return _autoNotify;
+}
+
+- (void)setAutoNotify:(BOOL)shouldAutoNotify {
+    if (shouldAutoNotify == _autoNotify) {
+        return;
+    }
+    [self willChangeValueForKey:NSStringFromSelector(@selector(autoNotify))];
+    _autoNotify = shouldAutoNotify;
+    [[Bugsnag notifier] updateCrashDetectionSettings];
+    [self didChangeValueForKey:NSStringFromSelector(@selector(autoNotify))];
+}
+
 @synthesize notifyReleaseStages = _notifyReleaseStages;
 
 - (NSArray *)notifyReleaseStages {

cocoa/vendor/bugsnag-cocoa/Source/BugsnagCrashReport.m

@@ -102,14 +102,22 @@
     return error[BSGKeyReason] ?: @"";
 }
 
+id BSGLoadConfigValue(NSDictionary *report, NSString *valueName) {
+    NSString *keypath = [NSString stringWithFormat:@"user.config.%@", valueName];
+    NSString *fallbackKeypath = [NSString stringWithFormat:@"user.config.config.%@", valueName];
+
+    return [report valueForKeyPath:keypath]
+    ?: [report valueForKeyPath:fallbackKeypath]; // some custom values are nested
+}
+
 NSString *BSGParseContext(NSDictionary *report, NSDictionary *metaData) {
     id context = [report valueForKeyPath:@"user.overrides.context"];
     if ([context isKindOfClass:[NSString class]])
         return context;
     context = metaData[BSGKeyContext];
     if ([context isKindOfClass:[NSString class]])
         return context;
-    context = [report valueForKeyPath:@"user.config.context"];
+    context = BSGLoadConfigValue(report, @"context");
     if ([context isKindOfClass:[NSString class]])
         return context;
     return nil;
@@ -132,7 +140,7 @@
 
 NSString *BSGParseReleaseStage(NSDictionary *report) {
     return [report valueForKeyPath:@"user.overrides.releaseStage"]
-               ?: [report valueForKeyPath:@"user.config.releaseStage"];
+               ?: BSGLoadConfigValue(report, @"releaseStage");
 }
 
 BSGSeverity BSGParseSeverity(NSString *severity) {
@@ -253,8 +261,7 @@ - (instancetype)initWithKSReport:(NSDictionary *)report
             }
         } else {
             FallbackReportData *fallback = [[FallbackReportData alloc] initWithMetadata:metadata];
-            _notifyReleaseStages =
-                [report valueForKeyPath:@"user.config.notifyReleaseStages"];
+            _notifyReleaseStages = BSGLoadConfigValue(report, @"notifyReleaseStages");
             _releaseStage = BSGParseReleaseStage(report);
             _incomplete = report.count == 0;
             _threads = [report valueForKeyPath:@"crash.threads"];
@@ -276,7 +283,10 @@ - (instancetype)initWithKSReport:(NSDictionary *)report
             _deviceState = BSGParseDeviceState(report);
             _device = BSGParseDevice(report);
             _app = BSGParseApp(report);
-            _appState = BSGParseAppState(report[BSGKeySystem], [report valueForKeyPath:@"user.config.appVersion"]);
+            _appState = BSGParseAppState(report[BSGKeySystem],
+                                         BSGLoadConfigValue(report, @"appVersion"),
+                                         _releaseStage, // Already loaded from config
+                                         BSGLoadConfigValue(report, @"codeBundleId"));
             _groupingHash = BSGParseGroupingHash(report, _metaData);
             _overrides = [report valueForKeyPath:@"user.overrides"];
             _customException = BSGParseCustomException(report, [_errorClass copy],

cocoa/vendor/bugsnag-cocoa/Source/BugsnagKSCrashSysInfoParser.h

@@ -12,5 +12,8 @@
 
 NSDictionary *_Nonnull BSGParseDevice(NSDictionary *_Nonnull report);
 NSDictionary *_Nonnull BSGParseApp(NSDictionary *_Nonnull report);
-NSDictionary *_Nonnull BSGParseAppState(NSDictionary *_Nonnull report, NSString *_Nullable preferredVersion);
+NSDictionary *_Nonnull BSGParseAppState(NSDictionary *_Nonnull report, 
+                                        NSString *_Nullable preferredVersion, 
+                                        NSString *_Nullable releaseStage, 
+                                        NSString *_Nullable codeBundleId);
 NSDictionary *_Nonnull BSGParseDeviceState(NSDictionary *_Nonnull report);

cocoa/vendor/bugsnag-cocoa/Source/BugsnagKSCrashSysInfoParser.m

@@ -90,17 +90,17 @@
     return appState;
 }
 
-NSDictionary *BSGParseAppState(NSDictionary *report, NSString *preferredVersion) {
+NSDictionary *BSGParseAppState(NSDictionary *report, NSString *preferredVersion, NSString *releaseStage, NSString *codeBundleId) {
     NSMutableDictionary *app = [NSMutableDictionary dictionary];
 
     NSString *version = preferredVersion ?: report[@"CFBundleShortVersionString"];
 
     BSGDictSetSafeObject(app, report[@"CFBundleVersion"], @"bundleVersion");
-    BSGDictSetSafeObject(app, [Bugsnag configuration].releaseStage,
+    BSGDictSetSafeObject(app, releaseStage,
                          BSGKeyReleaseStage);
     BSGDictSetSafeObject(app, version, BSGKeyVersion);
 
-    BSGDictSetSafeObject(app, [Bugsnag configuration].codeBundleId, @"codeBundleId");
+    BSGDictSetSafeObject(app, codeBundleId, @"codeBundleId");
 
     NSString *notifierType;
 #if TARGET_OS_TV

cocoa/vendor/bugsnag-cocoa/Source/BugsnagNotifier.h

@@ -121,4 +121,8 @@
  */
 - (void)updateAutomaticBreadcrumbDetectionSettings;
 
+/**
+ * Enable or disable crash reporting based on configuration state
+ */
+- (void)updateCrashDetectionSettings;
 @end

cocoa/vendor/bugsnag-cocoa/Source/BugsnagNotifier.m

@@ -35,6 +35,7 @@
 #import "BugsnagSessionTracker.h"
 #import "BSGOutOfMemoryWatchdog.h"
 #import "BSG_RFC3339DateTool.h"
+#import "BSG_KSCrashC.h"
 #import "BSG_KSCrashType.h"
 #import "BSG_KSCrashState.h"
 #import "BSG_KSSystemInfo.h"
@@ -46,7 +47,7 @@
 #import <AppKit/AppKit.h>
 #endif
 
-NSString *const NOTIFIER_VERSION = @"5.22.5";
+NSString *const NOTIFIER_VERSION = @"5.22.6";
 NSString *const NOTIFIER_URL = @"https://github.com/bugsnag/bugsnag-cocoa";
 NSString *const BSTabCrash = @"crash";
 NSString *const BSAttributeDepth = @"depth";
@@ -804,6 +805,21 @@ - (void)lowMemoryWarning:(NSNotification *)notif {
 }
 #endif
 
+- (void)updateCrashDetectionSettings {
+    if (self.configuration.autoNotify) {
+        // Enable all crash detection
+        bsg_kscrash_setHandlingCrashTypes(BSG_KSCrashTypeAll);
+        if (self.configuration.reportOOMs) {
+            [self.oomWatchdog enable];
+        }
+    } else {
+        // Only enable support for notify()-based reports
+        bsg_kscrash_setHandlingCrashTypes(BSG_KSCrashTypeUserReported);
+        // autoNotify gates all unhandled report detection
+        [self.oomWatchdog disable];
+    }
+}
+
 - (void)updateAutomaticBreadcrumbDetectionSettings {
     if ([self.configuration automaticallyCollectBreadcrumbs]) {
         for (NSString *name in [self automaticBreadcrumbStateEvents]) {

cocoa/vendor/bugsnag-cocoa/Source/BugsnagSessionTrackingPayload.m

@@ -39,7 +39,10 @@ - (NSMutableDictionary *)toJson {
     BSGDictSetSafeObject(dict, [Bugsnag notifier].details, BSGKeyNotifier);
 
     NSDictionary *systemInfo = [BSG_KSSystemInfo systemInfo];
-    BSGDictSetSafeObject(dict, BSGParseAppState(systemInfo, [Bugsnag configuration].appVersion), @"app");
+    BSGDictSetSafeObject(dict, BSGParseAppState(systemInfo,
+                                                [Bugsnag configuration].appVersion,
+                                                [Bugsnag configuration].releaseStage,
+                                                [Bugsnag configuration].codeBundleId), @"app");
     BSGDictSetSafeObject(dict, BSGParseDeviceState(systemInfo), @"device");
     return dict;
 }

cocoa/vendor/bugsnag-cocoa/iOS/BugsnagTests/BugsnagKSCrashSysInfoParserTest.m

@@ -50,4 +50,46 @@ - (void)testDeviceFreeSpaceShouldBeNilWhenFailsToRetrieveIt {
     XCTAssertNil(freeBytes, @"expect nil when fails to retrieve free space for the directory");
 }
 
+- (void)testParseAppInfo {
+    NSDictionary *rawInfo = @{
+        @"CFBundleShortVersionString":@"4.1.1",
+        @"CFBundleVersion":@"4.1.1.2362",
+        @"extra":@"foo",
+    };
+    NSDictionary *state = BSGParseAppState(rawInfo, nil, @"prod", nil);
+    XCTAssertEqual(state.count, 5);
+    XCTAssertEqualObjects(state[@"releaseStage"], @"prod");
+    XCTAssertEqualObjects(state[@"version"], @"4.1.1");
+    XCTAssertEqualObjects(state[@"bundleVersion"], @"4.1.1.2362");
+    XCTAssertEqual(state[@"codeBundleId"], [NSNull null]);
+#if TARGET_OS_TV
+    XCTAssertEqualObjects(state[@"type"], @"tvOS");
+#elif TARGET_IPHONE_SIMULATOR || TARGET_OS_IPHONE
+    XCTAssertEqualObjects(state[@"type"], @"iOS");
+#elif TARGET_OS_MAC
+    XCTAssertEqualObjects(state[@"type"], @"macOS");
+#endif
+}
+
+- (void)testParseAppInfoPreferredValues {
+    NSDictionary *rawInfo = @{
+        @"CFBundleShortVersionString":@"4.1.1",
+        @"CFBundleVersion":@"4.1.1.2362",
+        @"extra":@"foo",
+    };
+    NSDictionary *state = BSGParseAppState(rawInfo, @"2.0", @"prod", @"4.2.0-cbd");
+    XCTAssertEqual(state.count, 5);
+    XCTAssertEqualObjects(state[@"releaseStage"], @"prod");
+    XCTAssertEqualObjects(state[@"version"], @"2.0");
+    XCTAssertEqualObjects(state[@"bundleVersion"], @"4.1.1.2362");
+    XCTAssertEqualObjects(state[@"codeBundleId"], @"4.2.0-cbd");
+#if TARGET_OS_TV
+    XCTAssertEqualObjects(state[@"type"], @"tvOS");
+#elif TARGET_IPHONE_SIMULATOR || TARGET_OS_IPHONE
+    XCTAssertEqualObjects(state[@"type"], @"iOS");
+#elif TARGET_OS_MAC
+    XCTAssertEqualObjects(state[@"type"], @"macOS");
+#endif
+}
+
 @end