@rejourneyco/react-native 1.0.1 → 1.0.3

package/ios/Capture/RJCaptureEngine.m

@@ -1155,9 +1155,6 @@ typedef struct {
   NSTimeInterval now = CACurrentMediaTime();
 
   if (self.pendingCapture) {
-    // If we have a pending capture, force it to resolve now.
-    // If the new request is High importance, we effectively "upgrade" the
-    // current cycle by ensuring it runs immediately.
     self.pendingCapture.deadline = now;
     [self attemptPendingCapture:self.pendingCapture fullScan:NO];
   }
@@ -1173,8 +1170,6 @@ typedef struct {
     grace = MIN(grace, 0.3);
   }
 
-  // High importance requests should have a shorter grace, forcing faster
-  // resolution
   if (isCritical) {
     grace = MIN(grace, 0.1);
   }
@@ -1731,7 +1726,6 @@ typedef struct {
   }
 
   if (self.internalPerformanceLevel == RJPerformanceLevelMinimal) {
-    // Minimal mode trades quality for speed
     CGContextSetInterpolationQuality(context, kCGInterpolationNone);
     CGContextSetShouldAntialias(context, false);
     CGContextSetAllowsAntialiasing(context, false);
@@ -1741,17 +1735,13 @@ typedef struct {
     CGContextSetAllowsAntialiasing(context, true);
   }
 
-  // Set up context transform (flip for UIKit coordinates)
   CGContextScaleCTM(context, contextScale, -contextScale);
   CGContextTranslateCTM(context, 0, -sizePoints.height);
 
-  // Optimization #9: Fast Memset Clear (White = 0xFF)
-  // Much faster than CGContextFillRect
   memset(baseAddress, 0xFF, bytesPerRow * height);
 
   UIGraphicsPushContext(context);
 
-  // ===== RENDERING: ALWAYS USE drawViewHierarchyInRect =====
   RJ_TIME_START_NAMED(render);
   BOOL didDraw = NO;
   @try {
@@ -1772,10 +1762,6 @@ typedef struct {
     return NULL;
   }
 
-  // Recalculate effective scale so consumers (PrivacyMask) know the real
-  // mapping Used by caller to pass to applyToPixelBuffer Note: we don't need to
-  // return it, caller has it.
-
   return pixelBuffer;
 }
 
@@ -1815,9 +1801,6 @@ typedef struct {
 }
 
 - (NSTimeInterval)currentTimestamp {
-  // Always use wall clock time for session timestamps
-  // CACurrentMediaTime optimization removed - it causes drift after
-  // background periods The ~1ms overhead is acceptable for 1fps capture
   return [[NSDate date] timeIntervalSince1970] * 1000.0;
 }
 
@@ -1829,8 +1812,6 @@ typedef struct {
                              endTime:(NSTimeInterval)endTime
                           frameCount:(NSInteger)frameCount {
 
-  // Ensure we are on our own encoding queue to protect hierarchySnapshots
-  // and maintain thread safety (callback comes from VideoEncoder queue)
   dispatch_async(self.encodingQueue, ^{
     RJLogDebug(@"CaptureEngine: videoEncoderDidFinishSegment: %@ (%ld frames, "
                @"%.1fs), sessionId=%@",
@@ -1872,9 +1853,6 @@ typedef struct {
 
     [self uploadCurrentHierarchySnapshots];
 
-    // NUCLEAR FIX: Do NOT call startSegmentWithSize here!
-    // The encoder's appendFrame method will auto-start a segment with the
-    // correct PIXEL dimensions when the next frame is captured.
     if (self.internalIsRecording && !self.isShuttingDown) {
       RJLogDebug(
           @"CaptureEngine: Segment finished, auto-start new on next frame");
@@ -1912,10 +1890,8 @@ typedef struct {
 
   RJLogInfo(@"CaptureEngine: Pausing video capture (sync=%d)", synchronous);
 
-  // Reset capture-in-progress flag immediately to prevent stuck state
   self.captureInProgress = NO;
 
-  // Invalidate timer synchronously if in sync mode
   if (synchronous) {
     [self teardownDisplayLink];
   } else {
@@ -1925,7 +1901,7 @@ typedef struct {
   }
 
   if (self.internalVideoEncoder) {
-    self.internalIsRecording = NO; // prevent any new frames from being enqueued
+    self.internalIsRecording = NO;
 
     if (synchronous) {
       void (^finishSync)(void) = ^{
@@ -1964,19 +1940,15 @@ typedef struct {
     return;
   }
 
-  // Set recording back to YES to allow captureVideoFrame to proceed
   self.internalIsRecording = YES;
 
   RJLogInfo(@"CaptureEngine: Resuming video capture");
 
-  // Reset capture state to ensure clean resumption
-  // These flags may have been left in an inconsistent state when going to
-  // background
   self.captureInProgress = NO;
-  self.lastIntentTime = 0; // Allow immediate capture on resume
+  self.lastIntentTime = 0;
 
   self.internalPerformanceLevel =
-      RJPerformanceLevelNormal; // Reset perf level on resume
+      RJPerformanceLevelNormal;
 
   self.pendingCapture = nil;
   self.pendingCaptureGeneration = 0;
@@ -1995,7 +1967,6 @@ typedef struct {
     if (window && self.internalVideoEncoder) {
       RJLogInfo(@"CaptureEngine: Resuming capture...");
 
-      // Use the optimized Display Link
       [self setupDisplayLink];
 
     } else {
@@ -2012,14 +1983,12 @@ typedef struct {
   if (!self.internalIsRecording)
     return;
 
-  // Force update if screen changed
   if (![screenName isEqualToString:self.currentScreenName]) {
     NSTimeInterval now = CACurrentMediaTime();
     self.currentScreenName = screenName;
     RJLogDebug(@"Navigation to screen: %@ (forcing layout refresh)",
                screenName);
 
-    // Force layout change detection on next frame
     [self.captureHeuristics invalidateSignature];
     [self.captureHeuristics recordNavigationEventAtTime:now];
     self.lastSerializedSignature = nil;

package/ios/Capture/RJVideoEncoder.m

@@ -520,16 +520,7 @@
 }
 
 - (void)cleanup {
-  // Only cancel the current in-progress segment, don't delete the entire temp
-  // directory. Completed segments may still be uploading and must not be
-  // deleted here. The RJSegmentUploader handles file cleanup after successful
-  // upload.
   [self cancelSegment];
-
-  // NOTE: Do NOT delete rj_segments directory here!
-  // Other segments may be in the middle of uploading.
-  // Old orphaned segments are cleaned up by
-  // RJSegmentUploader.cleanupOrphanedSegments()
 }
 
 #pragma mark - Private Methods
@@ -561,14 +552,9 @@
   size_t width = (size_t)self.currentFrameSize.width;
   size_t height = (size_t)self.currentFrameSize.height;
 
-  // CRITICAL FIX: Validate incoming image dimensions match expected size
-  // During keyboard/rotation transitions, image size may temporarily differ
-  // from currentFrameSize, causing CGBitmapContextCreate bytesPerRow mismatch
   size_t imageWidth = CGImageGetWidth(cgImage);
   size_t imageHeight = CGImageGetHeight(cgImage);
 
-  // Allow small variance (1-2 pixels) due to rounding, but reject major
-  // mismatches
   if (labs((long)imageWidth - (long)width) > 2 ||
       labs((long)imageHeight - (long)height) > 2) {
     RJLogDebug(@"Video encoder: Skipping frame - size mismatch (got %zux%zu, "
@@ -639,9 +625,6 @@
     colorSpace = CGColorSpaceCreateDeviceRGB();
   }
 
-  // CRITICAL: Validate bytesPerRow is sufficient for the target width
-  // Error "CGBitmapContextCreate: invalid data bytes/row" occurs when
-  // bytesPerRow < width * 4 (4 bytes per pixel for BGRA)
   size_t requiredBytesPerRow = width * 4;
   if (bytesPerRow < requiredBytesPerRow) {
     CVPixelBufferUnlockBaseAddress(pixelBuffer, 0);
@@ -663,7 +646,6 @@
     return NULL;
   }
 
-  // Use fastest interpolation for pixel buffer drawing
   CGContextSetInterpolationQuality(context, kCGInterpolationNone);
   CGContextDrawImage(context, CGRectMake(0, 0, width, height), cgImage);
   CGContextRelease(context);
@@ -681,14 +663,10 @@
 }
 
 - (void)prewarmPixelBufferPool {
-  // Pre-warm the VideoToolbox H.264 encoder by creating a minimal AVAssetWriter
-  // and encoding a single dummy frame. This eliminates the ~1.5s spike on first
-  // real frame encode by front-loading the hardware encoder initialization.
   dispatch_async(self.encodingQueue, ^{
     @autoreleasepool {
       NSTimeInterval startTime = CACurrentMediaTime();
 
-      // Use a small size for fast prewarm (H.264 requires even dimensions)
       CGSize warmupSize = CGSizeMake(100, 100);
 
       // Create temp file for dummy segment
@@ -808,15 +786,12 @@ static dispatch_once_t sPrewarmOnceToken;
       return;
     sEncoderPrewarmed = YES;
 
-    // Run prewarm on a low-priority background queue
     dispatch_async(dispatch_get_global_queue(QOS_CLASS_UTILITY, 0), ^{
       @autoreleasepool {
         NSTimeInterval startTime = CACurrentMediaTime();
 
-        // Use a small size for fast prewarm (H.264 requires even dimensions)
         CGSize warmupSize = CGSizeMake(100, 100);
 
-        // Create temp file for dummy segment
         NSURL *tempDir = [NSURL fileURLWithPath:NSTemporaryDirectory()];
         NSURL *warmupURL =
             [tempDir URLByAppendingPathComponent:@"rj_encoder_prewarm.mp4"];
@@ -873,7 +848,6 @@ static dispatch_once_t sPrewarmOnceToken;
 
         [warmupWriter startSessionAtSourceTime:kCMTimeZero];
 
-        // Create and encode a single dummy frame to trigger H.264 encoder init
         CVPixelBufferRef dummyBuffer = NULL;
         NSDictionary *pixelBufferOpts = @{
           (id)kCVPixelBufferCGImageCompatibilityKey : @YES,

package/ios/Capture/RJViewHierarchyScanner.m

@@ -152,8 +152,10 @@ static inline uint64_t fnv1a_u64(uint64_t h, const void *data, size_t len) {
 @property(nonatomic, strong) NSMutableArray<NSValue *> *mutableVideoFrames;
 @property(nonatomic, strong) NSMutableArray<NSValue *> *mutableMapViewFrames;
 @property(nonatomic, strong) NSMutableArray<NSValue *> *mutableMapViewPointers;
-@property(nonatomic, strong) NSMutableArray<NSValue *> *mutableScrollViewPointers;
-@property(nonatomic, strong) NSMutableArray<NSValue *> *mutableAnimatedViewPointers;
+@property(nonatomic, strong)
+    NSMutableArray<NSValue *> *mutableScrollViewPointers;
+@property(nonatomic, strong)
+    NSMutableArray<NSValue *> *mutableAnimatedViewPointers;
 
 @property(nonatomic, strong) NSMapTable<Class, NSString *> *classNameCache;
 
@@ -251,11 +253,14 @@ static inline uint64_t fnv1a_u64(uint64_t h, const void *data, size_t len) {
     // because map tiles load asynchronously and layout signature doesn't
     // capture them
     _mapViewClasses = [NSSet setWithArray:@[
-      @"MKMapView",  // Apple Maps
-      @"AIRMap",     // react-native-maps (iOS)
-      @"AIRMapView", // react-native-maps alternate
-      @"RNMMapView", // react-native-maps newer versions
-      @"GMSMapView", // Google Maps SDK
+      @"MKMapView",     // Apple Maps
+      @"AIRMap",        // react-native-maps (iOS)
+      @"AIRMapView",    // react-native-maps alternate
+      @"RNMMapView",    // react-native-maps newer versions
+      @"GMSMapView",    // Google Maps SDK
+      @"MGLMapView",    // Mapbox GL Native (< v10)
+      @"RCTMGLMapView", // React Native Mapbox wrapper
+      @"MapboxMapView", // Mapbox Maps SDK (v10+)
     ]];
 
     _layoutSignatureHash = 14695981039346656037ULL;
@@ -331,7 +336,8 @@ static inline uint64_t fnv1a_u64(uint64_t h, const void *data, size_t len) {
     BOOL needsPrivacyFallback =
         (self.config.detectTextInputs &&
          self.mutableTextInputFrames.count == 0) ||
-        (self.config.detectCameraViews && self.mutableCameraFrames.count == 0) ||
+        (self.config.detectCameraViews &&
+         self.mutableCameraFrames.count == 0) ||
         (self.config.detectWebViews && self.mutableWebViewFrames.count == 0) ||
         (self.config.detectVideoLayers && self.mutableVideoFrames.count == 0);
     if (needsPrivacyFallback && (hitViewLimit || self.didBailOutEarly)) {
@@ -358,9 +364,7 @@ static inline uint64_t fnv1a_u64(uint64_t h, const void *data, size_t len) {
     result.hasAnyAnimations = self.scanHasAnimations;
     CGFloat screenArea = window.bounds.size.width * window.bounds.size.height;
     result.animationAreaRatio =
-        (screenArea > 0)
-            ? MIN(self.scanAnimatedArea / screenArea, 1.0)
-            : 0.0;
+        (screenArea > 0) ? MIN(self.scanAnimatedArea / screenArea, 1.0) : 0.0;
     result.didBailOutEarly = self.didBailOutEarly;
 
     if (self.layoutSignatureHash != 14695981039346656037ULL) {
@@ -498,9 +502,9 @@ static inline uint64_t fnv1a_u64(uint64_t h, const void *data, size_t len) {
            self.mutableTextInputFrames.count == 0) ||
           (self.config.detectCameraViews &&
            self.mutableCameraFrames.count == 0) ||
-          (self.config.detectWebViews && self.mutableWebViewFrames.count == 0) ||
-          (self.config.detectVideoLayers &&
-           self.mutableVideoFrames.count == 0);
+          (self.config.detectWebViews &&
+           self.mutableWebViewFrames.count == 0) ||
+          (self.config.detectVideoLayers && self.mutableVideoFrames.count == 0);
       if (needsPrivacyFallback && hitViewLimit) {
         [self scanSensitiveViewsOnlyInWindow:window];
       }
@@ -511,7 +515,8 @@ static inline uint64_t fnv1a_u64(uint64_t h, const void *data, size_t len) {
     BOOL needsPrivacyFallback =
         (self.config.detectTextInputs &&
          self.mutableTextInputFrames.count == 0) ||
-        (self.config.detectCameraViews && self.mutableCameraFrames.count == 0) ||
+        (self.config.detectCameraViews &&
+         self.mutableCameraFrames.count == 0) ||
         (self.config.detectWebViews && self.mutableWebViewFrames.count == 0) ||
         (self.config.detectVideoLayers && self.mutableVideoFrames.count == 0);
     if (needsPrivacyFallback && self.didBailOutEarly) {
@@ -542,9 +547,7 @@ static inline uint64_t fnv1a_u64(uint64_t h, const void *data, size_t len) {
     CGFloat screenArea =
         primaryWindow.bounds.size.width * primaryWindow.bounds.size.height;
     result.animationAreaRatio =
-        (screenArea > 0)
-            ? MIN(self.scanAnimatedArea / screenArea, 1.0)
-            : 0.0;
+        (screenArea > 0) ? MIN(self.scanAnimatedArea / screenArea, 1.0) : 0.0;
     result.didBailOutEarly = self.didBailOutEarly;
 
     if (self.layoutSignatureHash != 14695981039346656037ULL) {
@@ -679,8 +682,10 @@ static inline uint64_t fnv1a_u64(uint64_t h, const void *data, size_t len) {
 
   @try {
     BOOL isWebView = self.config.detectWebViews && [self isWebView:view];
-    BOOL isCamera = self.config.detectCameraViews && [self isCameraPreview:view];
-    BOOL isVideo = self.config.detectVideoLayers && [self isVideoLayerView:view];
+    BOOL isCamera =
+        self.config.detectCameraViews && [self isCameraPreview:view];
+    BOOL isVideo =
+        self.config.detectVideoLayers && [self isVideoLayerView:view];
     BOOL isBlockedSurface = isWebView || isCamera || isVideo;
 
     [self checkSensitiveView:view inWindow:window];
@@ -762,10 +767,11 @@ static inline uint64_t fnv1a_u64(uint64_t h, const void *data, size_t len) {
       UIEdgeInsets inset = ((UIScrollView *)view).contentInset;
       [self mixInt:(int32_t)lrintf(isfinite(inset.top) ? inset.top * 100 : 0)];
       [self mixInt:(int32_t)lrintf(isfinite(inset.bottom) ? inset.bottom * 100
-                                                         : 0)];
-      [self mixInt:(int32_t)lrintf(isfinite(inset.left) ? inset.left * 100 : 0)];
+                                                          : 0)];
+      [self
+          mixInt:(int32_t)lrintf(isfinite(inset.left) ? inset.left * 100 : 0)];
       [self mixInt:(int32_t)lrintf(isfinite(inset.right) ? inset.right * 100
-                                                      : 0)];
+                                                         : 0)];
     }
 
     // 5. Mix Text Content (avoid input content; use length only)
@@ -840,7 +846,8 @@ static inline uint64_t fnv1a_u64(uint64_t h, const void *data, size_t len) {
   }
 }
 
-- (void)appendBlockedSurfaceInfoToSignature:(UIView *)view depth:(NSInteger)depth {
+- (void)appendBlockedSurfaceInfoToSignature:(UIView *)view
+                                      depth:(NSInteger)depth {
   if (!view) {
     return;
   }
@@ -998,18 +1005,18 @@ static inline uint64_t fnv1a_u64(uint64_t h, const void *data, size_t len) {
       }
 
 #ifdef DEBUG
-       RJLogDebug(@"ViewHierarchyScanner: Found %@ at (%.0f,%.0f,%.0f,%.0f) - "
-                  @"view.window=%@ targetWindow=%@",
-                  isTextInput
-                      ? @"TextInput"
-                      : (isCamera
-                             ? @"Camera"
-                             : (isWebView ? @"WebView"
-                                          : (isVideo ? @"Video" : @"MaskedView"))),
-                  sanitizedFrame.origin.x, sanitizedFrame.origin.y,
-                  sanitizedFrame.size.width, sanitizedFrame.size.height,
-                  NSStringFromClass([view.window class]),
-                 NSStringFromClass([targetWindow class]));
+      RJLogDebug(
+          @"ViewHierarchyScanner: Found %@ at (%.0f,%.0f,%.0f,%.0f) - "
+          @"view.window=%@ targetWindow=%@",
+          isTextInput
+              ? @"TextInput"
+              : (isCamera ? @"Camera"
+                          : (isWebView ? @"WebView"
+                                       : (isVideo ? @"Video" : @"MaskedView"))),
+          sanitizedFrame.origin.x, sanitizedFrame.origin.y,
+          sanitizedFrame.size.width, sanitizedFrame.size.height,
+          NSStringFromClass([view.window class]),
+          NSStringFromClass([targetWindow class]));
 #endif
     }
   }
@@ -1212,7 +1219,7 @@ static inline uint64_t fnv1a_u64(uint64_t h, const void *data, size_t len) {
 
   @try {
     if ([view respondsToSelector:@selector(isLoading)]) {
-      BOOL (*loadingMsg)(id, SEL) = (BOOL (*)(id, SEL))objc_msgSend;
+      BOOL (*loadingMsg)(id, SEL) = (BOOL(*)(id, SEL))objc_msgSend;
       return loadingMsg(view, @selector(isLoading));
     }
     id loadingValue = [view valueForKey:@"loading"];
@@ -1314,8 +1321,9 @@ static inline uint64_t fnv1a_u64(uint64_t h, const void *data, size_t len) {
 
   BOOL tracking = scrollView.isTracking || scrollView.isDragging ||
                   scrollView.isDecelerating;
-  BOOL offsetMoved = (fabs(offset.x - state.contentOffset.x) > kRJScrollEpsilon ||
-                      fabs(offset.y - state.contentOffset.y) > kRJScrollEpsilon);
+  BOOL offsetMoved =
+      (fabs(offset.x - state.contentOffset.x) > kRJScrollEpsilon ||
+       fabs(offset.y - state.contentOffset.y) > kRJScrollEpsilon);
   BOOL zoomMoved = fabs(zoomScale - state.zoomScale) > kRJZoomEpsilon;
   if (tracking || offsetMoved || zoomMoved) {
     self.scanScrollActive = YES;
@@ -1331,8 +1339,8 @@ static inline uint64_t fnv1a_u64(uint64_t h, const void *data, size_t len) {
   }
 
   if ([self isRefreshActiveForScrollView:scrollView
-                                 offset:offset
-                                  inset:inset]) {
+                                  offset:offset
+                                   inset:inset]) {
     self.scanRefreshActive = YES;
   }
 
@@ -1351,16 +1359,16 @@ static inline uint64_t fnv1a_u64(uint64_t h, const void *data, size_t len) {
   }
   CGFloat topLimit = -inset.top - kRJScrollEpsilon;
   CGFloat bottomLimit = scrollView.contentSize.height -
-                        scrollView.bounds.size.height +
-                        inset.bottom + kRJScrollEpsilon;
+                        scrollView.bounds.size.height + inset.bottom +
+                        kRJScrollEpsilon;
   if (offset.y < topLimit || offset.y > bottomLimit) {
     return YES;
   }
 
   CGFloat leftLimit = -inset.left - kRJScrollEpsilon;
   CGFloat rightLimit = scrollView.contentSize.width -
-                       scrollView.bounds.size.width +
-                       inset.right + kRJScrollEpsilon;
+                       scrollView.bounds.size.width + inset.right +
+                       kRJScrollEpsilon;
   return (offset.x < leftLimit || offset.x > rightLimit);
 }
 
@@ -1376,8 +1384,8 @@ static inline uint64_t fnv1a_u64(uint64_t h, const void *data, size_t len) {
     return YES;
   }
 
-  CGFloat triggerOffset = -scrollView.adjustedContentInset.top -
-                          kRJScrollEpsilon;
+  CGFloat triggerOffset =
+      -scrollView.adjustedContentInset.top - kRJScrollEpsilon;
   if (offset.y < triggerOffset) {
     return YES;
   }
@@ -1448,14 +1456,23 @@ static inline uint64_t fnv1a_u64(uint64_t h, const void *data, size_t len) {
     NSNumber *heading = [view valueForKeyPath:@"camera.heading"];
     NSNumber *pitch = [view valueForKeyPath:@"camera.pitch"];
 
+    // Mapbox uses zoomLevel instead of span
+    NSNumber *zoomLevel = nil;
+    @try {
+      zoomLevel = [view valueForKey:@"zoomLevel"];
+    } @catch (NSException *e) {
+    }
+
     double altitudeValue = altitude ? altitude.doubleValue : 0;
     double headingValue = heading ? heading.doubleValue : 0;
     double pitchValue = pitch ? pitch.doubleValue : 0;
+    double zoomValue = zoomLevel ? zoomLevel.doubleValue : 0;
 
-    return [NSString stringWithFormat:@"%.5f:%.5f:%.5f:%.5f:%.1f:%.1f:%.1f",
-                                      center.latitude, center.longitude,
-                                      span.latitudeDelta, span.longitudeDelta,
-                                      altitudeValue, headingValue, pitchValue];
+    return [NSString
+        stringWithFormat:@"%.5f:%.5f:%.5f:%.5f:%.1f:%.1f:%.1f:%.2f",
+                         center.latitude, center.longitude, span.latitudeDelta,
+                         span.longitudeDelta, altitudeValue, headingValue,
+                         pitchValue, zoomValue];
   } @catch (NSException *exception) {
     return @"";
   }

package/ios/Core/RJLifecycleManager.m

@@ -121,7 +121,6 @@
                  name:UIApplicationDidBecomeActiveNotification
                object:nil];
 
-  // Text change notifications
   [center addObserver:self
              selector:@selector(textDidChange:)
                  name:UITextFieldTextDidChangeNotification
@@ -220,8 +219,6 @@
   RJLogInfo(@"[RJ-LIFECYCLE] appDidEnterBackground (isRecording=%@)",
              self.isRecording ? @"YES" : @"NO");
 
-  // Always track background entry time, even if not recording
-  // This allows us to detect timeout when session was ended while in background
   self.inBackground = YES;
   self.backgroundEntryTime = [[NSDate date] timeIntervalSince1970];
 
@@ -257,13 +254,10 @@
     RJLogInfo(@"[RJ-LIFECYCLE] appDidBecomeActive - was NOT in background");
   }
   
-  // Reset background tracking state
   self.inBackground = NO;
   self.backgroundEntryTime = 0;
   
-  // Handle the case where we weren't recording (session already ended)
   if (!self.isRecording) {
-    // If we were in background long enough, signal that a new session should start
     if (wasInBackground && backgroundDurationSec >= self.backgroundTimeoutThreshold) {
       RJLogInfo(@"[RJ-LIFECYCLE] Was not recording, background >= %.0fs - signaling for new session start",
             self.backgroundTimeoutThreshold);
@@ -274,14 +268,10 @@
     return;
   }
 
-  // We ARE recording - handle background return
   if (wasInBackground) {
     NSTimeInterval bgDurationMs = backgroundDurationSec * 1000;
     
     if (backgroundDurationSec >= self.backgroundTimeoutThreshold) {
-      // TIMEOUT CASE: End old session, start new one
-      // Add this background duration to accumulated time BEFORE signaling timeout
-      // so the old session gets the correct total background time
       self.accumulatedBackgroundTimeMs += bgDurationMs;
       RJLogInfo(@"[RJ-LIFECYCLE] TIMEOUT: Added %.0fms, total background=%.0fms - signaling session restart",
             bgDurationMs, self.accumulatedBackgroundTimeMs);
@@ -289,17 +279,13 @@
       if ([self.delegate respondsToSelector:@selector(lifecycleManagerSessionDidTimeout:)]) {
         [self.delegate lifecycleManagerSessionDidTimeout:backgroundDurationSec];
       }
-      // Note: The delegate's handleSessionTimeout will read totalBackgroundTimeMs
-      // and then call resetBackgroundTime for the new session
     } else {
-      // SHORT BACKGROUND: Just accumulate and resume
       self.accumulatedBackgroundTimeMs += bgDurationMs;
       RJLogInfo(@"[RJ-LIFECYCLE] Short background: Added %.0fms, total=%.0fms - resuming session",
             bgDurationMs, self.accumulatedBackgroundTimeMs);
     }
   }
 
-  // Call didBecomeActive for normal resume handling (video capture, etc.)
   if ([self.delegate respondsToSelector:@selector(lifecycleManagerDidBecomeActive)]) {
     [self.delegate lifecycleManagerDidBecomeActive];
   }