mirror of
https://github.com/Novaloop-AG/element-x-android.git
synced 2026-11-02 12:07:28 +00:00
PermissionsEvents -> PermissionsEvent
This commit is contained in:
+2
-2
@@ -41,9 +41,9 @@ class DefaultPermissionsPresenter(
|
||||
permissionsRequested = true
|
||||
}
|
||||
|
||||
fun handleEvent(event: PermissionsEvents) {
|
||||
fun handleEvent(event: PermissionsEvent) {
|
||||
when (event) {
|
||||
PermissionsEvents.RequestPermissions -> {
|
||||
PermissionsEvent.RequestPermissions -> {
|
||||
multiplePermissionsState.launchMultiplePermissionRequest()
|
||||
}
|
||||
}
|
||||
|
||||
+2
-2
@@ -8,6 +8,6 @@
|
||||
|
||||
package io.element.android.features.location.impl.common.permissions
|
||||
|
||||
sealed interface PermissionsEvents {
|
||||
data object RequestPermissions : PermissionsEvents
|
||||
sealed interface PermissionsEvent {
|
||||
data object RequestPermissions : PermissionsEvent
|
||||
}
|
||||
+1
-1
@@ -12,7 +12,7 @@ data class PermissionsState(
|
||||
val permissions: Permissions,
|
||||
val shouldShowRationale: Boolean,
|
||||
val permissionsAlreadyRequested: Boolean,
|
||||
val eventSink: (PermissionsEvents) -> Unit,
|
||||
val eventSink: (PermissionsEvent) -> Unit,
|
||||
) {
|
||||
sealed interface Permissions {
|
||||
data object AllGranted : Permissions
|
||||
|
||||
+4
-4
@@ -29,7 +29,7 @@ import io.element.android.features.location.impl.common.MapDefaults
|
||||
import io.element.android.features.location.impl.common.SendLiveLocationPermissions
|
||||
import io.element.android.features.location.impl.common.actions.LocationActions
|
||||
import io.element.android.features.location.impl.common.checkLocationConstraints
|
||||
import io.element.android.features.location.impl.common.permissions.PermissionsEvents
|
||||
import io.element.android.features.location.impl.common.permissions.PermissionsEvent
|
||||
import io.element.android.features.location.impl.common.permissions.PermissionsPresenter
|
||||
import io.element.android.features.location.impl.common.permissions.PermissionsState
|
||||
import io.element.android.features.location.impl.common.sendLiveLocationPermissions
|
||||
@@ -111,7 +111,7 @@ class ShareLocationPresenter(
|
||||
sendLiveLocationPermissions = SendLiveLocationPermissions.GRANTED
|
||||
)
|
||||
if (locationConstraints is LocationConstraintsCheck.PermissionShouldBeRequested) {
|
||||
permissionsState.eventSink(PermissionsEvents.RequestPermissions)
|
||||
permissionsState.eventSink(PermissionsEvent.RequestPermissions)
|
||||
}
|
||||
trackUserPosition = locationConstraints is LocationConstraintsCheck.Success
|
||||
dialogState = ShareLocationState.Dialog.Constraints(locationConstraints.toDialogState())
|
||||
@@ -137,7 +137,7 @@ class ShareLocationPresenter(
|
||||
}
|
||||
else -> {
|
||||
if (locationConstraints is LocationConstraintsCheck.PermissionShouldBeRequested) {
|
||||
permissionsState.eventSink(PermissionsEvents.RequestPermissions)
|
||||
permissionsState.eventSink(PermissionsEvent.RequestPermissions)
|
||||
}
|
||||
dialogState = ShareLocationState.Dialog.Constraints(locationConstraints.toDialogState())
|
||||
}
|
||||
@@ -195,7 +195,7 @@ class ShareLocationPresenter(
|
||||
}
|
||||
ShareLocationEvent.RequestPermissions -> {
|
||||
dialogState = ShareLocationState.Dialog.None
|
||||
permissionsState.eventSink(PermissionsEvents.RequestPermissions)
|
||||
permissionsState.eventSink(PermissionsEvent.RequestPermissions)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+3
-3
@@ -32,7 +32,7 @@ import io.element.android.features.location.impl.common.MapDefaults
|
||||
import io.element.android.features.location.impl.common.SendLiveLocationPermissions
|
||||
import io.element.android.features.location.impl.common.actions.LocationActions
|
||||
import io.element.android.features.location.impl.common.checkLocationConstraints
|
||||
import io.element.android.features.location.impl.common.permissions.PermissionsEvents
|
||||
import io.element.android.features.location.impl.common.permissions.PermissionsEvent
|
||||
import io.element.android.features.location.impl.common.permissions.PermissionsPresenter
|
||||
import io.element.android.features.location.impl.common.permissions.PermissionsState
|
||||
import io.element.android.features.location.impl.common.toDialogState
|
||||
@@ -99,7 +99,7 @@ class ShowLocationPresenter(
|
||||
sendLiveLocationPermissions = SendLiveLocationPermissions.GRANTED
|
||||
)
|
||||
if (locationConstraints is LocationConstraintsCheck.PermissionShouldBeRequested) {
|
||||
permissionsState.eventSink(PermissionsEvents.RequestPermissions)
|
||||
permissionsState.eventSink(PermissionsEvent.RequestPermissions)
|
||||
}
|
||||
isTrackMyLocation = locationConstraints is LocationConstraintsCheck.Success
|
||||
dialogState = locationConstraints.toDialogState()
|
||||
@@ -130,7 +130,7 @@ class ShowLocationPresenter(
|
||||
locationActions.openLocationSettings()
|
||||
dialogState = LocationConstraintsDialogState.None
|
||||
}
|
||||
ShowLocationEvent.RequestPermissions -> permissionsState.eventSink(PermissionsEvents.RequestPermissions)
|
||||
ShowLocationEvent.RequestPermissions -> permissionsState.eventSink(PermissionsEvent.RequestPermissions)
|
||||
ShowLocationEvent.StopLocationSharing -> coroutineScope.launch {
|
||||
liveLocationShareManager.stopShare(joinedRoom.roomId)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user