feat: support joining conversation with password protected code [WPB-1531] #2049

MohamadJaara · 2023-08-03T07:46:44Z

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 SQPIT-764
- 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

guest links with password

Solutions

implement the UI logic to join conversation when the code is password protected

Dependencies (Optional)

If there are some other pull requests related to this one (e.g. new releases of frameworks), specify them here.

Needs releases with:

GitHub link to other pull request

Testing

Test Coverage (Optional)

I have added automated test to this contribution

How to Test

Briefly describe how this change was tested and if applicable the exact steps taken to verify that it works as expected.

Notes (Optional)

Specify here any other facts that you think are important for this issue.

Attachments (Optional)

Attachments like images, videos, etc. (drag and drop in the text box)

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

https://sparkbox.com/foundry/semantic_commit_messages
https://github.com/wireapp/.github#usage
E.g. feat(conversation-list): Sort conversations by most emojis in the title #SQPIT-764.

…th-password # Conflicts: # app/src/main/kotlin/com/wire/android/ui/WireActivity.kt # app/src/main/kotlin/com/wire/android/ui/WireActivityViewModel.kt # app/src/test/kotlin/com/wire/android/ui/WireActivityViewModelTest.kt # kalium

github-actions · 2023-08-03T07:52:58Z

Test Results

508 tests +2 507 ✔️ +2 5m 35s ⏱️ - 1m 19s
  77 suites +1     1 💤 ±0
  77 files +1     0 ❌ ±0

Results for commit a01ece2. ± Comparison against base commit b392ba7.

This pull request removes 4 and adds 6 tests. Note that renamed tests count towards both.

com.wire.android.ui.WireActivityViewModelTest ‑ given No session, when try to join conversation, then get error and don't call onSuccess()
com.wire.android.ui.WireActivityViewModelTest ‑ given invalid code, when try to join conversation, then get error and don't call onSuccess()
com.wire.android.ui.WireActivityViewModelTest ‑ given valid code, when joining conversion and user us already a member, then call onSuccess()
com.wire.android.ui.WireActivityViewModelTest ‑ given valid code, when joining conversion success, then call onSuccess()

com.wire.android.ui.joinDeepLink.JoinViaCodeViewModelTest ‑ given invalid code, when try to join conversation, then state is updated()
com.wire.android.ui.joinDeepLink.JoinViaCodeViewModelTest ‑ given password field is empty, when try to join conversation, then password Is not passed to the use case()
com.wire.android.ui.joinDeepLink.JoinViaCodeViewModelTest ‑ given password, when try to join conversation, then password Is passed to the use case()
com.wire.android.ui.joinDeepLink.JoinViaCodeViewModelTest ‑ given valid code, when joining conversion and user us already a member, then update state()
com.wire.android.ui.joinDeepLink.JoinViaCodeViewModelTest ‑ given valid code, when joining conversion success, then stat is updated()
com.wire.android.ui.joinDeepLink.JoinViaCodeViewModelTest ‑ given wrong password error state, when updating password, then error is cleared()

♻️ This comment has been updated with latest results.

borichellow

Good one!!! Just 2 tiny comments :)

app/src/test/kotlin/com/wire/android/ui/joinDeepLink/JoinViaCodeViewModelTest.kt

borichellow · 2023-08-03T08:12:04Z

app/src/test/kotlin/com/wire/android/ui/joinDeepLink/JoinViaCodeViewModelTest.kt

+    }
+
+    @Test
+    fun `given valid code, when joining conversion and user us already a member, then update state`() {


...is already a member, then...

the state is d to Joined, maybe the state name is a bit confusing i will rename it to success

AndroidBob · 2023-08-03T08:16:13Z

Build 860 failed.

AndroidBob · 2023-08-03T09:02:41Z

Build 865 failed.

…th-password

AndroidBob · 2023-08-03T10:30:25Z

Build 872 failed.

…th-password

codecov · 2023-08-03T13:11:34Z

Codecov Report

Merging #2049 (a01ece2) into develop (b392ba7) will increase coverage by 0.04%.
Report is 1 commits behind head on develop.
The diff coverage is 56.52%.

@@              Coverage Diff              @@
##             develop    #2049      +/-   ##
=============================================
+ Coverage      39.04%   39.08%   +0.04%     
- Complexity       914      920       +6     
=============================================
  Files            303      305       +2     
  Lines          11152    11166      +14     
  Branches        1492     1489       -3     
=============================================
+ Hits            4354     4364      +10     
- Misses          6374     6381       +7     
+ Partials         424      421       -3

Files Changed	Coverage Δ
...rc/main/kotlin/com/wire/android/ui/WireActivity.kt	`0.00% <0.00%> (ø)`
...inConversation/JoinConversationViaCodeViewModel.kt	`90.90% <90.90%> (ø)`
...otlin/com/wire/android/ui/WireActivityViewModel.kt	`70.37% <100.00%> (+0.25%)`	⬆️
...nConversation/JoinConversationViaDeepLinkDialog.kt	`85.71% <100.00%> (+2.38%)`	⬆️
.../ui/joinConversation/JoinViaDeepLinkDialogState.kt	`100.00% <100.00%> (ø)`

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 b392ba7...a01ece2. Read the comment docs.

github-actions · 2023-08-03T13:17:53Z

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

AndroidBob · 2023-08-03T14:19:34Z

Build 890 succeeded.

The build produced the following APK's:

com.wire.android-v4.4.0(7210336)(7210336)-staging-compat.apk

app/src/main/kotlin/com/wire/android/ui/WireActivity.kt

app/src/main/kotlin/com/wire/android/ui/joinConversation/JoinConversationViaDeepLinkDialog.kt

github-actions · 2023-08-04T10:47:16Z

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

MohamadJaara added 5 commits August 2, 2023 12:45

kalium

9a162c8

feat: display password text box when the link is password protected

0a7308a

unit test

3830475

typo

2f49d09

add loading state

b8ecc70

pull-request-size bot added the size/XL label Aug 3, 2023

github-actions bot assigned MohamadJaara Aug 3, 2023

MohamadJaara requested review from borichellow, vitorhugods, trOnk12, saleniuk, a team and mchenani and removed request for a team August 3, 2023 07:51

borichellow approved these changes Aug 3, 2023

View reviewed changes

MohamadJaara added 2 commits August 3, 2023 10:47

rename Joined state to success

913655c

detekt

3a782b2

MohamadJaara added 3 commits August 3, 2023 11:54

handle merge issues with nav refactor

5cbdee2

Merge remote-tracking branch 'origin/develop' into feat/guest-link-wi…

d8212d9

…th-password

kalium

90cacb3

MohamadJaara added 3 commits August 3, 2023 14:46

trigger CI

c22c012

checkout develop

3e3066e

Merge remote-tracking branch 'origin/develop' into feat/guest-link-wi…

1b9c4de

…th-password

MohamadJaara changed the title ~~feat: support joining conversation with password protected code [WPB-1531]~~ feat: support joining conversation with password protected code (WPB-1531) Aug 3, 2023

trigger CI

688167f

MohamadJaara changed the title ~~feat: support joining conversation with password protected code (WPB-1531)~~ feat: support joining conversation with password protected code [WPB-1531] Aug 3, 2023

MohamadJaara requested a review from alexandreferris August 3, 2023 12:55

MohamadJaara enabled auto-merge August 3, 2023 13:43

saleniuk reviewed Aug 3, 2023

View reviewed changes

app/src/main/kotlin/com/wire/android/ui/WireActivity.kt Show resolved Hide resolved

app/src/main/kotlin/com/wire/android/ui/joinConversation/JoinConversationViaDeepLinkDialog.kt Outdated Show resolved Hide resolved

tmspzz and others added 2 commits August 4, 2023 13:04

Merge branch 'develop' into feat/guest-link-with-password

0832072

address PR comments

7c358db

saleniuk approved these changes Aug 4, 2023

View reviewed changes

detekt

a01ece2

MohamadJaara added this pull request to the merge queue Aug 4, 2023

Merged via the queue into develop with commit 37bbf63 Aug 4, 2023
13 of 14 checks passed

MohamadJaara deleted the feat/guest-link-with-password branch August 4, 2023 10:57

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: support joining conversation with password protected code [WPB-1531] #2049

feat: support joining conversation with password protected code [WPB-1531] #2049

MohamadJaara commented Aug 3, 2023

github-actions bot commented Aug 3, 2023 •

edited

borichellow left a comment

borichellow Aug 3, 2023

MohamadJaara Aug 3, 2023

AndroidBob commented Aug 3, 2023

AndroidBob commented Aug 3, 2023

AndroidBob commented Aug 3, 2023

codecov bot commented Aug 3, 2023 •

edited

github-actions bot commented Aug 3, 2023

AndroidBob commented Aug 3, 2023

github-actions bot commented Aug 4, 2023

feat: support joining conversation with password protected code [WPB-1531] #2049

feat: support joining conversation with password protected code [WPB-1531] #2049

Conversation

MohamadJaara commented Aug 3, 2023

PR Submission Checklist for internal contributors

What's new in this PR?

Issues

Solutions

Dependencies (Optional)

Testing

Test Coverage (Optional)

How to Test

Notes (Optional)

Attachments (Optional)

PR Post Submission Checklist for internal contributors (Optional)

PR Post Merge Checklist for internal contributors

References

github-actions bot commented Aug 3, 2023 • edited

Test Results

borichellow left a comment

Choose a reason for hiding this comment

borichellow Aug 3, 2023

Choose a reason for hiding this comment

MohamadJaara Aug 3, 2023

Choose a reason for hiding this comment

AndroidBob commented Aug 3, 2023

AndroidBob commented Aug 3, 2023

AndroidBob commented Aug 3, 2023

codecov bot commented Aug 3, 2023 • edited

Codecov Report

github-actions bot commented Aug 3, 2023

AndroidBob commented Aug 3, 2023

github-actions bot commented Aug 4, 2023

github-actions bot commented Aug 3, 2023 •

edited

codecov bot commented Aug 3, 2023 •

edited