Fix Objective-C app

FranAguilera · FranAguilera · commit cccecbfea39b · 2026-04-08T11:01:13.000+02:00
diff --git a/bazel/framework_imports_extractor.bzl b/bazel/framework_imports_extractor.bzl
@@ -29,8 +29,7 @@ def _framework_imports_extractor(ctx):
             arch = arch[4:]
 
         outputs.extend([
-            ctx.actions.declare_file("Capture.framework/Modules/Capture.swiftmodule/{}.swiftdoc".format(arch)),
-            ctx.actions.declare_file("Capture.framework/Modules/Capture.swiftmodule/{}.swiftinterface".format(arch)),
+            ctx.actions.declare_file("Capture.framework/Modules/Capture.swiftmodule/{}.swiftmodule".format(arch)),
         ])
 
     if len(ctx.attr.framework[0].files.to_list()) != 1:
diff --git a/examples/objective-c/CAPViewController.m b/examples/objective-c/CAPViewController.m
@@ -3,9 +3,26 @@
 
 #import "CAPViewController.h"
 
-NSString * const kCaptureAPIKey= @"<YOUR API KEY GOES HERE>";
-NSString * const kCaptureURLString = @"https://api.bitdrift.io";
-NSString * const kDeviceId = @"ios-objc-helloworld";
+static NSString * const kDefaultCaptureAPIKey = @"<YOUR API KEY GOES HERE>";
+static NSString * const kDefaultCaptureURLString = @"https://api.bitdrift.io";
+static NSString * const kSavedCaptureAPIKeyKey = @"capture_api_key";
+static NSString * const kSavedCaptureURLKey = @"capture_api_url";
+
+@interface CAPIssueLogger : NSObject <IssueReportCallback>
+@end
+
+@implementation CAPIssueLogger
+
+- (void)onBeforeReportSendWithReport:(CAPIssueReport *)report {
+    NSMutableDictionary<NSString *, NSString *> *fields = [NSMutableDictionary dictionaryWithDictionary:report.fields ?: @{}];
+    fields[@"reportType"] = report.reportType ?: @"";
+    fields[@"reason"] = report.reason ?: @"";
+    fields[@"details"] = report.details ?: @"";
+    fields[@"sessionID"] = report.sessionID ?: @"";
+    [CAPLogger logInfo:@"Bitdrift IssueCallback" fields:fields];
+}
+
+@end
 
 NSString *logLevelToString(LogLevel level) {
     switch (level) {
@@ -24,16 +41,29 @@
     return @"Unknown";
 }
 
-@interface CAPViewController ()
+@interface CAPViewController () <UITextFieldDelegate>
 
 @property (nonatomic, strong) NSArray<NSNumber *> *logLevels;
 @property (nonatomic, assign) LogLevel selectedLogLevel;
 @property (nonatomic, weak) UIButton *pickLogLevelButton;
+@property (nonatomic, weak) UITextField *apiKeyTextField;
+@property (nonatomic, weak) UITextField *apiURLTextField;
+@property (nonatomic, strong) CAPIssueLogger *issueLogger;
 
 @end
 
 @implementation CAPViewController
 
+- (NSString *)savedAPIKey {
+    NSString *apiKey = [[NSUserDefaults standardUserDefaults] stringForKey:kSavedCaptureAPIKeyKey];
+    return apiKey.length > 0 ? apiKey : kDefaultCaptureAPIKey;
+}
+
+- (NSString *)savedAPIURLString {
+    NSString *apiURLString = [[NSUserDefaults standardUserDefaults] stringForKey:kSavedCaptureURLKey];
+    return apiURLString.length > 0 ? apiURLString : kDefaultCaptureURLString;
+}
+
 - (instancetype)init {
     self = [super init];
 
@@ -53,16 +83,48 @@ - (instancetype)init {
 }
 
 - (void)loadView {
+    UIView *rootView = [UIView new];
+    rootView.backgroundColor = [UIColor whiteColor];
+
+    UIView *configurationView = [self createConfigurationView];
     UIView *sendLogView = [self createSendLogView];
+    UIView *copySessionURLView = [self createCopySessionURLView];
+    UIView *crashView = [self createCrashView];
     UIView *copySessionIDView = [self createCopySessionIDView];
 
-    UIStackView *view = [[UIStackView alloc]
-                         initWithArrangedSubviews:@[[UIView new], sendLogView, copySessionIDView]];
-    view.axis = UILayoutConstraintAxisVertical;
-    view.distribution = UIStackViewDistributionEqualCentering;
-    view.backgroundColor = [UIColor whiteColor];
-
-    self.view = view;
+    UIStackView *contentStack = [[UIStackView alloc]
+                                 initWithArrangedSubviews:@[configurationView, sendLogView, crashView, copySessionURLView, copySessionIDView]];
+    contentStack.axis = UILayoutConstraintAxisVertical;
+    contentStack.spacing = 16;
+    contentStack.translatesAutoresizingMaskIntoConstraints = NO;
+
+    UIScrollView *scrollView = [UIScrollView new];
+    scrollView.alwaysBounceVertical = YES;
+    scrollView.keyboardDismissMode = UIScrollViewKeyboardDismissModeInteractive;
+    scrollView.translatesAutoresizingMaskIntoConstraints = NO;
+
+    [scrollView addSubview:contentStack];
+    [rootView addSubview:scrollView];
+
+    UILayoutGuide *safeArea = rootView.safeAreaLayoutGuide;
+    [NSLayoutConstraint activateConstraints:@[
+        [scrollView.topAnchor constraintEqualToAnchor:safeArea.topAnchor],
+        [scrollView.leadingAnchor constraintEqualToAnchor:safeArea.leadingAnchor],
+        [scrollView.trailingAnchor constraintEqualToAnchor:safeArea.trailingAnchor],
+        [scrollView.bottomAnchor constraintEqualToAnchor:safeArea.bottomAnchor],
+
+        [contentStack.topAnchor constraintEqualToAnchor:scrollView.contentLayoutGuide.topAnchor constant:16],
+        [contentStack.leadingAnchor constraintEqualToAnchor:scrollView.contentLayoutGuide.leadingAnchor constant:16],
+        [contentStack.trailingAnchor constraintEqualToAnchor:scrollView.contentLayoutGuide.trailingAnchor constant:-16],
+        [contentStack.bottomAnchor constraintEqualToAnchor:scrollView.contentLayoutGuide.bottomAnchor constant:-16],
+        [contentStack.widthAnchor constraintEqualToAnchor:scrollView.frameLayoutGuide.widthAnchor constant:-32],
+    ]];
+
+    UITapGestureRecognizer *dismissKeyboardGesture = [[UITapGestureRecognizer alloc] initWithTarget:rootView action:@selector(endEditing:)];
+    dismissKeyboardGesture.cancelsTouchesInView = NO;
+    [rootView addGestureRecognizer:dismissKeyboardGesture];
+
+    self.view = rootView;
 }
 
 - (void)viewWillAppear:(BOOL)animated {
@@ -79,29 +141,89 @@ - (void)setSelectedLogLevel:(LogLevel)selectedLogLevel {
 // MARK: - Setup
 
 - (void)setUpLogger {
+    NSURL *apiURL = [NSURL URLWithString:[self savedAPIURLString]];
+    self.issueLogger = [CAPIssueLogger new];
+    CAPIssueCallbackConfiguration *issueCallbackConfiguration = [[CAPIssueCallbackConfiguration alloc]
+                                                                initWithCallbackQueue:dispatch_get_main_queue()
+                                                                issueReportCallback:self.issueLogger];
     CAPConfiguration *config = [[CAPConfiguration alloc] initWithEnableFatalIssueReporting:true
                                                                enableURLSessionIntegration:true
                                                                                  sleepMode:false
-                                                                                    apiURL:[NSURL URLWithString:kCaptureURLString]
-                                                                               rootFileURL:nil];
+                                                                                    apiURL:apiURL
+                                                                                rootFileURL:nil
+                                                                 issueCallbackConfiguration:issueCallbackConfiguration];
     [CAPLogger
-     startWithAPIKey:kCaptureAPIKey
+     startWithAPIKey:[self savedAPIKey]
      sessionStrategy:[CAPSessionStrategy fixed]
-     configuration: config
+      configuration: config
     ];
 
     [CAPLogger logInfo:@"An objective-c example app is launching" fields:nil];
+
+    NSDictionary *previousRunInfo = [CAPLogger previousRunInfo];
+    if (previousRunInfo != nil) {
+        NSMutableDictionary<NSString *, NSString *> *fields = [NSMutableDictionary new];
+        NSNumber *hasFatallyTerminated = previousRunInfo[@"hasFatallyTerminated"];
+        fields[@"hasFatallyTerminated"] = hasFatallyTerminated.boolValue ? @"true" : @"false";
+        [CAPLogger logInfo:@"Bitdrift PreviousRunInfo" fields:fields];
+    }
 }
 
 - (void)refresh {
     [self.pickLogLevelButton
      setTitle:logLevelToString(self.selectedLogLevel)
      forState:UIControlStateNormal
     ];
+
+    self.apiKeyTextField.text = [self savedAPIKey];
+    self.apiURLTextField.text = [self savedAPIURLString];
 }
 
 // MARK: - Views
 
+- (UIView *)createConfigurationView {
+    UILabel *apiKeyLabel = [UILabel new];
+    apiKeyLabel.text = @"API Key";
+
+    UITextField *apiKeyTextField = [UITextField new];
+    apiKeyTextField.borderStyle = UITextBorderStyleRoundedRect;
+    apiKeyTextField.placeholder = kDefaultCaptureAPIKey;
+    apiKeyTextField.autocorrectionType = UITextAutocorrectionTypeNo;
+    apiKeyTextField.autocapitalizationType = UITextAutocapitalizationTypeNone;
+    apiKeyTextField.returnKeyType = UIReturnKeyDone;
+    apiKeyTextField.delegate = self;
+    apiKeyTextField.text = [self savedAPIKey];
+
+    UILabel *apiURLLabel = [UILabel new];
+    apiURLLabel.text = @"API URL";
+
+    UITextField *apiURLTextField = [UITextField new];
+    apiURLTextField.borderStyle = UITextBorderStyleRoundedRect;
+    apiURLTextField.placeholder = kDefaultCaptureURLString;
+    apiURLTextField.autocorrectionType = UITextAutocorrectionTypeNo;
+    apiURLTextField.autocapitalizationType = UITextAutocapitalizationTypeNone;
+    apiURLTextField.keyboardType = UIKeyboardTypeURL;
+    apiURLTextField.returnKeyType = UIReturnKeyDone;
+    apiURLTextField.delegate = self;
+    apiURLTextField.text = [self savedAPIURLString];
+
+    UIButton *saveButton = [UIButton buttonWithType:UIButtonTypeSystem];
+    saveButton.backgroundColor = UIColor.systemBlueColor;
+    saveButton.tintColor = UIColor.whiteColor;
+    [saveButton setTitle:@"Save Config" forState:UIControlStateNormal];
+    [saveButton addTarget:self action:@selector(saveConfiguration) forControlEvents:UIControlEventTouchUpInside];
+
+    UIStackView *configurationView = [[UIStackView alloc]
+                                      initWithArrangedSubviews:@[apiKeyLabel, apiKeyTextField, apiURLLabel, apiURLTextField, saveButton]];
+    configurationView.axis = UILayoutConstraintAxisVertical;
+    configurationView.spacing = 8;
+
+    self.apiKeyTextField = apiKeyTextField;
+    self.apiURLTextField = apiURLTextField;
+
+    return configurationView;
+}
+
 - (UIView *)createSendLogView {
     UIButton *sendLogButton = [UIButton buttonWithType:UIButtonTypeSystem];
     sendLogButton.backgroundColor = UIColor.lightGrayColor;
@@ -133,6 +255,32 @@ - (UIView *)createSendLogView {
     return sendLogRow;
 }
 
+- (UIView *)createCrashView {
+    UIButton *crashButton = [UIButton buttonWithType:UIButtonTypeSystem];
+    crashButton.backgroundColor = UIColor.systemRedColor;
+    crashButton.tintColor = UIColor.whiteColor;
+    [crashButton setTitle:@"Trigger Controlled Crash"
+                 forState:UIControlStateNormal];
+    [crashButton addTarget:self
+                    action:@selector(triggerControlledCrash)
+          forControlEvents:UIControlEventTouchUpInside];
+
+    return crashButton;
+}
+
+- (UIView *)createCopySessionURLView {
+    UIButton *copySessionURLButton = [UIButton buttonWithType:UIButtonTypeSystem];
+    copySessionURLButton.backgroundColor = UIColor.systemGreenColor;
+    copySessionURLButton.tintColor = UIColor.whiteColor;
+    [copySessionURLButton setTitle:@"Copy Session URL"
+                          forState:UIControlStateNormal];
+    [copySessionURLButton addTarget:self
+                             action:@selector(copySessionURL)
+                   forControlEvents:UIControlEventTouchUpInside];
+
+    return copySessionURLButton;
+}
+
 - (UIView *)createCopySessionIDView {
     UIStackView *copySessionIDRow = [UIStackView new];
     copySessionIDRow.axis = UILayoutConstraintAxisVertical;
@@ -199,8 +347,43 @@ - (void)pickLogLevel {
     [self presentViewController:alert animated:YES completion:nil];
 }
 
+- (void)saveConfiguration {
+    [self.view endEditing:YES];
+
+    NSString *apiKey = self.apiKeyTextField.text.length > 0 ? self.apiKeyTextField.text : kDefaultCaptureAPIKey;
+    NSString *apiURLString = self.apiURLTextField.text.length > 0 ? self.apiURLTextField.text : kDefaultCaptureURLString;
+
+    [[NSUserDefaults standardUserDefaults] setObject:apiKey forKey:kSavedCaptureAPIKeyKey];
+    [[NSUserDefaults standardUserDefaults] setObject:apiURLString forKey:kSavedCaptureURLKey];
+    [[NSUserDefaults standardUserDefaults] synchronize];
+
+     UIAlertController *alert = [UIAlertController alertControllerWithTitle:@"Saved"
+                                                                    message:@"Restart the app to apply the new settings."
+                                                             preferredStyle:UIAlertControllerStyleAlert];
+    [alert addAction:[UIAlertAction actionWithTitle:@"OK" style:UIAlertActionStyleDefault handler:nil]];
+    [self presentViewController:alert animated:YES completion:nil];
+}
+
+- (void)triggerControlledCrash {
+    [CAPLogger logInfo:@"About to trigger controlled crash" fields:nil];
+    NSArray<NSNumber *> *items = @[@1, @2, @3];
+    NSLog(@"About to access out-of-bounds item: %@", items[3]);
+}
+
+- (void)copySessionURL {
+    NSString *sessionURL = [[CAPLogger class] sessionURL];
+    if (sessionURL.length > 0) {
+        UIPasteboard.generalPasteboard.string = sessionURL;
+    }
+}
+
 - (void)copySessionIDRow {
     UIPasteboard.generalPasteboard.string = [[CAPLogger class] sessionID];
 }
 
+- (BOOL)textFieldShouldReturn:(UITextField *)textField {
+    [textField resignFirstResponder];
+    return YES;
+}
+
 @end
diff --git a/platform/swift/source/LoggerObjc.swift b/platform/swift/source/LoggerObjc.swift
@@ -13,6 +13,7 @@ import Foundation
 public final class CAPConfiguration: NSObject {
     let underlyingConfig: Configuration
     public let enableURLSessionIntegration: Bool
+    public let issueCallbackConfiguration: IssueCallbackConfiguration?
 
     /// Initializes a new instance of the Capture configuration.
     ///
@@ -22,6 +23,7 @@ public final class CAPConfiguration: NSObject {
     public init(enableFatalIssueReporting: Bool, enableURLSessionIntegration: Bool) {
         self.underlyingConfig = Configuration(enableFatalIssueReporting: enableFatalIssueReporting)
         self.enableURLSessionIntegration = enableURLSessionIntegration
+        self.issueCallbackConfiguration = nil
     }
 
     /// Initializes a new instance of the Capture configuration.
@@ -41,6 +43,7 @@ public final class CAPConfiguration: NSObject {
         self.underlyingConfig = Configuration(sleepMode: sleepMode, enableFatalIssueReporting: enableFatalIssueReporting,
                                               apiURL: apiURL ?? URL(string: "https://api.bitdrift.io")!, rootFileURL: rootFileURL)
         self.enableURLSessionIntegration = enableURLSessionIntegration
+        self.issueCallbackConfiguration = nil
     }
 
     /// Initializes a new instance of the Capture configuration.
@@ -52,6 +55,21 @@ public final class CAPConfiguration: NSObject {
     public init(enableFatalIssueReporting: Bool, enableURLSessionIntegration: Bool, sleepMode: SleepMode) {
         self.underlyingConfig = Configuration(sleepMode: sleepMode, enableFatalIssueReporting: enableFatalIssueReporting)
         self.enableURLSessionIntegration = enableURLSessionIntegration
+        self.issueCallbackConfiguration = nil
+    }
+
+    @objc
+    public init(enableFatalIssueReporting: Bool, enableURLSessionIntegration: Bool,
+                sleepMode: SleepMode, apiURL: URL?, rootFileURL: URL?,
+                issueCallbackConfiguration: IssueCallbackConfiguration?)
+    {
+        self.underlyingConfig = Configuration(sleepMode: sleepMode,
+                                              enableFatalIssueReporting: enableFatalIssueReporting,
+                                              apiURL: apiURL ?? URL(string: "https://api.bitdrift.io")!,
+                                              rootFileURL: rootFileURL,
+                                              issueCallbackConfiguration: issueCallbackConfiguration)
+        self.enableURLSessionIntegration = enableURLSessionIntegration
+        self.issueCallbackConfiguration = issueCallbackConfiguration
     }
 }
 
