Merge pull request #460 from vector-im/feature/fix_cancellations

Feature/fix cancellations

CHANGES.md

@@ -8,6 +8,8 @@ Improvements:
  - UI for pending edits (#193)
  - UX image preview screen transition (#393)
  - Basic support for resending failed messages (retry/remove)
+ - Enable proper cancellation of suspending functions (including db transaction)
+ - Enhances network connectivity checks in SDK
 
 Other changes:
  -
@@ -17,6 +19,7 @@ Bugfix:
  - Close detail room screen when the room is left with another client (#256)
  - Clear notification for a room left on another client
  - Fix messages with empty `in_reply_to` not rendering (#447)
+ - Fix clear cache (#408) and Logout (#205 )
 
 Translations:
  -

matrix-sdk-android-rx/src/main/java/im/vector/matrix/rx/MatrixCallbackCompletable.kt

@@ -28,7 +28,7 @@ internal class MatrixCallbackCompletable<T>(private val completableEmitter: Comp
     }
 
     override fun onFailure(failure: Throwable) {
-        completableEmitter.onError(failure)
+        completableEmitter.tryOnError(failure)
     }
 }
 

matrix-sdk-android-rx/src/main/java/im/vector/matrix/rx/MatrixCallbackSingle.kt

@@ -27,7 +27,7 @@ internal class MatrixCallbackSingle<T>(private val singleEmitter: SingleEmitter<
     }
 
     override fun onFailure(failure: Throwable) {
-        singleEmitter.onError(failure)
+        singleEmitter.tryOnError(failure)
     }
 }
 

matrix-sdk-android-rx/src/main/java/im/vector/matrix/rx/RxRoom.kt

@@ -41,7 +41,7 @@ class RxRoom(private val room: Room) {
         return room.liveTimeLineEvent(eventId).asObservable()
     }
 
-    fun loadRoomMembersIfNeeded(): Single<Boolean> = Single.create {
+    fun loadRoomMembersIfNeeded(): Single<Unit> = Single.create {
         room.loadRoomMembersIfNeeded(MatrixCallbackSingle(it)).toSingle(it)
     }
 

matrix-sdk-android/build.gradle

@@ -110,7 +110,7 @@ dependencies {
     implementation 'com.squareup.retrofit2:converter-moshi:2.4.0'
     implementation 'com.squareup.okhttp3:okhttp:3.14.1'
     implementation 'com.squareup.okhttp3:logging-interceptor:3.10.0'
-    implementation 'com.novoda:merlin:1.1.6'
+    implementation 'com.novoda:merlin:1.2.0'
     implementation "com.squareup.moshi:moshi-adapters:$moshi_version"
     kapt "com.squareup.moshi:moshi-kotlin-codegen:$moshi_version"
 
@@ -126,9 +126,6 @@ dependencies {
     // FP
     implementation "io.arrow-kt:arrow-core:$arrow_version"
     implementation "io.arrow-kt:arrow-instances-core:$arrow_version"
-    implementation "io.arrow-kt:arrow-effects:$arrow_version"
-    implementation "io.arrow-kt:arrow-effects-instances:$arrow_version"
-    implementation "io.arrow-kt:arrow-integration-retrofit-adapter:$arrow_version"
 
     // olm lib is now hosted by jitpack: https://jitpack.io/#org.matrix.gitlab.matrix-org/olm
     implementation 'org.matrix.gitlab.matrix-org:olm:3.1.2'

matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/LiveDataTestObserver.java

@@ -16,10 +16,10 @@
 
 package im.vector.matrix.android;
 
+import androidx.annotation.Nullable;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.Observer;
-import androidx.annotation.Nullable;
 
 import java.util.ArrayList;
 import java.util.Collections;

matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/session/room/timeline/ChunkEntityTest.kt

@@ -19,11 +19,7 @@ package im.vector.matrix.android.session.room.timeline
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.zhuinden.monarchy.Monarchy
 import im.vector.matrix.android.InstrumentedTest
-import im.vector.matrix.android.internal.database.helper.add
+import im.vector.matrix.android.internal.database.helper.*
-import im.vector.matrix.android.internal.database.helper.addAll
-import im.vector.matrix.android.internal.database.helper.isUnlinked
-import im.vector.matrix.android.internal.database.helper.lastStateIndex
-import im.vector.matrix.android.internal.database.helper.merge
 import im.vector.matrix.android.internal.database.model.ChunkEntity
 import im.vector.matrix.android.internal.session.room.timeline.PaginationDirection
 import im.vector.matrix.android.session.room.timeline.RoomDataHelper.createFakeListOfEvents

matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/session/room/timeline/FakeGetContextOfEventTask.kt

@@ -16,7 +16,6 @@
 
 package im.vector.matrix.android.session.room.timeline
 
-import arrow.core.Try
 import im.vector.matrix.android.internal.session.room.timeline.GetContextOfEventTask
 import im.vector.matrix.android.internal.session.room.timeline.PaginationDirection
 import im.vector.matrix.android.internal.session.room.timeline.TokenChunkEventPersistor
@@ -24,7 +23,7 @@ import kotlin.random.Random
 
 internal class FakeGetContextOfEventTask constructor(private val tokenChunkEventPersistor: TokenChunkEventPersistor) : GetContextOfEventTask {
 
-    override suspend fun execute(params: GetContextOfEventTask.Params): Try<TokenChunkEventPersistor.Result> {
+    override suspend fun execute(params: GetContextOfEventTask.Params): TokenChunkEventPersistor.Result {
         val fakeEvents = RoomDataHelper.createFakeListOfEvents(30)
         val tokenChunkEvent = FakeTokenChunkEvent(
                 Random.nextLong(System.currentTimeMillis()).toString(),

matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/session/room/timeline/FakePaginationTask.kt

@@ -16,7 +16,6 @@
 
 package im.vector.matrix.android.session.room.timeline
 
-import arrow.core.Try
 import im.vector.matrix.android.internal.session.room.timeline.PaginationTask
 import im.vector.matrix.android.internal.session.room.timeline.TokenChunkEventPersistor
 import javax.inject.Inject
@@ -24,7 +23,7 @@ import kotlin.random.Random
 
 internal class FakePaginationTask @Inject constructor(private val tokenChunkEventPersistor: TokenChunkEventPersistor) : PaginationTask {
 
-    override suspend fun execute(params: PaginationTask.Params): Try<TokenChunkEventPersistor.Result> {
+    override suspend fun execute(params: PaginationTask.Params): TokenChunkEventPersistor.Result {
         val fakeEvents = RoomDataHelper.createFakeListOfEvents(30)
         val tokenChunkEvent = FakeTokenChunkEvent(params.from, Random.nextLong(System.currentTimeMillis()).toString(), fakeEvents)
         return tokenChunkEventPersistor.insertInDb(tokenChunkEvent, params.roomId, params.direction)

matrix-sdk-android/src/main/java/im/vector/matrix/android/api/permalinks/MatrixPermalinkSpan.kt

@@ -18,6 +18,7 @@ package im.vector.matrix.android.api.permalinks
 
 import android.text.style.ClickableSpan
 import android.view.View
+import im.vector.matrix.android.api.permalinks.MatrixPermalinkSpan.Callback
 
 /**
  * This MatrixPermalinkSpan is a clickable span which use a [Callback] to communicate back.

matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/crypto/CryptoService.kt

@@ -26,14 +26,12 @@ import im.vector.matrix.android.api.session.events.model.Content
 import im.vector.matrix.android.api.session.events.model.Event
 import im.vector.matrix.android.internal.crypto.MXEventDecryptionResult
 import im.vector.matrix.android.internal.crypto.NewSessionListener
-import im.vector.matrix.android.internal.crypto.attachments.ElementToDecrypt
 import im.vector.matrix.android.internal.crypto.model.ImportRoomKeysResult
 import im.vector.matrix.android.internal.crypto.model.MXDeviceInfo
 import im.vector.matrix.android.internal.crypto.model.MXEncryptEventContentResult
 import im.vector.matrix.android.internal.crypto.model.MXUsersDevicesMap
 import im.vector.matrix.android.internal.crypto.model.rest.DevicesListResponse
 import im.vector.matrix.android.internal.crypto.model.rest.RoomKeyRequestBody
-import java.io.File
 
 interface CryptoService {
 

matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/members/MembershipService.kt

@@ -30,7 +30,7 @@ interface MembershipService {
      * This methods load all room members if it was done yet.
      * @return a [Cancelable]
      */
-    fun loadRoomMembersIfNeeded(matrixCallback: MatrixCallback<Boolean>): Cancelable
+    fun loadRoomMembersIfNeeded(matrixCallback: MatrixCallback<Unit>): Cancelable
 
     /**
      * Return the roomMember with userId or null.

matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/timeline/TimelineEvent.kt

@@ -22,7 +22,6 @@ import im.vector.matrix.android.api.session.events.model.toModel
 import im.vector.matrix.android.api.session.room.model.EventAnnotationsSummary
 import im.vector.matrix.android.api.session.room.model.message.MessageContent
 import im.vector.matrix.android.api.session.room.model.message.isReply
-import im.vector.matrix.android.api.session.room.send.SendState
 import im.vector.matrix.android.api.util.ContentUtils.extractUsefulTextFromReply
 import im.vector.matrix.android.internal.crypto.model.event.EncryptedEventContent
 

matrix-sdk-android/src/main/java/im/vector/matrix/android/api/util/CancelableBag.kt

@@ -19,5 +19,6 @@ package im.vector.matrix.android.api.util
 class CancelableBag : Cancelable, MutableList<Cancelable> by ArrayList() {
     override fun cancel() {
         forEach { it.cancel() }
+        clear()
     }
 }

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/DefaultAuthenticator.kt

@@ -68,7 +68,9 @@ internal class DefaultAuthenticator @Inject constructor(@Unauthenticated
                               callback: MatrixCallback<Session>): Cancelable {
 
         val job = GlobalScope.launch(coroutineDispatchers.main) {
-            val sessionOrFailure = authenticate(homeServerConnectionConfig, login, password)
+            val sessionOrFailure = runCatching {
+                authenticate(homeServerConnectionConfig, login, password)
+            }
             sessionOrFailure.foldToCallback(callback)
         }
         return CancelableCoroutine(job)
@@ -85,16 +87,12 @@ internal class DefaultAuthenticator @Inject constructor(@Unauthenticated
         } else {
             PasswordLoginParams.userIdentifier(login, password, "Mobile")
         }
-        executeRequest<Credentials> {
+        val credentials = executeRequest<Credentials> {
             apiCall = authAPI.login(loginParams)
-        }.map {
-            val sessionParams = SessionParams(it, homeServerConnectionConfig)
-            sessionParamsStore.save(sessionParams)
-            sessionParams
-        }.map {
-            sessionManager.getOrCreateSession(it)
         }
-
+        val sessionParams = SessionParams(credentials, homeServerConnectionConfig)
+        sessionParamsStore.save(sessionParams)
+        sessionManager.getOrCreateSession(sessionParams)
     }
 
     private fun buildAuthAPI(homeServerConnectionConfig: HomeServerConnectionConfig): AuthAPI {

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/auth/db/SessionParamsMapper.kt

@@ -20,7 +20,6 @@ import com.squareup.moshi.Moshi
 import im.vector.matrix.android.api.auth.data.Credentials
 import im.vector.matrix.android.api.auth.data.HomeServerConnectionConfig
 import im.vector.matrix.android.api.auth.data.SessionParams
-import im.vector.matrix.android.internal.di.MatrixScope
 import javax.inject.Inject
 
 internal class SessionParamsMapper @Inject constructor(moshi: Moshi) {

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/CryptoManager.kt

@@ -72,7 +72,6 @@ import im.vector.matrix.android.internal.session.room.membership.RoomMembers
 import im.vector.matrix.android.internal.session.sync.model.SyncResponse
 import im.vector.matrix.android.internal.task.TaskExecutor
 import im.vector.matrix.android.internal.task.configureWith
-import im.vector.matrix.android.internal.task.toConfigurableTask
 import im.vector.matrix.android.internal.util.JsonCanonicalizer
 import im.vector.matrix.android.internal.util.MatrixCoroutineDispatchers
 import im.vector.matrix.android.internal.util.fetchCopied
@@ -167,22 +166,25 @@ internal class CryptoManager @Inject constructor(
 
     override fun setDeviceName(deviceId: String, deviceName: String, callback: MatrixCallback<Unit>) {
         setDeviceNameTask
-                .configureWith(SetDeviceNameTask.Params(deviceId, deviceName))
+                .configureWith(SetDeviceNameTask.Params(deviceId, deviceName)) {
-                .dispatchTo(callback)
+                    this.callback = callback
+                }
                 .executeBy(taskExecutor)
     }
 
     override fun deleteDevice(deviceId: String, callback: MatrixCallback<Unit>) {
         deleteDeviceTask
-                .configureWith(DeleteDeviceTask.Params(deviceId))
+                .configureWith(DeleteDeviceTask.Params(deviceId)) {
-                .dispatchTo(callback)
+                    this.callback = callback
+                }
                 .executeBy(taskExecutor)
     }
 
     override fun deleteDeviceWithUserPassword(deviceId: String, authSession: String?, password: String, callback: MatrixCallback<Unit>) {
         deleteDeviceWithUserPasswordTask
-                .configureWith(DeleteDeviceWithUserPasswordTask.Params(deviceId, authSession, password))
+                .configureWith(DeleteDeviceWithUserPasswordTask.Params(deviceId, authSession, password)) {
-                .dispatchTo(callback)
+                    this.callback = callback
+                }
                 .executeBy(taskExecutor)
     }
 
@@ -196,8 +198,9 @@ internal class CryptoManager @Inject constructor(
 
     override fun getDevicesList(callback: MatrixCallback<DevicesListResponse>) {
         getDevicesTask
-                .toConfigurableTask()
+                .configureWith {
-                .dispatchTo(callback)
+                    this.callback = callback
+                }
                 .executeBy(taskExecutor)
     }
 
@@ -254,16 +257,9 @@ internal class CryptoManager @Inject constructor(
     private suspend fun internalStart(isInitialSync: Boolean) {
         // Open the store
         cryptoStore.open()
+        runCatching {
             uploadDeviceKeys()
-                .flatMap { oneTimeKeysUploader.maybeUploadOneTimeKeys() }
+            oneTimeKeysUploader.maybeUploadOneTimeKeys()
-                .fold(
-                        {
-                            Timber.e("Start failed: $it")
-                            delay(1000)
-                            isStarting.set(false)
-                            internalStart(isInitialSync)
-                        },
-                        {
             outgoingRoomKeyRequestManager.start()
             keysBackup.checkAndStartKeysBackup()
             if (isInitialSync) {
@@ -273,8 +269,16 @@ internal class CryptoManager @Inject constructor(
             } else {
                 incomingRoomKeyRequestManager.processReceivedRoomKeyRequests()
             }
+        }.fold(
+                {
                     isStarting.set(false)
                     isStarted.set(true)
+                },
+                {
+                    Timber.e("Start failed: $it")
+                    delay(1000)
+                    isStarting.set(false)
+                    internalStart(isInitialSync)
                 }
         )
     }
@@ -282,7 +286,7 @@ internal class CryptoManager @Inject constructor(
     /**
      * Close the crypto
      */
-    fun close() {
+    fun close() = runBlocking(coroutineDispatchers.crypto) {
         olmDevice.release()
         cryptoStore.close()
         outgoingRoomKeyRequestManager.stop()
@@ -556,13 +560,16 @@ internal class CryptoManager @Inject constructor(
             if (safeAlgorithm != null) {
                 val t0 = System.currentTimeMillis()
                 Timber.v("## encryptEventContent() starts")
+                runCatching {
                     safeAlgorithm.encryptEventContent(eventContent, eventType, userIds)
+                }
                         .fold(
-                                { callback.onFailure(it) },
                                 {
                                     Timber.v("## encryptEventContent() : succeeds after ${System.currentTimeMillis() - t0} ms")
                                     callback.onSuccess(MXEncryptEventContentResult(it, EventType.ENCRYPTED))
-                                }
+                                },
+                                { callback.onFailure(it) }
+
                         )
             } else {
                 val algorithm = getEncryptionAlgorithm(roomId)
@@ -584,10 +591,7 @@ internal class CryptoManager @Inject constructor(
     @Throws(MXCryptoError::class)
     override fun decryptEvent(event: Event, timeline: String): MXEventDecryptionResult {
         return runBlocking {
-            internalDecryptEvent(event, timeline).fold(
+            internalDecryptEvent(event, timeline)
-                    { throw it },
-                    { it }
-            )
         }
     }
 
@@ -600,9 +604,11 @@ internal class CryptoManager @Inject constructor(
      */
     override fun decryptEventAsync(event: Event, timeline: String, callback: MatrixCallback<MXEventDecryptionResult>) {
         GlobalScope.launch {
-            val result = withContext(coroutineDispatchers.crypto) {
+            val result = runCatching {
+                withContext(coroutineDispatchers.crypto) {
                     internalDecryptEvent(event, timeline)
                 }
+            }
             result.foldToCallback(callback)
         }
     }
@@ -612,22 +618,22 @@ internal class CryptoManager @Inject constructor(
      *
      * @param event    the raw event.
      * @param timeline the id of the timeline where the event is decrypted. It is used to prevent replay attack.
-     * @return the MXEventDecryptionResult data, or null in case of error wrapped into [Try]
+     * @return the MXEventDecryptionResult data, or null in case of error
      */
-    private suspend fun internalDecryptEvent(event: Event, timeline: String): Try<MXEventDecryptionResult> {
+    private suspend fun internalDecryptEvent(event: Event, timeline: String): MXEventDecryptionResult {
         val eventContent = event.content
-        return if (eventContent == null) {
+        if (eventContent == null) {
             Timber.e("## decryptEvent : empty event content")
-            Try.Failure(MXCryptoError.Base(MXCryptoError.ErrorType.BAD_ENCRYPTED_MESSAGE, MXCryptoError.BAD_ENCRYPTED_MESSAGE_REASON))
+            throw MXCryptoError.Base(MXCryptoError.ErrorType.BAD_ENCRYPTED_MESSAGE, MXCryptoError.BAD_ENCRYPTED_MESSAGE_REASON)
         } else {
             val algorithm = eventContent["algorithm"]?.toString()
             val alg = roomDecryptorProvider.getOrCreateRoomDecryptor(event.roomId, algorithm)
             if (alg == null) {
                 val reason = String.format(MXCryptoError.UNABLE_TO_DECRYPT_REASON, event.eventId, algorithm)
                 Timber.e("## decryptEvent() : $reason")
-                Try.Failure(MXCryptoError.Base(MXCryptoError.ErrorType.UNABLE_TO_DECRYPT, reason))
+                throw MXCryptoError.Base(MXCryptoError.ErrorType.UNABLE_TO_DECRYPT, reason)
             } else {
-                alg.decryptEvent(event, timeline)
+                return alg.decryptEvent(event, timeline)
             }
         }
     }
@@ -689,11 +695,12 @@ internal class CryptoManager @Inject constructor(
     private fun onRoomEncryptionEvent(roomId: String, event: Event) {
         GlobalScope.launch(coroutineDispatchers.crypto) {
             val params = LoadRoomMembersTask.Params(roomId)
-            loadRoomMembersTask
+            try {
-                    .execute(params)
+                loadRoomMembersTask.execute(params)
-                    .map { _ ->
                 val userIds = getRoomUserIds(roomId)
                 setEncryptionInRoom(roomId, event.content?.get("algorithm")?.toString(), true, userIds)
+            } catch (throwable: Throwable) {
+                Timber.e(throwable)
             }
         }
     }
@@ -761,7 +768,7 @@ internal class CryptoManager @Inject constructor(
     /**
      * Upload my user's device keys.
      */
-    private suspend fun uploadDeviceKeys(): Try<KeysUploadResponse> {
+    private suspend fun uploadDeviceKeys(): KeysUploadResponse {
         // Prepare the device keys data to send
         // Sign it
         val canonicalJson = JsonCanonicalizer.getCanonicalJson(Map::class.java, getMyDevice().signalableJSONDictionary())
@@ -868,10 +875,8 @@ internal class CryptoManager @Inject constructor(
     fun checkUnknownDevices(userIds: List<String>, callback: MatrixCallback<Unit>) {
         // force the refresh to ensure that the devices list is up-to-date
         GlobalScope.launch(coroutineDispatchers.crypto) {
-            deviceListManager
+            runCatching { deviceListManager.downloadKeys(userIds, true) }
-                    .downloadKeys(userIds, true)
                     .fold(
-                            { callback.onFailure(it) },
                             {
                                 val unknownDevices = getUnknownDevices(it)
                                 if (unknownDevices.map.isEmpty()) {
@@ -880,7 +885,8 @@ internal class CryptoManager @Inject constructor(
                                     // trigger an an unknown devices exception
                                     callback.onFailure(Failure.CryptoError(MXCryptoError.UnknownDevice(unknownDevices)))
                                 }
-                            }
+                            },
+                            { callback.onFailure(it) }
                     )
         }
     }
@@ -1035,16 +1041,17 @@ internal class CryptoManager @Inject constructor(
 
     override fun downloadKeys(userIds: List<String>, forceDownload: Boolean, callback: MatrixCallback<MXUsersDevicesMap<MXDeviceInfo>>) {
         GlobalScope.launch(coroutineDispatchers.crypto) {
-            deviceListManager
+            runCatching {
-                    .downloadKeys(userIds, forceDownload)
+                deviceListManager.downloadKeys(userIds, forceDownload)
-                    .foldToCallback(callback)
+            }.foldToCallback(callback)
         }
     }
 
     override fun clearCryptoCache(callback: MatrixCallback<Unit>) {
         clearCryptoDataTask
-                .toConfigurableTask()
+                .configureWith {
-                .dispatchTo(callback)
+                    this.callback = callback
+                }
                 .executeBy(taskExecutor)
     }
 

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/DeviceListManager.kt

@@ -18,14 +18,12 @@
 package im.vector.matrix.android.internal.crypto
 
 import android.text.TextUtils
-import arrow.core.Try
 import im.vector.matrix.android.api.MatrixPatterns
 import im.vector.matrix.android.api.auth.data.Credentials
 import im.vector.matrix.android.internal.crypto.model.MXDeviceInfo
 import im.vector.matrix.android.internal.crypto.model.MXUsersDevicesMap
 import im.vector.matrix.android.internal.crypto.store.IMXCryptoStore
 import im.vector.matrix.android.internal.crypto.tasks.DownloadKeysForUsersTask
-import im.vector.matrix.android.internal.extensions.onError
 import im.vector.matrix.android.internal.session.SessionScope
 import im.vector.matrix.android.internal.session.sync.SyncTokenStore
 import timber.log.Timber
@@ -237,7 +235,7 @@ internal class DeviceListManager @Inject constructor(private val cryptoStore: IM
      * @param forceDownload Always download the keys even if cached.
      * @param callback      the asynchronous callback
      */
-    suspend fun downloadKeys(userIds: List<String>?, forceDownload: Boolean): Try<MXUsersDevicesMap<MXDeviceInfo>> {
+    suspend fun downloadKeys(userIds: List<String>?, forceDownload: Boolean): MXUsersDevicesMap<MXDeviceInfo> {
         Timber.v("## downloadKeys() : forceDownload $forceDownload : $userIds")
         // Map from userId -> deviceId -> MXDeviceInfo
         val stored = MXUsersDevicesMap<MXDeviceInfo>()
@@ -268,15 +266,14 @@ internal class DeviceListManager @Inject constructor(private val cryptoStore: IM
         }
         return if (downloadUsers.isEmpty()) {
             Timber.v("## downloadKeys() : no new user device")
-            Try.just(stored)
+            stored
         } else {
             Timber.v("## downloadKeys() : starts")
             val t0 = System.currentTimeMillis()
-            doKeyDownloadForUsers(downloadUsers)
+            val result = doKeyDownloadForUsers(downloadUsers)
-                    .map {
             Timber.v("## downloadKeys() : doKeyDownloadForUsers succeeds after " + (System.currentTimeMillis() - t0) + " ms")
+            result.also {
                 it.addEntriesFromMap(stored)
-                        it
             }
         }
     }
@@ -286,17 +283,22 @@ internal class DeviceListManager @Inject constructor(private val cryptoStore: IM
      *
      * @param downloadUsers the user ids list
      */
-    private suspend fun doKeyDownloadForUsers(downloadUsers: MutableList<String>): Try<MXUsersDevicesMap<MXDeviceInfo>> {
+    private suspend fun doKeyDownloadForUsers(downloadUsers: MutableList<String>): MXUsersDevicesMap<MXDeviceInfo> {
         Timber.v("## doKeyDownloadForUsers() : doKeyDownloadForUsers $downloadUsers")
         // get the user ids which did not already trigger a keys download
         val filteredUsers = downloadUsers.filter { MatrixPatterns.isUserId(it) }
         if (filteredUsers.isEmpty()) {
             // trigger nothing
-            return Try.just(MXUsersDevicesMap())
+            return MXUsersDevicesMap()
         }
         val params = DownloadKeysForUsersTask.Params(filteredUsers, syncTokenStore.getLastToken())
-        return downloadKeysForUsersTask.execute(params)
+        val response = try {
-                .map { response ->
+            downloadKeysForUsersTask.execute(params)
+        } catch (throwable: Throwable) {
+            Timber.e(throwable, "##doKeyDownloadForUsers(): error")
+            onKeysDownloadFailed(filteredUsers)
+            throw throwable
+        }
         Timber.v("## doKeyDownloadForUsers() : Got keys for " + filteredUsers.size + " users")
         for (userId in filteredUsers) {
             val devices = response.deviceKeys?.get(userId)
@@ -334,12 +336,7 @@ internal class DeviceListManager @Inject constructor(private val cryptoStore: IM
                 cryptoStore.storeUserDevices(userId, mutableDevices)
             }
         }
-                    onKeysDownloadSucceed(filteredUsers, response.failures)
+        return onKeysDownloadSucceed(filteredUsers, response.failures)
-                }
-                .onError {
-                    Timber.e(it, "##doKeyDownloadForUsers(): error")
-                    onKeysDownloadFailed(filteredUsers)
-                }
     }
 
     /**
@@ -465,13 +462,14 @@ internal class DeviceListManager @Inject constructor(private val cryptoStore: IM
         }
 
         cryptoStore.saveDeviceTrackingStatuses(deviceTrackingStatuses)
+        runCatching {
             doKeyDownloadForUsers(users)
-                .fold(
+        }.fold(
-                        {
-                            Timber.e(it, "## refreshOutdatedDeviceLists() : ERROR updating device keys for users $users")
-                        },
                 {
                     Timber.v("## refreshOutdatedDeviceLists() : done")
+                },
+                {
+                    Timber.e(it, "## refreshOutdatedDeviceLists() : ERROR updating device keys for users $users")
                 }
         )
     }

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/MXOlmDevice.kt

@@ -18,7 +18,6 @@
 package im.vector.matrix.android.internal.crypto
 
 import android.text.TextUtils
-import arrow.core.Try
 import im.vector.matrix.android.api.session.crypto.MXCryptoError
 import im.vector.matrix.android.api.util.JSON_DICT_PARAMETERIZED_TYPE
 import im.vector.matrix.android.api.util.JsonDict
@@ -506,11 +505,8 @@ internal class MXOlmDevice @Inject constructor(
                                keysClaimed: Map<String, String>,
                                exportFormat: Boolean): Boolean {
         val session = OlmInboundGroupSessionWrapper(sessionKey, exportFormat)
-
+        runCatching { getInboundGroupSession(sessionId, senderKey, roomId) }
-        getInboundGroupSession(sessionId, senderKey, roomId).fold(
+                .fold(
-                {
-                    // Nothing to do in case of error
-                },
                         {
                             // If we already have this session, consider updating it
                             Timber.e("## addInboundGroupSession() : Update for megolm session $senderKey/$sessionId")
@@ -523,6 +519,9 @@ internal class MXOlmDevice @Inject constructor(
                                 session.olmInboundGroupSession?.releaseSession()
                                 return false
                             }
+                        },
+                        {
+                            // Nothing to do in case of error
                         }
                 )
 
@@ -595,12 +594,8 @@ internal class MXOlmDevice @Inject constructor(
                 continue
             }
 
-            getInboundGroupSession(sessionId, senderKey, roomId)
+            runCatching { getInboundGroupSession(sessionId, senderKey, roomId) }
                     .fold(
-                            {
-                                // Session does not already exist, add it
-                                sessions.add(session)
-                            },
                             {
                                 // If we already have this session, consider updating it
                                 Timber.e("## importInboundGroupSession() : Update for megolm session $senderKey/$sessionId")
@@ -613,7 +608,12 @@ internal class MXOlmDevice @Inject constructor(
                                     sessions.add(session)
                                 }
                                 Unit
+                            },
+                            {
+                                // Session does not already exist, add it
+                                sessions.add(session)
                             }
+
                     )
         }
 
@@ -648,9 +648,8 @@ internal class MXOlmDevice @Inject constructor(
                             roomId: String,
                             timeline: String?,
                             sessionId: String,
-                            senderKey: String): Try<OlmDecryptionResult> {
+                            senderKey: String): OlmDecryptionResult {
-        return getInboundGroupSession(sessionId, senderKey, roomId)
+        val session = getInboundGroupSession(sessionId, senderKey, roomId)
-                .flatMap { session ->
         // Check that the room id matches the original one for the session. This stops
         // the HS pretending a message was targeting a different room.
         if (roomId == session.roomId) {
@@ -659,7 +658,7 @@ internal class MXOlmDevice @Inject constructor(
                 decryptResult = session.olmInboundGroupSession!!.decryptMessage(body)
             } catch (e: OlmException) {
                 Timber.e(e, "## decryptGroupMessage () : decryptMessage failed")
-                            return@flatMap Try.Failure(MXCryptoError.OlmError(e))
+                throw MXCryptoError.OlmError(e)
             }
 
             if (null != timeline) {
@@ -672,7 +671,7 @@ internal class MXOlmDevice @Inject constructor(
                 if (inboundGroupSessionMessageIndexes[timeline]?.get(messageIndexKey) != null) {
                     val reason = String.format(MXCryptoError.DUPLICATE_MESSAGE_INDEX_REASON, decryptResult.mIndex)
                     Timber.e("## decryptGroupMessage() : $reason")
-                                return@flatMap Try.Failure(MXCryptoError.Base(MXCryptoError.ErrorType.DUPLICATED_MESSAGE_INDEX, reason))
+                    throw MXCryptoError.Base(MXCryptoError.ErrorType.DUPLICATED_MESSAGE_INDEX, reason)
                 }
 
                 inboundGroupSessionMessageIndexes[timeline]!!.put(messageIndexKey, true)
@@ -685,23 +684,20 @@ internal class MXOlmDevice @Inject constructor(
                 adapter.fromJson(payloadString)
             } catch (e: Exception) {
                 Timber.e("## decryptGroupMessage() : fails to parse the payload")
-                            return@flatMap Try.Failure(
+                throw
-                                    MXCryptoError.Base(MXCryptoError.ErrorType.BAD_DECRYPTED_FORMAT, MXCryptoError.BAD_DECRYPTED_FORMAT_TEXT_REASON))
+                MXCryptoError.Base(MXCryptoError.ErrorType.BAD_DECRYPTED_FORMAT, MXCryptoError.BAD_DECRYPTED_FORMAT_TEXT_REASON)
             }
 
-                        return@flatMap Try.just(
+            return OlmDecryptionResult(
-                                OlmDecryptionResult(
                     payload,
                     session.keysClaimed,
                     senderKey,
                     session.forwardingCurve25519KeyChain
             )
-                        )
         } else {
             val reason = String.format(MXCryptoError.INBOUND_SESSION_MISMATCH_ROOM_ID_REASON, roomId, session.roomId)
             Timber.e("## decryptGroupMessage() : $reason")
-                        return@flatMap Try.Failure(MXCryptoError.Base(MXCryptoError.ErrorType.INBOUND_SESSION_MISMATCH_ROOM_ID, reason))
+            throw MXCryptoError.Base(MXCryptoError.ErrorType.INBOUND_SESSION_MISMATCH_ROOM_ID, reason)
-                    }
         }
     }
 
@@ -766,26 +762,26 @@ internal class MXOlmDevice @Inject constructor(
      * @param senderKey the base64-encoded curve25519 key of the sender.
      * @return the inbound group session.
      */
-    fun getInboundGroupSession(sessionId: String?, senderKey: String?, roomId: String?): Try<OlmInboundGroupSessionWrapper> {
+    fun getInboundGroupSession(sessionId: String?, senderKey: String?, roomId: String?): OlmInboundGroupSessionWrapper {
         if (sessionId.isNullOrBlank() || senderKey.isNullOrBlank()) {
-            return Try.Failure(MXCryptoError.Base(MXCryptoError.ErrorType.MISSING_SENDER_KEY, MXCryptoError.ERROR_MISSING_PROPERTY_REASON))
+            throw MXCryptoError.Base(MXCryptoError.ErrorType.MISSING_SENDER_KEY, MXCryptoError.ERROR_MISSING_PROPERTY_REASON)
         }
 
         val session = store.getInboundGroupSession(sessionId, senderKey)
 
-        return if (null != session) {
+        if (session != null) {
             // Check that the room id matches the original one for the session. This stops
             // the HS pretending a message was targeting a different room.
             if (!TextUtils.equals(roomId, session.roomId)) {
                 val errorDescription = String.format(MXCryptoError.INBOUND_SESSION_MISMATCH_ROOM_ID_REASON, roomId, session.roomId)
                 Timber.e("## getInboundGroupSession() : $errorDescription")
-                Try.Failure(MXCryptoError.Base(MXCryptoError.ErrorType.INBOUND_SESSION_MISMATCH_ROOM_ID, errorDescription))
+                throw MXCryptoError.Base(MXCryptoError.ErrorType.INBOUND_SESSION_MISMATCH_ROOM_ID, errorDescription)
             } else {
-                Try.just(session)
+                return session
             }
         } else {
             Timber.e("## getInboundGroupSession() : Cannot retrieve inbound group session $sessionId")
-            Try.Failure(MXCryptoError.Base(MXCryptoError.ErrorType.UNKNOWN_INBOUND_SESSION_ID, MXCryptoError.UNKNOWN_INBOUND_SESSION_ID_REASON))
+            throw MXCryptoError.Base(MXCryptoError.ErrorType.UNKNOWN_INBOUND_SESSION_ID, MXCryptoError.UNKNOWN_INBOUND_SESSION_ID_REASON)
         }
     }
 
@@ -798,6 +794,6 @@ internal class MXOlmDevice @Inject constructor(
      * @return true if the unbound session keys are known.
      */
     fun hasInboundSessionKeys(roomId: String, senderKey: String, sessionId: String): Boolean {
-        return getInboundGroupSession(sessionId, senderKey, roomId).isSuccess()
+        return runCatching { getInboundGroupSession(sessionId, senderKey, roomId) }.isSuccess
     }
 }

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/ObjectSigner.kt

@@ -17,7 +17,6 @@
 package im.vector.matrix.android.internal.crypto
 
 import im.vector.matrix.android.api.auth.data.Credentials
-import im.vector.matrix.android.internal.session.SessionScope
 import java.util.*
 import javax.inject.Inject
 

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/OneTimeKeysUploader.kt

@@ -16,8 +16,6 @@
 
 package im.vector.matrix.android.internal.crypto
 
-import arrow.core.Try
-import arrow.instances.`try`.applicativeError.handleError
 import im.vector.matrix.android.api.auth.data.Credentials
 import im.vector.matrix.android.internal.crypto.model.MXKey
 import im.vector.matrix.android.internal.crypto.model.rest.KeysUploadResponse
@@ -59,13 +57,13 @@ internal class OneTimeKeysUploader @Inject constructor(
     /**
      * Check if the OTK must be uploaded.
      */
-    suspend fun maybeUploadOneTimeKeys(): Try<Unit> {
+    suspend fun maybeUploadOneTimeKeys() {
         if (oneTimeKeyCheckInProgress) {
-            return Try.just(Unit)
+            return
         }
         if (System.currentTimeMillis() - lastOneTimeKeyCheck < ONE_TIME_KEY_UPLOAD_PERIOD) {
             // we've done a key upload recently.
-            return Try.just(Unit)
+            return
         }
 
         lastOneTimeKeyCheck = System.currentTimeMillis()
@@ -81,13 +79,12 @@ internal class OneTimeKeysUploader @Inject constructor(
         // discard the oldest private keys first. This will eventually clean
         // out stale private keys that won't receive a message.
         val keyLimit = Math.floor(maxOneTimeKeys / 2.0).toInt()
-        val result = if (oneTimeKeyCount != null) {
+        if (oneTimeKeyCount != null) {
             uploadOTK(oneTimeKeyCount!!, keyLimit)
         } else {
             // ask the server how many keys we have
             val uploadKeysParams = UploadKeysTask.Params(null, null, credentials.deviceId!!)
-            uploadKeysTask.execute(uploadKeysParams)
+            val response = uploadKeysTask.execute(uploadKeysParams)
-                    .flatMap {
             // We need to keep a pool of one time public keys on the server so that
             // other devices can start conversations with us. But we can only store
             // a finite number of private keys in the olm Account object.
@@ -101,22 +98,13 @@ internal class OneTimeKeysUploader @Inject constructor(
             // these factors.
             // TODO Why we do not set oneTimeKeyCount here?
             // TODO This is not needed anymore, see https://github.com/matrix-org/matrix-js-sdk/pull/493 (TODO on iOS also)
-                        val keyCount = it.oneTimeKeyCountsForAlgorithm(MXKey.KEY_SIGNED_CURVE_25519_TYPE)
+            val keyCount = response.oneTimeKeyCountsForAlgorithm(MXKey.KEY_SIGNED_CURVE_25519_TYPE)
             uploadOTK(keyCount, keyLimit)
         }
-        }
-        return result
-                .map {
         Timber.v("## uploadKeys() : success")
         oneTimeKeyCount = null
         oneTimeKeyCheckInProgress = false
     }
-                .handleError {
-                    Timber.e(it, "## uploadKeys() : failed")
-                    oneTimeKeyCount = null
-                    oneTimeKeyCheckInProgress = false
-                }
-    }
 
     /**
      * Upload some the OTKs.
@@ -124,29 +112,26 @@ internal class OneTimeKeysUploader @Inject constructor(
      * @param keyCount the key count
      * @param keyLimit the limit
      */
-    private suspend fun uploadOTK(keyCount: Int, keyLimit: Int): Try<Unit> {
+    private suspend fun uploadOTK(keyCount: Int, keyLimit: Int) {
         if (keyLimit <= keyCount) {
             // If we don't need to generate any more keys then we are done.
-            return Try.just(Unit)
+            return
         }
-
         val keysThisLoop = Math.min(keyLimit - keyCount, ONE_TIME_KEY_GENERATION_MAX_NUMBER)
         olmDevice.generateOneTimeKeys(keysThisLoop)
-        return uploadOneTimeKeys()
+        val response = uploadOneTimeKeys()
-                .flatMap {
+        if (response.hasOneTimeKeyCountsForAlgorithm(MXKey.KEY_SIGNED_CURVE_25519_TYPE)) {
-                    if (it.hasOneTimeKeyCountsForAlgorithm(MXKey.KEY_SIGNED_CURVE_25519_TYPE)) {
+            uploadOTK(response.oneTimeKeyCountsForAlgorithm(MXKey.KEY_SIGNED_CURVE_25519_TYPE), keyLimit)
-                        uploadOTK(it.oneTimeKeyCountsForAlgorithm(MXKey.KEY_SIGNED_CURVE_25519_TYPE), keyLimit)
         } else {
             Timber.e("## uploadLoop() : response for uploading keys does not contain one_time_key_counts.signed_curve25519")
-                        Try.raise(Exception("response for uploading keys does not contain one_time_key_counts.signed_curve25519"))
+            throw Exception("response for uploading keys does not contain one_time_key_counts.signed_curve25519")
-                    }
         }
     }
 
     /**
      * Upload my user's one time keys.
      */
-    private suspend fun uploadOneTimeKeys(): Try<KeysUploadResponse> {
+    private suspend fun uploadOneTimeKeys(): KeysUploadResponse {
         val oneTimeKeys = olmDevice.getOneTimeKeys()
         val oneTimeJson = HashMap<String, Any>()
 
@@ -169,13 +154,10 @@ internal class OneTimeKeysUploader @Inject constructor(
         // For now, we set the device id explicitly, as we may not be using the
         // same one as used in login.
         val uploadParams = UploadKeysTask.Params(null, oneTimeJson, credentials.deviceId!!)
-        return uploadKeysTask
+        val response = uploadKeysTask.execute(uploadParams)
-                .execute(uploadParams)
-                .map {
         lastPublishedOneTimeKeys = oneTimeKeys
         olmDevice.markKeysAsPublished()
-                    it
+        return response
-                }
     }
 
     companion object {

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/OutgoingRoomKeyRequestManager.kt

@@ -299,10 +299,12 @@ internal class OutgoingRoomKeyRequestManager @Inject constructor(
             // TODO Change this two hard coded key to something better
             contentMap.setObject(recipient["userId"], recipient["deviceId"], message)
         }
-        sendToDeviceTask.configureWith(SendToDeviceTask.Params(EventType.ROOM_KEY_REQUEST, contentMap, transactionId))
+        sendToDeviceTask
-                .dispatchTo(callback)
+                .configureWith(SendToDeviceTask.Params(EventType.ROOM_KEY_REQUEST, contentMap, transactionId)) {
-                .executeOn(TaskThread.CALLER)
+                    this.callback = callback
-                .callbackOn(TaskThread.CALLER)
+                    this.callbackThread = TaskThread.CALLER
+                    this.executionThread = TaskThread.CALLER
+                }
                 .executeBy(taskExecutor)
     }
 

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/actions/EnsureOlmSessionsForDevicesAction.kt

@@ -17,7 +17,6 @@
 package im.vector.matrix.android.internal.crypto.actions
 
 import android.text.TextUtils
-import arrow.core.Try
 import im.vector.matrix.android.internal.crypto.MXOlmDevice
 import im.vector.matrix.android.internal.crypto.model.MXDeviceInfo
 import im.vector.matrix.android.internal.crypto.model.MXKey
@@ -32,7 +31,7 @@ internal class EnsureOlmSessionsForDevicesAction @Inject constructor(private val
                                                                      private val oneTimeKeysForUsersDeviceTask: ClaimOneTimeKeysForUsersDeviceTask) {
 
 
-    suspend fun handle(devicesByUser: Map<String, List<MXDeviceInfo>>): Try<MXUsersDevicesMap<MXOlmSessionResult>> {
+    suspend fun handle(devicesByUser: Map<String, List<MXDeviceInfo>>): MXUsersDevicesMap<MXOlmSessionResult> {
         val devicesWithoutSession = ArrayList<MXDeviceInfo>()
 
         val results = MXUsersDevicesMap<MXOlmSessionResult>()
@@ -58,7 +57,7 @@ internal class EnsureOlmSessionsForDevicesAction @Inject constructor(private val
         }
 
         if (devicesWithoutSession.size == 0) {
-            return Try.just(results)
+            return results
         }
 
         // Prepare the request for claiming one-time keys
@@ -79,15 +78,13 @@ internal class EnsureOlmSessionsForDevicesAction @Inject constructor(private val
         Timber.v("## claimOneTimeKeysForUsersDevices() : $usersDevicesToClaim")
 
         val claimParams = ClaimOneTimeKeysForUsersDeviceTask.Params(usersDevicesToClaim)
-        return oneTimeKeysForUsersDeviceTask
+        val oneTimeKeys = oneTimeKeysForUsersDeviceTask.execute(claimParams)
-                .execute(claimParams)
+        Timber.v("## claimOneTimeKeysForUsersDevices() : keysClaimResponse.oneTimeKeys: $oneTimeKeys")
-                .map {
-                    Timber.v("## claimOneTimeKeysForUsersDevices() : keysClaimResponse.oneTimeKeys: $it")
         for (userId in userIds) {
             val deviceInfos = devicesByUser[userId]
             for (deviceInfo in deviceInfos!!) {
                 var oneTimeKey: MXKey? = null
-                            val deviceIds = it.getUserDeviceIds(userId)
+                val deviceIds = oneTimeKeys.getUserDeviceIds(userId)
                 if (null != deviceIds) {
                     for (deviceId in deviceIds) {
                         val olmSessionResult = results.getObject(userId, deviceId)
@@ -95,7 +92,7 @@ internal class EnsureOlmSessionsForDevicesAction @Inject constructor(private val
                             // We already have a result for this device
                             continue
                         }
-                                    val key = it.getObject(userId, deviceId)
+                        val key = oneTimeKeys.getObject(userId, deviceId)
                         if (key?.type == oneTimeKeyAlgorithm) {
                             oneTimeKey = key
                         }
@@ -110,8 +107,7 @@ internal class EnsureOlmSessionsForDevicesAction @Inject constructor(private val
                 }
             }
         }
-                    results
+        return results
-                }
     }
 
     private fun verifyKeyAndStartSession(oneTimeKey: MXKey, userId: String, deviceInfo: MXDeviceInfo): String? {

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/actions/EnsureOlmSessionsForUsersAction.kt

@@ -17,14 +17,11 @@
 package im.vector.matrix.android.internal.crypto.actions
 
 import android.text.TextUtils
-import arrow.core.Try
-import im.vector.matrix.android.api.MatrixCallback
 import im.vector.matrix.android.internal.crypto.MXOlmDevice
 import im.vector.matrix.android.internal.crypto.model.MXDeviceInfo
 import im.vector.matrix.android.internal.crypto.model.MXOlmSessionResult
 import im.vector.matrix.android.internal.crypto.model.MXUsersDevicesMap
 import im.vector.matrix.android.internal.crypto.store.IMXCryptoStore
-import im.vector.matrix.android.internal.session.SessionScope
 import timber.log.Timber
 import java.util.*
 import javax.inject.Inject
@@ -37,7 +34,7 @@ internal class EnsureOlmSessionsForUsersAction @Inject constructor(private val o
      * Try to make sure we have established olm sessions for the given users.
      * @param users    a list of user ids.
      */
-    suspend fun handle(users: List<String>) : Try<MXUsersDevicesMap<MXOlmSessionResult>> {
+    suspend fun handle(users: List<String>) : MXUsersDevicesMap<MXOlmSessionResult> {
         Timber.v("## ensureOlmSessionsForUsers() : ensureOlmSessionsForUsers $users")
         val devicesByUser = HashMap<String /* userId */, MutableList<MXDeviceInfo>>()
 

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/actions/MegolmSessionDataImporter.kt

@@ -26,7 +26,6 @@ import im.vector.matrix.android.internal.crypto.RoomDecryptorProvider
 import im.vector.matrix.android.internal.crypto.model.ImportRoomKeysResult
 import im.vector.matrix.android.internal.crypto.model.rest.RoomKeyRequestBody
 import im.vector.matrix.android.internal.crypto.store.IMXCryptoStore
-import im.vector.matrix.android.internal.session.SessionScope
 import timber.log.Timber
 import javax.inject.Inject
 

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/actions/SetDeviceVerificationAction.kt

@@ -19,7 +19,6 @@ package im.vector.matrix.android.internal.crypto.actions
 import im.vector.matrix.android.api.auth.data.Credentials
 import im.vector.matrix.android.internal.crypto.keysbackup.KeysBackup
 import im.vector.matrix.android.internal.crypto.store.IMXCryptoStore
-import im.vector.matrix.android.internal.session.SessionScope
 import timber.log.Timber
 import javax.inject.Inject
 

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/IMXDecrypting.kt

@@ -17,7 +17,6 @@
 
 package im.vector.matrix.android.internal.crypto.algorithms
 
-import arrow.core.Try
 import im.vector.matrix.android.api.session.events.model.Event
 import im.vector.matrix.android.internal.crypto.IncomingRoomKeyRequest
 import im.vector.matrix.android.internal.crypto.MXEventDecryptionResult
@@ -35,7 +34,7 @@ internal interface IMXDecrypting {
      * @param timeline the id of the timeline where the event is decrypted. It is used to prevent replay attack.
      * @return the decryption information, or an error
      */
-    suspend fun decryptEvent(event: Event, timeline: String): Try<MXEventDecryptionResult>
+    suspend fun decryptEvent(event: Event, timeline: String): MXEventDecryptionResult
 
     /**
      * Handle a key event.

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/IMXEncrypting.kt

@@ -17,7 +17,6 @@
 
 package im.vector.matrix.android.internal.crypto.algorithms
 
-import arrow.core.Try
 import im.vector.matrix.android.api.session.events.model.Content
 
 /**
@@ -31,7 +30,7 @@ internal interface IMXEncrypting {
      * @param eventContent the content of the event.
      * @param eventType    the type of the event.
      * @param userIds      the room members the event will be sent to.
-     * @return the encrypted content wrapped by [Try]
+     * @return the encrypted content
      */
-    suspend fun encryptEventContent(eventContent: Content, eventType: String, userIds: List<String>): Try<Content>
+    suspend fun encryptEventContent(eventContent: Content, eventType: String, userIds: List<String>): Content
 }

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/megolm/MXMegolmDecryption.kt

@@ -18,7 +18,6 @@
 package im.vector.matrix.android.internal.crypto.algorithms.megolm
 
 import android.text.TextUtils
-import arrow.core.Try
 import im.vector.matrix.android.api.auth.data.Credentials
 import im.vector.matrix.android.api.session.crypto.MXCryptoError
 import im.vector.matrix.android.api.session.events.model.Event
@@ -40,7 +39,6 @@ import im.vector.matrix.android.internal.util.MatrixCoroutineDispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import timber.log.Timber
-import kotlin.collections.HashMap
 
 internal class MXMegolmDecryption(private val credentials: Credentials,
                                   private val olmDevice: MXOlmDevice,
@@ -61,30 +59,46 @@ internal class MXMegolmDecryption(private val credentials: Credentials,
      */
     private var pendingEvents: MutableMap<String /* senderKey|sessionId */, MutableMap<String /* timelineId */, MutableList<Event>>> = HashMap()
 
-    override suspend fun decryptEvent(event: Event, timeline: String): Try<MXEventDecryptionResult> {
+    override suspend fun decryptEvent(event: Event, timeline: String): MXEventDecryptionResult {
         return decryptEvent(event, timeline, true)
     }
 
-    private fun decryptEvent(event: Event, timeline: String, requestKeysOnFail: Boolean): Try<MXEventDecryptionResult> {
+    private suspend fun decryptEvent(event: Event, timeline: String, requestKeysOnFail: Boolean): MXEventDecryptionResult {
         if (event.roomId.isNullOrBlank()) {
-            return Try.Failure(MXCryptoError.Base(MXCryptoError.ErrorType.MISSING_FIELDS, MXCryptoError.MISSING_FIELDS_REASON))
+            throw MXCryptoError.Base(MXCryptoError.ErrorType.MISSING_FIELDS, MXCryptoError.MISSING_FIELDS_REASON)
         }
 
         val encryptedEventContent = event.content.toModel<EncryptedEventContent>()
-                ?: return Try.Failure(MXCryptoError.Base(MXCryptoError.ErrorType.MISSING_FIELDS, MXCryptoError.MISSING_FIELDS_REASON))
+                ?: throw MXCryptoError.Base(MXCryptoError.ErrorType.MISSING_FIELDS, MXCryptoError.MISSING_FIELDS_REASON)
 
         if (encryptedEventContent.senderKey.isNullOrBlank()
                 || encryptedEventContent.sessionId.isNullOrBlank()
                 || encryptedEventContent.ciphertext.isNullOrBlank()) {
-            return Try.Failure(MXCryptoError.Base(MXCryptoError.ErrorType.MISSING_FIELDS, MXCryptoError.MISSING_FIELDS_REASON))
+            throw MXCryptoError.Base(MXCryptoError.ErrorType.MISSING_FIELDS, MXCryptoError.MISSING_FIELDS_REASON)
         }
 
-        return olmDevice.decryptGroupMessage(encryptedEventContent.ciphertext,
+        return runCatching {
+            olmDevice.decryptGroupMessage(encryptedEventContent.ciphertext,
                     event.roomId,
                     timeline,
                     encryptedEventContent.sessionId,
                     encryptedEventContent.senderKey)
+        }
                 .fold(
+                        { olmDecryptionResult ->
+                            // the decryption succeeds
+                            if (olmDecryptionResult.payload != null) {
+                                MXEventDecryptionResult(
+                                        clearEvent = olmDecryptionResult.payload,
+                                        senderCurve25519Key = olmDecryptionResult.senderKey,
+                                        claimedEd25519Key = olmDecryptionResult.keysClaimed?.get("ed25519"),
+                                        forwardingCurve25519KeyChain = olmDecryptionResult.forwardingCurve25519KeyChain
+                                                ?: emptyList()
+                                )
+                            } else {
+                                throw MXCryptoError.Base(MXCryptoError.ErrorType.MISSING_FIELDS, MXCryptoError.MISSING_FIELDS_REASON)
+                            }
+                        },
                         { throwable ->
                             if (throwable is MXCryptoError.OlmError) {
                                 // TODO Check the value of .message
@@ -98,10 +112,10 @@ internal class MXMegolmDecryption(private val credentials: Credentials,
                                 val reason = String.format(MXCryptoError.OLM_REASON, throwable.olmException.message)
                                 val detailedReason = String.format(MXCryptoError.DETAILED_OLM_REASON, encryptedEventContent.ciphertext, reason)
 
-                                Try.Failure(MXCryptoError.Base(
+                                throw MXCryptoError.Base(
                                         MXCryptoError.ErrorType.OLM,
                                         reason,
-                                        detailedReason))
+                                        detailedReason)
                             }
                             if (throwable is MXCryptoError.Base) {
                                 if (throwable.errorType == MXCryptoError.ErrorType.UNKNOWN_INBOUND_SESSION_ID) {
@@ -111,23 +125,7 @@ internal class MXMegolmDecryption(private val credentials: Credentials,
                                     }
                                 }
                             }
-
+                            throw throwable
-                            Try.Failure(throwable)
-                        },
-                        { olmDecryptionResult ->
-                            // the decryption succeeds
-                            if (olmDecryptionResult.payload != null) {
-                                Try.just(
-                                        MXEventDecryptionResult(
-                                                clearEvent = olmDecryptionResult.payload,
-                                                senderCurve25519Key = olmDecryptionResult.senderKey,
-                                                claimedEd25519Key = olmDecryptionResult.keysClaimed?.get("ed25519"),
-                                                forwardingCurve25519KeyChain = olmDecryptionResult.forwardingCurve25519KeyChain ?: emptyList()
-                                        )
-                                )
-                            } else {
-                                Try.Failure(MXCryptoError.Base(MXCryptoError.ErrorType.MISSING_FIELDS, MXCryptoError.MISSING_FIELDS_REASON))
-                            }
                         }
                 )
     }
@@ -311,39 +309,37 @@ internal class MXMegolmDecryption(private val credentials: Credentials,
         }
         val userId = request.userId ?: return
         GlobalScope.launch(coroutineDispatchers.crypto) {
-            deviceListManager
+            runCatching { deviceListManager.downloadKeys(listOf(userId), false) }
-                    .downloadKeys(listOf(userId), false)
+                    .mapCatching {
-                    .flatMap {
                         val deviceId = request.deviceId
                         val deviceInfo = cryptoStore.getUserDevice(deviceId ?: "", userId)
                         if (deviceInfo == null) {
                             throw RuntimeException()
                         } else {
                             val devicesByUser = mapOf(userId to listOf(deviceInfo))
-                            ensureOlmSessionsForDevicesAction
+                            val usersDeviceMap = ensureOlmSessionsForDevicesAction.handle(devicesByUser)
-                                    .handle(devicesByUser)
-                                    .flatMap {
                             val body = request.requestBody
-                                        val olmSessionResult = it.getObject(userId, deviceId)
+                            val olmSessionResult = usersDeviceMap.getObject(userId, deviceId)
                             if (olmSessionResult?.sessionId == null) {
                                 // no session with this device, probably because there
                                 // were no one-time keys.
-                                            Try.just(Unit)
+                                return@mapCatching
                             }
                             Timber.v("## shareKeysWithDevice() : sharing keys for session" +
                                     " ${body?.senderKey}|${body?.sessionId} with device $userId:$deviceId")
 
                             val payloadJson = mutableMapOf<String, Any>("type" to EventType.FORWARDED_ROOM_KEY)
-
+                            runCatching { olmDevice.getInboundGroupSession(body?.sessionId, body?.senderKey, body?.roomId) }
-                                        olmDevice.getInboundGroupSession(body?.sessionId, body?.senderKey, body?.roomId)
                                     .fold(
                                             {
                                                 // TODO
+                                                payloadJson["content"] = it.exportKeys()
+                                                        ?: ""
                                             },
                                             {
                                                 // TODO
-                                                            payloadJson["content"] = it.exportKeys() ?: ""
                                             }
+
                                     )
 
                             val encodedPayload = messageEncrypter.encryptMessage(payloadJson, listOf(deviceInfo))
@@ -356,6 +352,5 @@ internal class MXMegolmDecryption(private val credentials: Credentials,
                     }
         }
     }
-    }
-
 }
+

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/megolm/MXMegolmDecryptionFactory.kt

@@ -24,7 +24,6 @@ import im.vector.matrix.android.internal.crypto.actions.EnsureOlmSessionsForDevi
 import im.vector.matrix.android.internal.crypto.actions.MessageEncrypter
 import im.vector.matrix.android.internal.crypto.store.IMXCryptoStore
 import im.vector.matrix.android.internal.crypto.tasks.SendToDeviceTask
-import im.vector.matrix.android.internal.session.SessionScope
 import im.vector.matrix.android.internal.util.MatrixCoroutineDispatchers
 import javax.inject.Inject
 

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/megolm/MXMegolmEncryption.kt

@@ -19,7 +19,6 @@
 package im.vector.matrix.android.internal.crypto.algorithms.megolm
 
 import android.text.TextUtils
-import arrow.core.Try
 import im.vector.matrix.android.api.auth.data.Credentials
 import im.vector.matrix.android.api.session.crypto.MXCryptoError
 import im.vector.matrix.android.api.session.events.model.Content
@@ -69,12 +68,10 @@ internal class MXMegolmEncryption(
 
     override suspend fun encryptEventContent(eventContent: Content,
                                              eventType: String,
-                                             userIds: List<String>): Try<Content> {
+                                             userIds: List<String>): Content {
-        return getDevicesInRoom(userIds)
+        val devices = getDevicesInRoom(userIds)
-                .flatMap { ensureOutboundSession(it) }
+        val outboundSession = ensureOutboundSession(devices)
-                .flatMap {
+        return encryptContent(outboundSession, eventType, eventContent)
-                    encryptContent(it, eventType, eventContent)
-                }
     }
 
     /**
@@ -101,7 +98,7 @@ internal class MXMegolmEncryption(
      *
      * @param devicesInRoom the devices list
      */
-    private suspend fun ensureOutboundSession(devicesInRoom: MXUsersDevicesMap<MXDeviceInfo>): Try<MXOutboundSessionInfo> {
+    private suspend fun ensureOutboundSession(devicesInRoom: MXUsersDevicesMap<MXDeviceInfo>): MXOutboundSessionInfo {
         var session = outboundSession
         if (session == null
                 // Need to make a brand new session?
@@ -126,7 +123,8 @@ internal class MXMegolmEncryption(
                 }
             }
         }
-        return shareKey(safeSession, shareMap).map { safeSession!! }
+        shareKey(safeSession, shareMap)
+        return safeSession
     }
 
     /**
@@ -136,11 +134,11 @@ internal class MXMegolmEncryption(
      * @param devicesByUsers the devices map
      */
     private suspend fun shareKey(session: MXOutboundSessionInfo,
-                                 devicesByUsers: Map<String, List<MXDeviceInfo>>): Try<Unit> {
+                                 devicesByUsers: Map<String, List<MXDeviceInfo>>) {
         // nothing to send, the task is done
         if (devicesByUsers.isEmpty()) {
             Timber.v("## shareKey() : nothing more to do")
-            return Try.just(Unit)
+            return
         }
         // reduce the map size to avoid request timeout when there are too many devices (Users size  * devices per user)
         val subMap = HashMap<String, List<MXDeviceInfo>>()
@@ -157,12 +155,10 @@ internal class MXMegolmEncryption(
             }
         }
         Timber.v("## shareKey() ; userId $userIds")
-        return shareUserDevicesKey(session, subMap)
+        shareUserDevicesKey(session, subMap)
-                .flatMap {
         val remainingDevices = devicesByUsers.filterKeys { userIds.contains(it).not() }
         shareKey(session, remainingDevices)
     }
-    }
 
     /**
      * Share the device keys of a an user
@@ -172,7 +168,7 @@ internal class MXMegolmEncryption(
      * @param callback      the asynchronous callback
      */
     private suspend fun shareUserDevicesKey(session: MXOutboundSessionInfo,
-                                            devicesByUser: Map<String, List<MXDeviceInfo>>): Try<Unit> {
+                                            devicesByUser: Map<String, List<MXDeviceInfo>>) {
         val sessionKey = olmDevice.getSessionKey(session.sessionId)
         val chainIndex = olmDevice.getMessageIndex(session.sessionId)
 
@@ -190,17 +186,16 @@ internal class MXMegolmEncryption(
         var t0 = System.currentTimeMillis()
         Timber.v("## shareUserDevicesKey() : starts")
 
-        return ensureOlmSessionsForDevicesAction.handle(devicesByUser)
+        val results = ensureOlmSessionsForDevicesAction.handle(devicesByUser)
-                .flatMap {
         Timber.v("## shareUserDevicesKey() : ensureOlmSessionsForDevices succeeds after "
                 + (System.currentTimeMillis() - t0) + " ms")
         val contentMap = MXUsersDevicesMap<Any>()
         var haveTargets = false
-                    val userIds = it.userIds
+        val userIds = results.userIds
         for (userId in userIds) {
             val devicesToShareWith = devicesByUser[userId]
             for ((deviceID) in devicesToShareWith!!) {
-                            val sessionResult = it.getObject(userId, deviceID)
+                val sessionResult = results.getObject(userId, deviceID)
                 if (sessionResult?.sessionId == null) {
                     // no session with this device, probably because there
                     // were no one-time keys.
@@ -226,7 +221,6 @@ internal class MXMegolmEncryption(
             Timber.v("## shareUserDevicesKey() : has target")
             val sendToDeviceParams = SendToDeviceTask.Params(EventType.ENCRYPTED, contentMap)
             sendToDeviceTask.execute(sendToDeviceParams)
-                                .map {
             Timber.v("## shareUserDevicesKey() : sendToDevice succeeds after "
                     + (System.currentTimeMillis() - t0) + " ms")
 
@@ -241,20 +235,15 @@ internal class MXMegolmEncryption(
                     session.sharedWithDevices.setObject(userId, deviceId, chainIndex)
                 }
             }
-                                    Unit
-                                }
         } else {
             Timber.v("## shareUserDevicesKey() : no need to sharekey")
-                        Try.just(Unit)
-                    }
         }
     }
 
     /**
      * process the pending encryptions
      */
-    private fun encryptContent(session: MXOutboundSessionInfo, eventType: String, eventContent: Content): Try<Content> {
+    private fun encryptContent(session: MXOutboundSessionInfo, eventType: String, eventContent: Content): Content {
-        return Try<Content> {
         // Everything is in place, encrypt all pending events
         val payloadJson = HashMap<String, Any>()
         payloadJson["room_id"] = roomId
@@ -276,8 +265,7 @@ internal class MXMegolmEncryption(
         // m.new_device message if they don't have our session key.
         map["device_id"] = credentials.deviceId!!
         session.useCount++
-            map
+        return map
-        }
     }
 
     /**
@@ -287,24 +275,22 @@ internal class MXMegolmEncryption(
      * @param userIds  the user ids whose devices must be checked.
      * @param callback the asynchronous callback
      */
-    private suspend fun getDevicesInRoom(userIds: List<String>): Try<MXUsersDevicesMap<MXDeviceInfo>> {
+    private suspend fun getDevicesInRoom(userIds: List<String>): MXUsersDevicesMap<MXDeviceInfo> {
         // We are happy to use a cached version here: we assume that if we already
         // have a list of the user's devices, then we already share an e2e room
         // with them, which means that they will have announced any new devices via
         // an m.new_device.
-        return deviceListManager
+        val keys = deviceListManager.downloadKeys(userIds, false)
-                .downloadKeys(userIds, false)
-                .flatMap {
         val encryptToVerifiedDevicesOnly = cryptoStore.getGlobalBlacklistUnverifiedDevices()
                 || cryptoStore.getRoomsListBlacklistUnverifiedDevices().contains(roomId)
 
         val devicesInRoom = MXUsersDevicesMap<MXDeviceInfo>()
         val unknownDevices = MXUsersDevicesMap<MXDeviceInfo>()
 
-                    for (userId in it.userIds) {
+        for (userId in keys.userIds) {
-                        val deviceIds = it.getUserDeviceIds(userId) ?: continue
+            val deviceIds = keys.getUserDeviceIds(userId) ?: continue
             for (deviceId in deviceIds) {
-                            val deviceInfo = it.getObject(userId, deviceId) ?: continue
+                val deviceInfo = keys.getObject(userId, deviceId) ?: continue
                 if (warnOnUnknownDevicesRepository.warnOnUnknownDevices() && deviceInfo.isUnknown) {
                     // The device is not yet known by the user
                     unknownDevices.setObject(userId, deviceId, deviceInfo)
@@ -327,10 +313,9 @@ internal class MXMegolmEncryption(
             }
         }
         if (unknownDevices.isEmpty) {
-                        Try.just(devicesInRoom)
+            return devicesInRoom
         } else {
-                        Try.Failure(MXCryptoError.UnknownDevice(unknownDevices))
+            throw MXCryptoError.UnknownDevice(unknownDevices)
-                    }
         }
     }
 }

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/olm/MXOlmDecryption.kt

@@ -17,7 +17,6 @@
 
 package im.vector.matrix.android.internal.crypto.algorithms.olm
 
-import arrow.core.Try
 import im.vector.matrix.android.api.auth.data.Credentials
 import im.vector.matrix.android.api.session.crypto.MXCryptoError
 import im.vector.matrix.android.api.session.events.model.Event
@@ -41,29 +40,28 @@ internal class MXOlmDecryption(
         private val credentials: Credentials)
     : IMXDecrypting {
 
-    override suspend fun decryptEvent(event: Event, timeline: String): Try<MXEventDecryptionResult> {
+    override suspend fun decryptEvent(event: Event, timeline: String): MXEventDecryptionResult {
         val olmEventContent = event.content.toModel<OlmEventContent>() ?: run {
             Timber.e("## decryptEvent() : bad event format")
-            return Try.Failure(MXCryptoError.Base(MXCryptoError.ErrorType.BAD_EVENT_FORMAT,
+            throw MXCryptoError.Base(MXCryptoError.ErrorType.BAD_EVENT_FORMAT,
-                    MXCryptoError.BAD_EVENT_FORMAT_TEXT_REASON))
+                    MXCryptoError.BAD_EVENT_FORMAT_TEXT_REASON)
         }
 
         val cipherText = olmEventContent.ciphertext ?: run {
             Timber.e("## decryptEvent() : missing cipher text")
-            return Try.Failure(MXCryptoError.Base(MXCryptoError.ErrorType.MISSING_CIPHER_TEXT,
+            throw MXCryptoError.Base(MXCryptoError.ErrorType.MISSING_CIPHER_TEXT,
-                    MXCryptoError.MISSING_CIPHER_TEXT_REASON))
+                    MXCryptoError.MISSING_CIPHER_TEXT_REASON)
         }
 
         val senderKey = olmEventContent.senderKey ?: run {
             Timber.e("## decryptEvent() : missing sender key")
-            return Try.Failure(MXCryptoError.Base(MXCryptoError.ErrorType.MISSING_SENDER_KEY,
+            throw MXCryptoError.Base(MXCryptoError.ErrorType.MISSING_SENDER_KEY,
-                    MXCryptoError.MISSING_SENDER_KEY_TEXT_REASON))
+                    MXCryptoError.MISSING_SENDER_KEY_TEXT_REASON)
         }
 
         val messageAny = cipherText[olmDevice.deviceCurve25519Key] ?: run {
             Timber.e("## decryptEvent() : our device ${olmDevice.deviceCurve25519Key} is not included in recipients")
-            return Try.Failure(MXCryptoError.Base(MXCryptoError.ErrorType.NOT_INCLUDE_IN_RECIPIENTS,
+            throw MXCryptoError.Base(MXCryptoError.ErrorType.NOT_INCLUDE_IN_RECIPIENTS, MXCryptoError.NOT_INCLUDED_IN_RECIPIENT_REASON)
-                    MXCryptoError.NOT_INCLUDED_IN_RECIPIENT_REASON))
         }
 
         // The message for myUser
@@ -73,14 +71,12 @@ internal class MXOlmDecryption(
 
         if (decryptedPayload == null) {
             Timber.e("## decryptEvent() Failed to decrypt Olm event (id= ${event.eventId} from $senderKey")
-            return Try.Failure(MXCryptoError.Base(MXCryptoError.ErrorType.BAD_ENCRYPTED_MESSAGE,
+            throw MXCryptoError.Base(MXCryptoError.ErrorType.BAD_ENCRYPTED_MESSAGE, MXCryptoError.BAD_ENCRYPTED_MESSAGE_REASON)
-                    MXCryptoError.BAD_ENCRYPTED_MESSAGE_REASON))
         }
         val payloadString = convertFromUTF8(decryptedPayload)
         if (payloadString == null) {
             Timber.e("## decryptEvent() Failed to decrypt Olm event (id= ${event.eventId} from $senderKey")
-            return Try.Failure(MXCryptoError.Base(MXCryptoError.ErrorType.BAD_ENCRYPTED_MESSAGE,
+            throw MXCryptoError.Base(MXCryptoError.ErrorType.BAD_ENCRYPTED_MESSAGE, MXCryptoError.BAD_ENCRYPTED_MESSAGE_REASON)
-                    MXCryptoError.BAD_ENCRYPTED_MESSAGE_REASON))
         }
 
         val adapter = MoshiProvider.providesMoshi().adapter<JsonDict>(JSON_DICT_PARAMETERIZED_TYPE)
@@ -88,73 +84,70 @@ internal class MXOlmDecryption(
 
         if (payload == null) {
             Timber.e("## decryptEvent failed : null payload")
-            return Try.Failure(MXCryptoError.Base(MXCryptoError.ErrorType.UNABLE_TO_DECRYPT,
+            throw MXCryptoError.Base(MXCryptoError.ErrorType.UNABLE_TO_DECRYPT, MXCryptoError.MISSING_CIPHER_TEXT_REASON)
-                    MXCryptoError.MISSING_CIPHER_TEXT_REASON))
         }
 
         val olmPayloadContent = OlmPayloadContent.fromJsonString(payloadString) ?: run {
             Timber.e("## decryptEvent() : bad olmPayloadContent format")
-            return Try.Failure(MXCryptoError.Base(MXCryptoError.ErrorType.BAD_DECRYPTED_FORMAT,
+            throw MXCryptoError.Base(MXCryptoError.ErrorType.BAD_DECRYPTED_FORMAT, MXCryptoError.BAD_DECRYPTED_FORMAT_TEXT_REASON)
-                    MXCryptoError.BAD_DECRYPTED_FORMAT_TEXT_REASON))
         }
 
         if (olmPayloadContent.recipient.isNullOrBlank()) {
             val reason = String.format(MXCryptoError.ERROR_MISSING_PROPERTY_REASON, "recipient")
             Timber.e("## decryptEvent() : $reason")
-            return Try.Failure(MXCryptoError.Base(MXCryptoError.ErrorType.MISSING_PROPERTY,
+            throw MXCryptoError.Base(MXCryptoError.ErrorType.MISSING_PROPERTY, reason)
-                    reason))
         }
 
         if (olmPayloadContent.recipient != credentials.userId) {
             Timber.e("## decryptEvent() : Event ${event.eventId}:" +
                     " Intended recipient ${olmPayloadContent.recipient} does not match our id ${credentials.userId}")
-            return Try.Failure(MXCryptoError.Base(MXCryptoError.ErrorType.BAD_RECIPIENT,
+            throw MXCryptoError.Base(MXCryptoError.ErrorType.BAD_RECIPIENT,
-                    String.format(MXCryptoError.BAD_RECIPIENT_REASON, olmPayloadContent.recipient)))
+                    String.format(MXCryptoError.BAD_RECIPIENT_REASON, olmPayloadContent.recipient))
         }
 
         val recipientKeys = olmPayloadContent.recipient_keys ?: run {
             Timber.e("## decryptEvent() : Olm event (id=${event.eventId}) contains no 'recipient_keys' property; cannot prevent unknown-key attack")
-            return Try.Failure(MXCryptoError.Base(MXCryptoError.ErrorType.MISSING_PROPERTY,
+            throw MXCryptoError.Base(MXCryptoError.ErrorType.MISSING_PROPERTY,
-                    String.format(MXCryptoError.ERROR_MISSING_PROPERTY_REASON, "recipient_keys")))
+                    String.format(MXCryptoError.ERROR_MISSING_PROPERTY_REASON, "recipient_keys"))
         }
 
         val ed25519 = recipientKeys["ed25519"]
 
         if (ed25519 != olmDevice.deviceEd25519Key) {
             Timber.e("## decryptEvent() : Event ${event.eventId}: Intended recipient ed25519 key $ed25519 did not match ours")
-            return Try.Failure(MXCryptoError.Base(MXCryptoError.ErrorType.BAD_RECIPIENT_KEY,
+            throw MXCryptoError.Base(MXCryptoError.ErrorType.BAD_RECIPIENT_KEY,
-                    MXCryptoError.BAD_RECIPIENT_KEY_REASON))
+                    MXCryptoError.BAD_RECIPIENT_KEY_REASON)
         }
 
         if (olmPayloadContent.sender.isNullOrBlank()) {
             Timber.e("## decryptEvent() : Olm event (id=${event.eventId}) contains no 'sender' property; cannot prevent unknown-key attack")
-            return Try.Failure(MXCryptoError.Base(MXCryptoError.ErrorType.MISSING_PROPERTY,
+            throw MXCryptoError.Base(MXCryptoError.ErrorType.MISSING_PROPERTY,
-                    String.format(MXCryptoError.ERROR_MISSING_PROPERTY_REASON, "sender")))
+                    String.format(MXCryptoError.ERROR_MISSING_PROPERTY_REASON, "sender"))
         }
 
         if (olmPayloadContent.sender != event.senderId) {
             Timber.e("Event ${event.eventId}: original sender ${olmPayloadContent.sender} does not match reported sender ${event.senderId}")
-            return Try.Failure(MXCryptoError.Base(MXCryptoError.ErrorType.FORWARDED_MESSAGE,
+            throw MXCryptoError.Base(MXCryptoError.ErrorType.FORWARDED_MESSAGE,
-                    String.format(MXCryptoError.FORWARDED_MESSAGE_REASON, olmPayloadContent.sender)))
+                    String.format(MXCryptoError.FORWARDED_MESSAGE_REASON, olmPayloadContent.sender))
         }
 
         if (olmPayloadContent.room_id != event.roomId) {
             Timber.e("## decryptEvent() : Event ${event.eventId}: original room ${olmPayloadContent.room_id} does not match reported room ${event.roomId}")
-            return Try.Failure(MXCryptoError.Base(MXCryptoError.ErrorType.BAD_ROOM,
+            throw MXCryptoError.Base(MXCryptoError.ErrorType.BAD_ROOM,
-                    String.format(MXCryptoError.BAD_ROOM_REASON, olmPayloadContent.room_id)))
+                    String.format(MXCryptoError.BAD_ROOM_REASON, olmPayloadContent.room_id))
         }
 
         val keys = olmPayloadContent.keys ?: run {
             Timber.e("## decryptEvent failed : null keys")
-            return Try.Failure(MXCryptoError.Base(MXCryptoError.ErrorType.UNABLE_TO_DECRYPT,
+            throw MXCryptoError.Base(MXCryptoError.ErrorType.UNABLE_TO_DECRYPT,
-                    MXCryptoError.MISSING_CIPHER_TEXT_REASON))
+                    MXCryptoError.MISSING_CIPHER_TEXT_REASON)
         }
 
-        return Try.just(MXEventDecryptionResult(
+        return MXEventDecryptionResult(
                 clearEvent = payload,
                 senderCurve25519Key = senderKey,
                 claimedEd25519Key = keys["ed25519"]
-        ))
+        )
     }
 
     /**

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/olm/MXOlmDecryptionFactory.kt

@@ -18,7 +18,6 @@ package im.vector.matrix.android.internal.crypto.algorithms.olm
 
 import im.vector.matrix.android.api.auth.data.Credentials
 import im.vector.matrix.android.internal.crypto.MXOlmDevice
-import im.vector.matrix.android.internal.session.SessionScope
 import javax.inject.Inject
 
 internal class MXOlmDecryptionFactory @Inject constructor(private val olmDevice: MXOlmDevice,

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/olm/MXOlmEncryption.kt

@@ -19,7 +19,6 @@
 package im.vector.matrix.android.internal.crypto.algorithms.olm
 
 import android.text.TextUtils
-import arrow.core.Try
 import im.vector.matrix.android.api.session.events.model.Content
 import im.vector.matrix.android.api.session.events.model.toContent
 import im.vector.matrix.android.internal.crypto.DeviceListManager
@@ -40,12 +39,11 @@ internal class MXOlmEncryption(
         private val ensureOlmSessionsForUsersAction: EnsureOlmSessionsForUsersAction)
     : IMXEncrypting {
 
-    override suspend fun encryptEventContent(eventContent: Content, eventType: String, userIds: List<String>): Try<Content> {
+    override suspend fun encryptEventContent(eventContent: Content, eventType: String, userIds: List<String>): Content {
         // pick the list of recipients based on the membership list.
         //
         // TODO: there is a race condition here! What if a new user turns up
-        return ensureSession(userIds)
+        ensureSession(userIds)
-                .map {
         val deviceInfos = ArrayList<MXDeviceInfo>()
         for (userId in userIds) {
             val devices = cryptoStore.getUserDevices(userId)?.values ?: emptyList()
@@ -69,8 +67,7 @@ internal class MXOlmEncryption(
         messageMap["content"] = eventContent
 
         messageEncrypter.encryptMessage(messageMap, deviceInfos)
-                    messageMap.toContent()!!
+        return messageMap.toContent()!!
-                }
     }
 
 
@@ -78,13 +75,9 @@ internal class MXOlmEncryption(
      * Ensure that the session
      *
      * @param users    the user ids list
-     * @param callback the asynchronous callback
      */
-    private suspend fun ensureSession(users: List<String>): Try<Unit> {
+    private suspend fun ensureSession(users: List<String>) {
-        return deviceListManager
+        deviceListManager.downloadKeys(users, false)
-                .downloadKeys(users, false)
+        ensureOlmSessionsForUsersAction.handle(users)
-                .flatMap { ensureOlmSessionsForUsersAction.handle(users) }
-                .map { Unit }
-
     }
 }

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/algorithms/olm/MXOlmEncryptionFactory.kt

@@ -21,7 +21,6 @@ import im.vector.matrix.android.internal.crypto.MXOlmDevice
 import im.vector.matrix.android.internal.crypto.actions.EnsureOlmSessionsForUsersAction
 import im.vector.matrix.android.internal.crypto.actions.MessageEncrypter
 import im.vector.matrix.android.internal.crypto.store.IMXCryptoStore
-import im.vector.matrix.android.internal.session.SessionScope
 import im.vector.matrix.android.internal.util.MatrixCoroutineDispatchers
 import javax.inject.Inject
 

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/api/CryptoApi.kt

@@ -18,8 +18,6 @@ package im.vector.matrix.android.internal.crypto.api
 
 
 import im.vector.matrix.android.internal.crypto.model.rest.*
-import im.vector.matrix.android.internal.crypto.model.rest.KeysUploadBody
-import im.vector.matrix.android.internal.crypto.model.rest.SendToDeviceBody
 import im.vector.matrix.android.internal.network.NetworkConstants
 import retrofit2.Call
 import retrofit2.http.*

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/KeysBackup.kt

@@ -51,7 +51,6 @@ import im.vector.matrix.android.internal.crypto.store.db.model.KeysBackupDataEnt
 import im.vector.matrix.android.internal.di.MoshiProvider
 import im.vector.matrix.android.internal.extensions.foldToCallback
 import im.vector.matrix.android.internal.session.SessionScope
-import im.vector.matrix.android.internal.task.*
 import im.vector.matrix.android.internal.task.Task
 import im.vector.matrix.android.internal.task.TaskExecutor
 import im.vector.matrix.android.internal.task.TaskThread
@@ -204,8 +203,8 @@ internal class KeysBackup @Inject constructor(
         keysBackupStateManager.state = KeysBackupState.Enabling
 
         createKeysBackupVersionTask
-                .configureWith(createKeysBackupVersionBody)
+                .configureWith(createKeysBackupVersionBody) {
-                .dispatchTo(object : MatrixCallback<KeysVersion> {
+                    this.callback = object : MatrixCallback<KeysVersion> {
                         override fun onSuccess(info: KeysVersion) {
                             // Reset backup markers.
                             cryptoStore.resetBackupMarkers()
@@ -228,7 +227,8 @@ internal class KeysBackup @Inject constructor(
                             keysBackupStateManager.state = KeysBackupState.Disabled
                             callback.onFailure(failure)
                         }
-                })
+                    }
+                }
                 .executeBy(taskExecutor)
     }
 
@@ -243,8 +243,9 @@ internal class KeysBackup @Inject constructor(
                     keysBackupStateManager.state = KeysBackupState.Unknown
                 }
 
-                deleteBackupTask.configureWith(DeleteBackupTask.Params(version))
+                deleteBackupTask
-                        .dispatchTo(object : MatrixCallback<Unit> {
+                        .configureWith(DeleteBackupTask.Params(version)) {
+                            this.callback = object : MatrixCallback<Unit> {
                                 private fun eventuallyRestartBackup() {
                                     // Do not stay in KeysBackupState.Unknown but check what is available on the homeserver
                                     if (state == KeysBackupState.Unknown) {
@@ -263,7 +264,8 @@ internal class KeysBackup @Inject constructor(
 
                                     uiHandler.post { callback?.onFailure(failure) }
                                 }
-                        })
+                            }
+                        }
                         .executeBy(taskExecutor)
             }
         }
@@ -355,15 +357,14 @@ internal class KeysBackup @Inject constructor(
                                     callback: MatrixCallback<KeysBackupVersionTrust>) {
         // TODO Validate with François that this is correct
         object : Task<KeysVersionResult, KeysBackupVersionTrust> {
-            override suspend fun execute(params: KeysVersionResult): Try<KeysBackupVersionTrust> {
+            override suspend fun execute(params: KeysVersionResult): KeysBackupVersionTrust {
-                return Try {
+                return getKeysBackupTrustBg(params)
-                    getKeysBackupTrustBg(params)
             }
         }
+                .configureWith(keysBackupVersion) {
+                    this.callback = callback
+                    this.executionThread = TaskThread.COMPUTATION
                 }
-                .configureWith(keysBackupVersion)
-                .dispatchTo(callback)
-                .executeOn(TaskThread.COMPUTATION)
                 .executeBy(taskExecutor)
     }
 
@@ -454,7 +455,8 @@ internal class KeysBackup @Inject constructor(
                     val myUserId = credentials.userId
 
                     // Get current signatures, or create an empty set
-                    val myUserSignatures = authData.signatures?.get(myUserId)?.toMutableMap() ?: HashMap()
+                    val myUserSignatures = authData.signatures?.get(myUserId)?.toMutableMap()
+                            ?: HashMap()
 
                     if (trust) {
                         // Add current device signature
@@ -492,8 +494,8 @@ internal class KeysBackup @Inject constructor(
 
                 // And send it to the homeserver
                 updateKeysBackupVersionTask
-                        .configureWith(UpdateKeysBackupVersionTask.Params(keysBackupVersion.version!!, updateKeysBackupVersionBody))
+                        .configureWith(UpdateKeysBackupVersionTask.Params(keysBackupVersion.version!!, updateKeysBackupVersionBody)) {
-                        .dispatchTo(object : MatrixCallback<Unit> {
+                            this.callback = object : MatrixCallback<Unit> {
                                 override fun onSuccess(data: Unit) {
                                     // Relaunch the state machine on this updated backup version
                                     val newKeysBackupVersion = KeysVersionResult()
@@ -512,7 +514,8 @@ internal class KeysBackup @Inject constructor(
                                 override fun onFailure(failure: Throwable) {
                                     callback.onFailure(failure)
                                 }
-                        })
+                            }
+                        }
                         .executeBy(taskExecutor)
             }
         }
@@ -758,8 +761,8 @@ internal class KeysBackup @Inject constructor(
         if (roomId != null && sessionId != null) {
             // Get key for the room and for the session
             getRoomSessionDataTask
-                    .configureWith(GetRoomSessionDataTask.Params(roomId, sessionId, version))
+                    .configureWith(GetRoomSessionDataTask.Params(roomId, sessionId, version)) {
-                    .dispatchTo(object : MatrixCallback<KeyBackupData> {
+                        this.callback = object : MatrixCallback<KeyBackupData> {
                             override fun onSuccess(data: KeyBackupData) {
                                 // Convert to KeysBackupData
                                 val keysBackupData = KeysBackupData()
@@ -775,13 +778,14 @@ internal class KeysBackup @Inject constructor(
                             override fun onFailure(failure: Throwable) {
                                 callback.onFailure(failure)
                             }
-                    })
+                        }
+                    }
                     .executeBy(taskExecutor)
         } else if (roomId != null) {
             // Get all keys for the room
             getRoomSessionsDataTask
-                    .configureWith(GetRoomSessionsDataTask.Params(roomId, version))
+                    .configureWith(GetRoomSessionsDataTask.Params(roomId, version)) {
-                    .dispatchTo(object : MatrixCallback<RoomKeysBackupData> {
+                        this.callback = object : MatrixCallback<RoomKeysBackupData> {
                             override fun onSuccess(data: RoomKeysBackupData) {
                                 // Convert to KeysBackupData
                                 val keysBackupData = KeysBackupData()
@@ -794,13 +798,15 @@ internal class KeysBackup @Inject constructor(
                             override fun onFailure(failure: Throwable) {
                                 callback.onFailure(failure)
                             }
-                    })
+                        }
+                    }
                     .executeBy(taskExecutor)
         } else {
             // Get all keys
             getSessionsDataTask
-                    .configureWith(GetSessionsDataTask.Params(version))
+                    .configureWith(GetSessionsDataTask.Params(version)) {
-                    .dispatchTo(callback)
+                        this.callback = callback
+                    }
                     .executeBy(taskExecutor)
         }
     }
@@ -855,8 +861,8 @@ internal class KeysBackup @Inject constructor(
     override fun getVersion(version: String,
                             callback: MatrixCallback<KeysVersionResult?>) {
         getKeysBackupVersionTask
-                .configureWith(version)
+                .configureWith(version) {
-                .dispatchTo(object : MatrixCallback<KeysVersionResult> {
+                    this.callback = object : MatrixCallback<KeysVersionResult> {
                         override fun onSuccess(data: KeysVersionResult) {
                             callback.onSuccess(data)
                         }
@@ -871,14 +877,15 @@ internal class KeysBackup @Inject constructor(
                                 callback.onFailure(failure)
                             }
                         }
-                })
+                    }
+                }
                 .executeBy(taskExecutor)
     }
 
     override fun getCurrentVersion(callback: MatrixCallback<KeysVersionResult?>) {
         getKeysBackupLastVersionTask
-                .toConfigurableTask()
+                .configureWith {
-                .dispatchTo(object : MatrixCallback<KeysVersionResult> {
+                    this.callback = object : MatrixCallback<KeysVersionResult> {
                         override fun onSuccess(data: KeysVersionResult) {
                             callback.onSuccess(data)
                         }
@@ -893,7 +900,8 @@ internal class KeysBackup @Inject constructor(
                                 callback.onFailure(failure)
                             }
                         }
-                })
+                    }
+                }
                 .executeBy(taskExecutor)
     }
 
@@ -1236,10 +1244,7 @@ internal class KeysBackup @Inject constructor(
 
                 Timber.v("backupKeys: 4 - Sending request")
 
-                // Make the request
+                val sendingRequestCallback = object : MatrixCallback<BackupKeysResult> {
-                storeSessionDataTask
-                        .configureWith(StoreSessionsDataTask.Params(keysBackupVersion!!.version!!, keysBackupData))
-                        .dispatchTo(object : MatrixCallback<BackupKeysResult> {
                     override fun onSuccess(data: BackupKeysResult) {
                         uiHandler.post {
                             Timber.v("backupKeys: 5a - Request complete")
@@ -1298,7 +1303,13 @@ internal class KeysBackup @Inject constructor(
                             }
                         }
                     }
-                        })
+                }
+
+                // Make the request
+                storeSessionDataTask
+                        .configureWith(StoreSessionsDataTask.Params(keysBackupVersion!!.version!!, keysBackupData)){
+                            this.callback = sendingRequestCallback
+                        }
                         .executeBy(taskExecutor)
             }
         }

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/tasks/CreateKeysBackupVersionTask.kt

@@ -16,7 +16,6 @@
 
 package im.vector.matrix.android.internal.crypto.keysbackup.tasks
 
-import arrow.core.Try
 import im.vector.matrix.android.internal.crypto.keysbackup.api.RoomKeysApi
 import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.CreateKeysBackupVersionBody
 import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.KeysVersion
@@ -30,7 +29,7 @@ internal class DefaultCreateKeysBackupVersionTask @Inject constructor(private va
     : CreateKeysBackupVersionTask {
 
 
-    override suspend fun execute(params: CreateKeysBackupVersionBody): Try<KeysVersion> {
+    override suspend fun execute(params: CreateKeysBackupVersionBody): KeysVersion {
         return executeRequest {
             apiCall = roomKeysApi.createKeysBackupVersion(params)
         }

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/tasks/DeleteBackupTask.kt

@@ -16,10 +16,8 @@
 
 package im.vector.matrix.android.internal.crypto.keysbackup.tasks
 
-import arrow.core.Try
 import im.vector.matrix.android.internal.crypto.keysbackup.api.RoomKeysApi
 import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.session.SessionScope
 import im.vector.matrix.android.internal.task.Task
 import javax.inject.Inject
 
@@ -33,10 +31,9 @@ internal interface DeleteBackupTask : Task<DeleteBackupTask.Params, Unit> {
 internal class DefaultDeleteBackupTask @Inject constructor(private val roomKeysApi: RoomKeysApi)
     : DeleteBackupTask {
 
-    override suspend fun execute(params: DeleteBackupTask.Params): Try<Unit> {
+    override suspend fun execute(params: DeleteBackupTask.Params) {
         return executeRequest {
-            apiCall = roomKeysApi.deleteBackup(
+            apiCall = roomKeysApi.deleteBackup(params.version)
-                    params.version)
         }
     }
 }

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/tasks/DeleteRoomSessionDataTask.kt

@@ -16,10 +16,8 @@
 
 package im.vector.matrix.android.internal.crypto.keysbackup.tasks
 
-import arrow.core.Try
 import im.vector.matrix.android.internal.crypto.keysbackup.api.RoomKeysApi
 import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.session.SessionScope
 import im.vector.matrix.android.internal.task.Task
 import javax.inject.Inject
 
@@ -34,7 +32,7 @@ internal interface DeleteRoomSessionDataTask : Task<DeleteRoomSessionDataTask.Pa
 internal class DefaultDeleteRoomSessionDataTask @Inject constructor(private val roomKeysApi: RoomKeysApi)
     : DeleteRoomSessionDataTask {
 
-    override suspend fun execute(params: DeleteRoomSessionDataTask.Params): Try<Unit> {
+    override suspend fun execute(params: DeleteRoomSessionDataTask.Params) {
         return executeRequest {
             apiCall = roomKeysApi.deleteRoomSessionData(
                     params.roomId,

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/tasks/DeleteRoomSessionsDataTask.kt

@@ -16,10 +16,8 @@
 
 package im.vector.matrix.android.internal.crypto.keysbackup.tasks
 
-import arrow.core.Try
 import im.vector.matrix.android.internal.crypto.keysbackup.api.RoomKeysApi
 import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.session.SessionScope
 import im.vector.matrix.android.internal.task.Task
 import javax.inject.Inject
 
@@ -33,7 +31,7 @@ internal interface DeleteRoomSessionsDataTask : Task<DeleteRoomSessionsDataTask.
 internal class DefaultDeleteRoomSessionsDataTask @Inject constructor(private val roomKeysApi: RoomKeysApi)
     : DeleteRoomSessionsDataTask {
 
-    override suspend fun execute(params: DeleteRoomSessionsDataTask.Params): Try<Unit> {
+    override suspend fun execute(params: DeleteRoomSessionsDataTask.Params) {
         return executeRequest {
             apiCall = roomKeysApi.deleteRoomSessionsData(
                     params.roomId,

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/tasks/DeleteSessionsDataTask.kt

@@ -16,10 +16,8 @@
 
 package im.vector.matrix.android.internal.crypto.keysbackup.tasks
 
-import arrow.core.Try
 import im.vector.matrix.android.internal.crypto.keysbackup.api.RoomKeysApi
 import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.session.SessionScope
 import im.vector.matrix.android.internal.task.Task
 import javax.inject.Inject
 
@@ -32,10 +30,9 @@ internal interface DeleteSessionsDataTask : Task<DeleteSessionsDataTask.Params,
 internal class DefaultDeleteSessionsDataTask @Inject constructor(private val roomKeysApi: RoomKeysApi)
     : DeleteSessionsDataTask {
 
-    override suspend fun execute(params: DeleteSessionsDataTask.Params): Try<Unit> {
+    override suspend fun execute(params: DeleteSessionsDataTask.Params) {
         return executeRequest {
-            apiCall = roomKeysApi.deleteSessionsData(
+            apiCall = roomKeysApi.deleteSessionsData(params.version)
-                    params.version)
         }
     }
 }

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/tasks/GetKeysBackupLastVersionTask.kt

@@ -16,7 +16,6 @@
 
 package im.vector.matrix.android.internal.crypto.keysbackup.tasks
 
-import arrow.core.Try
 import im.vector.matrix.android.internal.crypto.keysbackup.api.RoomKeysApi
 import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.KeysVersionResult
 import im.vector.matrix.android.internal.network.executeRequest
@@ -29,7 +28,7 @@ internal class DefaultGetKeysBackupLastVersionTask @Inject constructor(private v
     : GetKeysBackupLastVersionTask {
 
 
-    override suspend fun execute(params: Unit): Try<KeysVersionResult> {
+    override suspend fun execute(params: Unit): KeysVersionResult {
         return executeRequest {
             apiCall = roomKeysApi.getKeysBackupLastVersion()
         }

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/tasks/GetKeysBackupVersionTask.kt

@@ -16,7 +16,6 @@
 
 package im.vector.matrix.android.internal.crypto.keysbackup.tasks
 
-import arrow.core.Try
 import im.vector.matrix.android.internal.crypto.keysbackup.api.RoomKeysApi
 import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.KeysVersionResult
 import im.vector.matrix.android.internal.network.executeRequest
@@ -29,7 +28,7 @@ internal class DefaultGetKeysBackupVersionTask @Inject constructor(private val r
     : GetKeysBackupVersionTask {
 
 
-    override suspend fun execute(params: String): Try<KeysVersionResult> {
+    override suspend fun execute(params: String): KeysVersionResult {
         return executeRequest {
             apiCall = roomKeysApi.getKeysBackupVersion(params)
         }

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/tasks/GetRoomSessionDataTask.kt

@@ -16,11 +16,9 @@
 
 package im.vector.matrix.android.internal.crypto.keysbackup.tasks
 
-import arrow.core.Try
 import im.vector.matrix.android.internal.crypto.keysbackup.api.RoomKeysApi
 import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.KeyBackupData
 import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.session.SessionScope
 import im.vector.matrix.android.internal.task.Task
 import javax.inject.Inject
 
@@ -35,7 +33,7 @@ internal interface GetRoomSessionDataTask : Task<GetRoomSessionDataTask.Params,
 internal class DefaultGetRoomSessionDataTask @Inject constructor(private val roomKeysApi: RoomKeysApi)
     : GetRoomSessionDataTask {
 
-    override suspend fun execute(params: GetRoomSessionDataTask.Params): Try<KeyBackupData> {
+    override suspend fun execute(params: GetRoomSessionDataTask.Params): KeyBackupData {
         return executeRequest {
             apiCall = roomKeysApi.getRoomSessionData(
                     params.roomId,

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/tasks/GetRoomSessionsDataTask.kt

@@ -16,11 +16,9 @@
 
 package im.vector.matrix.android.internal.crypto.keysbackup.tasks
 
-import arrow.core.Try
 import im.vector.matrix.android.internal.crypto.keysbackup.api.RoomKeysApi
 import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.RoomKeysBackupData
 import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.session.SessionScope
 import im.vector.matrix.android.internal.task.Task
 import javax.inject.Inject
 
@@ -35,7 +33,7 @@ internal interface GetRoomSessionsDataTask : Task<GetRoomSessionsDataTask.Params
 internal class DefaultGetRoomSessionsDataTask @Inject constructor(private val roomKeysApi: RoomKeysApi)
     : GetRoomSessionsDataTask {
 
-    override suspend fun execute(params: GetRoomSessionsDataTask.Params): Try<RoomKeysBackupData> {
+    override suspend fun execute(params: GetRoomSessionsDataTask.Params): RoomKeysBackupData {
         return executeRequest {
             apiCall = roomKeysApi.getRoomSessionsData(
                     params.roomId,

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/tasks/GetSessionsDataTask.kt

@@ -16,11 +16,9 @@
 
 package im.vector.matrix.android.internal.crypto.keysbackup.tasks
 
-import arrow.core.Try
 import im.vector.matrix.android.internal.crypto.keysbackup.api.RoomKeysApi
 import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.KeysBackupData
 import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.session.SessionScope
 import im.vector.matrix.android.internal.task.Task
 import javax.inject.Inject
 
@@ -33,10 +31,9 @@ internal interface GetSessionsDataTask : Task<GetSessionsDataTask.Params, KeysBa
 internal class DefaultGetSessionsDataTask @Inject constructor(private val roomKeysApi: RoomKeysApi)
     : GetSessionsDataTask {
 
-    override suspend fun execute(params: GetSessionsDataTask.Params): Try<KeysBackupData> {
+    override suspend fun execute(params: GetSessionsDataTask.Params): KeysBackupData {
         return executeRequest {
-            apiCall = roomKeysApi.getSessionsData(
+            apiCall = roomKeysApi.getSessionsData(params.version)
-                    params.version)
         }
     }
 }

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/tasks/StoreRoomSessionDataTask.kt

@@ -16,12 +16,10 @@
 
 package im.vector.matrix.android.internal.crypto.keysbackup.tasks
 
-import arrow.core.Try
 import im.vector.matrix.android.internal.crypto.keysbackup.api.RoomKeysApi
-import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.KeyBackupData
 import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.BackupKeysResult
+import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.KeyBackupData
 import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.session.SessionScope
 import im.vector.matrix.android.internal.task.Task
 import javax.inject.Inject
 
@@ -37,7 +35,7 @@ internal interface StoreRoomSessionDataTask : Task<StoreRoomSessionDataTask.Para
 internal class DefaultStoreRoomSessionDataTask @Inject constructor(private val roomKeysApi: RoomKeysApi)
     : StoreRoomSessionDataTask {
 
-    override suspend fun execute(params: StoreRoomSessionDataTask.Params): Try<BackupKeysResult> {
+    override suspend fun execute(params: StoreRoomSessionDataTask.Params): BackupKeysResult {
         return executeRequest {
             apiCall = roomKeysApi.storeRoomSessionData(
                     params.roomId,

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/tasks/StoreRoomSessionsDataTask.kt

@@ -16,12 +16,10 @@
 
 package im.vector.matrix.android.internal.crypto.keysbackup.tasks
 
-import arrow.core.Try
 import im.vector.matrix.android.internal.crypto.keysbackup.api.RoomKeysApi
-import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.RoomKeysBackupData
 import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.BackupKeysResult
+import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.RoomKeysBackupData
 import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.session.SessionScope
 import im.vector.matrix.android.internal.task.Task
 import javax.inject.Inject
 
@@ -36,7 +34,7 @@ internal interface StoreRoomSessionsDataTask : Task<StoreRoomSessionsDataTask.Pa
 internal class DefaultStoreRoomSessionsDataTask @Inject constructor(private val roomKeysApi: RoomKeysApi)
     : StoreRoomSessionsDataTask {
 
-    override suspend fun execute(params: StoreRoomSessionsDataTask.Params): Try<BackupKeysResult> {
+    override suspend fun execute(params: StoreRoomSessionsDataTask.Params): BackupKeysResult {
         return executeRequest {
             apiCall = roomKeysApi.storeRoomSessionsData(
                     params.roomId,

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/tasks/StoreSessionsDataTask.kt

@@ -16,12 +16,10 @@
 
 package im.vector.matrix.android.internal.crypto.keysbackup.tasks
 
-import arrow.core.Try
 import im.vector.matrix.android.internal.crypto.keysbackup.api.RoomKeysApi
-import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.KeysBackupData
 import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.BackupKeysResult
+import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.KeysBackupData
 import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.session.SessionScope
 import im.vector.matrix.android.internal.task.Task
 import javax.inject.Inject
 
@@ -35,7 +33,7 @@ internal interface StoreSessionsDataTask : Task<StoreSessionsDataTask.Params, Ba
 internal class DefaultStoreSessionsDataTask @Inject constructor(private val roomKeysApi: RoomKeysApi)
     : StoreSessionsDataTask {
 
-    override suspend fun execute(params: StoreSessionsDataTask.Params): Try<BackupKeysResult> {
+    override suspend fun execute(params: StoreSessionsDataTask.Params): BackupKeysResult {
         return executeRequest {
             apiCall = roomKeysApi.storeSessionsData(
                     params.version,

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/tasks/UpdateKeysBackupVersionTask.kt

@@ -16,7 +16,6 @@
 
 package im.vector.matrix.android.internal.crypto.keysbackup.tasks
 
-import arrow.core.Try
 import im.vector.matrix.android.internal.crypto.keysbackup.api.RoomKeysApi
 import im.vector.matrix.android.internal.crypto.keysbackup.model.rest.UpdateKeysBackupVersionBody
 import im.vector.matrix.android.internal.network.executeRequest
@@ -34,7 +33,7 @@ internal class DefaultUpdateKeysBackupVersionTask @Inject constructor(private va
     : UpdateKeysBackupVersionTask {
 
 
-    override suspend fun execute(params: UpdateKeysBackupVersionTask.Params): Try<Unit> {
+    override suspend fun execute(params: UpdateKeysBackupVersionTask.Params) {
         return executeRequest {
             apiCall = roomKeysApi.updateKeysBackupVersion(params.version, params.keysBackupVersionBody)
         }

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/RealmCryptoStoreModule.kt

@@ -16,8 +16,8 @@
 
 package im.vector.matrix.android.internal.crypto.store.db
 
-import io.realm.annotations.RealmModule
 import im.vector.matrix.android.internal.crypto.store.db.model.*
+import io.realm.annotations.RealmModule
 
 /**
  * Realm module for Crypto store classes

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/CryptoMetadataEntity.kt

@@ -16,10 +16,10 @@
 
 package im.vector.matrix.android.internal.crypto.store.db.model
 
-import io.realm.RealmObject
-import io.realm.annotations.PrimaryKey
 import im.vector.matrix.android.internal.crypto.store.db.deserializeFromRealm
 import im.vector.matrix.android.internal.crypto.store.db.serializeForRealm
+import io.realm.RealmObject
+import io.realm.annotations.PrimaryKey
 import org.matrix.olm.OlmAccount
 
 internal open class CryptoMetadataEntity(

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/DeviceInfoEntity.kt

@@ -16,9 +16,9 @@
 
 package im.vector.matrix.android.internal.crypto.store.db.model
 
+import im.vector.matrix.android.internal.crypto.model.MXDeviceInfo
 import im.vector.matrix.android.internal.crypto.store.db.deserializeFromRealm
 import im.vector.matrix.android.internal.crypto.store.db.serializeForRealm
-import im.vector.matrix.android.internal.crypto.model.MXDeviceInfo
 import io.realm.RealmObject
 import io.realm.RealmResults
 import io.realm.annotations.LinkingObjects

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/OlmInboundGroupSessionEntity.kt

@@ -16,11 +16,11 @@
 
 package im.vector.matrix.android.internal.crypto.store.db.model
 
-import io.realm.RealmObject
+import im.vector.matrix.android.internal.crypto.model.OlmInboundGroupSessionWrapper
-import io.realm.annotations.PrimaryKey
 import im.vector.matrix.android.internal.crypto.store.db.deserializeFromRealm
 import im.vector.matrix.android.internal.crypto.store.db.serializeForRealm
-import im.vector.matrix.android.internal.crypto.model.OlmInboundGroupSessionWrapper
+import io.realm.RealmObject
+import io.realm.annotations.PrimaryKey
 
 internal fun OlmInboundGroupSessionEntity.Companion.createPrimaryKey(sessionId: String?, senderKey: String?) = "$sessionId|$senderKey"
 

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/OlmSessionEntity.kt

@@ -16,10 +16,10 @@
 
 package im.vector.matrix.android.internal.crypto.store.db.model
 
-import io.realm.RealmObject
-import io.realm.annotations.PrimaryKey
 import im.vector.matrix.android.internal.crypto.store.db.deserializeFromRealm
 import im.vector.matrix.android.internal.crypto.store.db.serializeForRealm
+import io.realm.RealmObject
+import io.realm.annotations.PrimaryKey
 import org.matrix.olm.OlmSession
 
 internal fun OlmSessionEntity.Companion.createPrimaryKey(sessionId: String, deviceKey: String) = "$sessionId|$deviceKey"

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/model/OutgoingRoomKeyRequestEntity.kt

@@ -17,9 +17,9 @@
 package im.vector.matrix.android.internal.crypto.store.db.model
 
 import im.vector.matrix.android.internal.crypto.OutgoingRoomKeyRequest
+import im.vector.matrix.android.internal.crypto.model.rest.RoomKeyRequestBody
 import im.vector.matrix.android.internal.crypto.store.db.deserializeFromRealm
 import im.vector.matrix.android.internal.crypto.store.db.serializeForRealm
-import im.vector.matrix.android.internal.crypto.model.rest.RoomKeyRequestBody
 import io.realm.RealmObject
 import io.realm.annotations.PrimaryKey
 

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/query/DeviceInfoEntityQueries.kt

@@ -16,11 +16,11 @@
 
 package im.vector.matrix.android.internal.crypto.store.db.query
 
-import io.realm.Realm
-import io.realm.kotlin.where
 import im.vector.matrix.android.internal.crypto.store.db.model.DeviceInfoEntity
 import im.vector.matrix.android.internal.crypto.store.db.model.DeviceInfoEntityFields
 import im.vector.matrix.android.internal.crypto.store.db.model.createPrimaryKey
+import io.realm.Realm
+import io.realm.kotlin.where
 
 /**
  * Get or create a device info

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/store/db/query/UserEntitiesQueries.kt

@@ -16,10 +16,10 @@
 
 package im.vector.matrix.android.internal.crypto.store.db.query
 
-import io.realm.Realm
-import io.realm.kotlin.where
 import im.vector.matrix.android.internal.crypto.store.db.model.UserEntity
 import im.vector.matrix.android.internal.crypto.store.db.model.UserEntityFields
+import io.realm.Realm
+import io.realm.kotlin.where
 
 /**
  * Get or create a user

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/ClaimOneTimeKeysForUsersDeviceTask.kt

@@ -16,7 +16,6 @@
 
 package im.vector.matrix.android.internal.crypto.tasks
 
-import arrow.core.Try
 import im.vector.matrix.android.internal.crypto.api.CryptoApi
 import im.vector.matrix.android.internal.crypto.model.MXKey
 import im.vector.matrix.android.internal.crypto.model.MXUsersDevicesMap
@@ -37,15 +36,13 @@ internal interface ClaimOneTimeKeysForUsersDeviceTask : Task<ClaimOneTimeKeysFor
 internal class DefaultClaimOneTimeKeysForUsersDevice @Inject constructor(private val cryptoApi: CryptoApi)
     : ClaimOneTimeKeysForUsersDeviceTask {
 
-    override suspend fun execute(params: ClaimOneTimeKeysForUsersDeviceTask.Params): Try<MXUsersDevicesMap<MXKey>> {
+    override suspend fun execute(params: ClaimOneTimeKeysForUsersDeviceTask.Params): MXUsersDevicesMap<MXKey> {
         val body = KeysClaimBody(oneTimeKeys = params.usersDevicesKeyTypesMap.map)
 
-        return executeRequest<KeysClaimResponse> {
+        val keysClaimResponse = executeRequest<KeysClaimResponse> {
             apiCall = cryptoApi.claimOneTimeKeysForUsersDevices(body)
-        }.flatMap { keysClaimResponse ->
+        }
-            Try {
         val map = MXUsersDevicesMap<MXKey>()
-
         keysClaimResponse.oneTimeKeys?.let { oneTimeKeys ->
             for (userId in oneTimeKeys.keys) {
                 val mapByUserId = oneTimeKeys[userId]
@@ -63,9 +60,6 @@ internal class DefaultClaimOneTimeKeysForUsersDevice @Inject constructor(private
                 }
             }
         }
-
+        return map
-                map
-            }
-        }
     }
 }

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/DeleteDeviceTask.kt

@@ -16,16 +16,12 @@
 
 package im.vector.matrix.android.internal.crypto.tasks
 
-import arrow.core.Try
-import arrow.core.failure
-import arrow.core.recoverWith
 import im.vector.matrix.android.api.failure.Failure
 import im.vector.matrix.android.internal.auth.registration.RegistrationFlowResponse
 import im.vector.matrix.android.internal.crypto.api.CryptoApi
 import im.vector.matrix.android.internal.crypto.model.rest.DeleteDeviceParams
 import im.vector.matrix.android.internal.di.MoshiProvider
 import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.session.SessionScope
 import im.vector.matrix.android.internal.task.Task
 import javax.inject.Inject
 
@@ -38,10 +34,12 @@ internal interface DeleteDeviceTask : Task<DeleteDeviceTask.Params, Unit> {
 internal class DefaultDeleteDeviceTask @Inject constructor(private val cryptoApi: CryptoApi)
     : DeleteDeviceTask {
 
-    override suspend fun execute(params: DeleteDeviceTask.Params): Try<Unit> {
+    override suspend fun execute(params: DeleteDeviceTask.Params) {
-        return executeRequest<Unit> {
+        try {
+            executeRequest<Unit> {
                 apiCall = cryptoApi.deleteDevice(params.deviceId, DeleteDeviceParams())
-        }.recoverWith { throwable ->
+            }
+        } catch (throwable: Throwable) {
             if (throwable is Failure.OtherServerError && throwable.httpCode == 401) {
                 // Parse to get a RegistrationFlowResponse
                 val registrationFlowResponse = try {
@@ -51,17 +49,16 @@ internal class DefaultDeleteDeviceTask @Inject constructor(private val cryptoApi
                 } catch (e: Exception) {
                     null
                 }
-
                 // check if the server response can be casted
                 if (registrationFlowResponse != null) {
-                    Failure.RegistrationFlowError(registrationFlowResponse).failure()
+                    throw Failure.RegistrationFlowError(registrationFlowResponse)
                 } else {
-                    throwable.failure()
+                    throw throwable
                 }
 
             } else {
                 // Other error
-                throwable.failure()
+                throw throwable
             }
         }
     }

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/DeleteDeviceWithUserPasswordTask.kt

@@ -16,7 +16,6 @@
 
 package im.vector.matrix.android.internal.crypto.tasks
 
-import arrow.core.Try
 import im.vector.matrix.android.api.auth.data.Credentials
 import im.vector.matrix.android.internal.auth.data.LoginFlowTypes
 import im.vector.matrix.android.internal.crypto.api.CryptoApi
@@ -38,7 +37,7 @@ internal class DefaultDeleteDeviceWithUserPasswordTask @Inject constructor(priva
                                                                            private val credentials: Credentials)
     : DeleteDeviceWithUserPasswordTask {
 
-    override suspend fun execute(params: DeleteDeviceWithUserPasswordTask.Params): Try<Unit> {
+    override suspend fun execute(params: DeleteDeviceWithUserPasswordTask.Params) {
         return executeRequest {
             apiCall = cryptoApi.deleteDevice(params.deviceId, DeleteDeviceParams()
                     .apply {

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/DownloadKeysForUsersTask.kt

@@ -17,12 +17,10 @@
 package im.vector.matrix.android.internal.crypto.tasks
 
 import android.text.TextUtils
-import arrow.core.Try
 import im.vector.matrix.android.internal.crypto.api.CryptoApi
 import im.vector.matrix.android.internal.crypto.model.rest.KeysQueryBody
 import im.vector.matrix.android.internal.crypto.model.rest.KeysQueryResponse
 import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.session.SessionScope
 import im.vector.matrix.android.internal.task.Task
 import java.util.*
 import javax.inject.Inject
@@ -38,7 +36,7 @@ internal interface DownloadKeysForUsersTask : Task<DownloadKeysForUsersTask.Para
 internal class DefaultDownloadKeysForUsers @Inject constructor(private val cryptoApi: CryptoApi)
     : DownloadKeysForUsersTask {
 
-    override suspend fun execute(params: DownloadKeysForUsersTask.Params): Try<KeysQueryResponse> {
+    override suspend fun execute(params: DownloadKeysForUsersTask.Params): KeysQueryResponse {
         val downloadQuery = HashMap<String, Map<String, Any>>()
 
         if (null != params.userIds) {

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/GetDevicesTask.kt

@@ -16,11 +16,9 @@
 
 package im.vector.matrix.android.internal.crypto.tasks
 
-import arrow.core.Try
 import im.vector.matrix.android.internal.crypto.api.CryptoApi
 import im.vector.matrix.android.internal.crypto.model.rest.DevicesListResponse
 import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.session.SessionScope
 import im.vector.matrix.android.internal.task.Task
 import javax.inject.Inject
 
@@ -29,7 +27,7 @@ internal interface GetDevicesTask : Task<Unit, DevicesListResponse>
 internal class DefaultGetDevicesTask @Inject constructor(private val cryptoApi: CryptoApi)
     : GetDevicesTask {
 
-    override suspend fun execute(params: Unit): Try<DevicesListResponse> {
+    override suspend fun execute(params: Unit): DevicesListResponse {
         return executeRequest {
             apiCall = cryptoApi.getDevices()
         }

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/GetKeyChangesTask.kt

@@ -16,11 +16,9 @@
 
 package im.vector.matrix.android.internal.crypto.tasks
 
-import arrow.core.Try
 import im.vector.matrix.android.internal.crypto.api.CryptoApi
 import im.vector.matrix.android.internal.crypto.model.rest.KeyChangesResponse
 import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.session.SessionScope
 import im.vector.matrix.android.internal.task.Task
 import javax.inject.Inject
 
@@ -36,10 +34,9 @@ internal interface GetKeyChangesTask : Task<GetKeyChangesTask.Params, KeyChanges
 internal class DefaultGetKeyChangesTask @Inject constructor(private val cryptoApi: CryptoApi)
     : GetKeyChangesTask {
 
-    override suspend fun execute(params: GetKeyChangesTask.Params): Try<KeyChangesResponse> {
+    override suspend fun execute(params: GetKeyChangesTask.Params): KeyChangesResponse {
         return executeRequest {
-            apiCall = cryptoApi.getKeyChanges(params.from,
+            apiCall = cryptoApi.getKeyChanges(params.from, params.to)
-                    params.to)
         }
     }
 }

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/SendToDeviceTask.kt

@@ -16,12 +16,10 @@
 
 package im.vector.matrix.android.internal.crypto.tasks
 
-import arrow.core.Try
 import im.vector.matrix.android.internal.crypto.api.CryptoApi
 import im.vector.matrix.android.internal.crypto.model.MXUsersDevicesMap
 import im.vector.matrix.android.internal.crypto.model.rest.SendToDeviceBody
 import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.session.SessionScope
 import im.vector.matrix.android.internal.task.Task
 import java.util.*
 import javax.inject.Inject
@@ -40,7 +38,7 @@ internal interface SendToDeviceTask : Task<SendToDeviceTask.Params, Unit> {
 internal class DefaultSendToDeviceTask @Inject constructor(private val cryptoApi: CryptoApi)
     : SendToDeviceTask {
 
-    override suspend fun execute(params: SendToDeviceTask.Params): Try<Unit> {
+    override suspend fun execute(params: SendToDeviceTask.Params) {
         val sendToDeviceBody = SendToDeviceBody()
         sendToDeviceBody.messages = params.contentMap.map
 

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/SetDeviceNameTask.kt

@@ -17,11 +17,9 @@
 package im.vector.matrix.android.internal.crypto.tasks
 
 import android.text.TextUtils
-import arrow.core.Try
 import im.vector.matrix.android.internal.crypto.api.CryptoApi
 import im.vector.matrix.android.internal.crypto.model.rest.UpdateDeviceInfoBody
 import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.session.SessionScope
 import im.vector.matrix.android.internal.task.Task
 import javax.inject.Inject
 
@@ -37,11 +35,10 @@ internal interface SetDeviceNameTask : Task<SetDeviceNameTask.Params, Unit> {
 internal class DefaultSetDeviceNameTask @Inject constructor(private val cryptoApi: CryptoApi)
     : SetDeviceNameTask {
 
-    override suspend fun execute(params: SetDeviceNameTask.Params): Try<Unit> {
+    override suspend fun execute(params: SetDeviceNameTask.Params) {
         val body = UpdateDeviceInfoBody(
                 displayName = if (TextUtils.isEmpty(params.deviceName)) "" else params.deviceName
         )
-
         return executeRequest {
             apiCall = cryptoApi.updateDeviceInfo(params.deviceId, body)
         }

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/UploadKeysTask.kt

@@ -16,14 +16,12 @@
 
 package im.vector.matrix.android.internal.crypto.tasks
 
-import arrow.core.Try
 import im.vector.matrix.android.api.util.JsonDict
 import im.vector.matrix.android.internal.crypto.api.CryptoApi
-import im.vector.matrix.android.internal.crypto.model.rest.KeysUploadResponse
 import im.vector.matrix.android.internal.crypto.model.rest.DeviceKeys
 import im.vector.matrix.android.internal.crypto.model.rest.KeysUploadBody
+import im.vector.matrix.android.internal.crypto.model.rest.KeysUploadResponse
 import im.vector.matrix.android.internal.network.executeRequest
-import im.vector.matrix.android.internal.session.SessionScope
 import im.vector.matrix.android.internal.task.Task
 import im.vector.matrix.android.internal.util.convertToUTF8
 import javax.inject.Inject
@@ -41,7 +39,7 @@ internal interface UploadKeysTask : Task<UploadKeysTask.Params, KeysUploadRespon
 internal class DefaultUploadKeysTask @Inject constructor(private val cryptoApi: CryptoApi)
     : UploadKeysTask {
 
-    override suspend fun execute(params: UploadKeysTask.Params): Try<KeysUploadResponse> {
+    override suspend fun execute(params: UploadKeysTask.Params): KeysUploadResponse {
         val encodedDeviceId = convertToUTF8(params.deviceId)
 
         val body = KeysUploadBody()

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/DefaultSasVerificationService.kt

@@ -37,6 +37,7 @@ import im.vector.matrix.android.internal.crypto.model.rest.*
 import im.vector.matrix.android.internal.crypto.store.IMXCryptoStore
 import im.vector.matrix.android.internal.crypto.tasks.SendToDeviceTask
 import im.vector.matrix.android.internal.session.SessionScope
+import im.vector.matrix.android.internal.task.TaskConstraints
 import im.vector.matrix.android.internal.task.TaskExecutor
 import im.vector.matrix.android.internal.task.configureWith
 import im.vector.matrix.android.internal.util.MatrixCoroutineDispatchers
@@ -219,15 +220,18 @@ internal class DefaultSasVerificationService @Inject constructor(private val cre
                                                startReq: KeyVerificationStart,
                                                success: (MXUsersDevicesMap<MXDeviceInfo>) -> Unit,
                                                error: () -> Unit) {
+        runCatching {
             deviceListManager.downloadKeys(listOf(otherUserId), true)
-                .fold(
+        }.fold(
-                        { error() },
                 {
                     if (it.getUserDeviceIds(otherUserId)?.contains(startReq.fromDevice) == true) {
                         success(it)
                     } else {
                         error()
                     }
+                },
+                {
+                    error()
                 }
         )
     }
@@ -412,8 +416,9 @@ internal class DefaultSasVerificationService @Inject constructor(private val cre
         val contentMap = MXUsersDevicesMap<Any>()
         contentMap.setObject(userId, userDevice, cancelMessage)
 
-        sendToDeviceTask.configureWith(SendToDeviceTask.Params(EventType.KEY_VERIFICATION_CANCEL, contentMap, transactionId))
+        sendToDeviceTask
-                .dispatchTo(object : MatrixCallback<Unit> {
+                .configureWith(SendToDeviceTask.Params(EventType.KEY_VERIFICATION_CANCEL, contentMap, transactionId)) {
+                    this.callback = object : MatrixCallback<Unit> {
                         override fun onSuccess(data: Unit) {
                             Timber.v("## SAS verification [$transactionId] canceled for reason ${code.value}")
                         }
@@ -421,7 +426,8 @@ internal class DefaultSasVerificationService @Inject constructor(private val cre
                         override fun onFailure(failure: Throwable) {
                             Timber.e(failure, "## SAS verification [$transactionId] failed to cancel.")
                         }
-                })
+                    }
+                }
                 .executeBy(taskExecutor)
     }
 }

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/SASVerificationTransaction.kt

@@ -287,8 +287,9 @@ internal abstract class SASVerificationTransaction(
         val contentMap = MXUsersDevicesMap<Any>()
         contentMap.setObject(otherUserId, otherDeviceId, keyToDevice)
 
-        sendToDeviceTask.configureWith(SendToDeviceTask.Params(type, contentMap, transactionId))
+        sendToDeviceTask
-                .dispatchTo(object : MatrixCallback<Unit> {
+                .configureWith(SendToDeviceTask.Params(type, contentMap, transactionId)) {
+                    this.callback = object : MatrixCallback<Unit> {
                         override fun onSuccess(data: Unit) {
                             Timber.v("## SAS verification [$transactionId] toDevice type '$type' success.")
                             if (onDone != null) {
@@ -303,7 +304,8 @@ internal abstract class SASVerificationTransaction(
 
                             cancel(onErrorReason)
                         }
-                })
+                    }
+                }
                 .executeBy(taskExecutor)
     }
 

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/AsyncTransaction.kt

@@ -0,0 +1,39 @@
+/*
+  * Copyright 2019 New Vector Ltd
+  *
+  * Licensed under the Apache License, Version 2.0 (the "License");
+  * you may not use this file except in compliance with the License.
+  * You may obtain a copy of the License at
+  *
+  *     http://www.apache.org/licenses/LICENSE-2.0
+  *
+  * Unless required by applicable law or agreed to in writing, software
+  * distributed under the License is distributed on an "AS IS" BASIS,
+  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  * See the License for the specific language governing permissions and
+  * limitations under the License.
+ */
+package im.vector.matrix.android.internal.database
+
+import io.realm.Realm
+import io.realm.RealmConfiguration
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.isActive
+import kotlinx.coroutines.withContext
+
+
+suspend fun awaitTransaction(config: RealmConfiguration, transaction: suspend (realm: Realm) -> Unit) = withContext(Dispatchers.IO) {
+    Realm.getInstance(config).use { bgRealm ->
+        bgRealm.beginTransaction()
+        try {
+            transaction(bgRealm)
+            if (isActive) {
+                bgRealm.commitTransaction()
+            }
+        } finally {
+            if (bgRealm.isInTransaction) {
+                bgRealm.cancelTransaction()
+            }
+        }
+    }
+}

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/RealmLiveEntityObserver.kt

@@ -18,12 +18,7 @@ package im.vector.matrix.android.internal.database
 
 import com.zhuinden.monarchy.Monarchy
 import im.vector.matrix.android.internal.util.createBackgroundHandler
-import io.realm.OrderedCollectionChangeSet
+import io.realm.*
-import io.realm.OrderedRealmCollectionChangeListener
-import io.realm.Realm
-import io.realm.RealmConfiguration
-import io.realm.RealmObject
-import io.realm.RealmResults
 import java.util.concurrent.atomic.AtomicBoolean
 import java.util.concurrent.atomic.AtomicReference
 

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/helper/TimelineEventEntityHelper.kt

@@ -20,11 +20,7 @@ import im.vector.matrix.android.api.session.events.model.EventType
 import im.vector.matrix.android.api.session.events.model.toModel
 import im.vector.matrix.android.api.session.room.model.RoomMember
 import im.vector.matrix.android.internal.database.mapper.ContentMapper
-import im.vector.matrix.android.internal.database.model.EventEntity
+import im.vector.matrix.android.internal.database.model.*
-import im.vector.matrix.android.internal.database.model.EventEntityFields
-import im.vector.matrix.android.internal.database.model.RoomEntity
-import im.vector.matrix.android.internal.database.model.TimelineEventEntity
-import im.vector.matrix.android.internal.database.model.TimelineEventEntityFields
 import im.vector.matrix.android.internal.database.query.next
 import im.vector.matrix.android.internal.database.query.prev
 import im.vector.matrix.android.internal.database.query.where

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/EventMapper.kt

@@ -20,13 +20,10 @@ import com.squareup.moshi.JsonDataException
 import im.vector.matrix.android.api.session.crypto.MXCryptoError
 import im.vector.matrix.android.api.session.events.model.Event
 import im.vector.matrix.android.api.session.events.model.UnsignedData
-import im.vector.matrix.android.internal.crypto.MXEventDecryptionResult
-import im.vector.matrix.android.internal.crypto.algorithms.olm.MXOlmDecryption
 import im.vector.matrix.android.internal.crypto.algorithms.olm.OlmDecryptionResult
 import im.vector.matrix.android.internal.database.model.EventEntity
 import im.vector.matrix.android.internal.di.MoshiProvider
 import timber.log.Timber
-import java.util.*
 
 internal object EventMapper {
 

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/mapper/TimelineEventMapper.kt

@@ -17,7 +17,6 @@
 package im.vector.matrix.android.internal.database.mapper
 
 import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.room.send.SendState
 import im.vector.matrix.android.api.session.room.timeline.TimelineEvent
 import im.vector.matrix.android.internal.database.model.TimelineEventEntity
 

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/model/EventEntity.kt

@@ -24,8 +24,6 @@ import io.realm.RealmObject
 import io.realm.RealmResults
 import io.realm.annotations.Index
 import io.realm.annotations.LinkingObjects
-import io.realm.annotations.PrimaryKey
-import java.util.*
 
 internal open class EventEntity(@Index var eventId: String = "",
                                 @Index var roomId: String = "",

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/TimelineEventEntityQueries.kt

@@ -16,12 +16,8 @@
 
 package im.vector.matrix.android.internal.database.query
 
-import im.vector.matrix.android.internal.database.model.ChunkEntity
+import im.vector.matrix.android.internal.database.model.*
-import im.vector.matrix.android.internal.database.model.EventEntity
 import im.vector.matrix.android.internal.database.model.EventEntity.LinkFilterMode.*
-import im.vector.matrix.android.internal.database.model.RoomEntity
-import im.vector.matrix.android.internal.database.model.TimelineEventEntity
-import im.vector.matrix.android.internal.database.model.TimelineEventEntityFields
 import io.realm.Realm
 import io.realm.RealmList
 import io.realm.RealmQuery

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/di/MatrixComponent.kt

@@ -27,13 +27,11 @@ import im.vector.matrix.android.internal.SessionManager
 import im.vector.matrix.android.internal.auth.AuthModule
 import im.vector.matrix.android.internal.auth.SessionParamsStore
 import im.vector.matrix.android.internal.network.NetworkConnectivityChecker
-import im.vector.matrix.android.internal.network.RetrofitFactory
 import im.vector.matrix.android.internal.task.TaskExecutor
 import im.vector.matrix.android.internal.util.BackgroundDetectionObserver
 import im.vector.matrix.android.internal.util.MatrixCoroutineDispatchers
 import okhttp3.OkHttpClient
 import org.matrix.olm.OlmManager
-import retrofit2.Retrofit
 
 
 @Component(modules = [MatrixModule::class, NetworkModule::class, AuthModule::class])

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/extensions/Result.kt

@@ -0,0 +1,25 @@
+/*
+
+  * Copyright 2019 New Vector Ltd
+  *
+  * Licensed under the Apache License, Version 2.0 (the "License");
+  * you may not use this file except in compliance with the License.
+  * You may obtain a copy of the License at
+  *
+  *     http://www.apache.org/licenses/LICENSE-2.0
+  *
+  * Unless required by applicable law or agreed to in writing, software
+  * distributed under the License is distributed on an "AS IS" BASIS,
+  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  * See the License for the specific language governing permissions and
+  * limitations under the License.
+
+ */
+package im.vector.matrix.android.internal.extensions
+
+import im.vector.matrix.android.api.MatrixCallback
+
+fun <A> Result<A>.foldToCallback(callback: MatrixCallback<A>): Unit = fold(
+        { callback.onSuccess(it) },
+        { callback.onFailure(it) }
+)

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/NetworkConnectivityChecker.kt

@@ -19,35 +19,64 @@ package im.vector.matrix.android.internal.network
 import android.content.Context
 import com.novoda.merlin.Merlin
 import com.novoda.merlin.MerlinsBeard
-import com.novoda.merlin.registerable.connection.Connectable
 import im.vector.matrix.android.internal.di.MatrixScope
+import timber.log.Timber
+import java.util.*
 import javax.inject.Inject
+import kotlin.collections.ArrayList
+import kotlin.coroutines.resume
+import kotlin.coroutines.suspendCoroutine
 
 @MatrixScope
 internal class NetworkConnectivityChecker @Inject constructor(context: Context) {
 
-    private val merlin = Merlin.Builder().withConnectableCallbacks().build(context)
+    private val merlin = Merlin.Builder()
-    private val merlinsBeard = MerlinsBeard.from(context)
+            .withConnectableCallbacks()
+            .withDisconnectableCallbacks()
+            .build(context)
 
-    private val listeners = ArrayList<Listener>()
+    private val merlinsBeard = MerlinsBeard.Builder().build(context)
+    private val listeners = Collections.synchronizedList(ArrayList<Listener>())
+
+    init {
+        merlin.bind()
+        merlin.registerDisconnectable {
+            Timber.v("On Disconnect")
+            val localListeners = listeners.toList()
+            localListeners.forEach {
+                it.onDisconnect()
+            }
+        }
+        merlin.registerConnectable {
+            Timber.v("On Connect")
+            val localListeners = listeners.toList()
+            localListeners.forEach {
+                it.onConnect()
+            }
+        }
+    }
+
+    suspend fun waitUntilConnected() {
+        if (isConnected()) {
+            return
+        } else {
+            suspendCoroutine<Unit> { continuation ->
+                register(object : Listener {
+                    override fun onConnect() {
+                        unregister(this)
+                        continuation.resume(Unit)
+                    }
+                })
+            }
+        }
+    }
 
     fun register(listener: Listener) {
-        if (listeners.isEmpty()) {
-            merlin.bind()
-        }
         listeners.add(listener)
-        val connectable = Connectable {
-            if (listeners.contains(listener)) {
-                listener.onConnect()
-            }
-        }
-        merlin.registerConnectable(connectable)
     }
 
     fun unregister(listener: Listener) {
-        if (listeners.remove(listener) && listeners.isEmpty()) {
+        listeners.remove(listener)
-            merlin.unbind()
-        }
     }
 
     fun isConnected(): Boolean {
@@ -55,7 +84,13 @@ internal class NetworkConnectivityChecker @Inject constructor(context: Context)
     }
 
     interface Listener {
-        fun onConnect()
+        fun onConnect() {
+
+        }
+
+        fun onDisconnect() {
+
+        }
     }
 
 

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/ProgressRequestBody.kt

@@ -18,11 +18,7 @@ package im.vector.matrix.android.internal.network
 
 import okhttp3.MediaType
 import okhttp3.RequestBody
-import okio.Buffer
+import okio.*
-import okio.BufferedSink
-import okio.ForwardingSink
-import okio.Okio
-import okio.Sink
 import java.io.IOException
 
 internal class ProgressRequestBody(private val delegate: RequestBody,

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/Request.kt

@@ -16,9 +16,6 @@
 
 package im.vector.matrix.android.internal.network
 
-import arrow.core.Try
-import arrow.core.failure
-import arrow.core.recoverWith
 import com.squareup.moshi.JsonDataException
 import com.squareup.moshi.Moshi
 import im.vector.matrix.android.api.failure.Failure
@@ -36,8 +33,8 @@ internal class Request<DATA> {
     private val moshi: Moshi = MoshiProvider.providesMoshi()
     lateinit var apiCall: Call<DATA>
 
-    suspend fun execute(): Try<DATA> {
+    suspend fun execute(): DATA {
-        return Try {
+        return try {
             val response = apiCall.awaitResponse()
             if (response.isSuccessful) {
                 response.body()
@@ -45,13 +42,13 @@ internal class Request<DATA> {
             } else {
                 throw manageFailure(response.errorBody(), response.code())
             }
-        }.recoverWith {
+        } catch (exception: Throwable) {
-            when (it) {
+            throw when (exception) {
-                is IOException              -> Failure.NetworkConnection(it)
+                is IOException              -> Failure.NetworkConnection(exception)
                 is Failure.ServerError,
-                is Failure.OtherServerError -> it
+                is Failure.OtherServerError -> exception
-                else                        -> Failure.Unknown(it)
+                else                        -> Failure.Unknown(exception)
-            }.failure()
+            }
         }
     }
 

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/RetrofitExtensions.kt

@@ -19,7 +19,9 @@
 package im.vector.matrix.android.internal.network
 
 import kotlinx.coroutines.suspendCancellableCoroutine
-import retrofit2.*
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
 import kotlin.coroutines.resume
 import kotlin.coroutines.resumeWithException
 

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/RetrofitFactory.kt

@@ -17,7 +17,6 @@
 package im.vector.matrix.android.internal.network
 
 import com.squareup.moshi.Moshi
-import okhttp3.Interceptor
 import okhttp3.OkHttpClient
 import retrofit2.Retrofit
 import retrofit2.converter.moshi.MoshiConverterFactory

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/DefaultSession.kt

@@ -47,6 +47,7 @@ import im.vector.matrix.android.internal.session.sync.job.SyncWorker
 import im.vector.matrix.android.internal.worker.WorkManagerUtil
 import timber.log.Timber
 import javax.inject.Inject
+import javax.inject.Provider
 
 @SessionScope
 internal class DefaultSession @Inject constructor(override val sessionParams: SessionParams,
@@ -64,7 +65,7 @@ internal class DefaultSession @Inject constructor(override val sessionParams: Se
                                                   private val pushersService: Lazy<PushersService>,
                                                   private val cryptoService: Lazy<CryptoManager>,
                                                   private val fileService: Lazy<FileService>,
-                                                  private val syncThread: SyncThread,
+                                                  private val syncThreadProvider: Provider<SyncThread>,
                                                   private val contentUrlResolver: ContentUrlResolver,
                                                   private val contentUploadProgressTracker: ContentUploadStateTracker,
                                                   private val initialSyncProgressService: Lazy<InitialSyncProgressService>)
@@ -84,6 +85,7 @@ internal class DefaultSession @Inject constructor(override val sessionParams: Se
 
     private var isOpen = false
 
+    private var syncThread: SyncThread? = null
 
     @MainThread
     override fun open() {
@@ -105,21 +107,23 @@ internal class DefaultSession @Inject constructor(override val sessionParams: Se
         SyncWorker.stopAnyBackgroundSync(context)
     }
 
-    override fun startSync(fromForeground : Boolean) {
+    override fun startSync(fromForeground: Boolean) {
         Timber.i("Starting sync thread")
         assert(isOpen)
-        syncThread.setInitialForeground(fromForeground)
+        val localSyncThread = getSyncThread()
-        if (!syncThread.isAlive) {
+        localSyncThread.setInitialForeground(fromForeground)
-            syncThread.start()
+        if (!localSyncThread.isAlive) {
+            localSyncThread.start()
         } else {
-            syncThread.restart()
+            localSyncThread.restart()
             Timber.w("Attempt to start an already started thread")
         }
     }
 
     override fun stopSync() {
         assert(isOpen)
-        syncThread.kill()
+        syncThread?.kill()
+        syncThread = null
     }
 
     override fun close() {
@@ -131,7 +135,13 @@ internal class DefaultSession @Inject constructor(override val sessionParams: Se
     }
 
     override fun syncState(): LiveData<SyncState> {
-        return syncThread.liveState()
+        return getSyncThread().liveState()
+    }
+
+    private fun getSyncThread(): SyncThread {
+        return syncThread ?: syncThreadProvider.get().also {
+            syncThread = it
+        }
     }
 
     @MainThread
@@ -139,21 +149,20 @@ internal class DefaultSession @Inject constructor(override val sessionParams: Se
         Timber.w("SIGN_OUT: start")
 
         assert(isOpen)
-        //Timber.w("SIGN_OUT: kill sync thread")
-        //syncThread.kill()
 
         Timber.w("SIGN_OUT: call webservice")
         return signOutService.get().signOut(object : MatrixCallback<Unit> {
             override fun onSuccess(data: Unit) {
                 Timber.w("SIGN_OUT: call webservice -> SUCCESS: clear cache")
-
+                stopSync()
+                stopAnyBackgroundSync()
                 // Clear the cache
                 cacheService.get().clearCache(object : MatrixCallback<Unit> {
                     override fun onSuccess(data: Unit) {
                         Timber.w("SIGN_OUT: clear cache -> SUCCESS: clear crypto cache")
                         cryptoService.get().clearCryptoCache(MatrixCallbackDelegate(callback))
-
                         WorkManagerUtil.cancelAllWorks(context)
+                        callback.onSuccess(Unit)
                     }
 
                     override fun onFailure(failure: Throwable) {
@@ -172,6 +181,22 @@ internal class DefaultSession @Inject constructor(override val sessionParams: Se
         })
     }
 
+    override fun clearCache(callback: MatrixCallback<Unit>) {
+        stopSync()
+        stopAnyBackgroundSync()
+        cacheService.get().clearCache(object : MatrixCallback<Unit> {
+            override fun onSuccess(data: Unit) {
+                startSync(true)
+                callback.onSuccess(data)
+            }
+
+            override fun onFailure(failure: Throwable) {
+                startSync(true)
+                callback.onFailure(failure)
+            }
+        })
+    }
+
     override fun contentUrlResolver() = contentUrlResolver
 
     override fun contentUploadProgressTracker() = contentUploadProgressTracker

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/SessionComponent.kt

@@ -23,7 +23,6 @@ import im.vector.matrix.android.api.session.Session
 import im.vector.matrix.android.internal.crypto.CryptoModule
 import im.vector.matrix.android.internal.di.MatrixComponent
 import im.vector.matrix.android.internal.network.NetworkConnectivityChecker
-import im.vector.matrix.android.internal.session.user.accountdata.AccountDataModule
 import im.vector.matrix.android.internal.session.cache.CacheModule
 import im.vector.matrix.android.internal.session.content.ContentModule
 import im.vector.matrix.android.internal.session.content.UploadContentWorker
@@ -43,6 +42,7 @@ import im.vector.matrix.android.internal.session.sync.SyncTask
 import im.vector.matrix.android.internal.session.sync.SyncTokenStore
 import im.vector.matrix.android.internal.session.sync.job.SyncWorker
 import im.vector.matrix.android.internal.session.user.UserModule
+import im.vector.matrix.android.internal.session.user.accountdata.AccountDataModule
 import im.vector.matrix.android.internal.task.TaskExecutor
 
 @Component(dependencies = [MatrixComponent::class],

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/SessionModule.kt

@@ -38,8 +38,8 @@ import im.vector.matrix.android.internal.network.RetrofitFactory
 import im.vector.matrix.android.internal.session.group.GroupSummaryUpdater
 import im.vector.matrix.android.internal.session.room.EventRelationsAggregationUpdater
 import im.vector.matrix.android.internal.session.room.create.RoomCreateEventLiveObserver
-import im.vector.matrix.android.internal.session.room.tombstone.RoomTombstoneEventLiveObserver
 import im.vector.matrix.android.internal.session.room.prune.EventsPruner
+import im.vector.matrix.android.internal.session.room.tombstone.RoomTombstoneEventLiveObserver
 import im.vector.matrix.android.internal.util.md5
 import io.realm.RealmConfiguration
 import okhttp3.OkHttpClient

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/cache/CacheModule.kt

@@ -21,7 +21,6 @@ import dagger.Module
 import dagger.Provides
 import im.vector.matrix.android.api.session.cache.CacheService
 import im.vector.matrix.android.internal.di.SessionDatabase
-import im.vector.matrix.android.internal.session.SessionScope
 import io.realm.RealmConfiguration
 
 @Module

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/cache/ClearCacheTask.kt

@@ -16,27 +16,18 @@
 
 package im.vector.matrix.android.internal.session.cache
 
-import arrow.core.Try
+import im.vector.matrix.android.internal.database.awaitTransaction
-import im.vector.matrix.android.internal.session.SessionScope
 import im.vector.matrix.android.internal.task.Task
-import io.realm.Realm
 import io.realm.RealmConfiguration
 import javax.inject.Inject
-import javax.inject.Named
 
 internal interface ClearCacheTask : Task<Unit, Unit>
 
 internal class RealmClearCacheTask @Inject constructor(private val realmConfiguration: RealmConfiguration) : ClearCacheTask {
 
-    override suspend fun execute(params: Unit): Try<Unit> {
+    override suspend fun execute(params: Unit) {
-        return Try {
+        awaitTransaction(realmConfiguration) {
-            val realm = Realm.getInstance(realmConfiguration)
-
-            realm.executeTransaction {
             it.deleteAll()
         }
-
-            realm.close()
-        }
     }
 }

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/cache/DefaultCacheService.kt

@@ -20,16 +20,19 @@ import im.vector.matrix.android.api.MatrixCallback
 import im.vector.matrix.android.api.session.cache.CacheService
 import im.vector.matrix.android.internal.di.SessionDatabase
 import im.vector.matrix.android.internal.task.TaskExecutor
-import im.vector.matrix.android.internal.task.toConfigurableTask
+import im.vector.matrix.android.internal.task.configureWith
 import javax.inject.Inject
 
-internal class DefaultCacheService @Inject constructor(@SessionDatabase private val clearCacheTask: ClearCacheTask,
+internal class DefaultCacheService @Inject constructor(@SessionDatabase
+                                                       private val clearCacheTask: ClearCacheTask,
                                                        private val taskExecutor: TaskExecutor) : CacheService {
 
     override fun clearCache(callback: MatrixCallback<Unit>) {
+        taskExecutor.cancelAll()
         clearCacheTask
-                .toConfigurableTask()
+                .configureWith {
-                .dispatchTo(callback)
+                    this.callback = callback
+                }
                 .executeBy(taskExecutor)
     }
 }

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/filter/DefaultSaveFilterTask.kt

@@ -16,7 +16,6 @@
 
 package im.vector.matrix.android.internal.session.filter
 
-import arrow.core.Try
 import im.vector.matrix.android.api.auth.data.SessionParams
 import im.vector.matrix.android.internal.network.executeRequest
 import im.vector.matrix.android.internal.task.Task
@@ -39,15 +38,12 @@ internal class DefaultSaveFilterTask @Inject constructor(private val sessionPara
                                                          private val filterRepository: FilterRepository
 ) : SaveFilterTask {
 
-    override suspend fun execute(params: SaveFilterTask.Params): Try<Unit> {
+    override suspend fun execute(params: SaveFilterTask.Params) {
-        return executeRequest<FilterResponse> {
+        val filterResponse = executeRequest<FilterResponse> {
             // TODO auto retry
             apiCall = filterAPI.uploadFilter(sessionParams.credentials.userId, params.filter)
-        }.flatMap { filterResponse ->
+        }
-            Try {
         filterRepository.storeFilterId(params.filter, filterResponse.filterId)
     }
-        }
-    }
 
 }

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/DefaultGetGroupDataTask.kt

@@ -16,10 +16,6 @@
 
 package im.vector.matrix.android.internal.session.group
 
-import arrow.core.Try
-import arrow.core.fix
-import arrow.instances.`try`.monad.monad
-import arrow.typeclasses.binding
 import com.zhuinden.monarchy.Monarchy
 import im.vector.matrix.android.internal.database.model.GroupSummaryEntity
 import im.vector.matrix.android.internal.database.query.where
@@ -28,8 +24,6 @@ import im.vector.matrix.android.internal.session.group.model.GroupRooms
 import im.vector.matrix.android.internal.session.group.model.GroupSummaryResponse
 import im.vector.matrix.android.internal.session.group.model.GroupUsers
 import im.vector.matrix.android.internal.task.Task
-import im.vector.matrix.android.internal.util.tryTransactionSync
-import io.realm.kotlin.createObject
 import javax.inject.Inject
 
 internal interface GetGroupDataTask : Task<GetGroupDataTask.Params, Unit> {
@@ -43,7 +37,7 @@ internal class DefaultGetGroupDataTask @Inject constructor(
         private val monarchy: Monarchy
 ) : GetGroupDataTask {
 
-    override suspend fun execute(params: GetGroupDataTask.Params): Try<Unit> {
+    override suspend fun execute(params: GetGroupDataTask.Params) {
         val groupId = params.groupId
         val groupSummary = executeRequest<GroupSummaryResponse> {
             apiCall = groupAPI.getSummary(groupId)
@@ -54,20 +48,18 @@ internal class DefaultGetGroupDataTask @Inject constructor(
         val groupUsers = executeRequest<GroupUsers> {
             apiCall = groupAPI.getUsers(groupId)
         }
-        return Try.monad().binding {
+        insertInDb(groupSummary, groupRooms, groupUsers, groupId)
-            insertInDb(groupSummary.bind(), groupRooms.bind(), groupUsers.bind(), groupId).bind()
-        }.fix()
     }
 
 
     private fun insertInDb(groupSummary: GroupSummaryResponse,
                            groupRooms: GroupRooms,
                            groupUsers: GroupUsers,
-                           groupId: String): Try<Unit> {
+                           groupId: String) {
-        return monarchy
+        monarchy
-                .tryTransactionSync { realm ->
+                .writeAsync { realm ->
                     val groupSummaryEntity = GroupSummaryEntity.where(realm, groupId).findFirst()
-                            ?: realm.createObject(groupId)
+                            ?: realm.createObject(GroupSummaryEntity::class.java, groupId)
 
                     groupSummaryEntity.avatarUrl = groupSummary.profile?.avatarUrl ?: ""
                     val name = groupSummary.profile?.name
@@ -82,7 +74,6 @@ internal class DefaultGetGroupDataTask @Inject constructor(
                     val userIds = groupUsers.users.map { it.userId }
                     groupSummaryEntity.userIds.clear()
                     groupSummaryEntity.userIds.addAll(userIds)
-
                 }
     }
 

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/DefaultGroupService.kt

@@ -25,7 +25,6 @@ import im.vector.matrix.android.internal.database.mapper.asDomain
 import im.vector.matrix.android.internal.database.model.GroupSummaryEntity
 import im.vector.matrix.android.internal.database.model.GroupSummaryEntityFields
 import im.vector.matrix.android.internal.database.query.where
-import im.vector.matrix.android.internal.session.SessionScope
 import javax.inject.Inject
 
 internal class DefaultGroupService @Inject constructor(private val monarchy: Monarchy) : GroupService {

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/GetGroupDataWorker.kt

@@ -19,7 +19,6 @@ package im.vector.matrix.android.internal.session.group
 import android.content.Context
 import androidx.work.CoroutineWorker
 import androidx.work.WorkerParameters
-import arrow.core.Try
 import com.squareup.moshi.JsonClass
 import im.vector.matrix.android.internal.worker.SessionWorkerParams
 import im.vector.matrix.android.internal.worker.WorkerParamsFactory
@@ -43,16 +42,15 @@ internal class GetGroupDataWorker(context: Context, params: WorkerParameters) :
 
         val sessionComponent = getSessionComponent(params.userId) ?: return Result.success()
         sessionComponent.inject(this)
-
         val results = params.groupIds.map { groupId ->
-            fetchGroupData(groupId)
+            runCatching { fetchGroupData(groupId) }
         }
-        val isSuccessful = results.none { it.isFailure() }
+        val isSuccessful = results.none { it.isFailure }
         return if (isSuccessful) Result.success() else Result.retry()
     }
 
-    private suspend fun fetchGroupData(groupId: String): Try<Unit> {
+    private suspend fun fetchGroupData(groupId: String) {
-        return getGroupDataTask.execute(GetGroupDataTask.Params(groupId))
+        getGroupDataTask.execute(GetGroupDataTask.Params(groupId))
     }
 
 }

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/group/GroupSummaryUpdater.kt

@@ -22,20 +22,15 @@ import androidx.work.WorkManager
 import com.zhuinden.monarchy.Monarchy
 import im.vector.matrix.android.api.auth.data.Credentials
 import im.vector.matrix.android.internal.database.RealmLiveEntityObserver
-import im.vector.matrix.android.internal.database.mapper.asDomain
-import im.vector.matrix.android.internal.database.model.EventEntity
 import im.vector.matrix.android.internal.database.model.GroupEntity
 import im.vector.matrix.android.internal.database.query.where
 import im.vector.matrix.android.internal.di.SessionDatabase
-import im.vector.matrix.android.internal.session.room.prune.PruneEventTask
-import im.vector.matrix.android.internal.task.configureWith
 import im.vector.matrix.android.internal.worker.WorkManagerUtil
 import im.vector.matrix.android.internal.worker.WorkManagerUtil.matrixOneTimeWorkRequestBuilder
 import im.vector.matrix.android.internal.worker.WorkerParamsFactory
 import io.realm.OrderedCollectionChangeSet
 import io.realm.RealmConfiguration
 import io.realm.RealmResults
-import timber.log.Timber
 import javax.inject.Inject
 
 private const val GET_GROUP_DATA_WORKER = "GET_GROUP_DATA_WORKER"

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/notification/DefaultPushRuleService.kt

@@ -83,9 +83,10 @@ internal class DefaultPushRuleService @Inject constructor(
 
     override fun updatePushRuleEnableStatus(kind: String, pushRule: PushRule, enabled: Boolean, callback: MatrixCallback<Unit>): Cancelable {
         return updatePushRuleEnableStatusTask
-                .configureWith(UpdatePushRuleEnableStatusTask.Params(kind, pushRule, enabled))
+                .configureWith(UpdatePushRuleEnableStatusTask.Params(kind, pushRule, enabled)) {
+                    this.callback = callback
+                }
                 // TODO Fetch the rules
-                .dispatchTo(callback)
                 .executeBy(taskExecutor)
     }
 

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/notification/ProcessEventForPushTask.kt

@@ -16,7 +16,6 @@
 
 package im.vector.matrix.android.internal.session.notification
 
-import arrow.core.Try
 import im.vector.matrix.android.api.auth.data.SessionParams
 import im.vector.matrix.android.api.pushrules.rest.PushRule
 import im.vector.matrix.android.api.session.events.model.Event
@@ -41,9 +40,7 @@ internal class DefaultProcessEventForPushTask @Inject constructor(
         private val sessionParams: SessionParams
 ) : ProcessEventForPushTask {
 
-
+    override suspend fun execute(params: ProcessEventForPushTask.Params) {
-    override suspend fun execute(params: ProcessEventForPushTask.Params): Try<Unit> {
-        return Try {
         // Handle left rooms
         params.syncResponse.leave.keys.forEach {
             defaultPushRuleService.dispatchRoomLeft(it)
@@ -83,7 +80,6 @@ internal class DefaultProcessEventForPushTask @Inject constructor(
         }
         defaultPushRuleService.dispatchFinish()
     }
-    }
 
     private fun fulfilledBingRule(event: Event, rules: List<PushRule>): PushRule? {
         val conditionResolver = DefaultConditionResolver(event, roomService, sessionParams)

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/pushers/AddHttpPusherWorker.kt

@@ -26,6 +26,7 @@ import im.vector.matrix.android.internal.database.mapper.toEntity
 import im.vector.matrix.android.internal.database.model.PusherEntity
 import im.vector.matrix.android.internal.database.query.where
 import im.vector.matrix.android.internal.network.executeRequest
+import im.vector.matrix.android.internal.util.awaitTransaction
 import im.vector.matrix.android.internal.worker.WorkerParamsFactory
 import im.vector.matrix.android.internal.worker.getSessionComponent
 import javax.inject.Inject
@@ -55,15 +56,14 @@ internal class AddHttpPusherWorker(context: Context, params: WorkerParameters)
         if (pusher.pushKey.isBlank()) {
             return Result.failure()
         }
-
+        return try {
-        val result = executeRequest<Unit> {
+            setPusher(pusher, params.userId)
-            apiCall = pushersAPI.setPusher(pusher)
+            Result.success()
-        }
+        } catch (exception: Throwable) {
-        return result.fold({
+            when (exception) {
-            when (it) {
                 is Failure.NetworkConnection -> Result.retry()
                 else                         -> {
-                    monarchy.runTransactionSync { realm ->
+                    monarchy.awaitTransaction { realm ->
                         PusherEntity.where(realm, params.userId, pusher.pushKey).findFirst()?.let {
                             //update it
                             it.state = PusherState.FAILED_TO_REGISTER
@@ -73,9 +73,15 @@ internal class AddHttpPusherWorker(context: Context, params: WorkerParameters)
                     Result.failure()
                 }
             }
-        }, {
+        }
-            monarchy.runTransactionSync { realm ->
+    }
-                val echo = PusherEntity.where(realm, params.userId, pusher.pushKey).findFirst()
+
+    private suspend fun setPusher(pusher: JsonPusher, userId: String) {
+        executeRequest<Unit> {
+            apiCall = pushersAPI.setPusher(pusher)
+        }
+        monarchy.awaitTransaction { realm ->
+            val echo = PusherEntity.where(realm, userId, pusher.pushKey).findFirst()
             if (echo != null) {
                 //update it
                 echo.appDisplayName = pusher.appDisplayName
@@ -87,14 +93,11 @@ internal class AddHttpPusherWorker(context: Context, params: WorkerParameters)
                 echo.data?.url = pusher.data?.url
                 echo.state = PusherState.REGISTERED
             } else {
-                    pusher.toEntity(params.userId).also {
+                pusher.toEntity(userId).also {
                     it.state = PusherState.REGISTERED
                     realm.insertOrUpdate(it)
                 }
             }
         }
-            Result.success()
-
-        })
     }
 }

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/pushers/DefaultPusherService.kt

@@ -29,7 +29,6 @@ import im.vector.matrix.android.internal.database.model.PusherEntity
 import im.vector.matrix.android.internal.database.query.where
 import im.vector.matrix.android.internal.task.TaskExecutor
 import im.vector.matrix.android.internal.task.configureWith
-import im.vector.matrix.android.internal.task.toConfigurableTask
 import im.vector.matrix.android.internal.worker.WorkManagerUtil
 import im.vector.matrix.android.internal.worker.WorkManagerUtil.matrixOneTimeWorkRequestBuilder
 import im.vector.matrix.android.internal.worker.WorkerParamsFactory
@@ -50,7 +49,7 @@ internal class DefaultPusherService @Inject constructor(
 
     override fun refreshPushers() {
         getPusherTask
-                .toConfigurableTask()
+                .configureWith()
                 .executeBy(taskExecutor)
     }
 
@@ -85,8 +84,9 @@ internal class DefaultPusherService @Inject constructor(
     override fun removeHttpPusher(pushkey: String, appId: String, callback: MatrixCallback<Unit>) {
         val params = RemovePusherTask.Params(sessionParam.credentials.userId, pushkey, appId)
         removePusherTask
-                .configureWith(params)
+                .configureWith(params) {
-                .dispatchTo(callback)
+                    this.callback = callback
+                }
                 //.enableRetry() ??
                 .executeBy(taskExecutor)
     }

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/pushers/GetPushRulesTask.kt

@@ -15,7 +15,6 @@
  */
 package im.vector.matrix.android.internal.session.pushers
 
-import arrow.core.Try
 import com.zhuinden.monarchy.Monarchy
 import im.vector.matrix.android.api.auth.data.SessionParams
 import im.vector.matrix.android.api.pushrules.rest.GetPushRulesResponse
@@ -24,7 +23,7 @@ import im.vector.matrix.android.internal.database.model.PushRulesEntity
 import im.vector.matrix.android.internal.database.model.PusherEntityFields
 import im.vector.matrix.android.internal.network.executeRequest
 import im.vector.matrix.android.internal.task.Task
-import im.vector.matrix.android.internal.util.tryTransactionSync
+import im.vector.matrix.android.internal.util.awaitTransaction
 import javax.inject.Inject
 
 
@@ -39,12 +38,12 @@ internal class DefaultGetPushRulesTask @Inject constructor(private val pushRules
                                                            private val monarchy: Monarchy,
                                                            private val sessionParams: SessionParams) : GetPushRulesTask {
 
-    override suspend fun execute(params: GetPushRulesTask.Params): Try<Unit> {
+    override suspend fun execute(params: GetPushRulesTask.Params) {
-        return executeRequest<GetPushRulesResponse> {
+        val response = executeRequest<GetPushRulesResponse> {
             apiCall = pushRulesApi.getAllRules()
-        }.flatMap { response ->
+        }
         val scope = params.scope
-            return monarchy.tryTransactionSync { realm ->
+        monarchy.awaitTransaction { realm ->
             //clear existings?
             //TODO
             realm.where(PushRulesEntity::class.java)
@@ -92,5 +91,4 @@ internal class DefaultGetPushRulesTask @Inject constructor(private val pushRules
             realm.insertOrUpdate(underrides)
         }
     }
-    }
 }