diff --git a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomPresenter.kt b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomPresenter.kt index 8b62e7ef74..4a89e09dcd 100644 --- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomPresenter.kt +++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomPresenter.kt @@ -102,7 +102,7 @@ class ConfigureRoomPresenter @Inject constructor( AvatarAction.TakePhoto -> if (cameraPermissionState.permissionGranted) { cameraPhotoPicker.launch() } else { - cameraPermissionState.eventSink(PermissionsEvents.OpenSystemDialog) + cameraPermissionState.eventSink(PermissionsEvents.AskPermissionToUser) } AvatarAction.Remove -> dataStore.setAvatarUri(uri = null) } diff --git a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/notifications/NotificationsOptInPresenter.kt b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/notifications/NotificationsOptInPresenter.kt index f3bffca590..6797e0ef2d 100644 --- a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/notifications/NotificationsOptInPresenter.kt +++ b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/notifications/NotificationsOptInPresenter.kt @@ -65,7 +65,7 @@ class NotificationsOptInPresenter @AssistedInject constructor( if (notificationsPermissionsState.permissionGranted) { callback.onNotificationsOptInFinished() } else { - notificationsPermissionsState.eventSink(PermissionsEvents.OpenSystemDialog) + notificationsPermissionsState.eventSink(PermissionsEvents.AskPermissionToUser) } } NotificationsOptInEvents.NotNowClicked -> { diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfilePresenter.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfilePresenter.kt index 2f98691684..642f60a634 100644 --- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfilePresenter.kt +++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfilePresenter.kt @@ -94,7 +94,7 @@ class EditUserProfilePresenter @AssistedInject constructor( AvatarAction.TakePhoto -> if (cameraPermissionState.permissionGranted) { cameraPhotoPicker.launch() } else { - cameraPermissionState.eventSink.invoke(PermissionsEvents.OpenSystemDialog) + cameraPermissionState.eventSink.invoke(PermissionsEvents.AskPermissionToUser) } AvatarAction.Remove -> userAvatarUri = null } diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/edit/RoomDetailsEditPresenter.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/edit/RoomDetailsEditPresenter.kt index e73f15a1ba..da88f78b00 100644 --- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/edit/RoomDetailsEditPresenter.kt +++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/edit/RoomDetailsEditPresenter.kt @@ -119,7 +119,7 @@ class RoomDetailsEditPresenter @Inject constructor( AvatarAction.TakePhoto -> if (cameraPermissionState.permissionGranted) { cameraPhotoPicker.launch() } else { - cameraPermissionState.eventSink(PermissionsEvents.OpenSystemDialog) + cameraPermissionState.eventSink(PermissionsEvents.AskPermissionToUser) } AvatarAction.Remove -> roomAvatarUri = null } diff --git a/libraries/permissions/api/src/main/kotlin/io/element/android/libraries/permissions/api/PermissionsEvents.kt b/libraries/permissions/api/src/main/kotlin/io/element/android/libraries/permissions/api/PermissionsEvents.kt index 45232a51db..44b7ef62c0 100644 --- a/libraries/permissions/api/src/main/kotlin/io/element/android/libraries/permissions/api/PermissionsEvents.kt +++ b/libraries/permissions/api/src/main/kotlin/io/element/android/libraries/permissions/api/PermissionsEvents.kt @@ -17,6 +17,6 @@ package io.element.android.libraries.permissions.api sealed interface PermissionsEvents { - data object OpenSystemDialog : PermissionsEvents + data object AskPermissionToUser : PermissionsEvents data object CloseDialog : PermissionsEvents } diff --git a/libraries/permissions/api/src/main/kotlin/io/element/android/libraries/permissions/api/PermissionsView.kt b/libraries/permissions/api/src/main/kotlin/io/element/android/libraries/permissions/api/PermissionsView.kt index 67f1c7e127..a487186369 100644 --- a/libraries/permissions/api/src/main/kotlin/io/element/android/libraries/permissions/api/PermissionsView.kt +++ b/libraries/permissions/api/src/main/kotlin/io/element/android/libraries/permissions/api/PermissionsView.kt @@ -69,7 +69,7 @@ fun PermissionsView( content = textToShow, submitText = "Request permission", onSubmitClicked = { - state.eventSink.invoke(PermissionsEvents.OpenSystemDialog) + state.eventSink.invoke(PermissionsEvents.AskPermissionToUser) }, onCancelClicked = { state.eventSink.invoke(PermissionsEvents.CloseDialog) diff --git a/libraries/permissions/impl/src/main/kotlin/io/element/android/libraries/permissions/impl/DefaultPermissionsPresenter.kt b/libraries/permissions/impl/src/main/kotlin/io/element/android/libraries/permissions/impl/DefaultPermissionsPresenter.kt index a6149164d1..c80b3e2466 100644 --- a/libraries/permissions/impl/src/main/kotlin/io/element/android/libraries/permissions/impl/DefaultPermissionsPresenter.kt +++ b/libraries/permissions/impl/src/main/kotlin/io/element/android/libraries/permissions/impl/DefaultPermissionsPresenter.kt @@ -110,7 +110,7 @@ class DefaultPermissionsPresenter @AssistedInject constructor( PermissionsEvents.CloseDialog -> { showDialog.value = false } - PermissionsEvents.OpenSystemDialog -> { + PermissionsEvents.AskPermissionToUser -> { if (permissionState.status !is PermissionStatus.Granted && isAlreadyDenied) { showDialog.value = true } else { diff --git a/libraries/permissions/impl/src/test/kotlin/io/element/android/libraries/permissions/impl/DefaultPermissionsPresenterTest.kt b/libraries/permissions/impl/src/test/kotlin/io/element/android/libraries/permissions/impl/DefaultPermissionsPresenterTest.kt index 915b240598..420d298eac 100644 --- a/libraries/permissions/impl/src/test/kotlin/io/element/android/libraries/permissions/impl/DefaultPermissionsPresenterTest.kt +++ b/libraries/permissions/impl/src/test/kotlin/io/element/android/libraries/permissions/impl/DefaultPermissionsPresenterTest.kt @@ -91,7 +91,7 @@ class DefaultPermissionsPresenterTest { }.test { skipItems(1) val initialState = awaitItem() - initialState.eventSink.invoke(PermissionsEvents.OpenSystemDialog) + initialState.eventSink.invoke(PermissionsEvents.AskPermissionToUser) val withDialogState = awaitItem() assertThat(withDialogState.showDialog).isTrue() withDialogState.eventSink.invoke(PermissionsEvents.CloseDialog) @@ -120,7 +120,7 @@ class DefaultPermissionsPresenterTest { }.test { val initialState = awaitItem() assertThat(initialState.showDialog).isFalse() - initialState.eventSink.invoke(PermissionsEvents.OpenSystemDialog) + initialState.eventSink.invoke(PermissionsEvents.AskPermissionToUser) assertThat(permissionState.launchPermissionRequestCalled).isTrue() // User does not grant permission permissionStateProvider.userGiveAnswer(answer = false, firstTime = true) @@ -154,7 +154,7 @@ class DefaultPermissionsPresenterTest { }.test { val initialState = awaitItem() assertThat(initialState.showDialog).isFalse() - initialState.eventSink.invoke(PermissionsEvents.OpenSystemDialog) + initialState.eventSink.invoke(PermissionsEvents.AskPermissionToUser) assertThat(permissionState.launchPermissionRequestCalled).isTrue() // User does not grant permission permissionStateProvider.userGiveAnswer(answer = false, firstTime = false) @@ -192,7 +192,7 @@ class DefaultPermissionsPresenterTest { }.test { skipItems(1) val initialState = awaitItem() - initialState.eventSink.invoke(PermissionsEvents.OpenSystemDialog) + initialState.eventSink.invoke(PermissionsEvents.AskPermissionToUser) val withDialogState = awaitItem() assertThat(withDialogState.showDialog).isTrue() assertThat(withDialogState.permissionGranted).isFalse() @@ -222,7 +222,7 @@ class DefaultPermissionsPresenterTest { }.test { val initialState = awaitItem() assertThat(initialState.showDialog).isFalse() - initialState.eventSink.invoke(PermissionsEvents.OpenSystemDialog) + initialState.eventSink.invoke(PermissionsEvents.AskPermissionToUser) assertThat(permissionState.launchPermissionRequestCalled).isTrue() // User grants permission permissionStateProvider.userGiveAnswer(answer = true, firstTime = true) diff --git a/libraries/permissions/test/src/main/kotlin/io/element/android/libraries/permissions/test/FakePermissionsPresenter.kt b/libraries/permissions/test/src/main/kotlin/io/element/android/libraries/permissions/test/FakePermissionsPresenter.kt index 2332fb0b18..0e581f3cef 100644 --- a/libraries/permissions/test/src/main/kotlin/io/element/android/libraries/permissions/test/FakePermissionsPresenter.kt +++ b/libraries/permissions/test/src/main/kotlin/io/element/android/libraries/permissions/test/FakePermissionsPresenter.kt @@ -29,7 +29,7 @@ class FakePermissionsPresenter( private fun eventSink(events: PermissionsEvents) { when (events) { - PermissionsEvents.OpenSystemDialog -> state.value = state.value.copy(showDialog = true, permissionAlreadyAsked = true) + PermissionsEvents.AskPermissionToUser -> state.value = state.value.copy(showDialog = true, permissionAlreadyAsked = true) PermissionsEvents.CloseDialog -> state.value = state.value.copy(showDialog = false) } }