Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Rename Event for clarity

Browse source
This commit is contained in:
Benoit Marty 2023-09-21 15:33:03 +02:00
parent 7c190883e8
commit 74fc9ad905
9 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomPresenter.kt
View file

@ -112,7 +112,7 @@ class ConfigureRoomPresenter @Inject constructor(
cameraPhotoPicker.launch() cameraPhotoPicker.launch()
} else { } else {
pendingPermissionRequest = true pendingPermissionRequest = true
cameraPermissionState.eventSink(PermissionsEvents.AskPermissionToUser) cameraPermissionState.eventSink(PermissionsEvents.RequestPermissions)
} }
AvatarAction.Remove -> dataStore.setAvatarUri(uri = null) AvatarAction.Remove -> dataStore.setAvatarUri(uri = null)
} }

2
features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/notifications/NotificationsOptInPresenter.kt
View file

@ -65,7 +65,7 @@ class NotificationsOptInPresenter @AssistedInject constructor(
if (notificationsPermissionsState.permissionGranted) { if (notificationsPermissionsState.permissionGranted) {
callback.onNotificationsOptInFinished() callback.onNotificationsOptInFinished()
} else { } else {
notificationsPermissionsState.eventSink(PermissionsEvents.AskPermissionToUser) notificationsPermissionsState.eventSink(PermissionsEvents.RequestPermissions)
} }
} }
NotificationsOptInEvents.NotNowClicked -> { NotificationsOptInEvents.NotNowClicked -> {

4
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerPresenter.kt
View file

@ -186,7 +186,7 @@ class MessageComposerPresenter @Inject constructor(
cameraPhotoPicker.launch() cameraPhotoPicker.launch()
} else { } else {
pendingEvent = event pendingEvent = event
cameraPermissionState.eventSink(PermissionsEvents.AskPermissionToUser) cameraPermissionState.eventSink(PermissionsEvents.RequestPermissions)
} }
} }
MessageComposerEvents.PickAttachmentSource.VideoFromCamera -> localCoroutineScope.launch { MessageComposerEvents.PickAttachmentSource.VideoFromCamera -> localCoroutineScope.launch {
@ -195,7 +195,7 @@ class MessageComposerPresenter @Inject constructor(
cameraVideoPicker.launch() cameraVideoPicker.launch()
} else { } else {
pendingEvent = event pendingEvent = event
cameraPermissionState.eventSink(PermissionsEvents.AskPermissionToUser) cameraPermissionState.eventSink(PermissionsEvents.RequestPermissions)
} }
} }
MessageComposerEvents.PickAttachmentSource.Location -> { MessageComposerEvents.PickAttachmentSource.Location -> {

2
features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfilePresenter.kt
View file

@ -104,7 +104,7 @@ class EditUserProfilePresenter @AssistedInject constructor(
cameraPhotoPicker.launch() cameraPhotoPicker.launch()
} else { } else {
pendingPermissionRequest = true pendingPermissionRequest = true
cameraPermissionState.eventSink(PermissionsEvents.AskPermissionToUser) cameraPermissionState.eventSink(PermissionsEvents.RequestPermissions)
} }
AvatarAction.Remove -> userAvatarUri = null AvatarAction.Remove -> userAvatarUri = null
} }

2
features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/edit/RoomDetailsEditPresenter.kt
View file

@ -128,7 +128,7 @@ class RoomDetailsEditPresenter @Inject constructor(
cameraPhotoPicker.launch() cameraPhotoPicker.launch()
} else { } else {
pendingPermissionRequest = true pendingPermissionRequest = true
cameraPermissionState.eventSink(PermissionsEvents.AskPermissionToUser) cameraPermissionState.eventSink(PermissionsEvents.RequestPermissions)
} }
AvatarAction.Remove -> roomAvatarUri = null AvatarAction.Remove -> roomAvatarUri = null
} }

2
libraries/permissions/api/src/main/kotlin/io/element/android/libraries/permissions/api/PermissionsEvents.kt
View file

@ -17,7 +17,7 @@
package io.element.android.libraries.permissions.api package io.element.android.libraries.permissions.api
sealed interface PermissionsEvents { sealed interface PermissionsEvents {
data object AskPermissionToUser : PermissionsEvents data object RequestPermissions : PermissionsEvents
data object CloseDialog : PermissionsEvents data object CloseDialog : PermissionsEvents
data object OpenSystemSettingAndCloseDialog : PermissionsEvents data object OpenSystemSettingAndCloseDialog : PermissionsEvents
} }

2
libraries/permissions/impl/src/main/kotlin/io/element/android/libraries/permissions/impl/DefaultPermissionsPresenter.kt
View file

@ -112,7 +112,7 @@ class DefaultPermissionsPresenter @AssistedInject constructor(
PermissionsEvents.CloseDialog -> { PermissionsEvents.CloseDialog -> {
showDialog.value = false showDialog.value = false
} }
PermissionsEvents.AskPermissionToUser -> { PermissionsEvents.RequestPermissions -> {
if (permissionState.status !is PermissionStatus.Granted && isAlreadyDenied) { if (permissionState.status !is PermissionStatus.Granted && isAlreadyDenied) {
showDialog.value = true showDialog.value = true
} else { } else {

12
libraries/permissions/impl/src/test/kotlin/io/element/android/libraries/permissions/impl/DefaultPermissionsPresenterTest.kt
View file

@ -94,7 +94,7 @@ class DefaultPermissionsPresenterTest {
}.test { }.test {
skipItems(1) skipItems(1)
val initialState = awaitItem() val initialState = awaitItem()
initialState.eventSink.invoke(PermissionsEvents.AskPermissionToUser) initialState.eventSink.invoke(PermissionsEvents.RequestPermissions)
val withDialogState = awaitItem() val withDialogState = awaitItem()
assertThat(withDialogState.showDialog).isTrue() assertThat(withDialogState.showDialog).isTrue()
withDialogState.eventSink.invoke(PermissionsEvents.CloseDialog) withDialogState.eventSink.invoke(PermissionsEvents.CloseDialog)
@ -128,7 +128,7 @@ class DefaultPermissionsPresenterTest {
}.test { }.test {
skipItems(1) skipItems(1)
val initialState = awaitItem() val initialState = awaitItem()
initialState.eventSink.invoke(PermissionsEvents.AskPermissionToUser) initialState.eventSink.invoke(PermissionsEvents.RequestPermissions)
val withDialogState = awaitItem() val withDialogState = awaitItem()
assertThat(withDialogState.showDialog).isTrue() assertThat(withDialogState.showDialog).isTrue()
assertThat(permissionActions.openSettingsCalled).isFalse() assertThat(permissionActions.openSettingsCalled).isFalse()
@ -160,7 +160,7 @@ class DefaultPermissionsPresenterTest {
}.test { }.test {
val initialState = awaitItem() val initialState = awaitItem()
assertThat(initialState.showDialog).isFalse() assertThat(initialState.showDialog).isFalse()
initialState.eventSink.invoke(PermissionsEvents.AskPermissionToUser) initialState.eventSink.invoke(PermissionsEvents.RequestPermissions)
assertThat(permissionState.launchPermissionRequestCalled).isTrue() assertThat(permissionState.launchPermissionRequestCalled).isTrue()
// User does not grant permission // User does not grant permission
permissionStateProvider.userGiveAnswer(answer = false, firstTime = true) permissionStateProvider.userGiveAnswer(answer = false, firstTime = true)
@ -195,7 +195,7 @@ class DefaultPermissionsPresenterTest {
}.test { }.test {
val initialState = awaitItem() val initialState = awaitItem()
assertThat(initialState.showDialog).isFalse() assertThat(initialState.showDialog).isFalse()
initialState.eventSink.invoke(PermissionsEvents.AskPermissionToUser) initialState.eventSink.invoke(PermissionsEvents.RequestPermissions)
assertThat(permissionState.launchPermissionRequestCalled).isTrue() assertThat(permissionState.launchPermissionRequestCalled).isTrue()
// User does not grant permission // User does not grant permission
permissionStateProvider.userGiveAnswer(answer = false, firstTime = false) permissionStateProvider.userGiveAnswer(answer = false, firstTime = false)
@ -234,7 +234,7 @@ class DefaultPermissionsPresenterTest {
}.test { }.test {
skipItems(1) skipItems(1)
val initialState = awaitItem() val initialState = awaitItem()
initialState.eventSink.invoke(PermissionsEvents.AskPermissionToUser) initialState.eventSink.invoke(PermissionsEvents.RequestPermissions)
val withDialogState = awaitItem() val withDialogState = awaitItem()
assertThat(withDialogState.showDialog).isTrue() assertThat(withDialogState.showDialog).isTrue()
assertThat(withDialogState.permissionGranted).isFalse() assertThat(withDialogState.permissionGranted).isFalse()
@ -265,7 +265,7 @@ class DefaultPermissionsPresenterTest {
}.test { }.test {
val initialState = awaitItem() val initialState = awaitItem()
assertThat(initialState.showDialog).isFalse() assertThat(initialState.showDialog).isFalse()
initialState.eventSink.invoke(PermissionsEvents.AskPermissionToUser) initialState.eventSink.invoke(PermissionsEvents.RequestPermissions)
assertThat(permissionState.launchPermissionRequestCalled).isTrue() assertThat(permissionState.launchPermissionRequestCalled).isTrue()
// User grants permission // User grants permission
permissionStateProvider.userGiveAnswer(answer = true, firstTime = true) permissionStateProvider.userGiveAnswer(answer = true, firstTime = true)

2
libraries/permissions/test/src/main/kotlin/io/element/android/libraries/permissions/test/FakePermissionsPresenter.kt
View file

@ -29,7 +29,7 @@ class FakePermissionsPresenter(
private fun eventSink(events: PermissionsEvents) { private fun eventSink(events: PermissionsEvents) {
when (events) { 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.CloseDialog -> state.value = state.value.copy(showDialog = false)
PermissionsEvents.OpenSystemSettingAndCloseDialog -> state.value = state.value.copy(showDialog = false) PermissionsEvents.OpenSystemSettingAndCloseDialog -> state.value = state.value.copy(showDialog = false)
} }