From b523e1884fa5f624616a575739227fb30128307c Mon Sep 17 00:00:00 2001 From: Loewy Date: Mon, 17 Nov 2025 13:38:30 -0800 Subject: [PATCH] Fix React Native 0.79 Kotlin compilation errors - Fix currentActivity reference in CameraViewModule - Convert Map to MutableMap in CameraViewManager for RN 0.79 compatibility --- .../src/main/java/com/mrousavy/camera/CameraViewManager.kt | 2 +- .../src/main/java/com/mrousavy/camera/CameraViewModule.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/android/src/main/java/com/mrousavy/camera/CameraViewManager.kt b/package/android/src/main/java/com/mrousavy/camera/CameraViewManager.kt index d27a27a..af48c52 100644 --- a/package/android/src/main/java/com/mrousavy/camera/CameraViewManager.kt +++ b/package/android/src/main/java/com/mrousavy/camera/CameraViewManager.kt @@ -32,7 +32,7 @@ class CameraViewManager : ViewGroupManager() { .put("cameraError", MapBuilder.of("registrationName", "onError")) .put("cameraCodeScanned", MapBuilder.of("registrationName", "onCodeScanned")) .put("onVideoChunkReady", MapBuilder.of("registrationName", "onVideoChunkReady")) - .build() + .build()?.toMutableMap() override fun getName(): String = TAG diff --git a/package/android/src/main/java/com/mrousavy/camera/CameraViewModule.kt b/package/android/src/main/java/com/mrousavy/camera/CameraViewModule.kt index 5765d97..698d805 100644 --- a/package/android/src/main/java/com/mrousavy/camera/CameraViewModule.kt +++ b/package/android/src/main/java/com/mrousavy/camera/CameraViewModule.kt @@ -157,7 +157,7 @@ class CameraViewModule(reactContext: ReactApplicationContext) : ReactContextBase } private fun canRequestPermission(permission: String): Boolean { - val activity = currentActivity as? PermissionAwareActivity + val activity = reactApplicationContext.currentActivity as? PermissionAwareActivity return activity?.shouldShowRequestPermissionRationale(permission) ?: false }