fix(liveness): Screen rotation saves/loads correctly; lifecycle not destroyed at time of use (#65)

Co-authored-by: Thomas Leing <[email protected]>

Author: tjleing

liveness/src/main/java/com/amplifyframework/ui/liveness/camera/LivenessCoordinator.kt

@@ -26,6 +26,7 @@ import androidx.camera.core.ImageAnalysis
 import androidx.camera.core.Preview
 import androidx.camera.lifecycle.ProcessCameraProvider
 import androidx.core.content.ContextCompat
+import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleOwner
 import com.amplifyframework.auth.AWSCredentials
 import com.amplifyframework.auth.AWSCredentialsProvider
@@ -136,20 +137,22 @@ internal class LivenessCoordinator(
     init {
         MainScope().launch {
             getCameraProvider(context).apply {
-                unbindAll()
-                if (this.hasCamera(CameraSelector.DEFAULT_FRONT_CAMERA)) {
-                    bindToLifecycle(
-                        lifecycleOwner,
-                        CameraSelector.DEFAULT_FRONT_CAMERA,
-                        preview,
-                        analysis
-                    )
-                } else {
-                    val faceLivenessException = FaceLivenessDetectionException(
-                        "A front facing camera is required but no front facing camera detected.",
-                        "Enable a front facing camera."
-                    )
-                    processSessionError(faceLivenessException, true)
+                if (lifecycleOwner.lifecycle.currentState != Lifecycle.State.DESTROYED) {
+                    unbindAll()
+                    if (this.hasCamera(CameraSelector.DEFAULT_FRONT_CAMERA)) {
+                        bindToLifecycle(
+                            lifecycleOwner,
+                            CameraSelector.DEFAULT_FRONT_CAMERA,
+                            preview,
+                            analysis
+                        )
+                    } else {
+                        val faceLivenessException = FaceLivenessDetectionException(
+                            "A front facing camera is required but no front facing camera detected.",
+                            "Enable a front facing camera."
+                        )
+                        processSessionError(faceLivenessException, true)
+                    }
                 }
             }
         }

liveness/src/main/java/com/amplifyframework/ui/liveness/ui/FaceLivenessDetector.kt

@@ -109,33 +109,35 @@ fun FaceLivenessDetector(
     }
 
     // Locks portrait orientation for duration of challenge and resets on complete
-    LockPortraitOrientation()
-
-    Surface(color = MaterialTheme.colorScheme.background) {
-        if (showReadyView) {
-            GetReadyView {
-                showReadyView = false
-            }
-        } else {
-            AlwaysOnMaxBrightnessScreen()
-            ChallengeView(
-                key = key,
-                sessionId = sessionId,
-                region,
-                credentialsProvider = credentialsProvider,
-                onChallengeComplete = {
-                    scope.launch {
-                        isFinished = true
-                        currentOnComplete.call()
-                    }
-                },
-                onChallengeFailed = {
-                    scope.launch {
-                        isFinished = true
-                        currentOnError.accept(it)
-                    }
+    LockPortraitOrientation { resetOrientation ->
+        Surface(color = MaterialTheme.colorScheme.background) {
+            if (showReadyView) {
+                GetReadyView {
+                    showReadyView = false
                 }
-            )
+            } else {
+                AlwaysOnMaxBrightnessScreen()
+                ChallengeView(
+                    key = key,
+                    sessionId = sessionId,
+                    region,
+                    credentialsProvider = credentialsProvider,
+                    onChallengeComplete = {
+                        scope.launch {
+                            isFinished = true
+                            resetOrientation()
+                            currentOnComplete.call()
+                        }
+                    },
+                    onChallengeFailed = {
+                        scope.launch {
+                            isFinished = true
+                            resetOrientation()
+                            currentOnError.accept(it)
+                        }
+                    }
+                )
+            }
         }
     }
 }
@@ -191,7 +193,6 @@ internal fun ChallengeView(
                 )
             }
     ) {
-
         val videoViewportSize = livenessState.videoViewportSize
 
         if (videoViewportSize != null) {

liveness/src/main/java/com/amplifyframework/ui/liveness/ui/LockPortraitOrientation.kt

@@ -17,20 +17,28 @@ package com.amplifyframework.ui.liveness.ui
 
 import android.annotation.SuppressLint
 import android.content.pm.ActivityInfo
+import android.content.res.Configuration.ORIENTATION_PORTRAIT
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.SideEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.platform.LocalContext
 import com.amplifyframework.ui.liveness.util.findActivity
 
 @SuppressLint("SourceLockedOrientationActivity")
 @Composable
-internal fun LockPortraitOrientation() {
+internal fun LockPortraitOrientation(content: @Composable (resetOrientation: () -> Unit) -> Unit) {
     val context = LocalContext.current
-    DisposableEffect(Unit) {
-        val activity = context.findActivity() ?: return@DisposableEffect onDispose {}
-        val originalOrientation = activity.requestedOrientation
+    val activity = context.findActivity() ?: return content {}
+    val originalOrientation by rememberSaveable { mutableStateOf(activity.requestedOrientation) }
+    SideEffect {
         activity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
-        onDispose {
+    }
+
+    // wait until screen is rotated correctly
+    if (activity.resources.configuration.orientation == ORIENTATION_PORTRAIT) {
+        content {
             activity.requestedOrientation = originalOrientation
         }
     }