Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix navigation issue when entering recovery key after navigating from the banner #3961

Merged
merged 2 commits into from
Nov 29, 2024

Conversation

bmarty
Copy link
Member

@bmarty bmarty commented Nov 27, 2024

Content

Motivation and context

Closes #3278

Screenshots / GIFs

Before

EnterRecoveryKeyStuck.mp4

After

EnterRecoveryKeyFixed.mp4

Tests

  • Login to an account, but skip the verification step
  • Click on the banner to enter the recovery key
  • Enter the recovery key

Previous behavior: screen is stuck with a disabled "Continue" button. Need to close the screen manually
Now: navigating back to the room list, the banner is gone

Tested devices

  • Physical
  • Emulator
  • OS version(s):

Checklist

  • Changes have been tested on an Android device or Android emulator with API 23
  • UI change has been tested on both light and dark themes
  • Accessibility has been taken into account. See https://github.com/element-hq/element-x-android/blob/develop/CONTRIBUTING.md#accessibility
  • Pull request is based on the develop branch
  • Pull request title will be used in the release note, it clearly define what will change for the user
  • Pull request includes screenshots or videos if containing UI changes
  • Pull request includes a sign off
  • You've made a self review of your PR

@bmarty bmarty requested a review from a team as a code owner November 27, 2024 16:44
@bmarty bmarty requested review from ganfra and removed request for a team November 27, 2024 16:44
Copy link
Contributor

github-actions bot commented Nov 27, 2024

📱 Scan the QR code below to install the build (arm64 only) for this PR.
QR code
If you can't scan the QR code you can install the build via this link: https://i.diawi.com/vJtmdy

Copy link

codecov bot commented Nov 27, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 83.07%. Comparing base (6b9eb99) to head (646b92a).
Report is 16 commits behind head on develop.

Additional details and impacted files
@@           Coverage Diff            @@
##           develop    #3961   +/-   ##
========================================
  Coverage    83.07%   83.07%           
========================================
  Files         1791     1791           
  Lines        45335    45335           
  Branches      5348     5348           
========================================
  Hits         37661    37661           
  Misses        5799     5799           
  Partials      1875     1875           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@spaetz
Copy link

spaetz commented Nov 28, 2024

Fixes #3039
Fixes #3278
I guess.

callbacks.forEach { it.onDone() }
} else {
backstack.pop()
when (plugins.filterIsInstance<SecureBackupEntryPoint.Params>().first().initialElement) {
Copy link
Member

@ganfra ganfra Nov 28, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd prefer we check the state of the backstack here?

                        if(backstack.canPop()){
                            backstack.pop()
                        } else {
                            callbacks.forEach { it.onDone() }
                        }
                    }

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, this is probably safer: 646b92a

Copy link
Member

@ganfra ganfra left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See my remark, but both ways are ok, do as you prefer :)

@bmarty bmarty added the PR-Bugfix For bug fix label Nov 29, 2024
@bmarty bmarty merged commit 3677c43 into develop Nov 29, 2024
23 of 24 checks passed
@bmarty bmarty deleted the feature/bma/passphraseIssue branch November 29, 2024 08:11
Copy link

sonarcloud bot commented Nov 29, 2024

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
PR-Bugfix For bug fix
Projects
None yet
Development

Successfully merging this pull request may close these issues.

"Enter your recovery key" screen doesn't react after entering key
3 participants