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 room settings not treating unencrypted DMs as DMs #3545

Merged
merged 1 commit into from
Sep 26, 2024

Conversation

jmartinesp
Copy link
Member

Content

Removes the && isEncrypted check when trying to retrieve the other user in a DM.

Motivation and context

This condition was left there by mistake, we already consider unencrypted direct rooms with 2 people DMs.

Fixes #3071.

Tests

Open an unencrypted direct room with 2 people in it (you and someone else).

The room settings screen should display the info for the other user (double avatar, no invite button, etc.).

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 26, 2024
@jmartinesp jmartinesp requested a review from a team as a code owner September 26, 2024 08:32
@jmartinesp jmartinesp requested review from ganfra and removed request for a team September 26, 2024 08:32
Copy link

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/6RAjqa

Copy link

codecov bot commented Sep 26, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 82.66%. Comparing base (9756afc) to head (ea95a13).
Report is 7 commits behind head on develop.

Additional details and impacted files
@@           Coverage Diff            @@
##           develop    #3545   +/-   ##
========================================
  Coverage    82.66%   82.66%           
========================================
  Files         1732     1732           
  Lines        40958    40958           
  Branches      4955     4955           
========================================
  Hits         33859    33859           
  Misses        5342     5342           
  Partials      1757     1757           

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

@jmartinesp jmartinesp added the Run-Maestro Starts a Maestro Cloud session to run integration tests label Sep 26, 2024
@jmartinesp jmartinesp enabled auto-merge (squash) September 26, 2024 09:06
@github-actions github-actions bot removed the Run-Maestro Starts a Maestro Cloud session to run integration tests label Sep 26, 2024
@jmartinesp jmartinesp merged commit 2ce8bb7 into develop Sep 26, 2024
34 checks passed
@jmartinesp jmartinesp deleted the fix/jme/use-dm-ui-for-unencrypted-dms-too branch September 26, 2024 09:37
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
2 participants