Skip to content

Commit 0271e9e

Browse files
authored
fix: Simplify logic and also catch extension manager error (mrousavy#3390)
1 parent b194ef1 commit 0271e9e

1 file changed

Lines changed: 7 additions & 9 deletions

File tree

package/android/src/main/java/com/mrousavy/camera/react/CameraDevicesManager.kt

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -63,17 +63,15 @@ class CameraDevicesManager(private val reactContext: ReactApplicationContext) :
6363
super.initialize()
6464
cameraManager.registerAvailabilityCallback(callback, null)
6565
coroutineScope.launch {
66-
Log.i(TAG, "Initializing ProcessCameraProvider...")
67-
cameraProvider = try {
68-
ProcessCameraProvider.getInstance(reactContext).await(executor)
66+
try {
67+
Log.i(TAG, "Initializing ProcessCameraProvider...")
68+
cameraProvider = ProcessCameraProvider.getInstance(reactContext).await(executor)
69+
Log.i(TAG, "Initializing ExtensionsManager...")
70+
extensionsManager = ExtensionsManager.getInstanceAsync(reactContext, cameraProvider!!).await(executor)
71+
Log.i(TAG, "Successfully initialized!")
6972
} catch (error: Throwable) {
70-
Log.e(TAG, "Failed to get CameraProvider! Error: ${error.message}", error)
71-
sendAvailableDevicesChangedEvent()
72-
return@launch
73+
Log.e(TAG, "Failed to initialize ProcessCameraProvider/ExtensionsManager! Error: ${error.message}", error)
7374
}
74-
Log.i(TAG, "Initializing ExtensionsManager...")
75-
extensionsManager = ExtensionsManager.getInstanceAsync(reactContext, cameraProvider!!).await(executor)
76-
Log.i(TAG, "Successfully initialized!")
7775
sendAvailableDevicesChangedEvent()
7876
}
7977
}

0 commit comments

Comments
 (0)