From b3f887ca28e48b274dc579baa2df4468a1d06d41 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Thu, 5 Mar 2020 17:30:34 +0100 Subject: [PATCH] Code quality --- .../room/model/message/MessageVerificationAcceptContent.kt | 1 - .../internal/crypto/model/rest/KeyVerificationAccept.kt | 1 - .../crypto/verification/DefaultVerificationService.kt | 4 +++- .../internal/crypto/verification/VerificationInfoReady.kt | 1 - .../internal/crypto/verification/VerificationInfoRequest.kt | 1 - 5 files changed, 3 insertions(+), 5 deletions(-) diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageVerificationAcceptContent.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageVerificationAcceptContent.kt index 454110ed19..95088d0f75 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageVerificationAcceptContent.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageVerificationAcceptContent.kt @@ -22,7 +22,6 @@ import im.vector.matrix.android.api.session.events.model.toContent import im.vector.matrix.android.api.session.room.model.relation.RelationDefaultContent import im.vector.matrix.android.internal.crypto.verification.VerificationInfoAccept import im.vector.matrix.android.internal.crypto.verification.VerificationInfoAcceptFactory -import timber.log.Timber @JsonClass(generateAdapter = true) internal data class MessageVerificationAcceptContent( diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/KeyVerificationAccept.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/KeyVerificationAccept.kt index 757b504db2..1aa45040e3 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/KeyVerificationAccept.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/rest/KeyVerificationAccept.kt @@ -19,7 +19,6 @@ import com.squareup.moshi.Json import com.squareup.moshi.JsonClass import im.vector.matrix.android.internal.crypto.verification.VerificationInfoAccept import im.vector.matrix.android.internal.crypto.verification.VerificationInfoAcceptFactory -import timber.log.Timber /** * Sent by Bob to accept a verification from a previously sent m.key.verification.start message. diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/DefaultVerificationService.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/DefaultVerificationService.kt index d145d66daa..098973f489 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/DefaultVerificationService.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/DefaultVerificationService.kt @@ -433,7 +433,9 @@ internal class DefaultVerificationService @Inject constructor( /** * Return a CancelCode to make the caller cancel the verification. Else return null */ - private suspend fun handleStart(otherUserId: String?, startReq: ValidVerificationInfoStart, txConfigure: (DefaultVerificationTransaction) -> Unit): CancelCode? { + private suspend fun handleStart(otherUserId: String?, + startReq: ValidVerificationInfoStart, + txConfigure: (DefaultVerificationTransaction) -> Unit): CancelCode? { Timber.d("## SAS onStartRequestReceived ${startReq.transactionID}") if (checkKeysAreDownloaded(otherUserId!!, startReq.fromDevice) != null) { val tid = startReq.transactionID diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/VerificationInfoReady.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/VerificationInfoReady.kt index 41062484e3..09a119be12 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/VerificationInfoReady.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/VerificationInfoReady.kt @@ -54,4 +54,3 @@ internal interface VerificationInfoReady : VerificationInfo, fromDevice: String): VerificationInfoReady } - diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/VerificationInfoRequest.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/VerificationInfoRequest.kt index 8cb55f2987..962eb29f67 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/VerificationInfoRequest.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/VerificationInfoRequest.kt @@ -49,4 +49,3 @@ internal interface VerificationInfoRequest : VerificationInfo