From d19b624c6f3f482f2bbc8f6af21c5c6f22901422 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Thu, 21 Sep 2023 15:33:03 +0200 Subject: [PATCH] Rename Event for clarity --- .../impl/configureroom/ConfigureRoomPresenter.kt | 2 +- .../notifications/NotificationsOptInPresenter.kt | 2 +- .../impl/messagecomposer/MessageComposerPresenter.kt | 4 ++-- .../user/editprofile/EditUserProfilePresenter.kt | 2 +- .../impl/edit/RoomDetailsEditPresenter.kt | 2 +- .../libraries/permissions/api/PermissionsEvents.kt | 2 +- .../permissions/impl/DefaultPermissionsPresenter.kt | 2 +- .../impl/DefaultPermissionsPresenterTest.kt | 12 ++++++------ .../permissions/test/FakePermissionsPresenter.kt | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) 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 8321cd82c7..4cefa82a31 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 @@ -112,7 +112,7 @@ class ConfigureRoomPresenter @Inject constructor( cameraPhotoPicker.launch() } else { pendingPermissionRequest = true - cameraPermissionState.eventSink(PermissionsEvents.AskPermissionToUser) + cameraPermissionState.eventSink(PermissionsEvents.RequestPermissions) } 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 6797e0ef2d..43bdaa3732 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.AskPermissionToUser) + notificationsPermissionsState.eventSink(PermissionsEvents.RequestPermissions) } } NotificationsOptInEvents.NotNowClicked -> { diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerPresenter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerPresenter.kt index dbf6afc46e..6898d7796f 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerPresenter.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerPresenter.kt @@ -186,7 +186,7 @@ class MessageComposerPresenter @Inject constructor( cameraPhotoPicker.launch() } else { pendingEvent = event - cameraPermissionState.eventSink(PermissionsEvents.AskPermissionToUser) + cameraPermissionState.eventSink(PermissionsEvents.RequestPermissions) } } MessageComposerEvents.PickAttachmentSource.VideoFromCamera -> localCoroutineScope.launch { @@ -195,7 +195,7 @@ class MessageComposerPresenter @Inject constructor( cameraVideoPicker.launch() } else { pendingEvent = event - cameraPermissionState.eventSink(PermissionsEvents.AskPermissionToUser) + cameraPermissionState.eventSink(PermissionsEvents.RequestPermissions) } } MessageComposerEvents.PickAttachmentSource.Location -> { 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 90288957b3..be0a5f4cca 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 @@ -104,7 +104,7 @@ class EditUserProfilePresenter @AssistedInject constructor( cameraPhotoPicker.launch() } else { pendingPermissionRequest = true - cameraPermissionState.eventSink(PermissionsEvents.AskPermissionToUser) + cameraPermissionState.eventSink(PermissionsEvents.RequestPermissions) } 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 82704bdf78..40df3791d4 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 @@ -128,7 +128,7 @@ class RoomDetailsEditPresenter @Inject constructor( cameraPhotoPicker.launch() } else { pendingPermissionRequest = true - cameraPermissionState.eventSink(PermissionsEvents.AskPermissionToUser) + cameraPermissionState.eventSink(PermissionsEvents.RequestPermissions) } 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 393f91cab5..0f3432b9d9 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,7 +17,7 @@ package io.element.android.libraries.permissions.api sealed interface PermissionsEvents { - data object AskPermissionToUser : PermissionsEvents + data object RequestPermissions : PermissionsEvents data object CloseDialog : PermissionsEvents data object OpenSystemSettingAndCloseDialog : PermissionsEvents } 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 a5030178c3..8fccfcc09d 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 @@ -112,7 +112,7 @@ class DefaultPermissionsPresenter @AssistedInject constructor( PermissionsEvents.CloseDialog -> { showDialog.value = false } - PermissionsEvents.AskPermissionToUser -> { + PermissionsEvents.RequestPermissions -> { 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 51f9ecc5e6..ca96833d69 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 @@ -94,7 +94,7 @@ class DefaultPermissionsPresenterTest { }.test { skipItems(1) val initialState = awaitItem() - initialState.eventSink.invoke(PermissionsEvents.AskPermissionToUser) + initialState.eventSink.invoke(PermissionsEvents.RequestPermissions) val withDialogState = awaitItem() assertThat(withDialogState.showDialog).isTrue() withDialogState.eventSink.invoke(PermissionsEvents.CloseDialog) @@ -128,7 +128,7 @@ class DefaultPermissionsPresenterTest { }.test { skipItems(1) val initialState = awaitItem() - initialState.eventSink.invoke(PermissionsEvents.AskPermissionToUser) + initialState.eventSink.invoke(PermissionsEvents.RequestPermissions) val withDialogState = awaitItem() assertThat(withDialogState.showDialog).isTrue() assertThat(permissionActions.openSettingsCalled).isFalse() @@ -160,7 +160,7 @@ class DefaultPermissionsPresenterTest { }.test { val initialState = awaitItem() assertThat(initialState.showDialog).isFalse() - initialState.eventSink.invoke(PermissionsEvents.AskPermissionToUser) + initialState.eventSink.invoke(PermissionsEvents.RequestPermissions) assertThat(permissionState.launchPermissionRequestCalled).isTrue() // User does not grant permission permissionStateProvider.userGiveAnswer(answer = false, firstTime = true) @@ -195,7 +195,7 @@ class DefaultPermissionsPresenterTest { }.test { val initialState = awaitItem() assertThat(initialState.showDialog).isFalse() - initialState.eventSink.invoke(PermissionsEvents.AskPermissionToUser) + initialState.eventSink.invoke(PermissionsEvents.RequestPermissions) assertThat(permissionState.launchPermissionRequestCalled).isTrue() // User does not grant permission permissionStateProvider.userGiveAnswer(answer = false, firstTime = false) @@ -234,7 +234,7 @@ class DefaultPermissionsPresenterTest { }.test { skipItems(1) val initialState = awaitItem() - initialState.eventSink.invoke(PermissionsEvents.AskPermissionToUser) + initialState.eventSink.invoke(PermissionsEvents.RequestPermissions) val withDialogState = awaitItem() assertThat(withDialogState.showDialog).isTrue() assertThat(withDialogState.permissionGranted).isFalse() @@ -265,7 +265,7 @@ class DefaultPermissionsPresenterTest { }.test { val initialState = awaitItem() assertThat(initialState.showDialog).isFalse() - initialState.eventSink.invoke(PermissionsEvents.AskPermissionToUser) + initialState.eventSink.invoke(PermissionsEvents.RequestPermissions) 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 e7c639e8a1..871f562489 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.AskPermissionToUser -> state.value = state.value.copy(showDialog = true, permissionAlreadyAsked = true) + PermissionsEvents.RequestPermissions -> state.value = state.value.copy(showDialog = true, permissionAlreadyAsked = true) PermissionsEvents.CloseDialog -> state.value = state.value.copy(showDialog = false) PermissionsEvents.OpenSystemSettingAndCloseDialog -> state.value = state.value.copy(showDialog = false) }