Matrix/element-android-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-android.git synced 2024-11-15 01:35:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

better feedback on verification request sent

Browse Source
This commit is contained in:
valere 2022-12-20 14:58:37 +01:00
parent ee5dfba389
commit 695a2b3345
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
library/ui-strings/src/main/res/values/strings.xml
View File

@ -2503,6 +2503,7 @@
<string name="new_session">New login. Was this you?</string> <string name="new_session">New login. Was this you?</string>
<string name="verify_new_session_notice">Use this session to verify your new one, granting it access to encrypted messages.</string> <string name="verify_new_session_notice">Use this session to verify your new one, granting it access to encrypted messages.</string>
<string name="verification_request_was_sent">A verification request has been sent. Open one of your other sessions to accept and start the verification.</string>
<string name="verify_new_session_was_not_me">This wasn’t me</string> <string name="verify_new_session_was_not_me">This wasn’t me</string>
<string name="verify_new_session_compromized">Your account may be compromised</string> <string name="verify_new_session_compromized">Your account may be compromised</string>

13
vector/src/main/java/im/vector/app/features/crypto/verification/self/SelfVerificationController.kt
View File

@ -24,6 +24,8 @@ import im.vector.app.R
import im.vector.app.core.epoxy.bottomSheetDividerItem import im.vector.app.core.epoxy.bottomSheetDividerItem
import im.vector.app.core.resources.ColorProvider import im.vector.app.core.resources.ColorProvider
import im.vector.app.core.resources.StringProvider import im.vector.app.core.resources.StringProvider
import im.vector.app.core.ui.list.genericFooterItem
import im.vector.app.core.ui.list.ItemStyle
import im.vector.app.features.crypto.verification.epoxy.bottomSheetSelfWaitItem import im.vector.app.features.crypto.verification.epoxy.bottomSheetSelfWaitItem
import im.vector.app.features.crypto.verification.epoxy.bottomSheetVerificationActionItem import im.vector.app.features.crypto.verification.epoxy.bottomSheetVerificationActionItem
import im.vector.app.features.crypto.verification.epoxy.bottomSheetVerificationNoticeItem import im.vector.app.features.crypto.verification.epoxy.bottomSheetVerificationNoticeItem
@ -39,6 +41,7 @@ import im.vector.app.features.crypto.verification.user.renderSasTransaction
import im.vector.app.features.crypto.verification.user.renderStartTransactionOptions import im.vector.app.features.crypto.verification.user.renderStartTransactionOptions
import im.vector.app.features.crypto.verification.user.verifiedSuccessTile import im.vector.app.features.crypto.verification.user.verifiedSuccessTile
import im.vector.app.features.html.EventHtmlRenderer import im.vector.app.features.html.EventHtmlRenderer
import im.vector.app.features.spaces.create.SpaceType
import im.vector.lib.core.utils.epoxy.charsequence.toEpoxyCharSequence import im.vector.lib.core.utils.epoxy.charsequence.toEpoxyCharSequence
import org.matrix.android.sdk.api.session.crypto.verification.CancelCode import org.matrix.android.sdk.api.session.crypto.verification.CancelCode
import org.matrix.android.sdk.api.session.crypto.verification.EVerificationState import org.matrix.android.sdk.api.session.crypto.verification.EVerificationState
@ -124,6 +127,16 @@ class SelfVerificationController @Inject constructor(
val pendingRequest = state.pendingRequest.invoke() val pendingRequest = state.pendingRequest.invoke()
when (pendingRequest.state) { when (pendingRequest.state) {
EVerificationState.WaitingForReady -> { EVerificationState.WaitingForReady -> {
genericFooterItem {
id("open_other")
style(ItemStyle.NORMAL_TEXT)
text(
host.stringProvider.getString(R.string.verification_request_was_sent).toEpoxyCharSequence()
)
textColor(host.colorProvider.getColorFromAttribute(R.attr.vctr_content_primary))
}
bottomSheetSelfWaitItem { bottomSheetSelfWaitItem {
id("waiting") id("waiting")
} }