Code quality
This commit is contained in:
parent
3425dd0a63
commit
b3f887ca28
|
@ -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.api.session.room.model.relation.RelationDefaultContent
|
||||||
import im.vector.matrix.android.internal.crypto.verification.VerificationInfoAccept
|
import im.vector.matrix.android.internal.crypto.verification.VerificationInfoAccept
|
||||||
import im.vector.matrix.android.internal.crypto.verification.VerificationInfoAcceptFactory
|
import im.vector.matrix.android.internal.crypto.verification.VerificationInfoAcceptFactory
|
||||||
import timber.log.Timber
|
|
||||||
|
|
||||||
@JsonClass(generateAdapter = true)
|
@JsonClass(generateAdapter = true)
|
||||||
internal data class MessageVerificationAcceptContent(
|
internal data class MessageVerificationAcceptContent(
|
||||||
|
|
|
@ -19,7 +19,6 @@ import com.squareup.moshi.Json
|
||||||
import com.squareup.moshi.JsonClass
|
import com.squareup.moshi.JsonClass
|
||||||
import im.vector.matrix.android.internal.crypto.verification.VerificationInfoAccept
|
import im.vector.matrix.android.internal.crypto.verification.VerificationInfoAccept
|
||||||
import im.vector.matrix.android.internal.crypto.verification.VerificationInfoAcceptFactory
|
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.
|
* Sent by Bob to accept a verification from a previously sent m.key.verification.start message.
|
||||||
|
|
|
@ -433,7 +433,9 @@ internal class DefaultVerificationService @Inject constructor(
|
||||||
/**
|
/**
|
||||||
* Return a CancelCode to make the caller cancel the verification. Else return null
|
* 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}")
|
Timber.d("## SAS onStartRequestReceived ${startReq.transactionID}")
|
||||||
if (checkKeysAreDownloaded(otherUserId!!, startReq.fromDevice) != null) {
|
if (checkKeysAreDownloaded(otherUserId!!, startReq.fromDevice) != null) {
|
||||||
val tid = startReq.transactionID
|
val tid = startReq.transactionID
|
||||||
|
|
|
@ -54,4 +54,3 @@ internal interface VerificationInfoReady : VerificationInfo<ValidVerificationInf
|
||||||
internal interface MessageVerificationReadyFactory {
|
internal interface MessageVerificationReadyFactory {
|
||||||
fun create(tid: String, methods: List<String>, fromDevice: String): VerificationInfoReady
|
fun create(tid: String, methods: List<String>, fromDevice: String): VerificationInfoReady
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -49,4 +49,3 @@ internal interface VerificationInfoRequest : VerificationInfo<ValidVerificationI
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue