@rejourneyco/react-native 1.0.2 → 1.0.3

package/android/src/main/java/com/rejourney/network/UploadWorker.kt

@@ -64,7 +64,6 @@ class UploadWorker(
                     TimeUnit.SECONDS
                 )
             
-            // For urgent uploads (app going to background), use expedited work
             if (expedited) {
                 workRequestBuilder.setExpedited(OutOfQuotaPolicy.RUN_AS_NON_EXPEDITED_WORK_REQUEST)
             }
@@ -107,13 +106,13 @@ class UploadWorker(
                     30,
                     TimeUnit.SECONDS
                 )
-                .setInitialDelay(2, TimeUnit.SECONDS) // Small delay to let app initialize
+                .setInitialDelay(2, TimeUnit.SECONDS)
                 .build()
             
             WorkManager.getInstance(context)
                 .enqueueUniqueWork(
                     RECOVERY_WORK_NAME,
-                    ExistingWorkPolicy.KEEP, // Don't replace if already running
+                    ExistingWorkPolicy.KEEP,
                     workRequest
                 )
             
@@ -146,7 +145,6 @@ class UploadWorker(
         
         try {
             if (isRecovery) {
-                // Recovery mode: process all pending sessions
                 val success = performRecoveryUpload()
                 return@withContext if (success) Result.success() else Result.retry()
             }
@@ -156,7 +154,6 @@ class UploadWorker(
                 return@withContext Result.failure()
             }
             
-            // Upload pending data for this specific session
             Logger.debug("[UploadWorker] ===== CALLING performSessionUpload =====")
             Logger.debug("[UploadWorker] About to upload session: $sessionId, isFinal=$isFinal")
             val success = performSessionUpload(sessionId, isFinal)
@@ -168,7 +165,6 @@ class UploadWorker(
                 Result.success()
             } else {
                 Logger.debug("[UploadWorker] ===== UPLOAD FAILED =====")
-                // Retry up to 5 times with exponential backoff
                 if (runAttemptCount < 5) {
                     Logger.warning("[UploadWorker] ⚠️ Upload failed, will retry (attempt $runAttemptCount)")
                     Result.retry()
@@ -178,13 +174,11 @@ class UploadWorker(
                 }
             }
         } catch (e: CancellationException) {
-            // WorkManager cancellation is expected, not an error
             Logger.debug("[UploadWorker] Work cancelled")
-            throw e // Re-throw to let WorkManager handle cancellation
+            throw e
         } catch (e: Exception) {
             Logger.error("[UploadWorker] Upload error", e)
             
-            // Retry on transient errors
             if (runAttemptCount < 5) {
                 Result.retry()
             } else {
@@ -201,14 +195,11 @@ class UploadWorker(
     private suspend fun performSessionUpload(sessionId: String, isFinal: Boolean): Boolean {
         Logger.debug("[UploadWorker] performSessionUpload START (sessionId=$sessionId, isFinal=$isFinal)")
         
-        // EventBuffer stores events in cache directory
         val eventBufferDir = File(appContext.cacheDir, "rj_pending/$sessionId")
-        // UploadManager stores session metadata in files directory
         val uploadManagerDir = File(appContext.filesDir, "rejourney/pending_uploads/$sessionId")
         
         Logger.debug("[UploadWorker] Checking directories: eventBufferDir=${eventBufferDir.exists()}, uploadManagerDir=${uploadManagerDir.exists()}")
         
-        // Read events from EventBuffer's disk storage
         val eventsFile = File(eventBufferDir, "events.jsonl")
         Logger.debug("[UploadWorker] ===== READING EVENTS FROM DISK =====")
         Logger.debug("[UploadWorker] Events file path: ${eventsFile.absolutePath}")
@@ -224,7 +215,7 @@ class UploadWorker(
             if (eventBufferDir.exists()) {
                 Logger.warning("[UploadWorker] EventBuffer directory contents: ${eventBufferDir.listFiles()?.map { it.name }?.joinToString(", ") ?: "empty"}")
             }
-            return true // Nothing to upload is success
+            return true
         }
         
         Logger.debug("[UploadWorker] Reading events from file...")
@@ -245,7 +236,6 @@ class UploadWorker(
         
         if (events.isEmpty()) {
             Logger.warning("[UploadWorker] ⚠️ No events to upload for session: $sessionId (file exists but is empty or unreadable)")
-            // Clean up empty events file
             eventsFile.delete()
             File(eventBufferDir, "buffer_meta.json").delete()
             if (eventBufferDir.listFiles()?.isEmpty() == true) {
@@ -256,25 +246,19 @@ class UploadWorker(
         
         Logger.debug("[UploadWorker] ===== FOUND ${events.size} EVENTS TO UPLOAD =====")
         
-        // CRITICAL FIX: Ensure valid auth token before attempting any upload!
-        // This was the root cause of silent upload failures - the token would be
-        // expired/missing and presign requests would fail silently.
         val authManager = DeviceAuthManager.getInstance(appContext)
         Logger.debug("[UploadWorker] Ensuring valid auth token before upload...")
         
         val tokenValid = authManager.ensureValidToken()
         if (!tokenValid) {
             Logger.error("[UploadWorker] FAILED to obtain valid auth token - upload will likely fail!")
-            // Continue anyway, the upload will fail but at least we'll get detailed error logs
         } else {
             Logger.debug("[UploadWorker] Auth token is valid, proceeding with upload")
         }
         
-        // Create upload manager for this upload (reads session metadata from uploadManagerDir)
         val uploadManager = createUploadManager(sessionId, uploadManagerDir)
         Logger.debug("[UploadWorker] UploadManager created (apiUrl=${uploadManager.apiUrl}, publicKey=${uploadManager.publicKey.take(8)}...)")
         
-        // Perform upload
         Logger.debug("[UploadWorker] ===== STARTING EVENT UPLOAD =====")
         Logger.debug("[UploadWorker] Calling uploadBatch for ${events.size} events (isFinal=$isFinal, sessionId=$sessionId)")
         val uploadStartTime = System.currentTimeMillis()
@@ -284,28 +268,23 @@ class UploadWorker(
         
         if (uploadSuccess) {
             Logger.debug("[UploadWorker] Upload SUCCESS - cleaning up local files")
-            // Clear the events file after successful upload
             eventsFile.delete()
             File(eventBufferDir, "buffer_meta.json").delete()
             
-            // Clean up EventBuffer directory if empty
             if (eventBufferDir.listFiles()?.isEmpty() == true) {
                 eventBufferDir.delete()
             }
             
-            // If final upload, send session end
             if (isFinal) {
                 Logger.debug("[UploadWorker] Sending session end signal...")
                 val endSuccess = uploadManager.endSession()
                 Logger.debug("[UploadWorker] Session end signal: ${if (endSuccess) "SUCCESS" else "FAILED"}")
-                // Clean up UploadManager directory
                 uploadManagerDir.deleteRecursively()
             }
         } else {
             Logger.error("[UploadWorker] Upload FAILED for session $sessionId - will retry")
         }
         
-        // Video Recovery: Check for crash segment
         checkAndUploadCrashSegment(uploadManager, sessionId)
 
         return uploadSuccess
@@ -324,7 +303,6 @@ class UploadWorker(
             val metaJson = JSONObject(metaFile.readText())
             val metaSessionId = metaJson.optString("sessionId")
             
-            // Only process if it matches our session
             if (metaSessionId != sessionId) return
             
             Logger.debug("[UploadWorker] Found pending crash segment for session $sessionId")
@@ -346,7 +324,6 @@ class UploadWorker(
                 
                 if (success) {
                     Logger.debug("[UploadWorker] Crash segment recovered successfully")
-                    // Delete metadata and file
                     metaFile.delete()
                     segmentFile.delete()
                 } else {
@@ -354,7 +331,7 @@ class UploadWorker(
                 }
             } else {
                 Logger.warning("[UploadWorker] Crash segment file missing or empty: $segmentPath")
-                metaFile.delete() // Clean up invalid metadata
+                metaFile.delete()
             }
         } catch (e: Exception) {
             Logger.error("[UploadWorker] Error processing crash segment", e)
@@ -366,20 +343,15 @@ class UploadWorker(
      * Scans both the EventBuffer cache directory and UploadManager pending directory.
      */
     private suspend fun performRecoveryUpload(): Boolean {
-        // EventBuffer stores events in cache directory
         val eventBufferRootDir = File(appContext.cacheDir, "rj_pending")
-        // UploadManager stores session metadata in files directory
         val uploadManagerRootDir = File(appContext.filesDir, "rejourney/pending_uploads")
         
-        // Collect all session IDs from both locations
         val sessionIds = mutableSetOf<String>()
         
-        // Get sessions from EventBuffer directory (has events.jsonl)
         eventBufferRootDir.listFiles()?.filter { it.isDirectory }?.forEach { 
             sessionIds.add(it.name) 
         }
         
-        // Get sessions from UploadManager directory (has session.json metadata)
         uploadManagerRootDir.listFiles()?.filter { it.isDirectory }?.forEach { 
             sessionIds.add(it.name) 
         }
@@ -398,7 +370,6 @@ class UploadWorker(
             
             Logger.debug("[UploadWorker] Checking session for recovery: $sessionId")
             
-            // Skip current active session (marked by session.json with recent timestamp)
             val sessionMetaFile = File(uploadManagerRootDir, "$sessionId/session.json")
             if (sessionMetaFile.exists()) {
                 try {
@@ -406,14 +377,11 @@ class UploadWorker(
                     val updatedAt = meta.optLong("updatedAt", 0)
                     val age = System.currentTimeMillis() - updatedAt
                     
-                    // Skip if session was active less than 60 seconds ago
-                    // (likely current active session)
                     if (age < 60_000) {
                         Logger.debug("[UploadWorker] Skipping recent session: $sessionId (age=${age}ms)")
                         continue
                     }
                 } catch (e: Exception) {
-                    // Continue with recovery
                 }
             }
             
@@ -444,7 +412,6 @@ class UploadWorker(
                             }
                             events.add(map)
                         } catch (e: Exception) {
-                            // Skip malformed lines
                         }
                     }
                 }
@@ -460,7 +427,6 @@ class UploadWorker(
      * Create an UploadManager configured for the given session.
      */
     private fun createUploadManager(sessionId: String, sessionDir: File): UploadManager {
-        // Read session metadata
         val sessionMetaFile = File(sessionDir, "session.json")
         var sessionStartTime = System.currentTimeMillis()
         var totalBackgroundTimeMs = 0L
@@ -471,11 +437,9 @@ class UploadWorker(
                 sessionStartTime = meta.optLong("sessionStartTime", sessionStartTime)
                 totalBackgroundTimeMs = meta.optLong("totalBackgroundTimeMs", 0)
             } catch (e: Exception) {
-                // Use defaults
             }
         }
         
-        // Get auth details from DeviceAuthManager
         val authManager = DeviceAuthManager.getInstance(appContext)
         val publicKey = authManager.getCurrentPublicKey() ?: ""
         val deviceHash = authManager.getCurrentDeviceHash() ?: ""

package/android/src/main/java/com/rejourney/privacy/PrivacyMask.kt

@@ -30,19 +30,18 @@ object PrivacyMask {
     var maskVideoLayers: Boolean = true
     
     private val maskPaint = Paint().apply {
-        color = Color.BLACK // Solid black mask
+        color = Color.BLACK
         style = Paint.Style.FILL
     }
     
     private val textPaint = Paint().apply {
         color = Color.WHITE
-        textSize = 32f // Visible size on standard density
+        textSize = 32f
         textAlign = Paint.Align.CENTER
         typeface = Typeface.DEFAULT_BOLD
         isAntiAlias = true
     }
 
-    // Set of nativeIDs that should be manually masked
     private val maskedNativeIDs = mutableSetOf<String>()
 
     /**
@@ -90,16 +89,13 @@ object PrivacyMask {
         if (sensitiveRects.isEmpty()) return bitmap
 
         return try {
-            // Create mutable copy if needed - use ARGB_8888 as fallback if config is null
             val config = bitmap.config ?: Bitmap.Config.ARGB_8888
             val mutableBitmap = if (bitmap.isMutable) bitmap else bitmap.copy(config, true)
             val canvas = Canvas(mutableBitmap)
             
-            // Calculate scale factor
             val scaleX = mutableBitmap.width.toFloat() / rootWidth
             val scaleY = mutableBitmap.height.toFloat() / rootHeight
             
-            // Draw masks over sensitive areas
             for (rect in sensitiveRects) {
                 val scaledRect = Rect(
                     (rect.left * scaleX).toInt(),
@@ -109,9 +105,7 @@ object PrivacyMask {
                 )
                 canvas.drawRect(scaledRect, maskPaint)
                 
-                // Draw stars centered
                 val centerX = scaledRect.centerX().toFloat()
-                // Approximated vertical centering
                 val centerY = scaledRect.centerY().toFloat() + (textPaint.textSize / 3) 
                 canvas.drawText("********", centerX, centerY, textPaint)
             }
@@ -130,9 +124,6 @@ object PrivacyMask {
     fun findSensitiveRects(rootView: View): List<Rect> {
         val rects = mutableListOf<Rect>()
 
-        // IMPORTANT: The capture bitmap is in the Activity window/decorView coordinate space,
-        // but View.getLocationOnScreen() returns absolute screen coordinates.
-        // Convert to coordinates relative to the provided rootView to ensure masks land correctly.
         val rootLocationOnScreen = IntArray(2)
         rootView.getLocationOnScreen(rootLocationOnScreen)
 
@@ -144,9 +135,6 @@ object PrivacyMask {
             rootHeight = rootView.height
         )
 
-        // Fail-closed fallback: if the scan returns nothing but there is a focused sensitive view,
-        // at least mask that focused view. This protects against edge cases where parts of the
-        // hierarchy are not reachable (e.g., some dialog/modal roots) or transient layout states.
         if (rects.isEmpty()) {
             try {
                 val focused = rootView.findFocus()
@@ -174,7 +162,6 @@ object PrivacyMask {
                     }
                 }
             } catch (e: Exception) {
-                // Best-effort only
             }
         }
         return rects
@@ -184,12 +171,6 @@ object PrivacyMask {
      * Find all sensitive views across ALL visible windows.
      * This includes the main Activity window plus any dialogs, modals, or popup windows.
      * 
-     * CRITICAL: React Native modals/sheets may create views in separate windows
-     * that are not children of the main decorView. This method scans all windows
-     * to ensure text inputs in modals are properly masked.
-     * 
-     * Must be run on Main Thread.
-     * 
      * @param activity The current Activity (to access window and system windows)
      * @param primaryRootView The primary decorView for coordinate reference
      * @return List of sensitive view rects in primaryRootView coordinate space
@@ -199,12 +180,10 @@ object PrivacyMask {
         val scannedViews = mutableSetOf<View>()
         var didBailOutEarly = false
         
-        // Get primary window location for coordinate conversion
         val primaryLocationOnScreen = IntArray(2)
         primaryRootView.getLocationOnScreen(primaryLocationOnScreen)
         
         try {
-            // 1. Scan the primary decorView (main window)
             findSensitiveViewsRecursive(
                 view = primaryRootView,
                 rects = rects,
@@ -214,8 +193,6 @@ object PrivacyMask {
             )
             scannedViews.add(primaryRootView)
             
-            // 2. Access all visible windows using reflection on WindowManager
-            // This catches Dialogs, PopupWindows, and React Native modals
             val additionalWindows = getAllVisibleWindowRoots(activity)
             
             for (windowRoot in additionalWindows) {
@@ -226,8 +203,6 @@ object PrivacyMask {
                 
                 scannedViews.add(windowRoot)
                 
-                // Scan this window for sensitive views
-                // Convert coordinates relative to the primary window for proper masking
                 val hitLimit = findSensitiveViewsInWindowRelativeTo(
                     windowRoot = windowRoot,
                     rects = rects,
@@ -245,14 +220,11 @@ object PrivacyMask {
             
         } catch (e: Exception) {
             Logger.warning("PrivacyMask: Multi-window scan failed: ${e.message}")
-            // Fall back to single-window scan if multi-window fails
             if (rects.isEmpty()) {
                 return findSensitiveRects(primaryRootView)
             }
         }
         
-        // If we bailed out early and found nothing, do a targeted fallback
-        // with a higher per-window budget to avoid missing inputs on complex screens.
         if (rects.isEmpty() && didBailOutEarly) {
             try {
                 for (windowRoot in getAllVisibleWindowRoots(activity)) {
@@ -271,14 +243,11 @@ object PrivacyMask {
                     Logger.warning("PrivacyMask: Fallback scan recovered ${rects.size} sensitive views after early bailout")
                 }
             } catch (_: Exception) {
-                // Best-effort only
             }
         }
 
-        // Fail-closed fallback for focused view
         if (rects.isEmpty()) {
             try {
-                // Check focused view across all windows
                 val focusedView = activity.currentFocus
                 if (focusedView != null && focusedView.isShown && isSensitiveView(focusedView) &&
                     focusedView.width > 0 && focusedView.height > 0
@@ -304,7 +273,6 @@ object PrivacyMask {
                     }
                 }
             } catch (e: Exception) {
-                // Best-effort only
             }
         }
         
@@ -320,12 +288,9 @@ object PrivacyMask {
         val roots = mutableListOf<View>()
         
         try {
-            // Method 1: Use WindowManager's internal mViews array via reflection
-            // This is how system tools and accessibility services access all windows
             val wmgClass = Class.forName("android.view.WindowManagerGlobal")
             val wmgInstance = wmgClass.getMethod("getInstance").invoke(null)
             
-            // Try to get mViews field (array of DecorViews for all windows)
             val viewsField = wmgClass.getDeclaredField("mViews")
             viewsField.isAccessible = true
             val views = viewsField.get(wmgInstance)
@@ -349,8 +314,6 @@ object PrivacyMask {
         } catch (e: Exception) {
             Logger.debug("PrivacyMask: Reflection method failed (${e.message}), using fallback")
             
-            // Method 2: Fallback - just scan the activity's own windows
-            // This won't catch all dialogs but is safer
             try {
                 activity.window?.decorView?.let { roots.add(it) }
             } catch (_: Exception) {}
@@ -385,13 +348,11 @@ object PrivacyMask {
                 val location = IntArray(2)
                 view.getLocationOnScreen(location)
                 
-                // Convert to primary window coordinates
                 val left = location[0] - primaryLocationOnScreen[0]
                 val top = location[1] - primaryLocationOnScreen[1]
                 val right = left + view.width
                 val bottom = top + view.height
                 
-                // Clip to primary window bounds
                 val clipped = Rect(
                     left.coerceAtLeast(0),
                     top.coerceAtLeast(0),
@@ -427,19 +388,16 @@ object PrivacyMask {
     ) {
         if (!view.isShown) return
 
-        // Check if this is a sensitive view
         if (isSensitiveView(view)) {
             if (view.width > 0 && view.height > 0) {
             val location = IntArray(2)
             view.getLocationOnScreen(location)
 
-            // Convert absolute screen coords -> rootView-relative coords
             val left = location[0] - rootLocationOnScreen[0]
             val top = location[1] - rootLocationOnScreen[1]
             val right = left + view.width
             val bottom = top + view.height
 
-            // Clip to root bounds to avoid huge/offscreen rects
             val clipped = Rect(
                 left.coerceAtLeast(0),
                 top.coerceAtLeast(0),
@@ -453,7 +411,6 @@ object PrivacyMask {
             }
         }
 
-        // Recurse into children
         if (view is ViewGroup) {
             for (i in 0 until view.childCount) {
                 findSensitiveViewsRecursive(
@@ -471,18 +428,14 @@ object PrivacyMask {
      * Determine if a view should be masked.
      */
     internal fun isSensitiveView(view: View): Boolean {
-        // Check for manual masking tag first
         if (hasPrivacyTag(view)) return true
 
-        // Check if view's nativeID is in the masked set
         val viewNativeID = view.getTag(com.facebook.react.R.id.view_tag_native_id)
         if (viewNativeID is String && maskedNativeIDs.contains(viewNativeID)) {
             Logger.debug("PrivacyMask: Found masked nativeID: $viewNativeID")
             return true
         }
 
-        // Check immediate children for nativeID - React Native nests views so
-        // the nativeID may be on a child wrapper rather than the parent container
         if (view is ViewGroup) {
             for (i in view.childCount - 1 downTo 0) {
                 val child = view.getChildAt(i)
@@ -494,10 +447,8 @@ object PrivacyMask {
             }
         }
 
-        // EditText and subclasses (password fields, etc.)
         if (maskTextInputs && view is EditText) return true
 
-        // Check for WebView (both Android native and React Native)
         if (maskWebViews && isWebViewSurface(view)) return true
         if (maskCameraViews && isCameraPreview(view)) return true
         if (maskVideoLayers && isVideoLayerView(view)) return true
@@ -579,7 +530,6 @@ object PrivacyMask {
         }
     }
 
-    // Class cache for prewarm (matching iOS prewarmClassCaches)
     @Volatile
     private var classesPrewarmed = false
     
@@ -595,14 +545,11 @@ object PrivacyMask {
         classesPrewarmed = true
         
         try {
-            // Force class loading for common sensitive view types
-            // These class lookups are cached by the JVM after first access
             EditText::class.java
             android.widget.TextView::class.java
             android.widget.Button::class.java
             ViewGroup::class.java
             
-            // Force loading of WebView class name strings (used in isSensitiveView)
             val dummyClassNames = listOf(
                 "android.webkit.webview",
                 "webview",
@@ -613,14 +560,11 @@ object PrivacyMask {
                 "password",
                 "securetext"
             )
-            // Touch each string to ensure interning
             dummyClassNames.forEach { it.lowercase() }
             
-            // Pre-load React Native tag ID lookup (if available)
             try {
                 com.facebook.react.R.id.view_tag_native_id
             } catch (_: Exception) {
-                // May not be available in all configurations
             }
             
             Logger.debug("PrivacyMask: Class caches pre-warmed")

package/android/src/main/java/com/rejourney/touch/TouchInterceptor.kt

@@ -29,8 +29,8 @@ import kotlin.math.sqrt
  * Touch point data matching iOS RJTouchPoint.
  */
 data class TouchPoint(
-    val x: Float,      // Density-independent pixels (dp)
-    val y: Float,      // Density-independent pixels (dp)
+    val x: Float,      
+    val y: Float,    
     val timestamp: Long,
     val force: Float   // Pressure (0.0-1.0)
 ) {
@@ -63,8 +63,8 @@ interface TouchInterceptorDelegate {
         type: String,      // "scroll", "swipe", "pan"
         t0: Long,          // Start timestamp
         t1: Long,          // End timestamp
-        dx: Float,         // Delta X (dp)
-        dy: Float,         // Delta Y (dp)
+        dx: Float,         // Delta X 
+        dy: Float,         // Delta Y 
         v0: Float,         // Initial velocity
         v1: Float,         // Final velocity
         curve: String      // "linear", "exponential_decay", "ease_out"

package/android/src/main/java/com/rejourney/utils/EventBuffer.kt

@@ -219,14 +219,43 @@ class EventBuffer(
     }
 
     fun readEventsAfterBatchNumber(afterBatchNumber: Int): List<Map<String, Any?>> {
-        val allEvents = readAllEvents()
-        val startIndex = lock.withLock {
-            maxOf(uploadedEventCount, maxOf(0, afterBatchNumber))
-        }
-        if (startIndex >= allEvents.size) {
-            return emptyList()
+        return lock.withLock {
+            try {
+                if (!eventsFile.exists()) {
+                    return@withLock emptyList()
+                }
+
+                val events = mutableListOf<Map<String, Any?>>()
+                val targetIndex = maxOf(uploadedEventCount, maxOf(0, afterBatchNumber))
+                var currentIndex = 0
+
+                // Use BufferedReader to stream the file line by line
+                // This avoids loading the whole file into memory just to skip lines
+                BufferedReader(FileReader(eventsFile)).use { reader ->
+                    reader.forEachLine { line ->
+                        if (line.isNotBlank()) {
+                            // Only parse JSON if we are past the skip threshold
+                            if (currentIndex >= targetIndex) {
+                                try {
+                                    val json = JSONObject(line)
+                                    val map = mutableMapOf<String, Any?>()
+                                    json.keys().forEach { key ->
+                                        map[key] = json.opt(key)
+                                    }
+                                    events.add(map)
+                                } catch (_: Exception) {
+                                }
+                            }
+                            currentIndex++
+                        }
+                    }
+                }
+                events
+            } catch (e: Exception) {
+                Logger.error("[EventBuffer] readEventsAfterBatchNumber: Failed to read events", e)
+                emptyList()
+            }
         }
-        return allEvents.subList(startIndex, allEvents.size)
     }
 
     fun readPendingEvents(): List<Map<String, Any?>> {