PermissionsEvents -> PermissionsEvent

This commit is contained in:
Benoit Marty 2025-12-10 10:50:10 +01:00
parent fa3274e135
commit 8a7e71b49e
13 changed files with 43 additions and 43 deletions

View file

@ -40,7 +40,7 @@ import io.element.android.libraries.matrix.ui.room.address.RoomAddressValidityEf
import io.element.android.libraries.mediapickers.api.PickerProvider import io.element.android.libraries.mediapickers.api.PickerProvider
import io.element.android.libraries.mediaupload.api.MediaOptimizationConfigProvider import io.element.android.libraries.mediaupload.api.MediaOptimizationConfigProvider
import io.element.android.libraries.mediaupload.api.MediaPreProcessor import io.element.android.libraries.mediaupload.api.MediaPreProcessor
import io.element.android.libraries.permissions.api.PermissionsEvents import io.element.android.libraries.permissions.api.PermissionsEvent
import io.element.android.libraries.permissions.api.PermissionsPresenter import io.element.android.libraries.permissions.api.PermissionsPresenter
import io.element.android.services.analytics.api.AnalyticsService import io.element.android.services.analytics.api.AnalyticsService
import kotlinx.collections.immutable.toImmutableList import kotlinx.collections.immutable.toImmutableList
@ -132,7 +132,7 @@ class ConfigureRoomPresenter(
cameraPhotoPicker.launch() cameraPhotoPicker.launch()
} else { } else {
pendingPermissionRequest = true pendingPermissionRequest = true
cameraPermissionState.eventSink(PermissionsEvents.RequestPermissions) cameraPermissionState.eventSink(PermissionsEvent.RequestPermissions)
} }
AvatarAction.Remove -> dataStore.setAvatarUri(uri = null) AvatarAction.Remove -> dataStore.setAvatarUri(uri = null)
} }

View file

@ -19,7 +19,7 @@ import dev.zacsweers.metro.AssistedInject
import io.element.android.libraries.architecture.Presenter import io.element.android.libraries.architecture.Presenter
import io.element.android.libraries.di.annotations.AppCoroutineScope import io.element.android.libraries.di.annotations.AppCoroutineScope
import io.element.android.libraries.permissions.api.PermissionStateProvider import io.element.android.libraries.permissions.api.PermissionStateProvider
import io.element.android.libraries.permissions.api.PermissionsEvents import io.element.android.libraries.permissions.api.PermissionsEvent
import io.element.android.libraries.permissions.api.PermissionsPresenter import io.element.android.libraries.permissions.api.PermissionsPresenter
import io.element.android.libraries.permissions.noop.NoopPermissionsPresenter import io.element.android.libraries.permissions.noop.NoopPermissionsPresenter
import io.element.android.services.toolbox.api.sdk.BuildVersionSdkIntProvider import io.element.android.services.toolbox.api.sdk.BuildVersionSdkIntProvider
@ -58,7 +58,7 @@ class NotificationsOptInPresenter(
if (notificationsPermissionsState.permissionGranted) { if (notificationsPermissionsState.permissionGranted) {
callback.onNotificationsOptInFinished() callback.onNotificationsOptInFinished()
} else { } else {
notificationsPermissionsState.eventSink(PermissionsEvents.RequestPermissions) notificationsPermissionsState.eventSink(PermissionsEvent.RequestPermissions)
} }
} }
NotificationsOptInEvents.NotNowClicked -> { NotificationsOptInEvents.NotNowClicked -> {

View file

@ -18,7 +18,7 @@ import androidx.compose.runtime.setValue
import dev.zacsweers.metro.Inject import dev.zacsweers.metro.Inject
import io.element.android.libraries.architecture.Presenter import io.element.android.libraries.architecture.Presenter
import io.element.android.libraries.core.meta.BuildMeta import io.element.android.libraries.core.meta.BuildMeta
import io.element.android.libraries.permissions.api.PermissionsEvents import io.element.android.libraries.permissions.api.PermissionsEvent
import io.element.android.libraries.permissions.api.PermissionsPresenter import io.element.android.libraries.permissions.api.PermissionsPresenter
@Inject @Inject
@ -46,7 +46,7 @@ class QrCodeIntroPresenter(
canContinue = true canContinue = true
} else { } else {
pendingPermissionRequest = true pendingPermissionRequest = true
cameraPermissionState.eventSink(PermissionsEvents.RequestPermissions) cameraPermissionState.eventSink(PermissionsEvent.RequestPermissions)
} }
} }
} }

View file

@ -63,7 +63,7 @@ import io.element.android.libraries.mediapickers.api.PickerProvider
import io.element.android.libraries.mediaupload.api.MediaOptimizationConfigProvider import io.element.android.libraries.mediaupload.api.MediaOptimizationConfigProvider
import io.element.android.libraries.mediaupload.api.MediaSenderFactory import io.element.android.libraries.mediaupload.api.MediaSenderFactory
import io.element.android.libraries.mediaviewer.api.local.LocalMediaFactory import io.element.android.libraries.mediaviewer.api.local.LocalMediaFactory
import io.element.android.libraries.permissions.api.PermissionsEvents import io.element.android.libraries.permissions.api.PermissionsEvent
import io.element.android.libraries.permissions.api.PermissionsPresenter import io.element.android.libraries.permissions.api.PermissionsPresenter
import io.element.android.libraries.preferences.api.store.SessionPreferencesStore import io.element.android.libraries.preferences.api.store.SessionPreferencesStore
import io.element.android.libraries.push.api.notifications.conversations.NotificationConversationService import io.element.android.libraries.push.api.notifications.conversations.NotificationConversationService
@ -284,7 +284,7 @@ class MessageComposerPresenter(
cameraPhotoPicker.launch() cameraPhotoPicker.launch()
} else { } else {
pendingEvent = event pendingEvent = event
cameraPermissionState.eventSink(PermissionsEvents.RequestPermissions) cameraPermissionState.eventSink(PermissionsEvent.RequestPermissions)
} }
} }
MessageComposerEvent.PickAttachmentSource.VideoFromCamera -> localCoroutineScope.launch { MessageComposerEvent.PickAttachmentSource.VideoFromCamera -> localCoroutineScope.launch {
@ -293,7 +293,7 @@ class MessageComposerPresenter(
cameraVideoPicker.launch() cameraVideoPicker.launch()
} else { } else {
pendingEvent = event pendingEvent = event
cameraPermissionState.eventSink(PermissionsEvents.RequestPermissions) cameraPermissionState.eventSink(PermissionsEvent.RequestPermissions)
} }
} }
MessageComposerEvent.PickAttachmentSource.Location -> { MessageComposerEvent.PickAttachmentSource.Location -> {

View file

@ -33,7 +33,7 @@ import io.element.android.libraries.di.RoomScope
import io.element.android.libraries.di.annotations.SessionCoroutineScope import io.element.android.libraries.di.annotations.SessionCoroutineScope
import io.element.android.libraries.matrix.api.timeline.Timeline import io.element.android.libraries.matrix.api.timeline.Timeline
import io.element.android.libraries.mediaupload.api.MediaSenderFactory import io.element.android.libraries.mediaupload.api.MediaSenderFactory
import io.element.android.libraries.permissions.api.PermissionsEvents import io.element.android.libraries.permissions.api.PermissionsEvent
import io.element.android.libraries.permissions.api.PermissionsPresenter import io.element.android.libraries.permissions.api.PermissionsPresenter
import io.element.android.libraries.textcomposer.model.VoiceMessagePlayerEvent import io.element.android.libraries.textcomposer.model.VoiceMessagePlayerEvent
import io.element.android.libraries.textcomposer.model.VoiceMessageRecorderEvent import io.element.android.libraries.textcomposer.model.VoiceMessageRecorderEvent
@ -111,7 +111,7 @@ class DefaultVoiceMessageComposerPresenter(
} }
else -> { else -> {
Timber.i("Voice message permission needed") Timber.i("Voice message permission needed")
permissionState.eventSink(PermissionsEvents.RequestPermissions) permissionState.eventSink(PermissionsEvent.RequestPermissions)
} }
} }
} }
@ -176,10 +176,10 @@ class DefaultVoiceMessageComposerPresenter(
localCoroutineScope.deleteRecording() localCoroutineScope.deleteRecording()
} }
VoiceMessageComposerEvent.DismissPermissionsRationale -> { VoiceMessageComposerEvent.DismissPermissionsRationale -> {
permissionState.eventSink(PermissionsEvents.CloseDialog) permissionState.eventSink(PermissionsEvent.CloseDialog)
} }
VoiceMessageComposerEvent.AcceptPermissionRationale -> { VoiceMessageComposerEvent.AcceptPermissionRationale -> {
permissionState.eventSink(PermissionsEvents.OpenSystemSettingAndCloseDialog) permissionState.eventSink(PermissionsEvent.OpenSystemSettingAndCloseDialog)
} }
is VoiceMessageComposerEvent.LifecycleEvent -> handleLifecycleEvent(event.event) is VoiceMessageComposerEvent.LifecycleEvent -> handleLifecycleEvent(event.event)
VoiceMessageComposerEvent.DismissSendFailureDialog -> { VoiceMessageComposerEvent.DismissSendFailureDialog -> {

View file

@ -35,7 +35,7 @@ import io.element.android.libraries.matrix.ui.media.AvatarAction
import io.element.android.libraries.mediapickers.api.PickerProvider import io.element.android.libraries.mediapickers.api.PickerProvider
import io.element.android.libraries.mediaupload.api.MediaOptimizationConfigProvider import io.element.android.libraries.mediaupload.api.MediaOptimizationConfigProvider
import io.element.android.libraries.mediaupload.api.MediaPreProcessor import io.element.android.libraries.mediaupload.api.MediaPreProcessor
import io.element.android.libraries.permissions.api.PermissionsEvents import io.element.android.libraries.permissions.api.PermissionsEvent
import io.element.android.libraries.permissions.api.PermissionsPresenter import io.element.android.libraries.permissions.api.PermissionsPresenter
import kotlinx.collections.immutable.toImmutableList import kotlinx.collections.immutable.toImmutableList
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope
@ -127,7 +127,7 @@ class EditUserProfilePresenter(
cameraPhotoPicker.launch() cameraPhotoPicker.launch()
} else { } else {
pendingPermissionRequest = true pendingPermissionRequest = true
cameraPermissionState.eventSink(PermissionsEvents.RequestPermissions) cameraPermissionState.eventSink(PermissionsEvent.RequestPermissions)
} }
AvatarAction.Remove -> { AvatarAction.Remove -> {
temporaryUriDeleter.delete(userAvatarUri?.toUri()) temporaryUriDeleter.delete(userAvatarUri?.toUri())

View file

@ -36,7 +36,7 @@ import io.element.android.libraries.matrix.ui.media.AvatarAction
import io.element.android.libraries.mediapickers.api.PickerProvider import io.element.android.libraries.mediapickers.api.PickerProvider
import io.element.android.libraries.mediaupload.api.MediaOptimizationConfigProvider import io.element.android.libraries.mediaupload.api.MediaOptimizationConfigProvider
import io.element.android.libraries.mediaupload.api.MediaPreProcessor import io.element.android.libraries.mediaupload.api.MediaPreProcessor
import io.element.android.libraries.permissions.api.PermissionsEvents import io.element.android.libraries.permissions.api.PermissionsEvent
import io.element.android.libraries.permissions.api.PermissionsPresenter import io.element.android.libraries.permissions.api.PermissionsPresenter
import kotlinx.collections.immutable.toImmutableList import kotlinx.collections.immutable.toImmutableList
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope
@ -157,7 +157,7 @@ class RoomDetailsEditPresenter(
cameraPhotoPicker.launch() cameraPhotoPicker.launch()
} else { } else {
pendingPermissionRequest = true pendingPermissionRequest = true
cameraPermissionState.eventSink(PermissionsEvents.RequestPermissions) cameraPermissionState.eventSink(PermissionsEvent.RequestPermissions)
} }
AvatarAction.Remove -> { AvatarAction.Remove -> {
temporaryUriDeleter.delete(roomAvatarUriEdited?.toUri()) temporaryUriDeleter.delete(roomAvatarUriEdited?.toUri())

View file

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

View file

@ -17,5 +17,5 @@ data class PermissionsState(
val permissionAlreadyAsked: Boolean, val permissionAlreadyAsked: Boolean,
// If true, there is no need to ask again, the system dialog will not be displayed // If true, there is no need to ask again, the system dialog will not be displayed
val permissionAlreadyDenied: Boolean, val permissionAlreadyDenied: Boolean,
val eventSink: (PermissionsEvents) -> Unit val eventSink: (PermissionsEvent) -> Unit
) )

View file

@ -35,9 +35,9 @@ fun PermissionsView(
content = content ?: state.permission.toDialogContent(), content = content ?: state.permission.toDialogContent(),
submitText = stringResource(id = CommonStrings.action_open_settings), submitText = stringResource(id = CommonStrings.action_open_settings),
onSubmitClick = { onSubmitClick = {
state.eventSink.invoke(PermissionsEvents.OpenSystemSettingAndCloseDialog) state.eventSink.invoke(PermissionsEvent.OpenSystemSettingAndCloseDialog)
}, },
onDismiss = { state.eventSink.invoke(PermissionsEvents.CloseDialog) }, onDismiss = { state.eventSink.invoke(PermissionsEvent.CloseDialog) },
icon = icon, icon = icon,
) )
} }

View file

@ -28,7 +28,7 @@ import dev.zacsweers.metro.AssistedFactory
import dev.zacsweers.metro.AssistedInject import dev.zacsweers.metro.AssistedInject
import dev.zacsweers.metro.ContributesBinding import dev.zacsweers.metro.ContributesBinding
import io.element.android.libraries.core.log.logger.LoggerTag import io.element.android.libraries.core.log.logger.LoggerTag
import io.element.android.libraries.permissions.api.PermissionsEvents import io.element.android.libraries.permissions.api.PermissionsEvent
import io.element.android.libraries.permissions.api.PermissionsPresenter import io.element.android.libraries.permissions.api.PermissionsPresenter
import io.element.android.libraries.permissions.api.PermissionsState import io.element.android.libraries.permissions.api.PermissionsState
import io.element.android.libraries.permissions.api.PermissionsStore import io.element.android.libraries.permissions.api.PermissionsStore
@ -100,19 +100,19 @@ class DefaultPermissionsPresenter(
val showDialog = rememberSaveable { mutableStateOf(false) } val showDialog = rememberSaveable { mutableStateOf(false) }
fun handleEvent(event: PermissionsEvents) { fun handleEvent(event: PermissionsEvent) {
when (event) { when (event) {
PermissionsEvents.CloseDialog -> { PermissionsEvent.CloseDialog -> {
showDialog.value = false showDialog.value = false
} }
PermissionsEvents.RequestPermissions -> { PermissionsEvent.RequestPermissions -> {
if (permissionState.status !is PermissionStatus.Granted && isAlreadyDenied) { if (permissionState.status !is PermissionStatus.Granted && isAlreadyDenied) {
showDialog.value = true showDialog.value = true
} else { } else {
permissionState.launchPermissionRequest() permissionState.launchPermissionRequest()
} }
} }
PermissionsEvents.OpenSystemSettingAndCloseDialog -> { PermissionsEvent.OpenSystemSettingAndCloseDialog -> {
permissionActions.openSettings(permission) permissionActions.openSettings(permission)
showDialog.value = false showDialog.value = false
} }

View file

@ -13,7 +13,7 @@ package io.element.android.libraries.permissions.impl
import com.google.accompanist.permissions.ExperimentalPermissionsApi import com.google.accompanist.permissions.ExperimentalPermissionsApi
import com.google.accompanist.permissions.PermissionStatus import com.google.accompanist.permissions.PermissionStatus
import com.google.common.truth.Truth.assertThat import com.google.common.truth.Truth.assertThat
import io.element.android.libraries.permissions.api.PermissionsEvents import io.element.android.libraries.permissions.api.PermissionsEvent
import io.element.android.libraries.permissions.api.PermissionsStore import io.element.android.libraries.permissions.api.PermissionsStore
import io.element.android.libraries.permissions.impl.action.FakePermissionActions import io.element.android.libraries.permissions.impl.action.FakePermissionActions
import io.element.android.libraries.permissions.impl.action.PermissionActions import io.element.android.libraries.permissions.impl.action.PermissionActions
@ -64,10 +64,10 @@ class DefaultPermissionsPresenterTest {
presenter.test { presenter.test {
skipItems(1) skipItems(1)
val initialState = awaitItem() val initialState = awaitItem()
initialState.eventSink.invoke(PermissionsEvents.RequestPermissions) initialState.eventSink.invoke(PermissionsEvent.RequestPermissions)
val withDialogState = awaitItem() val withDialogState = awaitItem()
assertThat(withDialogState.showDialog).isTrue() assertThat(withDialogState.showDialog).isTrue()
withDialogState.eventSink.invoke(PermissionsEvents.CloseDialog) withDialogState.eventSink.invoke(PermissionsEvent.CloseDialog)
assertThat(awaitItem().showDialog).isFalse() assertThat(awaitItem().showDialog).isFalse()
} }
} }
@ -95,11 +95,11 @@ class DefaultPermissionsPresenterTest {
presenter.test { presenter.test {
skipItems(1) skipItems(1)
val initialState = awaitItem() val initialState = awaitItem()
initialState.eventSink.invoke(PermissionsEvents.RequestPermissions) initialState.eventSink.invoke(PermissionsEvent.RequestPermissions)
val withDialogState = awaitItem() val withDialogState = awaitItem()
assertThat(withDialogState.showDialog).isTrue() assertThat(withDialogState.showDialog).isTrue()
openSettingsAction.assertions().isNeverCalled() openSettingsAction.assertions().isNeverCalled()
withDialogState.eventSink.invoke(PermissionsEvents.OpenSystemSettingAndCloseDialog) withDialogState.eventSink.invoke(PermissionsEvent.OpenSystemSettingAndCloseDialog)
assertThat(awaitItem().showDialog).isFalse() assertThat(awaitItem().showDialog).isFalse()
openSettingsAction.assertions().isCalledOnce().with(value(A_PERMISSION)) openSettingsAction.assertions().isCalledOnce().with(value(A_PERMISSION))
} }
@ -119,7 +119,7 @@ class DefaultPermissionsPresenterTest {
presenter.test { presenter.test {
val initialState = awaitItem() val initialState = awaitItem()
assertThat(initialState.showDialog).isFalse() assertThat(initialState.showDialog).isFalse()
initialState.eventSink.invoke(PermissionsEvents.RequestPermissions) initialState.eventSink.invoke(PermissionsEvent.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)
@ -146,7 +146,7 @@ class DefaultPermissionsPresenterTest {
presenter.test { presenter.test {
val initialState = awaitItem() val initialState = awaitItem()
assertThat(initialState.showDialog).isFalse() assertThat(initialState.showDialog).isFalse()
initialState.eventSink.invoke(PermissionsEvents.RequestPermissions) initialState.eventSink.invoke(PermissionsEvent.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)
@ -178,7 +178,7 @@ class DefaultPermissionsPresenterTest {
presenter.test { presenter.test {
skipItems(1) skipItems(1)
val initialState = awaitItem() val initialState = awaitItem()
initialState.eventSink.invoke(PermissionsEvents.RequestPermissions) initialState.eventSink.invoke(PermissionsEvent.RequestPermissions)
val withDialogState = awaitItem() val withDialogState = awaitItem()
assertThat(withDialogState.showDialog).isTrue() assertThat(withDialogState.showDialog).isTrue()
assertThat(withDialogState.permissionGranted).isFalse() assertThat(withDialogState.permissionGranted).isFalse()
@ -201,7 +201,7 @@ class DefaultPermissionsPresenterTest {
presenter.test { presenter.test {
val initialState = awaitItem() val initialState = awaitItem()
assertThat(initialState.showDialog).isFalse() assertThat(initialState.showDialog).isFalse()
initialState.eventSink.invoke(PermissionsEvents.RequestPermissions) initialState.eventSink.invoke(PermissionsEvent.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)

View file

@ -10,7 +10,7 @@ package io.element.android.libraries.permissions.test
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.mutableStateOf
import io.element.android.libraries.permissions.api.PermissionsEvents import io.element.android.libraries.permissions.api.PermissionsEvent
import io.element.android.libraries.permissions.api.PermissionsPresenter import io.element.android.libraries.permissions.api.PermissionsPresenter
import io.element.android.libraries.permissions.api.PermissionsState import io.element.android.libraries.permissions.api.PermissionsState
import io.element.android.libraries.permissions.api.aPermissionsState import io.element.android.libraries.permissions.api.aPermissionsState
@ -18,11 +18,11 @@ import io.element.android.libraries.permissions.api.aPermissionsState
class FakePermissionsPresenter( class FakePermissionsPresenter(
private val initialState: PermissionsState = aPermissionsState(showDialog = false), private val initialState: PermissionsState = aPermissionsState(showDialog = false),
) : PermissionsPresenter { ) : PermissionsPresenter {
private fun handleEvent(event: PermissionsEvents) { private fun handleEvent(event: PermissionsEvent) {
when (event) { when (event) {
PermissionsEvents.RequestPermissions -> state.value = state.value.copy(showDialog = true, permissionAlreadyAsked = true) PermissionsEvent.RequestPermissions -> state.value = state.value.copy(showDialog = true, permissionAlreadyAsked = true)
PermissionsEvents.CloseDialog -> state.value = state.value.copy(showDialog = false) PermissionsEvent.CloseDialog -> state.value = state.value.copy(showDialog = false)
PermissionsEvents.OpenSystemSettingAndCloseDialog -> state.value = state.value.copy(showDialog = false) PermissionsEvent.OpenSystemSettingAndCloseDialog -> state.value = state.value.copy(showDialog = false)
} }
} }