From f07f4a8770d79fde931213858537b73f83ee40d7 Mon Sep 17 00:00:00 2001
From: Marc Rousavy <marcrousavy@hotmail.com>
Date: Tue, 29 Jun 2021 10:16:38 +0200
Subject: [PATCH] fix: Correctly propagate Errors in `configureSession()`

---
 android/src/main/java/com/mrousavy/camera/CameraView.kt | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/android/src/main/java/com/mrousavy/camera/CameraView.kt b/android/src/main/java/com/mrousavy/camera/CameraView.kt
index 176a049..3b528fe 100644
--- a/android/src/main/java/com/mrousavy/camera/CameraView.kt
+++ b/android/src/main/java/com/mrousavy/camera/CameraView.kt
@@ -202,7 +202,11 @@ class CameraView(context: Context) : FrameLayout(context), LifecycleOwner {
     if (before != enable) {
       // reconfigure session if frame processor was added/removed to adjust use-cases.
       GlobalScope.launch(Dispatchers.Main) {
-        configureSession()
+        try {
+          configureSession()
+        } catch (e: CameraError) {
+          invokeOnError(e)
+        }
       }
     }
   }
@@ -428,7 +432,7 @@ class CameraView(context: Context) : FrameLayout(context), LifecycleOwner {
       Log.i(TAG_PERF, "Session configured in $duration ms! Camera: ${camera!!}")
       invokeOnInitialized()
     } catch (exc: Throwable) {
-      val error = when (exc) {
+      throw when (exc) {
         is CameraError -> exc
         is IllegalArgumentException -> {
           if (exc.message?.contains("too many use cases") == true) {
@@ -439,7 +443,6 @@ class CameraView(context: Context) : FrameLayout(context), LifecycleOwner {
         }
         else -> UnknownCameraError(exc)
       }
-      invokeOnError(error)
     }
   }