@rejourneyco/react-native 1.0.2 → 1.0.4

package/ios/Core/Rejourney.mm

@@ -249,22 +249,33 @@ RCT_EXPORT_MODULE()
     didDecideSample = YES;
   }
 
-  BOOL shouldRecord = self.recordingEnabledByConfig && self.sessionSampled;
-  self.remoteRecordingEnabled = shouldRecord;
+  // Decouple video recording from session active state.
+  // We want to record video ONLY if:
+  // 1. Config says recording is enabled (remote toggles)
+  // 2. Sample rate allows it
+  //
+  // NOTE: Even if shouldRecordVideo is NO, the session remains active
+  // (isRecording=YES) and events are still observed and uploaded ("Data-Only
+  // Mode").
+  BOOL shouldRecordVideo = self.recordingEnabledByConfig && self.sessionSampled;
+  self.remoteRecordingEnabled = shouldRecordVideo;
 
   if (self.captureEngine) {
-    self.captureEngine.uploadsEnabled = shouldRecord;
-    if (!shouldRecord && self.captureEngine.isRecording) {
+    self.captureEngine.uploadsEnabled = shouldRecordVideo;
+    if (!shouldRecordVideo && self.captureEngine.isRecording) {
+      // Stop video capture pipeline to save resources, but keep session alive
       [self.captureEngine stopSession];
     }
   }
 
   if (didDecideSample && self.recordingEnabledByConfig &&
       !self.sessionSampled) {
-    RJLogWarning(@"Session skipped by sample rate (%ld%%)", (long)clampedRate);
+    RJLogInfo(@"Session sampled out for video (%ld%%) - entering Data-Only "
+              @"Mode (Events enabled, Video disabled)",
+              (long)clampedRate);
   }
 
-  return shouldRecord;
+  return shouldRecordVideo;
 }
 
 - (void)ensureFullyInitialized {
@@ -676,10 +687,7 @@ RCT_EXPORT_METHOD(stopSession : (RCTPromiseResolveBlock)
 
       NSString *sessionId = self.currentSessionId ?: @"";
 
-      // CRITICAL: Compute background time at the moment we end the session.
-      // When a session ends while the app is in background (e.g. max duration),
-      // we must include the ongoing background duration, otherwise the backend
-      // will think the entire wall-clock session duration is playable.
+    
       NSTimeInterval totalBgTimeMs = 0;
       if (self.lifecycleManager) {
         totalBgTimeMs = self.lifecycleManager.totalBackgroundTimeMs;
@@ -1037,7 +1045,7 @@ RCT_EXPORT_METHOD(getUserIdentity : (RCTPromiseResolveBlock)
   if ([gestureType hasPrefix:@"scroll"]) {
     static NSTimeInterval lastScrollLogTime = 0;
     NSTimeInterval now = CACurrentMediaTime();
-    if (now - lastScrollLogTime < 0.5) { 
+    if (now - lastScrollLogTime < 0.5) {
       return;
     }
     lastScrollLogTime = now;
@@ -1125,7 +1133,7 @@ RCT_EXPORT_METHOD(getUserIdentity : (RCTPromiseResolveBlock)
       registerDeviceWithProjectKey:publicKey
                           bundleId:bundleId
                           platform:@"ios"
-                        sdkVersion:@"1.0.0"
+                        sdkVersion:RJSDKVersion
                             apiUrl:apiUrl
                         completion:^(BOOL success, NSString *credId,
                                      NSError *error) {
@@ -1329,12 +1337,10 @@ RCT_EXPORT_METHOD(getUserIdentity : (RCTPromiseResolveBlock)
       return;
     }
 
-    // Handle security errors (403 = forbidden/mismatch, 404 = not found)
     if ((error.code == 403 || error.code == 404) &&
         [error.domain isEqualToString:@"RJDeviceAuth"]) {
 
       if (!isRetry) {
-        // First failure - try re-registration
         RJLogDebug(@"Device auth invalid (%ld), attempting re-registration...",
                    (long)error.code);
         NSString *bundleId =
@@ -1345,7 +1351,7 @@ RCT_EXPORT_METHOD(getUserIdentity : (RCTPromiseResolveBlock)
             registerDeviceWithProjectKey:publicKey
                                 bundleId:bundleId
                                 platform:@"ios"
-                              sdkVersion:@"1.0.0"
+                              sdkVersion:RJSDKVersion
                                   apiUrl:apiUrl
                               completion:^(BOOL retrySuccess, NSString *credId,
                                            NSError *retryError) {
@@ -2112,7 +2118,7 @@ RCT_EXPORT_METHOD(getUserIdentity : (RCTPromiseResolveBlock)
     }
 
     if (self.captureEngine) {
-      
+
       RJLogInfo(@"[RJ-TERMINATE] Stopping capture engine synchronously");
       [self.captureEngine stopSessionSync];
       RJLogInfo(@"[RJ-TERMINATE] Capture engine stopped");
@@ -2146,9 +2152,9 @@ RCT_EXPORT_METHOD(getUserIdentity : (RCTPromiseResolveBlock)
 
     if (self.uploadManager && events.count > 0) {
       @try {
-        [self.uploadManager synchronousUploadWithEvents:events ?: @[]];
+        [self.uploadManager persistTerminationEvents:events ?: @[]];
       } @catch (NSException *e) {
-        RJLogWarning(@"Terminate upload failed: %@", e);
+        RJLogWarning(@"Terminate persistence failed: %@", e);
       }
     }
   } @catch (NSException *exception) {
@@ -2212,13 +2218,6 @@ RCT_EXPORT_METHOD(getUserIdentity : (RCTPromiseResolveBlock)
   [self handleSessionTimeout:backgroundDuration currentTime:currentTime];
 }
 
-
-/// 1. Capture final background time from lifecycle manager
-/// 2. Stop timers and capture engine for old session
-/// 3. Synchronously end the old session with correct background time
-/// 4. Create new session ID and reset all state
-/// 5. Start capture for new session
-/// 6. Trigger immediate upload to register new session
 - (void)handleSessionTimeout:(NSTimeInterval)backgroundDuration
                  currentTime:(NSTimeInterval)currentTime {
   RJLogInfo(
@@ -2232,8 +2231,6 @@ RCT_EXPORT_METHOD(getUserIdentity : (RCTPromiseResolveBlock)
     RJLogInfo(@"[RJ-SESSION-TIMEOUT] === ENDING OLD SESSION: %@ ===",
               oldSessionId);
 
-    // ========== STEP 1: Capture background time BEFORE any state changes
-    // ==========
     NSTimeInterval totalBackgroundMs = 0;
     if (self.lifecycleManager) {
       totalBackgroundMs = self.lifecycleManager.totalBackgroundTimeMs;
@@ -2242,7 +2239,6 @@ RCT_EXPORT_METHOD(getUserIdentity : (RCTPromiseResolveBlock)
           totalBackgroundMs);
     }
 
-    // ========== STEP 2: Stop all capture/timers for old session ==========
     [self stopBatchUploadTimer];
     [self stopDurationLimitTimer];
 
@@ -2255,14 +2251,10 @@ RCT_EXPORT_METHOD(getUserIdentity : (RCTPromiseResolveBlock)
       }
     }
 
-    // ========== STEP 3: End old session SYNCHRONOUSLY with correct background
-    // time ==========
     if (wasRecording && self.uploadManager && oldSessionId.length > 0 &&
         ![oldSessionId isEqualToString:@"none"]) {
-      // Set background time on upload manager
       self.uploadManager.totalBackgroundTimeMs = totalBackgroundMs;
 
-      // Get current events for final upload
       __block NSArray<NSDictionary *> *finalEvents = nil;
       [self performStateSync:^{
         finalEvents = [self.sessionEvents copy];
@@ -2272,7 +2264,6 @@ RCT_EXPORT_METHOD(getUserIdentity : (RCTPromiseResolveBlock)
                 @"bgTime=%.0fms",
                 (unsigned long)finalEvents.count, totalBackgroundMs);
 
-      // Synchronous upload and session end
       if (finalEvents.count > 0) {
         [self.uploadManager synchronousUploadWithEvents:finalEvents];
       } else {
@@ -2282,7 +2273,6 @@ RCT_EXPORT_METHOD(getUserIdentity : (RCTPromiseResolveBlock)
       RJLogInfo(@"[RJ-SESSION-TIMEOUT] Old session %@ ended", oldSessionId);
     }
 
-    // ========== STEP 4: Reset ALL state for new session ==========
     RJLogInfo(@"[RJ-SESSION-TIMEOUT] === STARTING NEW SESSION ===");
 
     __block NSString *newSessionId = nil;
@@ -2336,7 +2326,6 @@ RCT_EXPORT_METHOD(getUserIdentity : (RCTPromiseResolveBlock)
     self.eventBuffer = [[RJEventBuffer alloc] initWithSessionId:newSessionId
                                                 pendingRootPath:pendingPath];
 
-    // ========== STEP 5: Start capture for new session ==========
     [self resetSamplingDecision];
     self.remoteRecordingEnabled = self.recordingEnabledByConfig;
     if (self.captureEngine) {
@@ -2367,8 +2356,6 @@ RCT_EXPORT_METHOD(getUserIdentity : (RCTPromiseResolveBlock)
     [self startBatchUploadTimer];
     [self startDurationLimitTimer];
 
-    // ========== STEP 6: Log session_start and trigger immediate upload
-    // ==========
     NSMutableDictionary *sessionStartEvent = [NSMutableDictionary dictionary];
     sessionStartEvent[@"type"] = RJEventTypeSessionStart;
     sessionStartEvent[@"timestamp"] = @([RJWindowUtils currentTimestampMillis]);

package/ios/Network/RJDeviceAuthManager.m

@@ -857,10 +857,8 @@ static const NSInteger RJ_AUTH_MAX_CONSECUTIVE_FAILURES = 10;
     return;
   }
   
-  // Check cooldown after consecutive failures to prevent flooding
   NSTimeInterval now = [[NSDate date] timeIntervalSince1970];
   if (self.consecutiveFailures > 0 && self.lastFailedRegistrationTime > 0) {
-    // Exponential backoff: 5s, 10s, 20s, 40s... up to 5 minutes
     NSTimeInterval cooldown = MIN(
       RJ_AUTH_COOLDOWN_BASE_SECONDS * pow(2, self.consecutiveFailures - 1),
       RJ_AUTH_COOLDOWN_MAX_SECONDS

package/ios/Network/RJUploadManager.h

@@ -180,6 +180,14 @@ NS_ASSUME_NONNULL_BEGIN
  */
 - (BOOL)synchronousUploadWithEvents:(NSArray<NSDictionary *> *)events;
 
+/**
+ * Persists events to disk for termination, skipping network upload.
+ * Use this in appWillTerminate to avoid watchdog kills.
+ *
+ * @param events Array of event dictionaries.
+ */
+- (void)persistTerminationEvents:(NSArray<NSDictionary *> *)events;
+
 /**
  * Uploads a crash report to the dashboard.
  *

package/ios/Network/RJUploadManager.m

@@ -67,6 +67,7 @@ static NSString *RJRedactedURLForLogFromString(NSString *urlString) {
 
 @interface RJUploadManager ()
 
+@property(nonatomic, assign) BOOL keyboardVisible;
 @property(nonatomic, strong) dispatch_queue_t uploadQueue;
 
 @property(nonatomic, strong, nullable) NSTimer *batchUploadTimer;
@@ -1820,6 +1821,50 @@ static NSString *RJRedactedURLForLogFromString(NSString *urlString) {
   return YES;
 }
 
+- (void)persistTerminationEvents:(NSArray<NSDictionary *> *)events {
+  if (events.count == 0 && self.sessionId.length == 0)
+    return;
+
+  self.eventBatchNumber += 1;
+  NSInteger currentBatch = self.eventBatchNumber;
+
+  RJLogInfo(@"[RJ-UPLOAD] persistTerminationEvents starting: sessionId=%@, "
+            @"batch=%ld, "
+            @"eventCount=%lu",
+            self.sessionId ?: @"<nil>", (long)currentBatch,
+            (unsigned long)events.count);
+
+  NSDictionary *payload = [self buildEventPayloadWithEvents:events
+                                                batchNumber:currentBatch
+                                                    isFinal:YES];
+  if (!payload)
+    return;
+
+  NSError *jsonError = nil;
+  NSData *jsonData = [NSJSONSerialization dataWithJSONObject:payload
+                                                     options:0
+                                                       error:&jsonError];
+  if (jsonError || !jsonData)
+    return;
+
+  NSError *gzipError = nil;
+  NSData *compressed = RJGzipData(jsonData, &gzipError);
+  if (gzipError || !compressed)
+    return;
+
+  [self persistPendingUploadWithContentType:@"events"
+                                batchNumber:currentBatch
+                                   keyframe:NO
+                                    gzipped:compressed
+                                 eventCount:events.count
+                                 frameCount:0];
+
+  [self markSessionActiveForRecovery];
+
+  RJLogInfo(@"[RJ-CHECKPOINT] Persisted termination events to disk, skipping "
+            @"sync upload");
+}
+
 - (BOOL)uploadEventsBatchSync:(NSArray<NSDictionary *> *)events
                       isFinal:(BOOL)isFinal {
   self.eventBatchNumber += 1;

package/ios/Privacy/RJPrivacyMask.m

@@ -280,28 +280,19 @@ static inline BOOL RJIsValidMaskFrame(CGRect frame) {
   }
 
   if (context) {
-    // PUSH context so high-level UIKit drawing (NSString drawAtPoint) works
     UIGraphicsPushContext(context);
 
-    // CRITICAL FIX: Flip coordinate system to match UIKit (Top-Left origin)
-    // CoreGraphics defaults to Bottom-Left origin, so without this flip,
-    // masking rects are drawn vertically mirrored (wrong place).
     CGContextTranslateCTM(context, 0, height);
     CGContextScaleCTM(context, 1.0, -1.0);
-
-    // Apply correct scale transform (Points -> Pixels)
     CGContextScaleCTM(context, safeScale, safeScale);
 
-    // If in background or privacy scan is unavailable, draw full overlay
     if (self.isInBackground || shouldMaskAll) {
-      // Create bounds in points (since we scaled the CTM)
       CGRect boundsPoints =
           CGRectMake(0, 0, width / safeScale, height / safeScale);
       [self drawBackgroundOverlayInContext:context
                                     bounds:boundsPoints
                                      scale:1.0];
     } else {
-      // Draw standard masks
       [self drawMasksWithScanResult:scanResult
                             context:context
                               bounds:CGRectMake(0, 0, width / safeScale,
@@ -332,9 +323,7 @@ static inline BOOL RJIsValidMaskFrame(CGRect frame) {
     self.lastFrameHadWebView = NO;
     self.lastFrameHadVideo = NO;
 
-    // Handle background state
     if (self.isInBackground) {
-      // Only draw background overlay if we have a method for it
       if ([self respondsToSelector:@selector
                 (drawBackgroundOverlayInContext:bounds:scale:)]) {
         [self drawBackgroundOverlayInContext:context bounds:bounds scale:scale];
@@ -342,7 +331,6 @@ static inline BOOL RJIsValidMaskFrame(CGRect frame) {
       return;
     }
 
-    // Early exit if nothing to mask - saves ~1-2ms per frame
     if (scanResult.textInputFrames.count == 0 &&
         scanResult.cameraFrames.count == 0 &&
         scanResult.webViewFrames.count == 0 &&
@@ -363,7 +351,7 @@ static inline BOOL RJIsValidMaskFrame(CGRect frame) {
       }
       [self drawBlurRectInContext:context
                             frame:frame
-                         maskType:0]; // 0 = TextInput
+                         maskType:0];
       self.lastFrameHadTextInput = YES;
     }
 
@@ -396,7 +384,7 @@ static inline BOOL RJIsValidMaskFrame(CGRect frame) {
         }
         [self drawBlurRectInContext:context
                               frame:frame
-                           maskType:2]; // 2 = WebView
+                           maskType:2];
         self.lastFrameHadWebView = YES;
       }
     }
@@ -415,7 +403,7 @@ static inline BOOL RJIsValidMaskFrame(CGRect frame) {
         }
         [self drawBlurRectInContext:context
                               frame:frame
-                           maskType:3]; // 3 = Video
+                           maskType:3];
         self.lastFrameHadVideo = YES;
       }
     }
@@ -427,17 +415,13 @@ static inline BOOL RJIsValidMaskFrame(CGRect frame) {
 - (void)drawBackgroundOverlayInContext:(CGContextRef)context
                                 bounds:(CGRect)bounds
                                  scale:(CGFloat)scale {
-  // Simple black overlay for backgrounding
   CGContextSetFillColorWithColor(context, [UIColor blackColor].CGColor);
   CGContextFillRect(context, bounds);
-
-  // Optional: Draw text or logo? Keeping it simple/fast.
 }
 
 - (void)drawBlurRectInContext:(CGContextRef)context
                         frame:(CGRect)frame
                      maskType:(NSInteger)maskType {
-  // Validate frame to prevent CoreGraphics NaN errors
   if (isnan(frame.origin.x) || isnan(frame.origin.y) ||
       isnan(frame.size.width) || isnan(frame.size.height) ||
       isinf(frame.origin.x) || isinf(frame.origin.y) ||
@@ -446,7 +430,6 @@ static inline BOOL RJIsValidMaskFrame(CGRect frame) {
     return;
   }
 
-  // Also skip zero or negative sized frames
   if (frame.size.width <= 0 || frame.size.height <= 0) {
     return;
   }
@@ -458,12 +441,11 @@ static inline BOOL RJIsValidMaskFrame(CGRect frame) {
                                  cornerRadius:self.blurCornerRadius];
 
   UIColor *blurColor;
-  if (maskType == 1 || maskType == 3) { // Camera / Video
+  if (maskType == 1 || maskType == 3) {
     blurColor = [UIColor colorWithRed:0.12 green:0.12 blue:0.15 alpha:1.0];
-  } else if (maskType == 2) { // WebView - Use same style as Camera as requested
+  } else if (maskType == 2) {
     blurColor = [UIColor colorWithRed:0.12 green:0.12 blue:0.15 alpha:1.0];
   } else {
-    // TextInput and others
     blurColor = [UIColor blackColor];
   }
 
@@ -480,7 +462,6 @@ static inline BOOL RJIsValidMaskFrame(CGRect frame) {
   if (maskType == 1) {
     [self drawCameraLabelInContext:context frame:frame];
   } else if (maskType == 2) {
-    // Reuse camera label style but with different text
     [self drawWebViewLabelInContext:context frame:frame];
   } else if (maskType == 3) {
     [self drawVideoLabelInContext:context frame:frame];
@@ -492,7 +473,6 @@ static inline BOOL RJIsValidMaskFrame(CGRect frame) {
 }
 
 - (void)drawCameraLabelInContext:(CGContextRef)context frame:(CGRect)frame {
-  // Skip if frame has invalid values
   if (isnan(frame.size.width) || isnan(frame.size.height) ||
       frame.size.width <= 0 || frame.size.height <= 0) {
     return;
@@ -501,7 +481,6 @@ static inline BOOL RJIsValidMaskFrame(CGRect frame) {
   CGFloat centerX = CGRectGetMidX(frame);
   CGFloat centerY = CGRectGetMidY(frame);
 
-  // Validate centers aren't NaN
   if (isnan(centerX) || isnan(centerY)) {
     return;
   }
@@ -524,7 +503,6 @@ static inline BOOL RJIsValidMaskFrame(CGRect frame) {
 }
 
 - (void)drawWebViewLabelInContext:(CGContextRef)context frame:(CGRect)frame {
-  // Skip if frame has invalid values
   if (isnan(frame.size.width) || isnan(frame.size.height) ||
       frame.size.width <= 0 || frame.size.height <= 0) {
     return;
@@ -533,7 +511,6 @@ static inline BOOL RJIsValidMaskFrame(CGRect frame) {
   CGFloat centerX = CGRectGetMidX(frame);
   CGFloat centerY = CGRectGetMidY(frame);
 
-  // Validate centers aren't NaN
   if (isnan(centerX) || isnan(centerY)) {
     return;
   }
@@ -586,7 +563,6 @@ static inline BOOL RJIsValidMaskFrame(CGRect frame) {
 }
 
 - (void)drawTextInputLabelInContext:(CGContextRef)context frame:(CGRect)frame {
-  // Skip if frame has invalid values
   if (isnan(frame.size.width) || isnan(frame.size.height) ||
       frame.size.width <= 0 || frame.size.height <= 0) {
     return;
@@ -595,7 +571,6 @@ static inline BOOL RJIsValidMaskFrame(CGRect frame) {
   CGFloat centerX = CGRectGetMidX(frame);
   CGFloat centerY = CGRectGetMidY(frame);
 
-  // Validate centers aren't NaN
   if (isnan(centerX) || isnan(centerY)) {
     return;
   }
@@ -664,7 +639,6 @@ static inline BOOL RJIsValidMaskFrame(CGRect frame) {
   if (isTextInput || isCamera || isWebView || isVideo || isManuallyMasked) {
     CGRect frameInWindow = [view convertRect:view.bounds toView:window];
 
-    // Sanitize NaN/Inf values from convertRect:toView:
     CGFloat x = (isnan(frameInWindow.origin.x) || isinf(frameInWindow.origin.x))
                     ? 0
                     : frameInWindow.origin.x;

package/ios/Rejourney.h

@@ -1,17 +1,3 @@
-//  Licensed under the Apache License, Version 2.0 (the "License");
-//  you may not use this file except in compliance with the License.
-//  You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-//  Copyright (c) 2026 Rejourney
-
 //
 //
 //  Rejourney.h

package/ios/Touch/RJTouchInterceptor.m

@@ -54,10 +54,10 @@ static void RJ_swizzled_sendEvent(id self, SEL _cmd, UIEvent *event) {
         static int swizzleSkipCount = 0;
         if (++swizzleSkipCount % 500 == 1) {
           RJLogInfo(@"[RJ-TOUCH-SWIZZLE] Touch not handled: interceptor=%@, "
-                @"isTrackingEnabled=%d (skipCount=%d)",
-                interceptor ? @"exists" : @"nil",
-                interceptor ? interceptor.isTrackingEnabled : -1,
-                swizzleSkipCount);
+                    @"isTrackingEnabled=%d (skipCount=%d)",
+                    interceptor ? @"exists" : @"nil",
+                    interceptor ? interceptor.isTrackingEnabled : -1,
+                    swizzleSkipCount);
         }
       }
     }
@@ -148,8 +148,8 @@ static const NSTimeInterval kCoalesceInterval = 0.050;
 
 - (void)enableGlobalTracking {
   RJLogInfo(@"[RJ-TOUCH-SETUP] enableGlobalTracking called, current "
-        @"isTrackingEnabled=%d",
-        self.isTrackingEnabled);
+            @"isTrackingEnabled=%d",
+            self.isTrackingEnabled);
   static dispatch_once_t onceToken;
   dispatch_once(&onceToken, ^{
     RJLogInfo(@"[RJ-TOUCH-SETUP] First-time setup - performing swizzle");
@@ -164,13 +164,14 @@ static const NSTimeInterval kCoalesceInterval = 0.050;
       _swizzlingPerformed = YES;
       self.isTrackingEnabled = YES;
       RJLogInfo(@"[RJ-TOUCH-SETUP] Swizzle complete, isTrackingEnabled=%d",
-            self.isTrackingEnabled);
+                self.isTrackingEnabled);
     } else {
       RJLogError(@"Failed to enable touch tracking - sendEvent: not found");
     }
   });
-  RJLogInfo(@"[RJ-TOUCH-SETUP] enableGlobalTracking finished, isTrackingEnabled=%d",
-        self.isTrackingEnabled);
+  RJLogInfo(
+      @"[RJ-TOUCH-SETUP] enableGlobalTracking finished, isTrackingEnabled=%d",
+      self.isTrackingEnabled);
 }
 
 #pragma mark - Touch Event Handling
@@ -181,7 +182,7 @@ static const NSTimeInterval kCoalesceInterval = 0.050;
     static int skipCount = 0;
     if (++skipCount % 100 == 1) {
       RJLogInfo(@"[RJ-TOUCH] Skipping touch: event=%@, isTrackingEnabled=%d",
-            event ? @"exists" : @"nil", self.isTrackingEnabled);
+                event ? @"exists" : @"nil", self.isTrackingEnabled);
     }
     return;
   }
@@ -205,7 +206,7 @@ static const NSTimeInterval kCoalesceInterval = 0.050;
       static int notRecordingCount = 0;
       if (++notRecordingCount % 100 == 1) {
         RJLogInfo(@"[RJ-TOUCH] Not recording, skipping touch (count=%d)",
-              notRecordingCount);
+                  notRecordingCount);
       }
       return;
     }
@@ -465,7 +466,11 @@ static const NSTimeInterval kCoalesceInterval = 0.050;
   @try {
 
     NSMutableDictionary<NSNumber *, NSArray *> *touchPathsCopy =
-        [self.touchPaths mutableCopy];
+        [NSMutableDictionary dictionaryWithCapacity:self.touchPaths.count];
+    [self.touchPaths enumerateKeysAndObjectsUsingBlock:^(
+                         NSNumber *key, NSMutableArray *obj, BOOL *stop) {
+      touchPathsCopy[key] = [obj copy];
+    }];
     NSTimeInterval duration = MAX(0, timestamp - self.touchStartTime);
     NSInteger touchCount = self.touchPaths.count;
     CGPoint startPoint = self.touchStartPoint;
@@ -753,7 +758,8 @@ static const NSTimeInterval kCoalesceInterval = 0.050;
             respondsToSelector:@selector
             (touchInterceptorDidRecognizeGesture:
                                          touches:duration:targetLabel:)]) {
-      RJLogInfo(@"[RJ-TOUCH] Calling delegate touchInterceptorDidRecognizeGesture");
+      RJLogInfo(
+          @"[RJ-TOUCH] Calling delegate touchInterceptorDidRecognizeGesture");
       [delegate
           touchInterceptorDidRecognizeGesture:gestureType ?: RJGestureTypeTap
                                       touches:touches ?: @[]
@@ -761,8 +767,8 @@ static const NSTimeInterval kCoalesceInterval = 0.050;
                                   targetLabel:targetLabel];
     } else {
       RJLogInfo(@"[RJ-TOUCH] Delegate missing or doesn't respond to selector: "
-            @"delegate=%@",
-            delegate);
+                @"delegate=%@",
+                delegate);
     }
   } @catch (NSException *exception) {
     RJLogWarning(@"Gesture notification failed: %@", exception);