Merge pull request #2457 from Dominaezzz/suspend_functions_2

Convert IntegrationManagerService to suspend functions

matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/integrationmanager/IntegrationManagerService.kt

@@ -16,9 +16,6 @@
 
 package org.matrix.android.sdk.api.session.integrationmanager
 
-import org.matrix.android.sdk.api.MatrixCallback
-import org.matrix.android.sdk.api.util.Cancelable
-
 /**
  * This is the entry point to manage integration. You can grab an instance of this service through an active session.
  */
@@ -80,19 +77,17 @@ interface IntegrationManagerService {
     /**
      * Offers to enable or disable the integration.
      * @param enable the param to change
-     * @param callback the matrix callback to listen for result.
      * @return Cancelable
      */
-    fun setIntegrationEnabled(enable: Boolean, callback: MatrixCallback<Unit>): Cancelable
+    suspend fun setIntegrationEnabled(enable: Boolean)
 
     /**
      * Offers to allow or disallow a widget.
      * @param stateEventId the eventId of the state event defining the widget.
      * @param allowed the param to change
-     * @param callback the matrix callback to listen for result.
      * @return Cancelable
      */
-    fun setWidgetAllowed(stateEventId: String, allowed: Boolean, callback: MatrixCallback<Unit>): Cancelable
+    suspend fun setWidgetAllowed(stateEventId: String, allowed: Boolean)
 
     /**
      * Returns true if the widget is allowed, false otherwise.
@@ -105,7 +100,7 @@ interface IntegrationManagerService {
      * @param widgetType the widget type to check for
      * @param domain the domain to check for
      */
-    fun setNativeWidgetDomainAllowed(widgetType: String, domain: String, allowed: Boolean, callback: MatrixCallback<Unit>): Cancelable
+    suspend fun setNativeWidgetDomainAllowed(widgetType: String, domain: String, allowed: Boolean)
 
     /**
      * Returns true if the widget domain is allowed, false otherwise.

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/DefaultIntegrationManagerService.kt

@@ -16,10 +16,8 @@
 
 package org.matrix.android.sdk.internal.session.integrationmanager
 
-import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.session.integrationmanager.IntegrationManagerConfig
 import org.matrix.android.sdk.api.session.integrationmanager.IntegrationManagerService
-import org.matrix.android.sdk.api.util.Cancelable
 import javax.inject.Inject
 
 internal class DefaultIntegrationManagerService @Inject constructor(private val integrationManager: IntegrationManager) : IntegrationManagerService {
@@ -44,20 +42,20 @@ internal class DefaultIntegrationManagerService @Inject constructor(private val
         return integrationManager.isIntegrationEnabled()
     }
 
-    override fun setIntegrationEnabled(enable: Boolean, callback: MatrixCallback<Unit>): Cancelable {
-        return integrationManager.setIntegrationEnabled(enable, callback)
+    override suspend fun setIntegrationEnabled(enable: Boolean) {
+        integrationManager.setIntegrationEnabled(enable)
     }
 
-    override fun setWidgetAllowed(stateEventId: String, allowed: Boolean, callback: MatrixCallback<Unit>): Cancelable {
-        return integrationManager.setWidgetAllowed(stateEventId, allowed, callback)
+    override suspend fun setWidgetAllowed(stateEventId: String, allowed: Boolean) {
+        integrationManager.setWidgetAllowed(stateEventId, allowed)
     }
 
     override fun isWidgetAllowed(stateEventId: String): Boolean {
         return integrationManager.isWidgetAllowed(stateEventId)
     }
 
-    override fun setNativeWidgetDomainAllowed(widgetType: String, domain: String, allowed: Boolean, callback: MatrixCallback<Unit>): Cancelable {
-        return integrationManager.setNativeWidgetDomainAllowed(widgetType, domain, allowed, callback)
+    override suspend fun setNativeWidgetDomainAllowed(widgetType: String, domain: String, allowed: Boolean) {
+        integrationManager.setNativeWidgetDomainAllowed(widgetType, domain, allowed)
     }
 
     override fun isNativeWidgetDomainAllowed(widgetType: String, domain: String): Boolean {

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/integrationmanager/IntegrationManager.kt

@@ -20,15 +20,12 @@ import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.LifecycleRegistry
 import com.zhuinden.monarchy.Monarchy
-import org.matrix.android.sdk.api.MatrixCallback
 import org.matrix.android.sdk.api.MatrixConfiguration
 import org.matrix.android.sdk.api.session.events.model.toModel
 import org.matrix.android.sdk.api.session.integrationmanager.IntegrationManagerConfig
 import org.matrix.android.sdk.api.session.integrationmanager.IntegrationManagerService
 import org.matrix.android.sdk.api.session.widgets.model.WidgetContent
 import org.matrix.android.sdk.api.session.widgets.model.WidgetType
-import org.matrix.android.sdk.api.util.Cancelable
-import org.matrix.android.sdk.api.util.NoOpCancellable
 import org.matrix.android.sdk.internal.database.model.WellknownIntegrationManagerConfigEntity
 import org.matrix.android.sdk.internal.di.SessionDatabase
 import org.matrix.android.sdk.internal.extensions.observeNotNull
@@ -41,7 +38,6 @@ import org.matrix.android.sdk.internal.session.user.accountdata.UpdateUserAccoun
 import org.matrix.android.sdk.internal.session.widgets.helper.WidgetFactory
 import org.matrix.android.sdk.internal.session.widgets.helper.extractWidgetSequence
 import org.matrix.android.sdk.internal.task.TaskExecutor
-import org.matrix.android.sdk.internal.task.configureWith
 import timber.log.Timber
 import javax.inject.Inject
 
@@ -137,22 +133,17 @@ internal class IntegrationManager @Inject constructor(matrixConfiguration: Matri
         return integrationProvisioningContent?.enabled ?: false
     }
 
-    fun setIntegrationEnabled(enable: Boolean, callback: MatrixCallback<Unit>): Cancelable {
+    suspend fun setIntegrationEnabled(enable: Boolean) {
         val isIntegrationEnabled = isIntegrationEnabled()
         if (enable == isIntegrationEnabled) {
-            callback.onSuccess(Unit)
-            return NoOpCancellable
+            return
         }
         val integrationProvisioningContent = IntegrationProvisioningContent(enabled = enable)
         val params = UpdateUserAccountDataTask.IntegrationProvisioning(integrationProvisioningContent = integrationProvisioningContent)
-        return updateUserAccountDataTask
-                .configureWith(params) {
-                    this.callback = callback
-                }
-                .executeBy(taskExecutor)
+        return updateUserAccountDataTask.execute(params)
     }
 
-    fun setWidgetAllowed(stateEventId: String, allowed: Boolean, callback: MatrixCallback<Unit>): Cancelable {
+    suspend fun setWidgetAllowed(stateEventId: String, allowed: Boolean) {
         val currentAllowedWidgets = accountDataDataSource.getAccountDataEvent(UserAccountDataTypes.TYPE_ALLOWED_WIDGETS)
         val currentContent = currentAllowedWidgets?.content?.toModel<AllowedWidgetsContent>()
         val newContent = if (currentContent == null) {
@@ -165,11 +156,7 @@ internal class IntegrationManager @Inject constructor(matrixConfiguration: Matri
             currentContent.copy(widgets = allowedWidgets)
         }
         val params = UpdateUserAccountDataTask.AllowedWidgets(allowedWidgetsContent = newContent)
-        return updateUserAccountDataTask
-                .configureWith(params) {
-                    this.callback = callback
-                }
-                .executeBy(taskExecutor)
+        return updateUserAccountDataTask.execute(params)
     }
 
     fun isWidgetAllowed(stateEventId: String): Boolean {
@@ -178,7 +165,7 @@ internal class IntegrationManager @Inject constructor(matrixConfiguration: Matri
         return currentContent?.widgets?.get(stateEventId) ?: false
     }
 
-    fun setNativeWidgetDomainAllowed(widgetType: String, domain: String, allowed: Boolean, callback: MatrixCallback<Unit>): Cancelable {
+    suspend fun setNativeWidgetDomainAllowed(widgetType: String, domain: String, allowed: Boolean) {
         val currentAllowedWidgets = accountDataDataSource.getAccountDataEvent(UserAccountDataTypes.TYPE_ALLOWED_WIDGETS)
         val currentContent = currentAllowedWidgets?.content?.toModel<AllowedWidgetsContent>()
         val newContent = if (currentContent == null) {
@@ -195,11 +182,7 @@ internal class IntegrationManager @Inject constructor(matrixConfiguration: Matri
             currentContent.copy(native = nativeAllowedWidgets)
         }
         val params = UpdateUserAccountDataTask.AllowedWidgets(allowedWidgetsContent = newContent)
-        return updateUserAccountDataTask
-                .configureWith(params) {
-                    this.callback = callback
-                }
-                .executeBy(taskExecutor)
+        return updateUserAccountDataTask.execute(params)
     }
 
     fun isNativeWidgetDomainAllowed(widgetType: String, domain: String?): Boolean {

vector/src/main/java/im/vector/app/features/settings/VectorSettingsGeneralFragment.kt

@@ -58,7 +58,6 @@ import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.matrix.android.sdk.api.MatrixCallback
-import org.matrix.android.sdk.api.NoOpMatrixCallback
 import org.matrix.android.sdk.api.failure.isInvalidPassword
 import org.matrix.android.sdk.api.session.integrationmanager.IntegrationManagerConfig
 import org.matrix.android.sdk.api.session.integrationmanager.IntegrationManagerService
@@ -214,7 +213,9 @@ class VectorSettingsGeneralFragment @Inject constructor(
             it.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
                 // 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())
+                lifecycleScope.launch {
+                    session.integrationManagerService().setIntegrationEnabled(newValue as Boolean)
+                }
                 true
             }
         }

vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionViewModel.kt

@@ -29,7 +29,6 @@ import org.matrix.android.sdk.api.extensions.orFalse
 import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.widgets.model.WidgetType
-import org.matrix.android.sdk.internal.util.awaitCallback
 import org.matrix.android.sdk.rx.rx
 import timber.log.Timber
 import java.net.URL
@@ -106,15 +105,12 @@ class RoomWidgetPermissionViewModel @AssistedInject constructor(@Assisted val in
                 if (state.permissionData()?.isWebviewWidget.orFalse()) {
                     WidgetPermissionsHelper(integrationManagerService, widgetService).changePermission(state.roomId, widgetId, false)
                 } else {
-                    awaitCallback<Unit> {
                     session.integrationManagerService().setNativeWidgetDomainAllowed(
                             state.permissionData.invoke()?.widget?.type?.preferred ?: "",
                             state.permissionData.invoke()?.widgetDomain ?: "",
-                                false,
-                                it
+                            false
                     )
                 }
-                }
             } catch (failure: Throwable) {
                 Timber.v("Failure revoking widget: ${state.widgetId}")
             } finally {
@@ -131,15 +127,12 @@ class RoomWidgetPermissionViewModel @AssistedInject constructor(@Assisted val in
                 if (state.permissionData()?.isWebviewWidget.orFalse()) {
                     WidgetPermissionsHelper(integrationManagerService, widgetService).changePermission(state.roomId, widgetId, true)
                 } else {
-                    awaitCallback<Unit> {
                     session.integrationManagerService().setNativeWidgetDomainAllowed(
                             state.permissionData.invoke()?.widget?.type?.preferred ?: "",
                             state.permissionData.invoke()?.widgetDomain ?: "",
-                                true,
-                                it
+                            true
                     )
                 }
-                }
             } catch (failure: Throwable) {
                 Timber.v("Failure allowing widget: ${state.widgetId}")
                 // We send close event only when it's failed

vector/src/main/java/im/vector/app/features/widgets/permissions/WidgetPermissionsHelper.kt

@@ -19,7 +19,6 @@ package im.vector.app.features.widgets.permissions
 import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.session.integrationmanager.IntegrationManagerService
 import org.matrix.android.sdk.api.session.widgets.WidgetService
-import org.matrix.android.sdk.internal.util.awaitCallback
 
 class WidgetPermissionsHelper(private val integrationManagerService: IntegrationManagerService,
                               private val widgetService: WidgetService) {
@@ -30,8 +29,6 @@ class WidgetPermissionsHelper(private val integrationManagerService: Integration
                 widgetId = QueryStringValue.Equals(widgetId, QueryStringValue.Case.SENSITIVE)
         ).firstOrNull()
         val eventId = widget?.event?.eventId ?: return
-        awaitCallback<Unit> {
-            integrationManagerService.setWidgetAllowed(eventId, allow, it)
-        }
+        integrationManagerService.setWidgetAllowed(eventId, allow)
     }
 }