mirror of
https://github.com/Novaloop-AG/element-x-android.git
synced 2026-11-03 06:55:41 +00:00
Rename Event for clarity
This commit is contained in:
+1
-1
@@ -102,7 +102,7 @@ class ConfigureRoomPresenter @Inject constructor(
|
|||||||
AvatarAction.TakePhoto -> if (cameraPermissionState.permissionGranted) {
|
AvatarAction.TakePhoto -> if (cameraPermissionState.permissionGranted) {
|
||||||
cameraPhotoPicker.launch()
|
cameraPhotoPicker.launch()
|
||||||
} else {
|
} else {
|
||||||
cameraPermissionState.eventSink(PermissionsEvents.OpenSystemDialog)
|
cameraPermissionState.eventSink(PermissionsEvents.AskPermissionToUser)
|
||||||
}
|
}
|
||||||
AvatarAction.Remove -> dataStore.setAvatarUri(uri = null)
|
AvatarAction.Remove -> dataStore.setAvatarUri(uri = null)
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -65,7 +65,7 @@ class NotificationsOptInPresenter @AssistedInject constructor(
|
|||||||
if (notificationsPermissionsState.permissionGranted) {
|
if (notificationsPermissionsState.permissionGranted) {
|
||||||
callback.onNotificationsOptInFinished()
|
callback.onNotificationsOptInFinished()
|
||||||
} else {
|
} else {
|
||||||
notificationsPermissionsState.eventSink(PermissionsEvents.OpenSystemDialog)
|
notificationsPermissionsState.eventSink(PermissionsEvents.AskPermissionToUser)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
NotificationsOptInEvents.NotNowClicked -> {
|
NotificationsOptInEvents.NotNowClicked -> {
|
||||||
|
|||||||
+1
-1
@@ -94,7 +94,7 @@ class EditUserProfilePresenter @AssistedInject constructor(
|
|||||||
AvatarAction.TakePhoto -> if (cameraPermissionState.permissionGranted) {
|
AvatarAction.TakePhoto -> if (cameraPermissionState.permissionGranted) {
|
||||||
cameraPhotoPicker.launch()
|
cameraPhotoPicker.launch()
|
||||||
} else {
|
} else {
|
||||||
cameraPermissionState.eventSink.invoke(PermissionsEvents.OpenSystemDialog)
|
cameraPermissionState.eventSink.invoke(PermissionsEvents.AskPermissionToUser)
|
||||||
}
|
}
|
||||||
AvatarAction.Remove -> userAvatarUri = null
|
AvatarAction.Remove -> userAvatarUri = null
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -119,7 +119,7 @@ class RoomDetailsEditPresenter @Inject constructor(
|
|||||||
AvatarAction.TakePhoto -> if (cameraPermissionState.permissionGranted) {
|
AvatarAction.TakePhoto -> if (cameraPermissionState.permissionGranted) {
|
||||||
cameraPhotoPicker.launch()
|
cameraPhotoPicker.launch()
|
||||||
} else {
|
} else {
|
||||||
cameraPermissionState.eventSink(PermissionsEvents.OpenSystemDialog)
|
cameraPermissionState.eventSink(PermissionsEvents.AskPermissionToUser)
|
||||||
}
|
}
|
||||||
AvatarAction.Remove -> roomAvatarUri = null
|
AvatarAction.Remove -> roomAvatarUri = null
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -17,6 +17,6 @@
|
|||||||
package io.element.android.libraries.permissions.api
|
package io.element.android.libraries.permissions.api
|
||||||
|
|
||||||
sealed interface PermissionsEvents {
|
sealed interface PermissionsEvents {
|
||||||
data object OpenSystemDialog : PermissionsEvents
|
data object AskPermissionToUser : PermissionsEvents
|
||||||
data object CloseDialog : PermissionsEvents
|
data object CloseDialog : PermissionsEvents
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -69,7 +69,7 @@ fun PermissionsView(
|
|||||||
content = textToShow,
|
content = textToShow,
|
||||||
submitText = "Request permission",
|
submitText = "Request permission",
|
||||||
onSubmitClicked = {
|
onSubmitClicked = {
|
||||||
state.eventSink.invoke(PermissionsEvents.OpenSystemDialog)
|
state.eventSink.invoke(PermissionsEvents.AskPermissionToUser)
|
||||||
},
|
},
|
||||||
onCancelClicked = {
|
onCancelClicked = {
|
||||||
state.eventSink.invoke(PermissionsEvents.CloseDialog)
|
state.eventSink.invoke(PermissionsEvents.CloseDialog)
|
||||||
|
|||||||
+1
-1
@@ -110,7 +110,7 @@ class DefaultPermissionsPresenter @AssistedInject constructor(
|
|||||||
PermissionsEvents.CloseDialog -> {
|
PermissionsEvents.CloseDialog -> {
|
||||||
showDialog.value = false
|
showDialog.value = false
|
||||||
}
|
}
|
||||||
PermissionsEvents.OpenSystemDialog -> {
|
PermissionsEvents.AskPermissionToUser -> {
|
||||||
if (permissionState.status !is PermissionStatus.Granted && isAlreadyDenied) {
|
if (permissionState.status !is PermissionStatus.Granted && isAlreadyDenied) {
|
||||||
showDialog.value = true
|
showDialog.value = true
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
+5
-5
@@ -91,7 +91,7 @@ class DefaultPermissionsPresenterTest {
|
|||||||
}.test {
|
}.test {
|
||||||
skipItems(1)
|
skipItems(1)
|
||||||
val initialState = awaitItem()
|
val initialState = awaitItem()
|
||||||
initialState.eventSink.invoke(PermissionsEvents.OpenSystemDialog)
|
initialState.eventSink.invoke(PermissionsEvents.AskPermissionToUser)
|
||||||
val withDialogState = awaitItem()
|
val withDialogState = awaitItem()
|
||||||
assertThat(withDialogState.showDialog).isTrue()
|
assertThat(withDialogState.showDialog).isTrue()
|
||||||
withDialogState.eventSink.invoke(PermissionsEvents.CloseDialog)
|
withDialogState.eventSink.invoke(PermissionsEvents.CloseDialog)
|
||||||
@@ -120,7 +120,7 @@ class DefaultPermissionsPresenterTest {
|
|||||||
}.test {
|
}.test {
|
||||||
val initialState = awaitItem()
|
val initialState = awaitItem()
|
||||||
assertThat(initialState.showDialog).isFalse()
|
assertThat(initialState.showDialog).isFalse()
|
||||||
initialState.eventSink.invoke(PermissionsEvents.OpenSystemDialog)
|
initialState.eventSink.invoke(PermissionsEvents.AskPermissionToUser)
|
||||||
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)
|
||||||
@@ -154,7 +154,7 @@ class DefaultPermissionsPresenterTest {
|
|||||||
}.test {
|
}.test {
|
||||||
val initialState = awaitItem()
|
val initialState = awaitItem()
|
||||||
assertThat(initialState.showDialog).isFalse()
|
assertThat(initialState.showDialog).isFalse()
|
||||||
initialState.eventSink.invoke(PermissionsEvents.OpenSystemDialog)
|
initialState.eventSink.invoke(PermissionsEvents.AskPermissionToUser)
|
||||||
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)
|
||||||
@@ -192,7 +192,7 @@ class DefaultPermissionsPresenterTest {
|
|||||||
}.test {
|
}.test {
|
||||||
skipItems(1)
|
skipItems(1)
|
||||||
val initialState = awaitItem()
|
val initialState = awaitItem()
|
||||||
initialState.eventSink.invoke(PermissionsEvents.OpenSystemDialog)
|
initialState.eventSink.invoke(PermissionsEvents.AskPermissionToUser)
|
||||||
val withDialogState = awaitItem()
|
val withDialogState = awaitItem()
|
||||||
assertThat(withDialogState.showDialog).isTrue()
|
assertThat(withDialogState.showDialog).isTrue()
|
||||||
assertThat(withDialogState.permissionGranted).isFalse()
|
assertThat(withDialogState.permissionGranted).isFalse()
|
||||||
@@ -222,7 +222,7 @@ class DefaultPermissionsPresenterTest {
|
|||||||
}.test {
|
}.test {
|
||||||
val initialState = awaitItem()
|
val initialState = awaitItem()
|
||||||
assertThat(initialState.showDialog).isFalse()
|
assertThat(initialState.showDialog).isFalse()
|
||||||
initialState.eventSink.invoke(PermissionsEvents.OpenSystemDialog)
|
initialState.eventSink.invoke(PermissionsEvents.AskPermissionToUser)
|
||||||
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)
|
||||||
|
|||||||
+1
-1
@@ -29,7 +29,7 @@ class FakePermissionsPresenter(
|
|||||||
|
|
||||||
private fun eventSink(events: PermissionsEvents) {
|
private fun eventSink(events: PermissionsEvents) {
|
||||||
when (events) {
|
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)
|
PermissionsEvents.CloseDialog -> state.value = state.value.copy(showDialog = false)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user