fix(liveness): Minor UI Fixes (#103)

Author: tylerjroach

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

@@ -124,9 +124,12 @@ fun FaceLivenessDetector(
                 disableStartView,
                 onChallengeComplete = {
                     scope.launch {
-                        isFinished = true
-                        resetOrientation()
-                        currentOnComplete.call()
+                        // if we are already finished, we already provided a result in complete or failed
+                        if (!isFinished) {
+                            isFinished = true
+                            resetOrientation()
+                            currentOnComplete.call()
+                        }
                     }
                 },
                 onChallengeFailed = {

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

@@ -46,11 +46,10 @@ import com.amplifyframework.ui.liveness.model.LivenessCheckState
     livenessCheckState: LivenessCheckState
 ) {
     val instructionText = livenessCheckState.instructionId?.let { stringResource(it) } ?: return
-    val showProgress = livenessCheckState is LivenessCheckState.Success
     if (livenessCheckState.isActionable) {
         FaceOvalInstructionMessage(message = instructionText)
     } else {
-        InstructionMessage(message = instructionText, showProgress = showProgress)
+        InstructionMessage(message = instructionText, showProgress = true)
     }
 }
 @Composable

samples/liveness/app/src/main/java/com/amplifyframework/ui/sample/liveness/MainViewModel.kt

@@ -88,6 +88,8 @@ class MainViewModel : ViewModel() {
     }
 
     fun fetchSessionResult(sessionId: String) {
+        if (_resultData.value != null) return //we already have result, likely timeout
+
         _fetchingResult.value = true
         viewModelScope.launch {
             try {
@@ -125,6 +127,7 @@ class MainViewModel : ViewModel() {
     fun reportErrorResult(exception: FaceLivenessDetectionException) {
         sessionId.value?.let {
             _resultData.value = ResultData(it, error = exception)
+            _fetchingResult.value = false
         }
     }
 

samples/liveness/app/src/main/java/com/amplifyframework/ui/sample/liveness/ui/ResultScreen.kt

@@ -299,15 +299,16 @@ private fun getDisplayError(error: FaceLivenessDetectionException): DisplayError
         is FaceLivenessDetectionException.SessionTimedOutException -> {
             DisplayError(
                 title = stringResource(id = R.string.error_timed_out_title),
-                message = if (error.message.contains("did not match oval", true)) {
-                    stringResource(id = R.string.error_timed_out_face_fit_message)
-                } else {
-                    stringResource(id = R.string.error_timed_out_session_message)
-                }
+                message = stringResource(id = R.string.error_timed_out_session_message)
             )
         }
         else -> {
-            if (error.message.contains("failed during countdown", ignoreCase = true)) {
+            if (error.message.contains("did not match oval", true)) {
+                DisplayError(
+                    title = stringResource(id = R.string.error_timed_out_title),
+                    message = stringResource(id = R.string.error_timed_out_face_fit_message)
+                )
+            } else if (error.message.contains("failed during countdown", ignoreCase = true)) {
                 DisplayError(
                     title = stringResource(id = R.string.error_failure_during_countdown_title),
                     message = stringResource(id = R.string.error_failure_during_countdown_message)