mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2025-03-18 04:08:44 +03:00
Code Issues Projects Releases Packages Wiki Activity

Widget: fix nullable widgetId

Browse source
This commit is contained in:
ganfra 2020-05-29 18:08:56 +02:00
parent c742ca3b41
commit 64cfd4d81a
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
vector/src/main/java/im/vector/riotx/features/widgets/permissions/RoomWidgetPermissionViewModel.kt
View file

@ -44,7 +44,7 @@ class RoomWidgetPermissionViewModel @AssistedInject constructor(@Assisted val in
}
private fun observeWidget() {
val widgetId = initialState.widgetId
val widgetId = initialState.widgetId ?: return
session.rx()
.liveRoomWidgets(initialState.roomId, QueryStringValue.Equals(widgetId))
.filter { it.isNotEmpty() }
@ -87,8 +87,9 @@ class RoomWidgetPermissionViewModel @AssistedInject constructor(@Assisted val in
private fun handleRevokeWidget() = withState { state ->
viewModelScope.launch {
try {
val widgetId = state.widgetId ?: return@launch
if (state.permissionData()?.isWebviewWidget.orFalse()) {
WidgetPermissionsHelper(integrationManagerService, widgetService).changePermission(state.roomId, state.widgetId, false)
WidgetPermissionsHelper(integrationManagerService, widgetService).changePermission(state.roomId, widgetId, false)
} else {
//TODO JITSI
}
@ -104,8 +105,9 @@ class RoomWidgetPermissionViewModel @AssistedInject constructor(@Assisted val in
private fun handleAllowWidget() = withState { state ->
viewModelScope.launch {
try {
val widgetId = state.widgetId ?: return@launch
if (state.permissionData()?.isWebviewWidget.orFalse()) {
WidgetPermissionsHelper(integrationManagerService, widgetService).changePermission(state.roomId, state.widgetId, true)
WidgetPermissionsHelper(integrationManagerService, widgetService).changePermission(state.roomId, widgetId, true)
} else {
//TODO JITSI
}

4
vector/src/main/java/im/vector/riotx/features/widgets/permissions/RoomWidgetPermissionViewState.kt
View file

@ -24,13 +24,13 @@ import im.vector.riotx.features.widgets.WidgetArgs
data class RoomWidgetPermissionViewState(
val roomId: String,
val widgetId: String,
val widgetId: String?,
val permissionData: Async<WidgetPermissionData> = Uninitialized
) : MvRxState {
constructor(widgetArgs: WidgetArgs) : this(
roomId = widgetArgs.roomId,
widgetId = widgetArgs.widgetId!!
widgetId = widgetArgs.widgetId
)
data class WidgetPermissionData(