Crypto: make encryption working.

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

@@ -24,7 +24,6 @@ import im.vector.matrix.android.api.session.crypto.keyshare.RoomKeysRequestListe
 import im.vector.matrix.android.api.session.crypto.sas.SasVerificationService
 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.api.session.room.Room
 import im.vector.matrix.android.internal.crypto.MXEventDecryptionResult
 import im.vector.matrix.android.internal.crypto.model.ImportRoomKeysResult
 import im.vector.matrix.android.internal.crypto.model.MXDeviceInfo
@@ -90,7 +89,7 @@ interface CryptoService {
 
     fun encryptEventContent(eventContent: Content,
                             eventType: String,
-                            room: Room,
+                            roomId: String,
                             callback: MatrixCallback<MXEncryptEventContentResult>)
 
     /*

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

@@ -35,7 +35,6 @@ 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.api.session.events.model.EventType
 import im.vector.matrix.android.api.session.events.model.toModel
-import im.vector.matrix.android.api.session.room.Room
 import im.vector.matrix.android.api.session.room.model.Membership
 import im.vector.matrix.android.api.session.room.model.RoomHistoryVisibility
 import im.vector.matrix.android.api.session.room.model.RoomHistoryVisibilityContent
@@ -47,14 +46,24 @@ import im.vector.matrix.android.internal.crypto.algorithms.IMXEncrypting
 import im.vector.matrix.android.internal.crypto.algorithms.megolm.MXMegolmEncryptionFactory
 import im.vector.matrix.android.internal.crypto.algorithms.olm.MXOlmEncryptionFactory
 import im.vector.matrix.android.internal.crypto.keysbackup.KeysBackup
-import im.vector.matrix.android.internal.crypto.model.*
+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.MXOlmSessionResult
+import im.vector.matrix.android.internal.crypto.model.MXUsersDevicesMap
 import im.vector.matrix.android.internal.crypto.model.event.RoomKeyContent
 import im.vector.matrix.android.internal.crypto.model.rest.DevicesListResponse
 import im.vector.matrix.android.internal.crypto.model.rest.KeysUploadResponse
 import im.vector.matrix.android.internal.crypto.model.rest.RoomKeyRequestBody
 import im.vector.matrix.android.internal.crypto.repository.WarnOnUnknownDeviceRepository
 import im.vector.matrix.android.internal.crypto.store.IMXCryptoStore
-import im.vector.matrix.android.internal.crypto.tasks.*
+import im.vector.matrix.android.internal.crypto.tasks.ClaimOneTimeKeysForUsersDeviceTask
+import im.vector.matrix.android.internal.crypto.tasks.DeleteDeviceTask
+import im.vector.matrix.android.internal.crypto.tasks.GetDevicesTask
+import im.vector.matrix.android.internal.crypto.tasks.GetKeyChangesTask
+import im.vector.matrix.android.internal.crypto.tasks.SendToDeviceTask
+import im.vector.matrix.android.internal.crypto.tasks.SetDeviceNameTask
+import im.vector.matrix.android.internal.crypto.tasks.UploadKeysTask
 import im.vector.matrix.android.internal.crypto.verification.DefaultSasVerificationService
 import im.vector.matrix.android.internal.di.MoshiProvider
 import im.vector.matrix.android.internal.session.room.members.LoadRoomMembersTask
@@ -587,48 +596,31 @@ internal class CryptoManager(
      *
      * @param eventContent the content of the event.
      * @param eventType    the type of the event.
-     * @param room         the room the event will be sent.
+     * @param roomId       the room identifier the event will be sent.
      * @param callback     the asynchronous callback
      */
     override fun encryptEventContent(eventContent: Content,
                                      eventType: String,
-                                     room: Room,
+                                     roomId: String,
                                      callback: MatrixCallback<MXEncryptEventContentResult>) {
         // wait that the crypto is really started
         if (!isStarted()) {
             Timber.v("## encryptEventContent() : wait after e2e init")
 
             start(false)
-
             return
         }
 
-        // Check whether the event content must be encrypted for the invited members.
+        val userIds = getRoomUserIds(roomId)
-        val encryptForInvitedMembers = mCryptoConfig.mEnableEncryptionForInvitedMembers && shouldEncryptForInvitedMembers(room.roomId)
+        var alg = synchronized(mRoomEncryptors) {
-
+            mRoomEncryptors[roomId]
-        // TODO
-        //val userIds = if (encryptForInvitedMembers) {
-        //    room.getActiveRoomMemberIds()
-        //} else {
-        //    room.getJoinedRoomMemberIds()
-        //}
-        val userIds = emptyList<String>()
-
-        // just as you are sending a secret message?
-
-        var alg: IMXEncrypting?
-
-        synchronized(mRoomEncryptors) {
-            alg = mRoomEncryptors[room.roomId]
         }
-
         if (null == alg) {
-            val algorithm = room.encryptionAlgorithm()
+            val algorithm = getEncryptionAlgorithm(roomId)
-
             if (null != algorithm) {
-                if (setEncryptionInRoom(room.roomId, algorithm, false, userIds)) {
+                if (setEncryptionInRoom(roomId, algorithm, false, userIds)) {
                     synchronized(mRoomEncryptors) {
-                        alg = mRoomEncryptors[room.roomId]
+                        alg = mRoomEncryptors[roomId]
                     }
                 }
             }
@@ -650,7 +642,7 @@ internal class CryptoManager(
                 }
             })
         } else {
-            val algorithm = room.encryptionAlgorithm()
+            val algorithm = getEncryptionAlgorithm(roomId)
             val reason = String.format(MXCryptoError.UNABLE_TO_ENCRYPT_REASON,
                                        algorithm ?: MXCryptoError.NO_MORE_ALGORITHM_REASON)
             Timber.e("## encryptEventContent() : $reason")
@@ -765,6 +757,14 @@ internal class CryptoManager(
             loadRoomMembersTask
                     .execute(params)
                     .map { allLoaded ->
+                        val userIds = getRoomUserIds(roomId)
+                        setEncryptionInRoom(roomId, event.content!!["algorithm"] as String, true, userIds)
+                        allLoaded
+                    }
+        }
+    }
+
+    private fun getRoomUserIds(roomId: String): List<String> {
         var userIds: List<String> = emptyList()
         monarchy.doWithRealm { realm ->
             // Check whether the event content must be encrypted for the invited members.
@@ -778,10 +778,7 @@ internal class CryptoManager(
             }
 
         }
-                        setEncryptionInRoom(roomId, event.content!!["algorithm"] as String, true, userIds)
+        return userIds
-                        allLoaded
-                    }
-        }
     }
 
     /**

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

@@ -505,6 +505,7 @@ internal class MXMegolmEncryption(
                     } else {
                         callback.onSuccess(devicesInRoom)
                     }
+
                 }
             }
 

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

@@ -18,8 +18,9 @@ package im.vector.matrix.android.internal.crypto.repository
 
 internal class WarnOnUnknownDeviceRepository {
 
+    // TODO: set it back to true by default. Need UI
     // Warn the user if some new devices are detected while encrypting a message.
-    private var mWarnOnUnknownDevices = true
+    private var mWarnOnUnknownDevices = false
 
     /**
      * Tells if the encryption must fail if some unknown devices are detected.

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

@@ -326,11 +326,8 @@ internal class DefaultSession(override val sessionParams: SessionParams) : Sessi
         return cryptoService.isRoomEncrypted(roomId)
     }
 
-    override fun encryptEventContent(eventContent: Content,
+    override fun encryptEventContent(eventContent: Content, eventType: String, roomId: String, callback: MatrixCallback<MXEncryptEventContentResult>) {
-                                     eventType: String,
+        cryptoService.encryptEventContent(eventContent, eventType, roomId, callback)
-                                     room: Room,
-                                     callback: MatrixCallback<MXEncryptEventContentResult>) {
-        cryptoService.encryptEventContent(eventContent, eventType, room, callback)
     }
 
     override fun getDeviceInfo(userId: String, deviceId: String?): MXDeviceInfo? {

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/DefaultSendService.kt

@@ -16,7 +16,13 @@
 
 package im.vector.matrix.android.internal.session.room.send
 
-import androidx.work.*
+import androidx.work.BackoffPolicy
+import androidx.work.Constraints
+import androidx.work.ExistingWorkPolicy
+import androidx.work.NetworkType
+import androidx.work.OneTimeWorkRequest
+import androidx.work.OneTimeWorkRequestBuilder
+import androidx.work.WorkManager
 import com.zhuinden.monarchy.Monarchy
 import im.vector.matrix.android.api.session.content.ContentAttachmentData
 import im.vector.matrix.android.api.session.crypto.CryptoService
@@ -51,7 +57,6 @@ internal class DefaultSendService(private val roomId: String,
                                   private val monarchy: Monarchy)
     : SendService {
 
-
     override fun sendTextMessage(text: String, msgType: String): Cancelable {
         val event = eventFactory.createTextEvent(roomId, msgType, text).also {
             saveLocalEcho(it)

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/EncryptEventWorker.kt

@@ -23,7 +23,6 @@ import com.squareup.moshi.JsonClass
 import im.vector.matrix.android.api.MatrixCallback
 import im.vector.matrix.android.api.session.crypto.CryptoService
 import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.room.RoomService
 import im.vector.matrix.android.internal.crypto.model.MXEncryptEventContentResult
 import im.vector.matrix.android.internal.di.MatrixKoinComponent
 import im.vector.matrix.android.internal.util.WorkerParamsFactory
@@ -41,7 +40,6 @@ internal class EncryptEventWorker(context: Context, params: WorkerParameters)
     )
 
     private val crypto by inject<CryptoService>()
-    private val roomService by inject<RoomService>()
 
     override fun doWork(): Result {
 
@@ -60,7 +58,7 @@ internal class EncryptEventWorker(context: Context, params: WorkerParameters)
         var error: Throwable? = null
 
         try {
-            crypto.encryptEventContent(localEvent.content!!, localEvent.getClearType(), roomService.getRoom(params.roomId)!!, object : MatrixCallback<MXEncryptEventContentResult> {
+            crypto.encryptEventContent(localEvent.content!!, localEvent.type, params.roomId, object : MatrixCallback<MXEncryptEventContentResult> {
                 override fun onSuccess(data: MXEncryptEventContentResult) {
                     result = data
                     latch.countDown()
@@ -77,16 +75,20 @@ internal class EncryptEventWorker(context: Context, params: WorkerParameters)
         }
         latch.await()
 
+        val safeResult = result
         // TODO Update local echo
+        return if (error != null) {
+            Result.failure() // TODO Pass error!!)
+        } else if (safeResult != null) {
+            val encryptedEvent = localEvent.copy(
+                    type = safeResult.mEventType,
+                    content = safeResult.mEventContent
+            )
+            val nextWorkerParams = SendEventWorker.Params(params.roomId, encryptedEvent)
+            Result.success(WorkerParamsFactory.toData(nextWorkerParams))
 
-        if (error != null) {
-            return Result.failure() // TODO Pass error!!)
-        } else if (result != null) {
-            return Result.success(WorkerParamsFactory.toData(SendEventWorker.Params(params.roomId,
-                    Event(type = result!!.mEventType,
-                            content = result!!.mEventContent))))
         } else {
-            return Result.failure()
+            Result.failure()
         }
     }
 }

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/SendEventWorker.kt

@@ -53,7 +53,7 @@ internal class SendEventWorker(context: Context, params: WorkerParameters)
             apiCall = roomAPI.send(
                     localEvent.eventId,
                     params.roomId,
-                    localEvent.getClearType(),
+                    localEvent.type,
                     localEvent.content
             )
         }