mirror of
https://github.com/element-hq/element-android
synced 2024-11-24 02:15:35 +03:00
Merge branch 'feature/hughns/qr_code_login' of https://github.com/vector-im/element-android into feature/hughns/qr_code_login
This commit is contained in:
commit
0acbd9c531
3 changed files with 4 additions and 4 deletions
|
@ -3383,7 +3383,7 @@
|
||||||
<string name="qr_code_login_header_failed_timeout_description">The linking wasn’t completed in the required time.</string>
|
<string name="qr_code_login_header_failed_timeout_description">The linking wasn’t completed in the required time.</string>
|
||||||
<string name="qr_code_login_header_failed_denied_description">The request was denied on the other device.</string>
|
<string name="qr_code_login_header_failed_denied_description">The request was denied on the other device.</string>
|
||||||
<string name="qr_code_login_header_failed_other_description">The request failed.</string>
|
<string name="qr_code_login_header_failed_other_description">The request failed.</string>
|
||||||
<string name="qr_code_login_header_failed_e2ee_security_issue_description">A security issue was encountered setting up secure messaging. One of the following may be compromised: Your homeserver; Your intent connection(s); Your device(s);</string>
|
<string name="qr_code_login_header_failed_e2ee_security_issue_description">A security issue was encountered setting up secure messaging. One of the following may be compromised: Your homeserver; Your internet connection(s); Your device(s);</string>
|
||||||
<string name="qr_code_login_header_failed_other_device_already_signed_in_description">The other device is already signed in.</string>
|
<string name="qr_code_login_header_failed_other_device_already_signed_in_description">The other device is already signed in.</string>
|
||||||
<string name="qr_code_login_header_failed_other_device_not_signed_in_description">The other device must be signed in.</string>
|
<string name="qr_code_login_header_failed_other_device_not_signed_in_description">The other device must be signed in.</string>
|
||||||
<string name="qr_code_login_header_failed_invalid_qr_code_description">That QR code is invalid.</string>
|
<string name="qr_code_login_header_failed_invalid_qr_code_description">That QR code is invalid.</string>
|
||||||
|
|
|
@ -22,7 +22,7 @@ import org.matrix.android.sdk.api.rendezvous.model.RendezvousError
|
||||||
* Representation of a rendezvous channel such as that described by MSC3903.
|
* Representation of a rendezvous channel such as that described by MSC3903.
|
||||||
*/
|
*/
|
||||||
interface RendezvousChannel {
|
interface RendezvousChannel {
|
||||||
var transport: RendezvousTransport
|
val transport: RendezvousTransport
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @returns the checksum/confirmation digits to be shown to the user
|
* @returns the checksum/confirmation digits to be shown to the user
|
||||||
|
@ -45,7 +45,7 @@ interface RendezvousChannel {
|
||||||
suspend fun receive(): ByteArray?
|
suspend fun receive(): ByteArray?
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @returns closes the channel and cleans up
|
* Closes the channel and cleans up.
|
||||||
*/
|
*/
|
||||||
suspend fun close()
|
suspend fun close()
|
||||||
}
|
}
|
||||||
|
|
|
@ -73,7 +73,7 @@ class ECDHRendezvousChannel(override var transport: RendezvousTransport, theirPu
|
||||||
@Json val iv: String? = null
|
@Json val iv: String? = null
|
||||||
)
|
)
|
||||||
|
|
||||||
private var olmSASMutex = Mutex()
|
private val olmSASMutex = Mutex()
|
||||||
private var olmSAS: OlmSAS?
|
private var olmSAS: OlmSAS?
|
||||||
private val ourPublicKey: ByteArray
|
private val ourPublicKey: ByteArray
|
||||||
private val ecdhAdapter = MatrixJsonParser.getMoshi().adapter(ECDHPayload::class.java)
|
private val ecdhAdapter = MatrixJsonParser.getMoshi().adapter(ECDHPayload::class.java)
|
||||||
|
|
Loading…
Reference in a new issue