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

Merge pull request #3140 from vector-im/feature/bca/verification_as_per_web

Browse source 
Fix EW-EA compatibility for verification
This commit is contained in:
Benoit Marty 2021-04-09 10:24:01 +02:00 committed by GitHub
commit da7c2e38f6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
vector/src/main/java/im/vector/app/features/crypto/verification/IncomingVerificationRequestHandler.kt
View file

@ -60,7 +60,7 @@ class IncomingVerificationRequestHandler @Inject constructor(
// TODO maybe check also if // TODO maybe check also if
val uid = "kvr_${tx.transactionId}" val uid = "kvr_${tx.transactionId}"
when (tx.state) { when (tx.state) {
is VerificationTxState.OnStarted -> { is VerificationTxState.OnStarted -> {
// Add a notification for every incoming request // Add a notification for every incoming request
val user = session?.getUser(tx.otherUserId) val user = session?.getUser(tx.otherUserId)
val name = user?.getBestName() ?: tx.otherUserId val name = user?.getBestName() ?: tx.otherUserId
@ -119,6 +119,14 @@ class IncomingVerificationRequestHandler @Inject constructor(
Timber.v("## SAS verificationRequestCreated ${pr.transactionId}") Timber.v("## SAS verificationRequestCreated ${pr.transactionId}")
// For incoming request we should prompt (if not in activity where this request apply) // For incoming request we should prompt (if not in activity where this request apply)
if (pr.isIncoming) { if (pr.isIncoming) {
// if it's a self verification for my devices, we can discard the review login alert
// if not this request will be underneath and not visible by the user...
// it will re-appear later
if (pr.otherUserId == session?.myUserId) {
// XXX this is a bit hard coded :/
popupAlertManager.cancelAlert("review_login")
}
val user = session?.getUser(pr.otherUserId)?.toMatrixItem() val user = session?.getUser(pr.otherUserId)?.toMatrixItem()
val name = user?.getBestName() ?: pr.otherUserId val name = user?.getBestName() ?: pr.otherUserId
val description = if (name == pr.otherUserId) { val description = if (name == pr.otherUserId) {

5
vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt
View file

@ -203,9 +203,8 @@ class HomeActivityViewModel @AssistedInject constructor(
_viewEvents.post( _viewEvents.post(
HomeActivityViewEvents.OnNewSession( HomeActivityViewEvents.OnNewSession(
session.getUser(session.myUserId)?.toMatrixItem(), session.getUser(session.myUserId)?.toMatrixItem(),
// If it's an old unverified, we should send requests //Always send request instead of waiting for an incoming as per recent EW changes
// instead of waiting for an incoming one false
reAuthHelper.data != null
) )
) )
} }