filippodb/SchildiChat-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Convert VerificationService to suspend functions

Browse Source 
Signed-off-by: Dominic Fischer <dominicfischer7@gmail.com>
This commit is contained in:
Dominic Fischer 2021-03-27 19:20:16 +00:00
parent 2045a164c1
commit 8f67511b22
5 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CryptoTestHelper.kt
View File

@ -337,8 +337,7 @@ class CryptoTestHelper(private val mTestHelper: CommonTestHelper) {
requestID, requestID,
roomId, roomId,
bob.myUserId, bob.myUserId,
bob.sessionParams.credentials.deviceId!!, bob.sessionParams.credentials.deviceId!!)
null)
// we should reach SHOW SAS on both // we should reach SHOW SAS on both
var alicePovTx: OutgoingSasVerificationTransaction? = null var alicePovTx: OutgoingSasVerificationTransaction? = null

6
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/SASTest.kt
View File

@ -593,16 +593,14 @@ class SASTest : InstrumentedTest {
requestID!!, requestID!!,
cryptoTestData.roomId, cryptoTestData.roomId,
bobSession.myUserId, bobSession.myUserId,
bobSession.sessionParams.deviceId!!, bobSession.sessionParams.deviceId!!)
null)
bobVerificationService.beginKeyVerificationInDMs( bobVerificationService.beginKeyVerificationInDMs(
VerificationMethod.SAS, VerificationMethod.SAS,
requestID!!, requestID!!,
cryptoTestData.roomId, cryptoTestData.roomId,
aliceSession.myUserId, aliceSession.myUserId,
aliceSession.sessionParams.deviceId!!, aliceSession.sessionParams.deviceId!!)
null)
// we should reach SHOW SAS on both // we should reach SHOW SAS on both
var alicePovTx: SasVerificationTransaction? var alicePovTx: SasVerificationTransaction?

4
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/crypto/verification/VerificationService.kt
View File

@ -16,7 +16,6 @@
package org.matrix.android.sdk.api.session.crypto.verification package org.matrix.android.sdk.api.session.crypto.verification
import org.matrix.android.sdk.api.MatrixCallback
import org.matrix.android.sdk.api.session.events.model.Event import org.matrix.android.sdk.api.session.events.model.Event
import org.matrix.android.sdk.api.session.events.model.LocalEcho import org.matrix.android.sdk.api.session.events.model.LocalEcho
@ -79,8 +78,7 @@ interface VerificationService {
transactionId: String, transactionId: String,
roomId: String, roomId: String,
otherUserId: String, otherUserId: String,
otherDeviceId: String, otherDeviceId: String): String
callback: MatrixCallback<String>?): String?
/** /**
* Returns false if the request is unknown * Returns false if the request is unknown

4
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/DefaultVerificationService.kt
View File

@ -19,7 +19,6 @@ package org.matrix.android.sdk.internal.crypto.verification
import android.os.Handler import android.os.Handler
import android.os.Looper import android.os.Looper
import dagger.Lazy import dagger.Lazy
import org.matrix.android.sdk.api.MatrixCallback
import org.matrix.android.sdk.api.session.crypto.crosssigning.CrossSigningService import org.matrix.android.sdk.api.session.crypto.crosssigning.CrossSigningService
import org.matrix.android.sdk.api.session.crypto.crosssigning.KEYBACKUP_SECRET_SSSS_NAME import org.matrix.android.sdk.api.session.crypto.crosssigning.KEYBACKUP_SECRET_SSSS_NAME
import org.matrix.android.sdk.api.session.crypto.crosssigning.MASTER_KEY_SSSS_NAME import org.matrix.android.sdk.api.session.crypto.crosssigning.MASTER_KEY_SSSS_NAME
@ -1293,8 +1292,7 @@ internal class DefaultVerificationService @Inject constructor(
transactionId: String, transactionId: String,
roomId: String, roomId: String,
otherUserId: String, otherUserId: String,
otherDeviceId: String, otherDeviceId: String): String {
callback: MatrixCallback<String>?): String? {
if (method == VerificationMethod.SAS) { if (method == VerificationMethod.SAS) {
val tx = DefaultOutgoingSASDefaultVerificationTransaction( val tx = DefaultOutgoingSASDefaultVerificationTransaction(
setDeviceVerificationAction, setDeviceVerificationAction,

3
vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewModel.kt
View File

@ -305,8 +305,7 @@ class VerificationBottomSheetViewModel @AssistedInject constructor(
transactionId = action.pendingRequestTransactionId, transactionId = action.pendingRequestTransactionId,
roomId = roomId, roomId = roomId,
otherUserId = request.otherUserId, otherUserId = request.otherUserId,
otherDeviceId = otherDevice ?: "", otherDeviceId = otherDevice ?: ""
callback = null
) )
} }
Unit Unit