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(e2ei): remove E2EI shield and buttons if it's disabled on your team (WPB-6520) #2698

Merged
merged 4 commits into from
Feb 14, 2024

Conversation

AndroidBob
Copy link
Collaborator

@AndroidBob AndroidBob commented Feb 13, 2024

BugWPB-6520 [Android] Don't show the e2ei get certificate button if e2ei is disabled

Cherry pick from the original PR:


⚠️ Conflicts during cherry-pick:
kalium


PR Submission Checklist for internal contributors

  • The PR Title

    • conforms to the style of semantic commits messages¹ supported in Wire's Github Workflow²
    • contains a reference JIRA issue number like
    • answers the question: If merged, this PR will: ... ³
  • The PR Description

    • is free of optional paragraphs and you have filled the relevant parts to the best of your ability

What's new in this PR?

When E2EI is disabled on the user's team, all the info related to e2ei must be hidden.

Needs releases with:

Testing

Login to the user and if e2ei is disabled, shields and the get certificate on the current device screen shouldn't be visible, and if enable e2ei you should see the data.


PR Post Submission Checklist for internal contributors (Optional)

  • Wire's Github Workflow has automatically linked the PR to a JIRA issue

PR Post Merge Checklist for internal contributors

  • If any soft of configuration variable was introduced by this PR, it has been added to the relevant documents and the CI jobs have been updated.

References
  1. https://sparkbox.com/foundry/semantic_commit_messages
  2. https://github.com/wireapp/.github#usage
  3. E.g. .

@AndroidBob AndroidBob added the cherry-pick PR is cherry-picking changes from another banch label Feb 13, 2024
Copy link
Contributor

github-actions bot commented Feb 13, 2024

Test Results

816 tests  ±0   816 ✅ ±0   12m 3s ⏱️ + 2m 46s
114 suites ±0     0 💤 ±0 
114 files   ±0     0 ❌ ±0 

Results for commit ce083e7. ± Comparison against base commit 15bc6f3.

♻️ This comment has been updated with latest results.

@AndroidBob
Copy link
Collaborator Author

Build 3097 failed.

@mchenani mchenani enabled auto-merge February 13, 2024 15:05
@AndroidBob
Copy link
Collaborator Author

Build 3104 failed.

@mchenani mchenani added this pull request to the merge queue Feb 14, 2024
Copy link

codecov bot commented Feb 14, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (15bc6f3) 42.77% compared to head (ce083e7) 42.88%.
Report is 3 commits behind head on develop.

Additional details and impacted files
@@             Coverage Diff             @@
##           develop    #2698      +/-   ##
===========================================
+ Coverage    42.77%   42.88%   +0.10%     
===========================================
  Files          408      408              
  Lines        13516    13521       +5     
  Branches      2389     2389              
===========================================
+ Hits          5781     5798      +17     
+ Misses        7059     7047      -12     
  Partials       676      676              
Files Coverage Δ
...roid/ui/settings/devices/DeviceDetailsViewModel.kt 59.82% <100.00%> (+1.10%) ⬆️
...ndroid/ui/settings/devices/SelfDevicesViewModel.kt 78.57% <100.00%> (ø)
...id/ui/settings/devices/model/DeviceDetailsState.kt 100.00% <100.00%> (ø)
...roid/ui/settings/devices/model/SelfDevicesState.kt 100.00% <100.00%> (ø)

... and 1 file with indirect coverage changes


Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 15bc6f3...ce083e7. Read the comment docs.

Copy link
Contributor

APKs built during tests are available here. Scroll down to Artifacts!

@AndroidBob
Copy link
Collaborator Author

Build 3134 succeeded.

The build produced the following APK's:

Merged via the queue into develop with commit ca11930 Feb 14, 2024
15 checks passed
@mchenani mchenani deleted the release/fix/hide-e2ei-info-if-disabled-cherry-pick branch February 14, 2024 11:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick PR is cherry-picking changes from another banch size/S
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants