From 7080083f0438a9452f865454623b2be512c2e5aa Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Tue, 4 Oct 2022 21:26:33 -0700 Subject: [PATCH] Use if instead of non-exhaustive when clause Kotlin 1.7.0 requires when statements on enums to be exhaustive. Switch from a when with a single clause to an if statement. Bug: 216136346 Test: m CredentialManager Change-Id: Ief5a38ba1af05f6cd882a1e035538a44ff2753d3 --- .../credentialmanager/createflow/CreatePasskeyComponents.kt | 6 ++---- .../credentialmanager/getflow/GetCredentialComponents.kt | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/packages/CredentialManager/src/com/android/credentialmanager/createflow/CreatePasskeyComponents.kt b/packages/CredentialManager/src/com/android/credentialmanager/createflow/CreatePasskeyComponents.kt index 60a8e4b24d571..fbec1bc75dc6b 100644 --- a/packages/CredentialManager/src/com/android/credentialmanager/createflow/CreatePasskeyComponents.kt +++ b/packages/CredentialManager/src/com/android/credentialmanager/createflow/CreatePasskeyComponents.kt @@ -79,10 +79,8 @@ fun CreatePasskeyScreen( sheetShape = Shapes.medium, ) {} LaunchedEffect(state.currentValue) { - when (state.currentValue) { - ModalBottomSheetValue.Hidden -> { - cancelActivity() - } + if (state.currentValue == ModalBottomSheetValue.Hidden) { + cancelActivity() } } } diff --git a/packages/CredentialManager/src/com/android/credentialmanager/getflow/GetCredentialComponents.kt b/packages/CredentialManager/src/com/android/credentialmanager/getflow/GetCredentialComponents.kt index 4b957e84fc2b2..1ca70ed91598a 100644 --- a/packages/CredentialManager/src/com/android/credentialmanager/getflow/GetCredentialComponents.kt +++ b/packages/CredentialManager/src/com/android/credentialmanager/getflow/GetCredentialComponents.kt @@ -64,10 +64,8 @@ fun GetCredentialScreen( sheetShape = Shapes.medium, ) {} LaunchedEffect(state.currentValue) { - when (state.currentValue) { - ModalBottomSheetValue.Hidden -> { - cancelActivity() - } + if (state.currentValue == ModalBottomSheetValue.Hidden) { + cancelActivity() } } }