Skip to content

Fix logging via QR code when using MDM-configured homeserver#7228

Merged
bmarty merged 4 commits into
developfrom
mxandreas/no-hs-check-qr
Jul 16, 2026
Merged

Fix logging via QR code when using MDM-configured homeserver#7228
bmarty merged 4 commits into
developfrom
mxandreas/no-hs-check-qr

Conversation

@mxandreas

@mxandreas mxandreas commented Jul 16, 2026

Copy link
Copy Markdown
Member

Content

When logging in via QR Code, it is checked that the homeserver the user is logging in to, is the same as configured by MDM. This check has a bug (e.g. comparing https://example.com vs example.com). The same check is applied when the homeserver is pre-configured via custom app.

For now, we remove this check because of the following:

  • Even if in some cases the check can be easily fixed by ensuring there is always protocol there, it could be that we end up comparing server/domain name (e.g. https://example.com with the homeserver URL https://element.example.com/) and the check fails again for another reason.
  • The primary purpose of the feature MDM-configured homeserver was to simplify sign in (not necessarily to block users to sign in any other homeserver).
  • However, since in some cases there is interest that no other homeserver than configured by MDM is used (even when using QR code login), then there will be a project soon to add the check back and work robustly.

On iOS the check was already removed before.

Motivation and context

Screenshots / GIFs

Tests

  • Step 1
  • Step 2
  • Step ...

Tested devices

  • Physical
  • Emulator
  • OS version(s):

Checklist

  • I am aware of the etiquette.
  • This PR was made with the help of AI:
    • Yes. In this case, please request a review by Copilot.
    • No.
  • Changes have been tested on an Android device or Android emulator with API 24
  • 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 defines what will change for the user
  • Pull request includes screenshots or videos if containing UI changes
  • You've made a self review of your PR

@mxandreas mxandreas added the T-Defect Something isn't working: bugs, crashes, hangs and other reported problems label Jul 16, 2026
@mxandreas
mxandreas requested a review from a team as a code owner July 16, 2026 07:08
@mxandreas
mxandreas requested review from bmarty and removed request for a team July 16, 2026 07:08
@github-actions

github-actions Bot commented Jul 16, 2026

Copy link
Copy Markdown
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/Df6P63

@mxandreas mxandreas added the PR-Bugfix For bug fix label Jul 16, 2026
@sonarqubecloud

Copy link
Copy Markdown

@bmarty bmarty left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Thanks!

@bmarty
bmarty enabled auto-merge July 16, 2026 08:45
@bmarty
bmarty merged commit bf54701 into develop Jul 16, 2026
38 of 39 checks passed
@bmarty
bmarty deleted the mxandreas/no-hs-check-qr branch July 16, 2026 09:14
@codecov

codecov Bot commented Jul 16, 2026

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 80.53%. Comparing base (e79181d) to head (3854caa).
⚠️ Report is 21 commits behind head on develop.

Additional details and impacted files
@@             Coverage Diff             @@
##           develop    #7228      +/-   ##
===========================================
- Coverage    80.53%   80.53%   -0.01%     
===========================================
  Files         2730     2730              
  Lines        78992    78986       -6     
  Branches     10707    10706       -1     
===========================================
- Hits         63618    63612       -6     
- Misses       11232    11233       +1     
+ Partials      4142     4141       -1     

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

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

PR-Bugfix For bug fix T-Defect Something isn't working: bugs, crashes, hangs and other reported problems

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants