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

Linting

Browse Source
This commit is contained in:
Hugh Nimmo-Smith 2022-10-14 14:18:50 +01:00
parent 411b766890
commit 6426ff40d3
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/rendezvous/Rendezvous.kt
View File

@ -91,7 +91,11 @@ class Rendezvous(
if (incompatible) { if (incompatible) {
send(Payload(PayloadType.Finish, intent = ourIntent)) send(Payload(PayloadType.Finish, intent = ourIntent))
val reason = if (ourIntent == RendezvousIntent.LOGIN_ON_NEW_DEVICE) RendezvousFailureReason.OtherDeviceNotSignedIn else RendezvousFailureReason.OtherDeviceAlreadySignedIn val reason = if (ourIntent == RendezvousIntent.LOGIN_ON_NEW_DEVICE) {
RendezvousFailureReason.OtherDeviceNotSignedIn
} else {
RendezvousFailureReason.OtherDeviceAlreadySignedIn
}
channel.cancel(reason) channel.cancel(reason)
} }
@ -175,7 +179,6 @@ class Rendezvous(
Timber.tag(TAG).i("Setting device $verifyingDeviceId as verified") Timber.tag(TAG).i("Setting device $verifyingDeviceId as verified")
crypto.setDeviceVerification(DeviceTrustLevel(locallyVerified = true, crossSigningVerified = false), userId, verifyingDeviceId) crypto.setDeviceVerification(DeviceTrustLevel(locallyVerified = true, crossSigningVerified = false), userId, verifyingDeviceId)
// TODO: what do we do with the master key?
verificationResponse.masterKey ?.let { masterKeyFromVerifyingDevice -> verificationResponse.masterKey ?.let { masterKeyFromVerifyingDevice ->
// set master key as trusted // set master key as trusted
crypto.crossSigningService().getMyCrossSigningKeys()?.masterKey()?.let { localMasterKey -> crypto.crossSigningService().getMyCrossSigningKeys()?.masterKey()?.let { localMasterKey ->