feat: mls epic #1953

typfel · 2023-07-18T08:52:40Z

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?

Build from MLS epic for migration and 1-1 support.

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.

github-actions · 2023-07-18T08:56:12Z

Test Results

647 tests +2 647 ✔️ +2 6m 42s ⏱️ - 2m 7s
  94 suites +1     0 💤 ±0
  94 files +1     0 ❌ ±0

Results for commit 87bc79f. ± Comparison against base commit 04c06e3.

♻️ This comment has been updated with latest results.

AndroidBob · 2023-07-18T09:06:35Z

Build 463 failed.

AndroidBob · 2023-07-18T13:48:23Z

Build 474 failed.

borichellow

Nice one!
Just a small comments

borichellow · 2023-07-19T12:29:17Z

app/src/main/kotlin/com/wire/android/ui/home/conversations/model/UIMessage.kt

+            R.string.label_system_message_conversation_history_lost,
+            true)
+
+        class HistoryLostProtocolChanged: SystemMessage(


HistoryLostProtocolChanged and HistoryLost could be just object not class

Thanks for the review! I'm mainly trying to produce a build for Antje here, I'll open real PR later when this is ready to be merged.

borichellow · 2023-07-19T12:32:15Z

app/src/main/res/values/strings.xml

@@ -567,6 +567,10 @@
    <string name="label_system_message_deactivated">deactivated</string>
    <string name="label_system_message_conversation_history_lost">You haven\'t used this device for a while. some messages may not appear here.</string>
    <string name="label_system_message_conversation_mls_wrong_epoch_error_handled">The MLS group key was updated without our knowledge. This could happen due to lost messages between backends, or a bug. We have automatically rejoined the conversation, but you may have lost messages.</string>
+    <string name="label_system_message_conversation_history_lost_protocol_changed">You didn\'t update your app in time. some messages may not appear here.</string>
+    <string name="label_system_message_conversation_protocol_changed_proteus">Migration of encryption protocol was canceled.</string>
+    <string name="label_system_message_conversation_protocol_changed_mixed">Migration of encryption protocol has started. Make sure you all your Wire clients are updated.</string>


Migration of encryption protocol has started. Make sure all your Wire clients are updated.

app/src/main/res/values/strings.xml

AndroidBob · 2023-07-20T10:08:59Z

Build 556 failed.

codecov · 2023-07-20T10:56:50Z

Codecov Report

Merging #1953 (87bc79f) into develop (d3d6bf7) will increase coverage by 0.06%.
Report is 2 commits behind head on develop.
The diff coverage is 60.19%.

@@              Coverage Diff              @@
##             develop    #1953      +/-   ##
=============================================
+ Coverage      41.27%   41.34%   +0.06%     
- Complexity      1051     1055       +4     
=============================================
  Files            328      329       +1     
  Lines          11924    11990      +66     
  Branches        1589     1592       +3     
=============================================
+ Hits            4922     4957      +35     
- Misses          6533     6559      +26     
- Partials         469      474       +5

Files	Coverage Δ
...ire/android/feature/ObserveAppLockConfigUseCase.kt	`90.00% <100.00%> (ø)`
...onversations/banner/ConversationBannerViewModel.kt	`55.81% <ø> (ø)`
...participants/GroupConversationParticipantsState.kt	`95.65% <100.00%> (+4.74%)`	⬆️
...participants/model/ConversationParticipantsData.kt	`100.00% <100.00%> (ø)`
...ations/details/participants/model/UIParticipant.kt	`100.00% <100.00%> (ø)`
...rc/main/kotlin/com/wire/android/ui/WireActivity.kt	`0.00% <0.00%> (ø)`
...ations/migration/ConversationMigrationViewModel.kt	`95.23% <95.23%> (ø)`
...tlin/com/wire/android/datastore/GlobalDataStore.kt	`11.29% <0.00%> (-1.21%)`	⬇️
...ire/android/ui/home/appLock/LockCodeTimeManager.kt	`89.28% <90.90%> (-6.87%)`	⬇️
...tlin/com/wire/android/migration/MigrationMapper.kt	`0.00% <0.00%> (ø)`
... and 4 more

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 04c06e3...87bc79f. Read the comment docs.

github-actions · 2023-07-20T11:01:35Z

Build (dev-debug) available here. Scroll down to Artifacts!

github-actions · 2023-07-20T11:02:40Z

Build (beta-debug) available here. Scroll down to Artifacts!

AndroidBob · 2023-07-20T11:13:25Z

Build 564 succeeded.

The build produced the following APK's:

com.wire.android-v4.3.0(7088341)(7088341)-staging-compat.apk

github-actions · 2023-07-20T13:27:44Z

Build (dev-debug) available here. Scroll down to Artifacts!

github-actions · 2023-07-20T13:28:04Z

Build (beta-debug) available here. Scroll down to Artifacts!

AndroidBob · 2023-07-20T13:37:56Z

Build 572 succeeded.

The build produced the following APK's:

com.wire.android-v4.3.0(7089214)(7089214)-staging-compat.apk

AndroidBob · 2023-08-15T15:53:59Z

Build 1113 failed.

AndroidBob · 2023-08-15T16:07:41Z

Build 1114 failed.

AndroidBob · 2023-08-16T08:21:18Z

Build 1123 failed.

github-actions · 2023-08-16T12:49:41Z

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

AndroidBob · 2023-08-16T13:05:13Z

Build 1133 succeeded.

The build produced the following APK's:

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

AndroidBob · 2023-10-11T22:02:23Z

Build 1248 succeeded.

The build produced the following APK's:

com.wire.android-v4.5.0(7809271)(7809271)-staging-compat.apk

AndroidBob · 2023-10-12T20:18:54Z

Build 1283 failed.

AndroidBob · 2023-10-13T06:35:52Z

Build 1284 succeeded.

The build produced the following APK's:

com.wire.android-v4.5.0(7821001)(7821001)-staging-compat.apk

AndroidBob · 2023-10-15T23:00:40Z

Build 1307 succeeded.

The build produced the following APK's:

com.wire.android-v4.5.0(7844174)(7844174)-staging-compat.apk

Co-authored-by: Vitor Hugo Schwaab <vitor@schwaab.dev>

github-actions · 2023-10-15T23:34:14Z

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

AndroidBob · 2023-10-15T23:54:46Z

Build 1308 succeeded.

The build produced the following APK's:

com.wire.android-v4.5.0(7844489)(7844489)-staging-compat.apk

pull-request-size bot added the size/M label Jul 18, 2023

github-actions bot assigned typfel Jul 18, 2023

typfel added the DO NOT MERGE label Jul 18, 2023

typfel force-pushed the feat/migration-system-messages branch from f7cdd0d to 6070ca2 Compare July 18, 2023 13:31

borichellow approved these changes Jul 19, 2023

View reviewed changes

typfel force-pushed the feat/migration-system-messages branch from 6070ca2 to 95c6388 Compare July 20, 2023 09:55

pull-request-size bot added size/L and removed size/M labels Jul 20, 2023

typfel force-pushed the feat/migration-system-messages branch from d842f2a to 48a2ed1 Compare July 20, 2023 13:11

saleniuk approved these changes Jul 27, 2023

View reviewed changes

typfel force-pushed the feat/migration-system-messages branch from 48a2ed1 to d6ce123 Compare August 15, 2023 15:40

typfel force-pushed the feat/migration-system-messages branch from d6ce123 to a293d31 Compare August 15, 2023 15:54

typfel force-pushed the feat/migration-system-messages branch from a293d31 to d790ed6 Compare August 16, 2023 07:55

typfel force-pushed the feat/migration-system-messages branch from d790ed6 to 7e3aba8 Compare August 16, 2023 12:26

pull-request-size bot added size/XL and removed size/L labels Oct 12, 2023

typfel force-pushed the feat/migration-system-messages branch from 36b5ef6 to 70e290c Compare October 12, 2023 20:10

pull-request-size bot added size/L and removed size/XL labels Oct 12, 2023

typfel force-pushed the feat/migration-system-messages branch from 70e290c to ab07f48 Compare October 13, 2023 05:55

pull-request-size bot added size/XL and removed size/L labels Oct 15, 2023

typfel added 5 commits October 16, 2023 00:54

feat: migration system messages

f7940d1

fix: tests not compiling

085877c

refactor: turn class into object

be9062f

chore: fix capitalisation

4c366b2

chore: fix detekt

a7b26c5

Garzas and others added 4 commits October 16, 2023 01:07

feat(debug): migration progress [WPB-3523] (#2128)

4fa70c1

feat(debug): add debug option for disabling event processing (#2277)

3e44758

fix: mixed conversation are effectively proteus

73def3a

feat(mls): navigate to migrated conversation [WPB-4705] (#2327)

87bc79f

Co-authored-by: Vitor Hugo Schwaab <vitor@schwaab.dev>

typfel force-pushed the feat/migration-system-messages branch from 5043e6a to 87bc79f Compare October 15, 2023 23:09

typfel changed the title ~~build: mls migration~~ feat: mls epic Oct 15, 2023

typfel enabled auto-merge October 15, 2023 23:12

typfel added this pull request to the merge queue Oct 15, 2023

Merged via the queue into develop with commit 43b3f91 Oct 15, 2023
18 of 19 checks passed

typfel deleted the feat/migration-system-messages branch October 15, 2023 23:45

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: mls epic #1953

feat: mls epic #1953

typfel commented Jul 18, 2023 •

edited

github-actions bot commented Jul 18, 2023 •

edited

AndroidBob commented Jul 18, 2023

AndroidBob commented Jul 18, 2023

borichellow left a comment

borichellow Jul 19, 2023

typfel Jul 20, 2023

borichellow Jul 19, 2023

AndroidBob commented Jul 20, 2023

codecov bot commented Jul 20, 2023 •

edited

github-actions bot commented Jul 20, 2023

github-actions bot commented Jul 20, 2023

AndroidBob commented Jul 20, 2023

github-actions bot commented Jul 20, 2023

github-actions bot commented Jul 20, 2023

AndroidBob commented Jul 20, 2023

AndroidBob commented Aug 15, 2023

AndroidBob commented Aug 15, 2023

AndroidBob commented Aug 16, 2023

github-actions bot commented Aug 16, 2023

AndroidBob commented Aug 16, 2023

AndroidBob commented Oct 11, 2023

AndroidBob commented Oct 12, 2023

AndroidBob commented Oct 13, 2023

AndroidBob commented Oct 15, 2023

github-actions bot commented Oct 15, 2023

AndroidBob commented Oct 15, 2023

feat: mls epic #1953

feat: mls epic #1953

Conversation

typfel commented Jul 18, 2023 • edited

PR Submission Checklist for internal contributors

What's new in this PR?

PR Post Submission Checklist for internal contributors (Optional)

PR Post Merge Checklist for internal contributors

References

github-actions bot commented Jul 18, 2023 • edited

Test Results

AndroidBob commented Jul 18, 2023

AndroidBob commented Jul 18, 2023

borichellow left a comment

Choose a reason for hiding this comment

borichellow Jul 19, 2023

Choose a reason for hiding this comment

typfel Jul 20, 2023

Choose a reason for hiding this comment

borichellow Jul 19, 2023

Choose a reason for hiding this comment

AndroidBob commented Jul 20, 2023

codecov bot commented Jul 20, 2023 • edited

Codecov Report

github-actions bot commented Jul 20, 2023

github-actions bot commented Jul 20, 2023

AndroidBob commented Jul 20, 2023

github-actions bot commented Jul 20, 2023

github-actions bot commented Jul 20, 2023

AndroidBob commented Jul 20, 2023

AndroidBob commented Aug 15, 2023

AndroidBob commented Aug 15, 2023

AndroidBob commented Aug 16, 2023

github-actions bot commented Aug 16, 2023

AndroidBob commented Aug 16, 2023

AndroidBob commented Oct 11, 2023

AndroidBob commented Oct 12, 2023

AndroidBob commented Oct 13, 2023

AndroidBob commented Oct 15, 2023

github-actions bot commented Oct 15, 2023

AndroidBob commented Oct 15, 2023

typfel commented Jul 18, 2023 •

edited

github-actions bot commented Jul 18, 2023 •

edited

codecov bot commented Jul 20, 2023 •

edited