From 817dc19b9aa0638efe7d3f616a623e4df05c35cc Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Fri, 21 Feb 2020 14:11:47 +0100
Subject: [PATCH] Cleaning

---
 .../internal/crypto/model/CryptoDeviceInfo.kt   | 17 -----------------
 .../crypto/tasks/RoomVerificationUpdateTask.kt  |  5 ++---
 2 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/CryptoDeviceInfo.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/CryptoDeviceInfo.kt
index 8f6d64221c..e3e8f3de27 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/CryptoDeviceInfo.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/CryptoDeviceInfo.kt
@@ -28,10 +28,6 @@ data class CryptoDeviceInfo(
         override val keys: Map<String, String>? = null,
         override val signatures: Map<String, Map<String, String>>? = null,
         val unsigned: JsonDict? = null,
-
-        // TODO how to store if this device is verified by a user SSK, or is legacy trusted?
-        // I need to know if it is trusted via cross signing (Trusted because bob verified it)
-
         var trustLevel: DeviceTrustLevel? = null,
         var isBlocked: Boolean = false
 ) : CryptoInfo {
@@ -75,19 +71,6 @@ data class CryptoDeviceInfo(
         keys?.let { map["keys"] = it }
         return map
     }
-//
-//    /**
-//     * @return a dictionary of the parameters
-//     */
-//    fun toDeviceKeys(): DeviceKeys {
-//        return DeviceKeys(
-//                userId = userId,
-//                deviceId = deviceId,
-//                algorithms = algorithms!!,
-//                keys = keys!!,
-//                signatures = signatures!!
-//        )
-//    }
 }
 
 internal fun CryptoDeviceInfo.toRest(): RestDeviceInfo {
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/RoomVerificationUpdateTask.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/RoomVerificationUpdateTask.kt
index fa5bfe56d1..46aa872f06 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/RoomVerificationUpdateTask.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/tasks/RoomVerificationUpdateTask.kt
@@ -90,7 +90,6 @@ internal class DefaultRoomVerificationUpdateTask @Inject constructor(
                 // If it's send from me, we need to keep track of Requests or Start
                 // done from another device of mine
 
-
                 if (EventType.MESSAGE == event.getClearType()) {
                     val msgType = event.getClearContent().toModel<MessageContent>()?.msgType
                     if (MessageType.MSGTYPE_VERIFICATION_REQUEST == msgType) {
@@ -106,7 +105,7 @@ internal class DefaultRoomVerificationUpdateTask @Inject constructor(
                     event.getClearContent().toModel<MessageVerificationStartContent>()?.let {
                         if (it.fromDevice != deviceId) {
                             // The verification is started from another device
-                            Timber.v("## SAS Verification live observer: Transaction started by other device  tid:${relatesTo} ")
+                            Timber.v("## SAS Verification live observer: Transaction started by other device  tid:$relatesTo ")
                             relatesTo?.let { txId -> transactionsHandledByOtherDevice.add(txId) }
                             params.verificationService.onRoomRequestHandledByOtherDevice(event)
                         }
@@ -115,7 +114,7 @@ internal class DefaultRoomVerificationUpdateTask @Inject constructor(
                     event.getClearContent().toModel<MessageVerificationReadyContent>()?.let {
                         if (it.fromDevice != deviceId) {
                             // The verification is started from another device
-                            Timber.v("## SAS Verification live observer: Transaction started by other device  tid:${relatesTo} ")
+                            Timber.v("## SAS Verification live observer: Transaction started by other device  tid:$relatesTo ")
                             relatesTo?.let { txId -> transactionsHandledByOtherDevice.add(txId) }
                             params.verificationService.onRoomRequestHandledByOtherDevice(event)
                         }