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: Handle 1o1 conversations when no key packages [WPB-6936] #2938

Conversation

AndroidBob
Copy link
Collaborator

@AndroidBob AndroidBob commented Apr 25, 2024

BugWPB-6936 [Android] Handle 1:1 conversations when no key packages are available

Cherry pick from the original PR:


⚠️ Conflicts during cherry-pick:
app/src/main/kotlin/com/wire/android/di/accountScoped/ConversationModule.kt
app/src/main/kotlin/com/wire/android/ui/connection/ConnectionActionButtonViewModel.kt
app/src/main/kotlin/com/wire/android/ui/userprofile/other/OtherUserProfileState.kt

What's new in this PR?

Issues

  1. when user try to start the MLS conversation with the user has no KeyPackages (not any device registered yet) then we need to show corresponding dialog informing user why conversation couldn't be started
  2. when user open the profile of the user that has no 1o1 conversation yet, then the bottom button should say Start conversation instead of open conversation

Solutions

implement it :)

Dependencies (Optional)

waiting for the kalium PR wireapp/kalium#2713

Attachments (Optional)

<img width=280 alt=Screenshot 2024-04-24 at 15 25 46 src=https://github.com/wireapp/wire-android/assets/6539347/d1fe3cda-bc96-4666-9167-821765e57886>

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

github-actions bot commented Apr 25, 2024

Test Results

916 tests  +1   916 ✅ +1   12m 50s ⏱️ - 1m 8s
123 suites ±0     0 💤 ±0 
123 files   ±0     0 ❌ ±0 

Results for commit f984266. ± Comparison against base commit ca21b3a.

♻️ This comment has been updated with latest results.

@AndroidBob
Copy link
Collaborator Author

Build 4460 failed.

@codecov-commenter
Copy link

Codecov Report

Attention: Patch coverage is 77.77778% with 2 lines in your changes are missing coverage. Please review.

Project coverage is 44.23%. Comparing base (ca21b3a) to head (f984266).

Additional details and impacted files
@@             Coverage Diff             @@
##           develop    #2938      +/-   ##
===========================================
+ Coverage    44.20%   44.23%   +0.02%     
===========================================
  Files          443      444       +1     
  Lines        14350    14359       +9     
  Branches      2469     2470       +1     
===========================================
+ Hits          6344     6351       +7     
- Misses        7313     7315       +2     
  Partials       693      693              
Files Coverage Δ
...erprofile/other/OtherUserProfileScreenViewModel.kt 59.57% <100.00%> (+0.87%) ⬆️
...roid/ui/userprofile/other/OtherUserProfileState.kt 77.27% <100.00%> (+0.52%) ⬆️
...re/android/ui/connection/ConnectionActionButton.kt 0.00% <0.00%> (ø)
...d/ui/connection/ConnectionActionButtonViewModel.kt 71.11% <66.66%> (-0.16%) ⬇️

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 ca21b3a...f984266. Read the comment docs.

Copy link
Contributor

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

@borichellow borichellow added this pull request to the merge queue Apr 29, 2024
Merged via the queue into develop with commit b0043db Apr 29, 2024
12 of 13 checks passed
@borichellow borichellow deleted the fix/handle_1_o_1_conversations_when_no_key_packages-cherry-pick branch April 29, 2024 08:52
@AndroidBob
Copy link
Collaborator Author

Build 4502 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/S
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants