Fix EW-EA compatibility for verification
This commit is contained in:
parent
0ede779ee5
commit
760e14531f
|
@ -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) {
|
||||||
|
|
|
@ -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
|
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue