From 7cf7b7e10ea623e1a878373f427995cfd023a9ef Mon Sep 17 00:00:00 2001 From: Valere Date: Thu, 30 Apr 2020 09:50:38 +0200 Subject: [PATCH] Fix / avoid showing legacy start toaster under verif bottomsheet --- .../crypto/verification/IncomingVerificationRequestHandler.kt | 2 +- .../im/vector/riotx/features/navigation/DefaultNavigator.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/IncomingVerificationRequestHandler.kt b/vector/src/main/java/im/vector/riotx/features/crypto/verification/IncomingVerificationRequestHandler.kt index ccd3e6578a..2bd815b6df 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/IncomingVerificationRequestHandler.kt +++ b/vector/src/main/java/im/vector/riotx/features/crypto/verification/IncomingVerificationRequestHandler.kt @@ -66,7 +66,7 @@ class IncomingVerificationRequestHandler @Inject constructor( uid, context.getString(R.string.sas_incoming_request_notif_title), context.getString(R.string.sas_incoming_request_notif_content, name), - R.drawable.shield, + R.drawable.ic_shield_black, shouldBeDisplayedIn = { activity -> if (activity is VectorBaseActivity) { // TODO a bit too hugly :/ diff --git a/vector/src/main/java/im/vector/riotx/features/navigation/DefaultNavigator.kt b/vector/src/main/java/im/vector/riotx/features/navigation/DefaultNavigator.kt index 0f19a1292a..2e2814cb78 100644 --- a/vector/src/main/java/im/vector/riotx/features/navigation/DefaultNavigator.kt +++ b/vector/src/main/java/im/vector/riotx/features/navigation/DefaultNavigator.kt @@ -96,7 +96,7 @@ class DefaultNavigator @Inject constructor( roomId = null, otherUserId = session.myUserId, transactionId = pr.transactionId - ).show(context.supportFragmentManager, "REQPOP") + ).show(context.supportFragmentManager, VerificationBottomSheet.WAITING_SELF_VERIF_TAG) } }