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 sliding sync proxy login not working after native SS failure #3489

Merged
merged 1 commit into from
Sep 18, 2024

Conversation

jmartinesp
Copy link
Member

Content

Catch right exception for retrying the HS setup with sliding sync proxy after native sliding sync failed.

Motivation and context

The wrong exception was being caught and the fallback mechanism wasn't properly working.

Tests

  • Use a HS without native sliding sync, such as riot.grin.hu.
  • Try to log in with the SSS toggle enabled.
  • It should work, but using the sliding sync proxy (you can check this in the logs).

Tested devices

  • Physical
  • Emulator
  • OS version(s): 14

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

@jmartinesp jmartinesp added the PR-Bugfix For bug fix label Sep 18, 2024
@jmartinesp jmartinesp requested a review from a team as a code owner September 18, 2024 13:58
@jmartinesp jmartinesp requested review from bmarty and removed request for a team September 18, 2024 13:58
Copy link
Member

@bmarty bmarty left a comment

Choose a reason for hiding this comment

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

LGTM, thanks!

@jmartinesp jmartinesp added the Run-Maestro Starts a Maestro Cloud session to run integration tests label Sep 18, 2024
@jmartinesp jmartinesp added Run-Maestro Starts a Maestro Cloud session to run integration tests and removed Run-Maestro Starts a Maestro Cloud session to run integration tests labels Sep 18, 2024
@github-actions github-actions bot removed the Run-Maestro Starts a Maestro Cloud session to run integration tests label Sep 18, 2024
Copy link
Contributor

📱 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/hcYvLk

Copy link

sonarcloud bot commented Sep 18, 2024

Copy link

codecov bot commented Sep 18, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 82.67%. Comparing base (7922243) to head (712f11b).
Report is 1 commits behind head on develop.

Additional details and impacted files
@@           Coverage Diff            @@
##           develop    #3489   +/-   ##
========================================
  Coverage    82.67%   82.67%           
========================================
  Files         1731     1731           
  Lines        40841    40841           
  Branches      4968     4968           
========================================
  Hits         33764    33764           
  Misses        5315     5315           
  Partials      1762     1762           

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

@jmartinesp jmartinesp merged commit d5ac6da into develop Sep 18, 2024
30 checks passed
@jmartinesp jmartinesp deleted the fix/jme/login-with-ss-proxy branch September 18, 2024 15:02
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.

2 participants