From 959b67908641d44628eb3d8d711470d4ff6a56e3 Mon Sep 17 00:00:00 2001 From: ganfra Date: Fri, 29 May 2020 19:03:54 +0200 Subject: [PATCH] Clean files --- .../java/im/vector/matrix/rx/RxSession.kt | 7 +++- .../IntegrationManagerService.kt | 7 ++-- .../api/session/widgets/WidgetURLFormatter.kt | 1 - .../api/session/widgets/model/Widget.kt | 2 - .../model/{WidgetTypes.kt => WidgetType.kt} | 2 +- .../database/model/ScalarTokenEntity.kt | 1 - .../IntegrationManagerConfigExtractor.kt | 1 - .../pushers/DefaultConditionResolver.kt | 1 - .../room/send/LocalEchoEventFactory.kt | 1 - .../session/widgets/CreateWidgetTask.kt | 1 - .../widgets/DefaultWidgetPostAPIMediator.kt | 3 +- .../session/widgets/DefaultWidgetService.kt | 40 +++++++++++++++---- .../widgets/DefaultWidgetURLFormatter.kt | 2 - .../internal/session/widgets/WidgetManager.kt | 18 +++++++-- .../internal/session/widgets/WidgetsAPI.kt | 2 +- .../im/vector/riotx/core/di/FragmentModule.kt | 1 - .../features/attachments/AttachmentsMapper.kt | 1 - .../features/navigation/DefaultNavigator.kt | 2 - .../riotx/features/navigation/Navigator.kt | 1 - .../settings/VectorSettingsGeneralFragment.kt | 2 +- .../features/webview/WebViewEventListener.kt | 22 +++++----- .../features/widgets/WidgetArgsBuilder.kt | 2 +- .../riotx/features/widgets/WidgetFragment.kt | 4 +- .../features/widgets/WidgetPostAPIHandler.kt | 4 +- .../riotx/features/widgets/WidgetViewModel.kt | 6 ++- .../RoomWidgetPermissionBottomSheet.kt | 4 +- .../RoomWidgetPermissionViewModel.kt | 8 ++-- .../RoomWidgetPermissionViewState.kt | 2 - .../widgets/webview/WebviewPermissionUtils.kt | 6 +-- .../main/res/layout/fragment_admin_widget.xml | 19 --------- .../main/res/layout/fragment_room_widgets.xml | 18 --------- 31 files changed, 89 insertions(+), 102 deletions(-) rename matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/widgets/model/{WidgetTypes.kt => WidgetType.kt} (98%) delete mode 100644 vector/src/main/res/layout/fragment_admin_widget.xml delete mode 100644 vector/src/main/res/layout/fragment_room_widgets.xml diff --git a/matrix-sdk-android-rx/src/main/java/im/vector/matrix/rx/RxSession.kt b/matrix-sdk-android-rx/src/main/java/im/vector/matrix/rx/RxSession.kt index 45c13f2182..d2d9eb4d5a 100644 --- a/matrix-sdk-android-rx/src/main/java/im/vector/matrix/rx/RxSession.kt +++ b/matrix-sdk-android-rx/src/main/java/im/vector/matrix/rx/RxSession.kt @@ -154,7 +154,12 @@ class RxSession(private val session: Session) { } } - fun liveRoomWidgets(roomId: String, widgetId: QueryStringValue, widgetTypes: Set? = null, excludedTypes: Set? = null): Observable> { + fun liveRoomWidgets( + roomId: String, + widgetId: QueryStringValue, + widgetTypes: Set? = null, + excludedTypes: Set? = null + ): Observable> { return session.widgetService().getRoomWidgetsLive(roomId, widgetId, widgetTypes, excludedTypes).asObservable() .startWithCallable { session.widgetService().getRoomWidgets(roomId, widgetId, widgetTypes, excludedTypes) diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/integrationmanager/IntegrationManagerService.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/integrationmanager/IntegrationManagerService.kt index 3992370785..259dca9b10 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/integrationmanager/IntegrationManagerService.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/integrationmanager/IntegrationManagerService.kt @@ -18,21 +18,20 @@ package im.vector.matrix.android.api.session.integrationmanager import im.vector.matrix.android.api.MatrixCallback import im.vector.matrix.android.api.util.Cancelable -import im.vector.matrix.android.internal.session.integrationmanager.IntegrationManager interface IntegrationManagerService { interface Listener { fun onIsEnabledChanged(enabled: Boolean) { - //No-op + // No-op } fun onConfigurationChanged(configs: List) { - //No-op + // No-op } fun onWidgetPermissionsChanged(widgets: Map) { - //No-op + // No-op } } diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/widgets/WidgetURLFormatter.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/widgets/WidgetURLFormatter.kt index 2efa443c65..f837b2542d 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/widgets/WidgetURLFormatter.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/widgets/WidgetURLFormatter.kt @@ -27,5 +27,4 @@ interface WidgetURLFormatter { forceFetchScalarToken: Boolean = false, bypassWhitelist: Boolean ): String - } diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/widgets/model/Widget.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/widgets/model/Widget.kt index 6928efce73..0b564d6496 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/widgets/model/Widget.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/widgets/model/Widget.kt @@ -18,7 +18,6 @@ package im.vector.matrix.android.api.session.widgets.model import im.vector.matrix.android.api.session.events.model.Event import im.vector.matrix.android.api.session.room.sender.SenderInfo -import im.vector.matrix.android.api.session.widgets.model.WidgetContent data class Widget( val widgetContent: WidgetContent, @@ -34,4 +33,3 @@ data class Widget( val name = widgetContent.getHumanName() } - diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/widgets/model/WidgetTypes.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/widgets/model/WidgetType.kt similarity index 98% rename from matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/widgets/model/WidgetTypes.kt rename to matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/widgets/model/WidgetType.kt index 650aadf444..86d2354cb3 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/widgets/model/WidgetTypes.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/widgets/model/WidgetType.kt @@ -34,7 +34,7 @@ sealed class WidgetType(open val preferred: String, open val legacy: String) { return type == preferred || type == legacy } - fun values(): Set{ + fun values(): Set { return setOf(preferred, legacy) } diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/ScalarTokenEntity.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/ScalarTokenEntity.kt index 7c93624804..eab85357e3 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/ScalarTokenEntity.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/ScalarTokenEntity.kt @@ -25,5 +25,4 @@ internal open class ScalarTokenEntity( ) : RealmObject() { companion object - } diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/integrationmanager/IntegrationManagerConfigExtractor.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/integrationmanager/IntegrationManagerConfigExtractor.kt index 5a1a51f36f..cd2621ab13 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/integrationmanager/IntegrationManagerConfigExtractor.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/integrationmanager/IntegrationManagerConfigExtractor.kt @@ -32,7 +32,6 @@ internal class IntegrationManagerConfigExtractor @Inject constructor() { if (apiUrl != null && apiUrl.startsWith("https://") && uiUrl!!.startsWith("https://")) { - return WellknownIntegrationManagerConfigEntity( apiUrl = apiUrl, uiUrl = uiUrl diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/pushers/DefaultConditionResolver.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/pushers/DefaultConditionResolver.kt index 6cbcac4881..7490ca54ad 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/pushers/DefaultConditionResolver.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/pushers/DefaultConditionResolver.kt @@ -20,7 +20,6 @@ import im.vector.matrix.android.api.pushrules.ContainsDisplayNameCondition import im.vector.matrix.android.api.pushrules.EventMatchCondition import im.vector.matrix.android.api.pushrules.RoomMemberCountCondition import im.vector.matrix.android.api.pushrules.SenderNotificationPermissionCondition -import im.vector.matrix.android.api.query.QueryStringValue import im.vector.matrix.android.api.session.events.model.Event import im.vector.matrix.android.api.session.events.model.EventType import im.vector.matrix.android.api.session.events.model.toModel diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/LocalEchoEventFactory.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/LocalEchoEventFactory.kt index 3bcdc05073..ae7c20ec35 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/LocalEchoEventFactory.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/LocalEchoEventFactory.kt @@ -57,7 +57,6 @@ import im.vector.matrix.android.api.session.room.model.relation.RelationDefaultC import im.vector.matrix.android.api.session.room.model.relation.ReplyToContent import im.vector.matrix.android.api.session.room.timeline.TimelineEvent import im.vector.matrix.android.api.session.room.timeline.getLastMessageContent -import im.vector.matrix.android.api.util.JsonDict import im.vector.matrix.android.internal.di.UserId import im.vector.matrix.android.internal.extensions.subStringBetween import im.vector.matrix.android.internal.session.content.ThumbnailExtractor diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/widgets/CreateWidgetTask.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/widgets/CreateWidgetTask.kt index b472f79f20..04d59ae878 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/widgets/CreateWidgetTask.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/widgets/CreateWidgetTask.kt @@ -19,7 +19,6 @@ package im.vector.matrix.android.internal.session.widgets import com.zhuinden.monarchy.Monarchy import im.vector.matrix.android.api.session.events.model.Content import im.vector.matrix.android.api.session.events.model.EventType -import im.vector.matrix.android.api.session.widgets.WidgetService import im.vector.matrix.android.internal.database.awaitNotEmptyResult import im.vector.matrix.android.internal.database.model.CurrentStateEventEntity import im.vector.matrix.android.internal.database.model.CurrentStateEventEntityFields diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/widgets/DefaultWidgetPostAPIMediator.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/widgets/DefaultWidgetPostAPIMediator.kt index 34421ecc0a..345ef39edd 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/widgets/DefaultWidgetPostAPIMediator.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/widgets/DefaultWidgetPostAPIMediator.kt @@ -30,7 +30,8 @@ import java.util.HashMap import javax.inject.Inject internal class DefaultWidgetPostAPIMediator @Inject constructor(private val moshi: Moshi, - private val widgetPostMessageAPIProvider: WidgetPostMessageAPIProvider) : WidgetPostAPIMediator { + private val widgetPostMessageAPIProvider: WidgetPostMessageAPIProvider) + : WidgetPostAPIMediator { private val jsonAdapter = moshi.adapter(JSON_DICT_PARAMETERIZED_TYPE) diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/widgets/DefaultWidgetService.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/widgets/DefaultWidgetService.kt index de37b55b2a..424168bc62 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/widgets/DefaultWidgetService.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/widgets/DefaultWidgetService.kt @@ -29,7 +29,8 @@ import javax.inject.Inject internal class DefaultWidgetService @Inject constructor(private val widgetManager: WidgetManager, private val widgetURLFormatter: WidgetURLFormatter, - private val widgetPostAPIMediator: WidgetPostAPIMediator) : WidgetService { + private val widgetPostAPIMediator: WidgetPostAPIMediator) + : WidgetService { override fun getWidgetURLFormatter(): WidgetURLFormatter { return widgetURLFormatter @@ -39,27 +40,52 @@ internal class DefaultWidgetService @Inject constructor(private val widgetManage return widgetPostAPIMediator } - override fun getRoomWidgets(roomId: String, widgetId: QueryStringValue, widgetTypes: Set?, excludedTypes: Set?): List { + override fun getRoomWidgets( + roomId: String, + widgetId: QueryStringValue, + widgetTypes: Set?, + excludedTypes: Set? + ): List { return widgetManager.getRoomWidgets(roomId, widgetId, widgetTypes, excludedTypes) } - override fun getRoomWidgetsLive(roomId: String, widgetId: QueryStringValue, widgetTypes: Set?, excludedTypes: Set?): LiveData> { + override fun getRoomWidgetsLive( + roomId: String, + widgetId: QueryStringValue, + widgetTypes: Set?, + excludedTypes: Set? + ): LiveData> { return widgetManager.getRoomWidgetsLive(roomId, widgetId, widgetTypes, excludedTypes) } - override fun getUserWidgetsLive(widgetTypes: Set?, excludedTypes: Set?): LiveData> { + override fun getUserWidgetsLive( + widgetTypes: Set?, + excludedTypes: Set? + ): LiveData> { return widgetManager.getUserWidgetsLive(widgetTypes, excludedTypes) } - override fun getUserWidgets(widgetTypes: Set?, excludedTypes: Set?): List { + override fun getUserWidgets( + widgetTypes: Set?, + excludedTypes: Set? + ): List { return widgetManager.getUserWidgets(widgetTypes, excludedTypes) } - override fun createRoomWidget(roomId: String, widgetId: String, content: Content, callback: MatrixCallback): Cancelable { + override fun createRoomWidget( + roomId: String, + widgetId: String, + content: Content, + callback: MatrixCallback + ): Cancelable { return widgetManager.createRoomWidget(roomId, widgetId, content, callback) } - override fun destroyRoomWidget(roomId: String, widgetId: String, callback: MatrixCallback): Cancelable { + override fun destroyRoomWidget( + roomId: String, + widgetId: String, + callback: MatrixCallback + ): Cancelable { return widgetManager.destroyRoomWidget(roomId, widgetId, callback) } diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/widgets/DefaultWidgetURLFormatter.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/widgets/DefaultWidgetURLFormatter.kt index 3391bf0818..411f17ceb5 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/widgets/DefaultWidgetURLFormatter.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/widgets/DefaultWidgetURLFormatter.kt @@ -113,5 +113,3 @@ internal class DefaultWidgetURLFormatter @Inject constructor(private val integra return this } } - - diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/widgets/WidgetManager.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/widgets/WidgetManager.kt index 0741e5b55e..eefdff8004 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/widgets/WidgetManager.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/widgets/WidgetManager.kt @@ -75,7 +75,11 @@ internal class WidgetManager @Inject constructor(private val integrationManager: excludedTypes: Set? = null ): LiveData> { // Get all im.vector.modular.widgets state events in the room - val liveWidgetEvents = stateEventDataSource.getStateEventsLive(roomId, setOf(EventType.STATE_ROOM_WIDGET, EventType.STATE_ROOM_WIDGET_LEGACY), widgetId) + val liveWidgetEvents = stateEventDataSource.getStateEventsLive( + roomId = roomId, + eventTypes = setOf(EventType.STATE_ROOM_WIDGET, EventType.STATE_ROOM_WIDGET_LEGACY), + stateKey = widgetId + ) return Transformations.map(liveWidgetEvents) { widgetEvents -> widgetEvents.mapEventsToWidgets(widgetTypes, excludedTypes) } @@ -88,7 +92,11 @@ internal class WidgetManager @Inject constructor(private val integrationManager: excludedTypes: Set? = null ): List { // Get all im.vector.modular.widgets state events in the room - val widgetEvents: List = stateEventDataSource.getStateEvents(roomId, setOf(EventType.STATE_ROOM_WIDGET, EventType.STATE_ROOM_WIDGET_LEGACY), widgetId) + val widgetEvents: List = stateEventDataSource.getStateEvents( + roomId = roomId, + eventTypes = setOf(EventType.STATE_ROOM_WIDGET, EventType.STATE_ROOM_WIDGET_LEGACY), + stateKey = widgetId + ) return widgetEvents.mapEventsToWidgets(widgetTypes, excludedTypes) } @@ -183,7 +191,11 @@ internal class WidgetManager @Inject constructor(private val integrationManager: } fun hasPermissionsToHandleWidgets(roomId: String): Boolean { - val powerLevelsEvent = stateEventDataSource.getStateEvent(roomId, EventType.STATE_ROOM_POWER_LEVELS, QueryStringValue.NoCondition) + val powerLevelsEvent = stateEventDataSource.getStateEvent( + roomId = roomId, + eventType = EventType.STATE_ROOM_POWER_LEVELS, + stateKey = QueryStringValue.NoCondition + ) val powerLevelsContent = powerLevelsEvent?.content?.toModel() ?: return false return PowerLevelsHelper(powerLevelsContent).isAllowedToSend(true, null, userId) } diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/widgets/WidgetsAPI.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/widgets/WidgetsAPI.kt index 7ad839bc9f..da9992d971 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/widgets/WidgetsAPI.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/widgets/WidgetsAPI.kt @@ -34,4 +34,4 @@ internal interface WidgetsAPI { @GET("account") fun validateToken(@Query("scalar_token") scalarToken: String?, @Query("v") version: String?): Call -} \ No newline at end of file +} diff --git a/vector/src/main/java/im/vector/riotx/core/di/FragmentModule.kt b/vector/src/main/java/im/vector/riotx/core/di/FragmentModule.kt index 43ff5a3792..3de05a04ce 100644 --- a/vector/src/main/java/im/vector/riotx/core/di/FragmentModule.kt +++ b/vector/src/main/java/im/vector/riotx/core/di/FragmentModule.kt @@ -516,5 +516,4 @@ interface FragmentModule { @IntoMap @FragmentKey(WidgetFragment::class) fun bindWidgetFragment(fragment: WidgetFragment): Fragment - } diff --git a/vector/src/main/java/im/vector/riotx/features/attachments/AttachmentsMapper.kt b/vector/src/main/java/im/vector/riotx/features/attachments/AttachmentsMapper.kt index 1c5fa037e7..02b712b8a7 100644 --- a/vector/src/main/java/im/vector/riotx/features/attachments/AttachmentsMapper.kt +++ b/vector/src/main/java/im/vector/riotx/features/attachments/AttachmentsMapper.kt @@ -17,7 +17,6 @@ package im.vector.riotx.features.attachments import im.vector.matrix.android.api.session.content.ContentAttachmentData -import im.vector.matrix.android.api.session.room.model.message.MessageStickerContent import im.vector.riotx.multipicker.entity.MultiPickerAudioType import im.vector.riotx.multipicker.entity.MultiPickerBaseType import im.vector.riotx.multipicker.entity.MultiPickerContactType diff --git a/vector/src/main/java/im/vector/riotx/features/navigation/DefaultNavigator.kt b/vector/src/main/java/im/vector/riotx/features/navigation/DefaultNavigator.kt index bc7cfc8156..6a0094520a 100644 --- a/vector/src/main/java/im/vector/riotx/features/navigation/DefaultNavigator.kt +++ b/vector/src/main/java/im/vector/riotx/features/navigation/DefaultNavigator.kt @@ -243,7 +243,6 @@ class DefaultNavigator @Inject constructor( context.startActivity(WidgetActivity.newIntent(context, widgetArgs)) } - override fun openImageViewer(activity: Activity, mediaData: ImageContentRenderer.Data, view: View, options: ((MutableList>) -> Unit)?) { val intent = ImageMediaViewerActivity.newIntent(activity, mediaData, ViewCompat.getTransitionName(view)) val pairs = ArrayList>() @@ -277,4 +276,3 @@ class DefaultNavigator @Inject constructor( } } } - diff --git a/vector/src/main/java/im/vector/riotx/features/navigation/Navigator.kt b/vector/src/main/java/im/vector/riotx/features/navigation/Navigator.kt index 79de5b3dbb..35ace87b6b 100644 --- a/vector/src/main/java/im/vector/riotx/features/navigation/Navigator.kt +++ b/vector/src/main/java/im/vector/riotx/features/navigation/Navigator.kt @@ -94,5 +94,4 @@ interface Navigator { fun openImageViewer(activity: Activity, mediaData: ImageContentRenderer.Data, view: View, options: ((MutableList>) -> Unit)?) fun openVideoViewer(activity: Activity, mediaData: VideoContentRenderer.Data) - } diff --git a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsGeneralFragment.kt b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsGeneralFragment.kt index 709d23abd7..926d285f7b 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsGeneralFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/settings/VectorSettingsGeneralFragment.kt @@ -213,7 +213,7 @@ class VectorSettingsGeneralFragment : VectorSettingsBaseFragment() { (findPreference(VectorPreferences.SETTINGS_ALLOW_INTEGRATIONS_KEY) as? VectorSwitchPreference)?.let { it.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue -> - //Disable it while updating the state, will be re-enabled by the account data listener. + // Disable it while updating the state, will be re-enabled by the account data listener. it.isEnabled = false session.integrationManagerService().setIntegrationEnabled(newValue as Boolean, NoOpMatrixCallback()) true diff --git a/vector/src/main/java/im/vector/riotx/features/webview/WebViewEventListener.kt b/vector/src/main/java/im/vector/riotx/features/webview/WebViewEventListener.kt index 050bbc5d87..92d9fedf94 100644 --- a/vector/src/main/java/im/vector/riotx/features/webview/WebViewEventListener.kt +++ b/vector/src/main/java/im/vector/riotx/features/webview/WebViewEventListener.kt @@ -23,8 +23,8 @@ interface WebViewEventListener { * * @param url The url about to be rendered. */ - fun pageWillStart(url: String){ - //NO-OP + fun pageWillStart(url: String) { + // NO-OP } /** @@ -32,8 +32,8 @@ interface WebViewEventListener { * * @param url The rendering url. */ - fun onPageStarted(url: String){ - //NO-OP + fun onPageStarted(url: String) { + // NO-OP } /** @@ -41,8 +41,8 @@ interface WebViewEventListener { * * @param url The finished url. */ - fun onPageFinished(url: String){ - //NO-OP + fun onPageFinished(url: String) { + // NO-OP } /** @@ -52,8 +52,8 @@ interface WebViewEventListener { * @param errorCode The error code. * @param description The error description. */ - fun onPageError(url: String, errorCode: Int, description: String){ - //NO-OP + fun onPageError(url: String, errorCode: Int, description: String) { + // NO-OP } /** @@ -63,8 +63,8 @@ interface WebViewEventListener { * @param errorCode The error code. * @param description The error description. */ - fun onHttpError(url: String, errorCode: Int, description: String){ - //NO-OP + fun onHttpError(url: String, errorCode: Int, description: String) { + // NO-OP } /** @@ -73,7 +73,7 @@ interface WebViewEventListener { * @param url The url about to be rendered. * @return true if the method needs to manage some custom handling */ - fun shouldOverrideUrlLoading(url: String): Boolean{ + fun shouldOverrideUrlLoading(url: String): Boolean { return false } } diff --git a/vector/src/main/java/im/vector/riotx/features/widgets/WidgetArgsBuilder.kt b/vector/src/main/java/im/vector/riotx/features/widgets/WidgetArgsBuilder.kt index d39614e3b7..6cbf1f29a1 100644 --- a/vector/src/main/java/im/vector/riotx/features/widgets/WidgetArgsBuilder.kt +++ b/vector/src/main/java/im/vector/riotx/features/widgets/WidgetArgsBuilder.kt @@ -61,7 +61,7 @@ class WidgetArgsBuilder @Inject constructor(private val sessionHolder: ActiveSes fun buildRoomWidgetArgs(roomId: String, widget: Widget): WidgetArgs { val widgetId = widget.widgetId - val baseUrl = widget.computedUrl?: throw IllegalStateException() + val baseUrl = widget.computedUrl ?: throw IllegalStateException() return WidgetArgs( baseUrl = baseUrl, kind = WidgetKind.ROOM, diff --git a/vector/src/main/java/im/vector/riotx/features/widgets/WidgetFragment.kt b/vector/src/main/java/im/vector/riotx/features/widgets/WidgetFragment.kt index dee0340f50..762a0d7ef4 100644 --- a/vector/src/main/java/im/vector/riotx/features/widgets/WidgetFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/widgets/WidgetFragment.kt @@ -171,7 +171,7 @@ class WidgetFragment @Inject constructor() : VectorBaseFragment(), WebViewEventL Timber.v("Invalidate state: $state") when (state.status) { WidgetStatus.UNKNOWN -> { - //Hide all? + // Hide all? widgetWebView.isVisible = false } WidgetStatus.WIDGET_NOT_ALLOWED -> { @@ -211,7 +211,7 @@ class WidgetFragment @Inject constructor() : VectorBaseFragment(), WebViewEventL } } is Fail -> { - //we need to show Error + // we need to show Error widgetWebView.isInvisible = true widgetProgressBar.isVisible = false setStateError(state.formattedURL.error.message) diff --git a/vector/src/main/java/im/vector/riotx/features/widgets/WidgetPostAPIHandler.kt b/vector/src/main/java/im/vector/riotx/features/widgets/WidgetPostAPIHandler.kt index 6c1c03f481..c47244c643 100644 --- a/vector/src/main/java/im/vector/riotx/features/widgets/WidgetPostAPIHandler.kt +++ b/vector/src/main/java/im/vector/riotx/features/widgets/WidgetPostAPIHandler.kt @@ -357,7 +357,7 @@ class WidgetPostAPIHandler @AssistedInject constructor(@Assisted private val roo val level = eventData["level"] as Int if (level >= 0) { // TODO - //room.updateUserPowerLevels(userId, level, WidgetApiCallback(eventData, description)) + // room.updateUserPowerLevels(userId, level, WidgetApiCallback(eventData, description)) } else { Timber.e("## setBotPower() : Power level must be positive integer.") widgetPostAPIMediator.sendError(stringProvider.getString(R.string.widget_integration_positive_power_level), eventData) @@ -458,5 +458,3 @@ class WidgetPostAPIHandler @AssistedInject constructor(@Assisted private val roo return WidgetAPICallback(widgetPostAPIMediator, eventData, stringProvider) } } - - diff --git a/vector/src/main/java/im/vector/riotx/features/widgets/WidgetViewModel.kt b/vector/src/main/java/im/vector/riotx/features/widgets/WidgetViewModel.kt index 698c015d6d..8762bf574a 100644 --- a/vector/src/main/java/im/vector/riotx/features/widgets/WidgetViewModel.kt +++ b/vector/src/main/java/im/vector/riotx/features/widgets/WidgetViewModel.kt @@ -178,7 +178,6 @@ class WidgetViewModel @AssistedInject constructor(@Assisted val initialState: Wi } catch (failure: Throwable) { _viewEvents.post(WidgetViewEvents.Failure(failure)) } - } } @@ -191,7 +190,10 @@ class WidgetViewModel @AssistedInject constructor(@Assisted val initialState: Wi setWidgetStatus(WidgetStatus.WIDGET_NOT_ALLOWED) return } - val roomWidget = widgetService.getRoomWidgets(initialState.roomId, widgetId = QueryStringValue.Equals(widgetId, QueryStringValue.Case.SENSITIVE)).firstOrNull() + val roomWidget = widgetService.getRoomWidgets( + roomId = initialState.roomId, + widgetId = QueryStringValue.Equals(widgetId, QueryStringValue.Case.SENSITIVE) + ).firstOrNull() if (roomWidget == null) { setWidgetStatus(WidgetStatus.WIDGET_NOT_ALLOWED) return diff --git a/vector/src/main/java/im/vector/riotx/features/widgets/permissions/RoomWidgetPermissionBottomSheet.kt b/vector/src/main/java/im/vector/riotx/features/widgets/permissions/RoomWidgetPermissionBottomSheet.kt index 01f889dc9e..4fcc0d7472 100644 --- a/vector/src/main/java/im/vector/riotx/features/widgets/permissions/RoomWidgetPermissionBottomSheet.kt +++ b/vector/src/main/java/im/vector/riotx/features/widgets/permissions/RoomWidgetPermissionBottomSheet.kt @@ -103,14 +103,14 @@ class RoomWidgetPermissionBottomSheet : VectorBaseBottomSheetDialogFragment() { @OnClick(R.id.bottom_sheet_widget_permission_decline_button) fun doDecline() { viewModel.handle(RoomWidgetPermissionActions.BlockWidget) - //optimistic dismiss + // optimistic dismiss dismiss() } @OnClick(R.id.bottom_sheet_widget_permission_continue_button) fun doAccept() { viewModel.handle(RoomWidgetPermissionActions.AllowWidget) - //optimistic dismiss + // optimistic dismiss dismiss() } diff --git a/vector/src/main/java/im/vector/riotx/features/widgets/permissions/RoomWidgetPermissionViewModel.kt b/vector/src/main/java/im/vector/riotx/features/widgets/permissions/RoomWidgetPermissionViewModel.kt index 8482462898..8e52a0c7d3 100644 --- a/vector/src/main/java/im/vector/riotx/features/widgets/permissions/RoomWidgetPermissionViewModel.kt +++ b/vector/src/main/java/im/vector/riotx/features/widgets/permissions/RoomWidgetPermissionViewModel.kt @@ -55,8 +55,8 @@ class RoomWidgetPermissionViewModel @AssistedInject constructor(@Assisted val in } catch (e: Throwable) { null } - //TODO check from widget urls the perms that should be shown? - //For now put all + // TODO check from widget urls the perms that should be shown? + // For now put all val infoShared = listOf( R.string.room_widget_permission_display_name, R.string.room_widget_permission_avatar_url, @@ -91,7 +91,7 @@ class RoomWidgetPermissionViewModel @AssistedInject constructor(@Assisted val in if (state.permissionData()?.isWebviewWidget.orFalse()) { WidgetPermissionsHelper(integrationManagerService, widgetService).changePermission(state.roomId, widgetId, false) } else { - //TODO JITSI + // TODO JITSI } } catch (failure: Throwable) { Timber.v("Failure revoking widget: ${state.widgetId}") @@ -109,7 +109,7 @@ class RoomWidgetPermissionViewModel @AssistedInject constructor(@Assisted val in if (state.permissionData()?.isWebviewWidget.orFalse()) { WidgetPermissionsHelper(integrationManagerService, widgetService).changePermission(state.roomId, widgetId, true) } else { - //TODO JITSI + // TODO JITSI } } catch (failure: Throwable) { Timber.v("Failure allowing widget: ${state.widgetId}") diff --git a/vector/src/main/java/im/vector/riotx/features/widgets/permissions/RoomWidgetPermissionViewState.kt b/vector/src/main/java/im/vector/riotx/features/widgets/permissions/RoomWidgetPermissionViewState.kt index b72409d737..8daef86324 100644 --- a/vector/src/main/java/im/vector/riotx/features/widgets/permissions/RoomWidgetPermissionViewState.kt +++ b/vector/src/main/java/im/vector/riotx/features/widgets/permissions/RoomWidgetPermissionViewState.kt @@ -40,5 +40,3 @@ data class RoomWidgetPermissionViewState( val widgetDomain: String? = null ) } - - diff --git a/vector/src/main/java/im/vector/riotx/features/widgets/webview/WebviewPermissionUtils.kt b/vector/src/main/java/im/vector/riotx/features/widgets/webview/WebviewPermissionUtils.kt index 8130242bb4..32f6a906e2 100644 --- a/vector/src/main/java/im/vector/riotx/features/widgets/webview/WebviewPermissionUtils.kt +++ b/vector/src/main/java/im/vector/riotx/features/widgets/webview/WebviewPermissionUtils.kt @@ -32,12 +32,11 @@ object WebviewPermissionUtils { AlertDialog.Builder(context) .setTitle(title) .setMultiChoiceItems( - request.resources.map { webPermissionToHumanReadable(it, context) }.toTypedArray() - , null + request.resources.map { webPermissionToHumanReadable(it, context) }.toTypedArray(), null ) { _, which, isChecked -> allowedPermissions[which] = allowedPermissions[which].first to isChecked } - .setPositiveButton(R.string.room_widget_resource_grant_permission) { _, _-> + .setPositiveButton(R.string.room_widget_resource_grant_permission) { _, _ -> request.grant(allowedPermissions.mapNotNull { perm -> perm.first.takeIf { perm.second } }.toTypedArray()) @@ -56,5 +55,4 @@ object WebviewPermissionUtils { else -> permission } } - } diff --git a/vector/src/main/res/layout/fragment_admin_widget.xml b/vector/src/main/res/layout/fragment_admin_widget.xml deleted file mode 100644 index 9a0139a89b..0000000000 --- a/vector/src/main/res/layout/fragment_admin_widget.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - diff --git a/vector/src/main/res/layout/fragment_room_widgets.xml b/vector/src/main/res/layout/fragment_room_widgets.xml deleted file mode 100644 index 2a8a4c864f..0000000000 --- a/vector/src/main/res/layout/fragment_room_widgets.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - -