mirrors/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-12-21 08:54:12 +03:00
Code Issues Projects Releases Packages Wiki Activity

crypto: Move the update dispatching logic into a separate class

Browse source
This commit is contained in:
Damir Jelić 2021-07-22 12:10:39 +02:00
parent 3993d2d4f2
commit 99ff097fc3
3 changed files with 46 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/QrCodeVerification.kt
View file

@ -16,8 +16,6 @@
package org.matrix.android.sdk.internal.crypto package org.matrix.android.sdk.internal.crypto
import android.os.Handler
import android.os.Looper
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.runBlocking import kotlinx.coroutines.runBlocking
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
@ -27,7 +25,7 @@ import org.matrix.android.sdk.api.session.crypto.verification.VerificationServic
import org.matrix.android.sdk.api.session.crypto.verification.VerificationTxState import org.matrix.android.sdk.api.session.crypto.verification.VerificationTxState
import org.matrix.android.sdk.api.session.crypto.verification.safeValueOf import org.matrix.android.sdk.api.session.crypto.verification.safeValueOf
import org.matrix.android.sdk.internal.crypto.crosssigning.fromBase64 import org.matrix.android.sdk.internal.crypto.crosssigning.fromBase64
import timber.log.Timber import org.matrix.android.sdk.internal.crypto.verification.UpdateDispatcher
import uniffi.olm.CryptoStoreErrorException import uniffi.olm.CryptoStoreErrorException
import uniffi.olm.OlmMachine import uniffi.olm.OlmMachine
import uniffi.olm.OutgoingVerificationRequest import uniffi.olm.OutgoingVerificationRequest
@ -39,20 +37,12 @@ internal class QrCodeVerification(
private var request: VerificationRequest, private var request: VerificationRequest,
private var inner: QrCode?, private var inner: QrCode?,
private val sender: RequestSender, private val sender: RequestSender,
private val listeners: ArrayList<VerificationService.Listener>, listeners: ArrayList<VerificationService.Listener>,
) : QrCodeVerificationTransaction { ) : QrCodeVerificationTransaction {
private val uiHandler = Handler(Looper.getMainLooper()) private val dispatcher = UpdateDispatcher(listeners)
private fun dispatchTxUpdated() { private fun dispatchTxUpdated() {
uiHandler.post { this.dispatcher.dispatchTxUpdated(this)
listeners.forEach {
try {
it.transactionUpdated(this)
} catch (e: Throwable) {
Timber.e(e, "## Error while notifying listeners")
}
}
}
} }
/** Generate, if possible, data that should be encoded as a QR code for QR code verification. /** Generate, if possible, data that should be encoded as a QR code for QR code verification.

18
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/SasVerification.kt
View file

@ -16,8 +16,6 @@
package org.matrix.android.sdk.internal.crypto package org.matrix.android.sdk.internal.crypto
import android.os.Handler
import android.os.Looper
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.runBlocking import kotlinx.coroutines.runBlocking
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
@ -27,8 +25,8 @@ import org.matrix.android.sdk.api.session.crypto.verification.SasVerificationTra
import org.matrix.android.sdk.api.session.crypto.verification.VerificationService import org.matrix.android.sdk.api.session.crypto.verification.VerificationService
import org.matrix.android.sdk.api.session.crypto.verification.VerificationTxState import org.matrix.android.sdk.api.session.crypto.verification.VerificationTxState
import org.matrix.android.sdk.api.session.crypto.verification.safeValueOf import org.matrix.android.sdk.api.session.crypto.verification.safeValueOf
import org.matrix.android.sdk.internal.crypto.verification.UpdateDispatcher
import org.matrix.android.sdk.internal.crypto.verification.getEmojiForCode import org.matrix.android.sdk.internal.crypto.verification.getEmojiForCode
import timber.log.Timber
import uniffi.olm.CryptoStoreErrorException import uniffi.olm.CryptoStoreErrorException
import uniffi.olm.OlmMachine import uniffi.olm.OlmMachine
import uniffi.olm.OutgoingVerificationRequest import uniffi.olm.OutgoingVerificationRequest
@ -39,21 +37,13 @@ internal class SasVerification(
private val machine: OlmMachine, private val machine: OlmMachine,
private var inner: Sas, private var inner: Sas,
private val sender: RequestSender, private val sender: RequestSender,
private val listeners: ArrayList<VerificationService.Listener>, listeners: ArrayList<VerificationService.Listener>,
) : ) :
SasVerificationTransaction { SasVerificationTransaction {
private val uiHandler = Handler(Looper.getMainLooper()) private val dispatcher = UpdateDispatcher(listeners)
private fun dispatchTxUpdated() { private fun dispatchTxUpdated() {
uiHandler.post { this.dispatcher.dispatchTxUpdated(this)
listeners.forEach {
try {
it.transactionUpdated(this)
} catch (e: Throwable) {
Timber.e(e, "## Error while notifying listeners")
}
}
}
} }
/** The user ID of the other user that is participating in this verification flow */ /** The user ID of the other user that is participating in this verification flow */

61
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/RustVerificationService.kt
View file

@ -70,27 +70,24 @@ internal fun prepareMethods(methods: List<VerificationMethod>): List<String> {
return stringMethods return stringMethods
} }
internal class RustVerificationService( internal class UpdateDispatcher(private val listeners: ArrayList<VerificationService.Listener>) {
private val olmMachine: OlmMachine,
private val requestSender: RequestSender,
) : VerificationService {
private val uiHandler = Handler(Looper.getMainLooper()) private val uiHandler = Handler(Looper.getMainLooper())
override fun addListener(listener: VerificationService.Listener) { internal fun addListener(listener: VerificationService.Listener) {
uiHandler.post { uiHandler.post {
if (!this.olmMachine.verificationListeners.contains(listener)) { if (!this.listeners.contains(listener)) {
this.olmMachine.verificationListeners.add(listener) this.listeners.add(listener)
} }
} }
} }
override fun removeListener(listener: VerificationService.Listener) { internal fun removeListener(listener: VerificationService.Listener) {
uiHandler.post { this.olmMachine.verificationListeners.remove(listener) } uiHandler.post { this.listeners.remove(listener) }
} }
private fun dispatchTxAdded(tx: VerificationTransaction) { internal fun dispatchTxAdded(tx: VerificationTransaction) {
uiHandler.post { uiHandler.post {
this.olmMachine.verificationListeners.forEach { this.listeners.forEach {
try { try {
it.transactionCreated(tx) it.transactionCreated(tx)
} catch (e: Throwable) { } catch (e: Throwable) {
@ -100,9 +97,9 @@ internal class RustVerificationService(
} }
} }
private fun dispatchTxUpdated(tx: VerificationTransaction) { internal fun dispatchTxUpdated(tx: VerificationTransaction) {
uiHandler.post { uiHandler.post {
this.olmMachine.verificationListeners.forEach { this.listeners.forEach {
try { try {
it.transactionUpdated(tx) it.transactionUpdated(tx)
} catch (e: Throwable) { } catch (e: Throwable) {
@ -112,10 +109,10 @@ internal class RustVerificationService(
} }
} }
private fun dispatchRequestAdded(tx: PendingVerificationRequest) { internal fun dispatchRequestAdded(tx: PendingVerificationRequest) {
Timber.v("## SAS dispatchRequestAdded txId:${tx.transactionId} $tx") Timber.v("## SAS dispatchRequestAdded txId:${tx.transactionId} $tx")
uiHandler.post { uiHandler.post {
this.olmMachine.verificationListeners.forEach { this.listeners.forEach {
try { try {
it.verificationRequestCreated(tx) it.verificationRequestCreated(tx)
} catch (e: Throwable) { } catch (e: Throwable) {
@ -124,8 +121,18 @@ internal class RustVerificationService(
} }
} }
} }
}
internal class RustVerificationService(
private val olmMachine: OlmMachine,
private val requestSender: RequestSender,
) : VerificationService {
private val dispatcher = UpdateDispatcher(this.olmMachine.verificationListeners)
internal suspend fun onEvent(event: Event) = when (event.getClearType()) { internal suspend fun onEvent(event: Event) = when (event.getClearType()) {
// I'm not entirely sure why getClearType() returns a msgtype in one case
// and a event type in the other case, but this is how the old verification
// service did things and it does seem to work.
MessageType.MSGTYPE_VERIFICATION_REQUEST -> onRequest(event) MessageType.MSGTYPE_VERIFICATION_REQUEST -> onRequest(event)
EventType.KEY_VERIFICATION_START -> onStart(event) EventType.KEY_VERIFICATION_START -> onStart(event)
EventType.KEY_VERIFICATION_READY, EventType.KEY_VERIFICATION_READY,
@ -144,7 +151,7 @@ internal class RustVerificationService(
this.olmMachine.getVerificationRequest(sender, flowId)?.dispatchRequestUpdated() this.olmMachine.getVerificationRequest(sender, flowId)?.dispatchRequestUpdated()
val verification = this.getExistingTransaction(sender, flowId) ?: return val verification = this.getExistingTransaction(sender, flowId) ?: return
dispatchTxUpdated(verification) this.dispatcher.dispatchTxUpdated(verification)
} }
private suspend fun onStart(event: Event) { private suspend fun onStart(event: Event) {
@ -163,15 +170,15 @@ internal class RustVerificationService(
Timber.d("## Verification: Auto accepting SAS verification with $sender") Timber.d("## Verification: Auto accepting SAS verification with $sender")
verification.accept() verification.accept()
} else { } else {
dispatchTxUpdated(verification) this.dispatcher.dispatchTxUpdated(verification)
} }
} else { } else {
// This didn't originate from a request, so tell our listeners that // This didn't originate from a request, so tell our listeners that
// this is a new verification. // this is a new verification.
dispatchTxAdded(verification) this.dispatcher.dispatchTxAdded(verification)
// The IncomingVerificationRequestHandler seems to only listen to updates // The IncomingVerificationRequestHandler seems to only listen to updates
// so let's trigger an update after the addition as well. // so let's trigger an update after the addition as well.
dispatchTxUpdated(verification) this.dispatcher.dispatchTxUpdated(verification)
} }
} }
@ -181,7 +188,15 @@ internal class RustVerificationService(
val request = this.getExistingVerificationRequest(sender, flowId) ?: return val request = this.getExistingVerificationRequest(sender, flowId) ?: return
dispatchRequestAdded(request) this.dispatcher.dispatchRequestAdded(request)
}
override fun addListener(listener: VerificationService.Listener) {
this.dispatcher.addListener(listener)
}
override fun removeListener(listener: VerificationService.Listener) {
this.dispatcher.removeListener(listener)
} }
override fun markedLocallyAsManuallyVerified(userId: String, deviceID: String) { override fun markedLocallyAsManuallyVerified(userId: String, deviceID: String) {
@ -303,7 +318,7 @@ internal class RustVerificationService(
val qrcode = request.startQrVerification() val qrcode = request.startQrVerification()
if (qrcode != null) { if (qrcode != null) {
dispatchTxAdded(qrcode) this.dispatcher.dispatchTxAdded(qrcode)
} }
true true
@ -338,7 +353,7 @@ internal class RustVerificationService(
val sas = request?.startSasVerification() val sas = request?.startSasVerification()
if (sas != null) { if (sas != null) {
dispatchTxAdded(sas) dispatcher.dispatchTxAdded(sas)
sas.transactionId sas.transactionId
} else { } else {
null null
@ -353,7 +368,7 @@ internal class RustVerificationService(
runBlocking { runBlocking {
val verification = olmMachine.getDevice(otherUserId, otherDeviceId)?.startVerification() val verification = olmMachine.getDevice(otherUserId, otherDeviceId)?.startVerification()
if (verification != null) { if (verification != null) {
dispatchTxAdded(verification) dispatcher.dispatchTxAdded(verification)
verification.transactionId verification.transactionId
} else { } else {
null null