mirror of
https://github.com/SchildiChat/SchildiChat-android.git
synced 2025-03-18 04:08:44 +03:00
Widget: fix nullable widgetId
This commit is contained in:
parent
c742ca3b41
commit
64cfd4d81a
2 changed files with 7 additions and 5 deletions
|
@ -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
|
||||
}
|
||||
|
|
|
@ -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(
|
||||
|
|
Loading…
Add table
Reference in a new issue