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: misleading dialog copy when certificate enrolling fails (WPB-7129) #2807

Conversation

AndroidBob
Copy link
Collaborator

@AndroidBob AndroidBob commented Mar 22, 2024

BugWPB-7129 [Android] Misleading dialogue if certificate generation fails after login with e2ei enabled

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?

Issues

When E2EI is already enabled when the user logs in, he is forced to generate his certificate. If this certificate generation fails, we see the wrong copy dialog.

Solutions

Adjust dialog copy with correct information (correct subtext and removal of button)

Testing

How to Test

  • have a team with e2ei enabled
  • login on android and tap on “get certificate” button
  • make getting certificate fail (e.g. by providing a wrong acme URL)
  • alert is shown with correct copy

Attachments (Optional)

Before After
old new

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 Mar 22, 2024
@alexandreferris alexandreferris requested review from a team, typfel, yamilmedina, borichellow, MohamadJaara and saleniuk and removed request for a team March 22, 2024 15:41
Copy link
Contributor

github-actions bot commented Mar 22, 2024

Test Results

878 tests  ±0   878 ✅ ±0   11m 1s ⏱️ - 3m 0s
118 suites ±0     0 💤 ±0 
118 files   ±0     0 ❌ ±0 

Results for commit 6418937. ± Comparison against base commit 0758737.

♻️ This comment has been updated with latest results.

Copy link
Contributor

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

@AndroidBob
Copy link
Collaborator Author

Build 3707 failed.

@alexandreferris alexandreferris added this pull request to the merge queue Mar 25, 2024
Copy link

codecov bot commented Mar 25, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 43.65%. Comparing base (0758737) to head (6418937).

Additional details and impacted files
@@             Coverage Diff             @@
##           develop    #2807      +/-   ##
===========================================
+ Coverage    43.61%   43.65%   +0.04%     
===========================================
  Files          418      418              
  Lines        14007    14007              
  Branches      2536     2536              
===========================================
+ Hits          6109     6115       +6     
+ Misses        7181     7174       -7     
- Partials       717      718       +1     

see 2 files 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 0758737...6418937. Read the comment docs.

@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to a conflict with the base branch Mar 25, 2024
Copy link
Contributor

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

@alexandreferris alexandreferris added this pull request to the merge queue Mar 25, 2024
Copy link
Contributor

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

Merged via the queue into develop with commit 85c23df Mar 25, 2024
13 of 14 checks passed
@alexandreferris alexandreferris deleted the fix/misleading_dialog_copy_when_certificate_enrolling_fails-cherry-pick branch March 25, 2024 10:54
@AndroidBob
Copy link
Collaborator Author

Build 3725 succeeded.

The build produced the following APK's:

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/XS
Projects
None yet
5 participants