feat: Add screenshot at crash

Sources/Sentry/SentryScreenshot.m

@@ -26,7 +26,7 @@ - (void)saveScreenShots:(NSString *)path
 {
     // This function does not dispatch the screenshot to the main thread.
     // The caller should be aware of that.
-    // We done this way because we use this function to save screenshots
+    // We did it this way because we use this function to save screenshots
     // during signal handling, and if we dispatch it to the main thread,
     // that is probably blocked by the crash event, we freeze the application.
     [[self takeScreenshots] enumerateObjectsUsingBlock:^(NSData *obj, NSUInteger idx, BOOL *stop) {

Sources/Sentry/SentryScreenshotIntegration.m

@@ -25,15 +25,16 @@
                                                       error:&error];
         if (error != nil)
             return;
-    }
-
-    // We first delete any screenshot that could be from an old crash report
-    NSArray *oldFiles = [NSFileManager.defaultManager contentsOfDirectoryAtPath:reportPath
-                                                                          error:&error];
-    if (!error) {
-        [oldFiles enumerateObjectsUsingBlock:^(NSString *obj, NSUInteger idx, BOOL *stop) {
-            [NSFileManager.defaultManager removeItemAtPath:obj error:nil];
-        }];
+    } else {
+        // We first delete any screenshot that could be from an old crash report
+        NSArray *oldFiles = [NSFileManager.defaultManager contentsOfDirectoryAtPath:reportPath
+                                                                              error:&error];
+
+        if (!error) {
+            [oldFiles enumerateObjectsUsingBlock:^(NSString *obj, NSUInteger idx, BOOL *stop) {
+                [NSFileManager.defaultManager removeItemAtPath:obj error:nil];
+            }];
+        }
     }
 
     [SentryDependencyContainer.sharedInstance.screenshot saveScreenShots:reportPath];

Sources/SentryCrash/Recording/SentryCrash.m

@@ -408,7 +408,7 @@ - (NSData *)loadCrashReportJSONWithID:(int64_t)reportID
     return nil;
 }
 
-- (NSArray *)getScreenShots:(int64_t)reportID
+- (NSArray<NSString *> *)getScreenshotPaths:(int64_t)reportID
 {
     char report_screenshot_path[SentryCrashCRS_MAX_PATH_LENGTH];
     sentrycrashcrs_getScreenshotPath_forReportId(reportID, report_screenshot_path);
@@ -485,9 +485,9 @@ - (NSDictionary *)reportWithIntID:(int64_t)reportID
         return nil;
     }
 
-    NSArray *screenShots = [self getScreenShots:reportID];
+    NSArray *screenShots = [self getScreenshotPaths:reportID];
     if (screenShots.count > 0) {
-        [crashReport setObject:screenShots forKey:SENTRYCRASH_REPORT_SCREENSHOT_ITEM];
+        crashReport[SENTRYCRASH_REPORT_SCREENSHOT_ITEM] = screenShots;
     }
 
     [self doctorReport:crashReport];

Sources/SentryCrash/Recording/SentryCrashC.c

@@ -112,7 +112,7 @@ onCrash(struct SentryCrash_MonitorContext *monitorContext)
     // Depending on the state of the crash this may not work
     // because we gonna call into non async-signal safe code
     // but since the app is already in a crash state we don't
-    // mind if this approach causes more crashes.
+    // mind if this approach crashes.
     if (g_saveScreenShot) {
         char crashScreenshotsPath[SentryCrashFU_MAX_PATH_LENGTH];
         sentrycrashcrs_getScreenshotsPath_forReport(

Tests/SentryTests/SentryCrash/SentryCrashTests.m

@@ -27,11 +27,10 @@ - (void)test_getScreenshots_CheckName
         initWithBasePath:[self.tempPath stringByAppendingPathComponent:@"Reports"]];
     NSArray *files = [sentryCrash getScreenShots:12];
 
+    XCTAssertEqual(files.count, 1);
     XCTAssertEqualObjects(files.firstObject,
         [self.tempPath stringByAppendingPathComponent:
                            @"Reports/AppName-report-000000000000000c-screenshots/0.png"]);
-
-    XCTAssertEqual(files.count, 1);
 }
 
 - (void)test_getScreenshots_TwoFiles