Support Bugsnag 6.26.2 and above (#57)

Author: findjigar

bugsnag-ios-link/src/main/kotlin/co/touchlab/crashkios/BugsnagLinkPlugin.kt

@@ -27,7 +27,8 @@ class BugsnagLinkPlugin : Plugin<Project> {
     override fun apply(project: Project): Unit = with(project) {
         afterEvaluate {
             project.kotlinExtension.crashLinkerConfig(
-                "-U _OBJC_CLASS_\$_Bugsnag " +
+                "-U _OBJC_CLASS_\$_BugsnagHandledState " +
+                        "-U _OBJC_CLASS_\$_Bugsnag " +
                         "-U _OBJC_CLASS_\$_BugsnagStackframe " +
                         "-U _OBJC_CLASS_\$_FIRStackFrame " +
                         "-U _OBJC_CLASS_\$_BugsnagFeatureFlag " +

bugsnag/build.gradle.kts

@@ -82,6 +82,7 @@ kotlin {
 
             mainCompilation.cinterops.create("bugsnag") {
                 includeDirs("$projectDir/src/include")
+                includeDirs("$projectDir/src/include/private")
                 compilerOpts("-DNS_FORMAT_ARGUMENT(A)=", "-D_Nullable_result=_Nullable")
 //            extraOpts("-mode", "sourcecode")
             }

bugsnag/src/darwinMain/kotlin/co/touchlab/crashkios/bugsnag/BugsnagConfig.kt

@@ -16,6 +16,7 @@ public fun startBugsnag(config: BugsnagConfiguration){
  * Configures Bugsnag to ignore the Kotlin termination crash.
  */
 public fun configureBugsnag(config: BugsnagConfiguration) {
+    NSExceptionKt_OverrideBugsnagHandledStateOriginalUnhandledValue()
     NSExceptionKt_BugsnagConfigAddOnSendErrorBlock(config) { event ->
         if (event == null) return@NSExceptionKt_BugsnagConfigAddOnSendErrorBlock true
         !event.unhandled || event.featureFlags.none { (it as BugsnagFeatureFlag).name == kotlinCrashedFeatureFlag }

bugsnag/src/include/Private/BugsnagHandledState+NSExceptionKt.h

@@ -0,0 +1,14 @@
+#import <objc/runtime.h>
+#import <Private/BugsnagHandledState.h>
+
+BOOL NSExceptionKt_BugsnagHandledStateOriginalUnhandledValue(BugsnagHandledState* self, SEL _cmd) {
+    return self.unhandled;
+}
+
+// In Bugsnag 6.26.2 and above we need to override the originalUnhandledValue property.
+// By default it will prevent our exceptions from being stored to disk.
+// https://github.com/bugsnag/bugsnag-cocoa/pull/1549
+void NSExceptionKt_OverrideBugsnagHandledStateOriginalUnhandledValue() {
+    Method method = class_getInstanceMethod([BugsnagHandledState class], @selector(originalUnhandledValue));
+    method_setImplementation(method, (IMP)NSExceptionKt_BugsnagHandledStateOriginalUnhandledValue);
+}

bugsnag/src/include/Private/BugsnagHandledState.h

@@ -0,0 +1,23 @@
+// The following are snippets from the Bugsnag Cocoa SDK used to generate Kotlin stubs.
+//
+// https://github.com/bugsnag/bugsnag-cocoa/blob/6bcd46f5f8dc06ac26537875d501f02b27d219a9/Bugsnag/Payload/BugsnagHandledState.h
+//
+// Copyright (c) 2012 Bugsnag, https://bugsnag.com/
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the Software
+// is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+
+#import <Foundation/Foundation.h>
+
+@interface BugsnagHandledState : NSObject
+
+@property(nonatomic) BOOL unhandled;
+
+@end

bugsnag/src/nativeInterop/cinterop/bugsnag.def

@@ -1,4 +1,6 @@
 package = co.touchlab.crashkios.bugsnag
 language = Objective-C
-headers = Bugsnag.h BugsnagConfiguration.h BugsnagConfiguration+NSExceptionKt.h BugsnagError.h BugsnagEvent.h BugsnagFeatureFlag.h BugsnagFeatureFlagStore.h BugsnagStackframe.h
+headers = Bugsnag.h BugsnagConfiguration.h BugsnagConfiguration+NSExceptionKt.h BugsnagError.h BugsnagEvent.h \
+BugsnagFeatureFlag.h BugsnagFeatureFlagStore.h BugsnagStackframe.h Private/BugsnagHandledState.h \
+Private/BugsnagHandledState+NSExceptionKt.h
 

gradle/libs.versions.toml

@@ -13,7 +13,7 @@ gradlePublish = "1.2.1"
 nsexceptionKt = "0.1.10"
 firebase-crashlytics = "18.4.1"
 bugsnag = "5.31.1"
-crashkios = "0.8.2"
+crashkios = "0.8.3"
 
 # Sample Apps
 androidx-core = "1.12.0"

samples/sample-bugsnag/CrashKiOSSampleIOS/Podfile.lock

@@ -1,5 +1,5 @@
 PODS:
-  - Bugsnag (6.22.3)
+  - Bugsnag (6.27.2)
   - shared (0.0.1)
 
 DEPENDENCIES:
@@ -15,7 +15,7 @@ EXTERNAL SOURCES:
     :path: "../shared"
 
 SPEC CHECKSUMS:
-  Bugsnag: 17fe7e9fcf60c1877a6a638a77327dce99590991
+  Bugsnag: d7b2e5e78eaf66246d635240c61a6c8a18e3922c
   shared: db2bfa2f9309d3a03ed92c95da4d0b121dfc7d02
 
 PODFILE CHECKSUM: 334109894bf80203c54092dcc680f36bc85b527c

samples/sample-bugsnag/app/src/main/AndroidManifest.xml

@@ -21,7 +21,7 @@
         android:theme="@style/Theme.Samplecrashlogging">
         <meta-data
                 android:name="com.bugsnag.android.API_KEY"
-                android:value="[your key here!]"/>
+                android:value="e3c4f60ce6e97f5dcbafabf59cbd8f29"/>
         <activity
             android:name="co.touchlab.crashkiossamplecrashlog.MainActivity"
             android:exported="true">