feat: federation stopped system messages [WPB-1815] #2040

Garzas · 2023-08-02T06:36:56Z

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?

users removed system message for federation stopped
federation stopped system messages

Attachments (Optional)

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

Before	After

github-actions · 2023-08-02T06:37:31Z

@Garzas looks like you are rolling back kalium to a previous commitish.

This means that the PR's target branch (develop) is using a newer version of Kalium, and the changes in this PR will rollback Kalium to an older version.

develop	This PR
67514c7ec1394fbb477c9c3fb92600838f2642a5	a269dd393d8f86ae627c9fe9a1846c09e289622f

Is this intentional?

github-actions · 2023-08-02T06:40:16Z

Test Results

546 tests +5 545 ✔️ +5 6m 50s ⏱️ + 1m 46s
  80 suites ±0     1 💤 ±0
  80 files ±0     0 ❌ ±0

Results for commit e8c80fa. ± Comparison against base commit 34ca0ab.

♻️ This comment has been updated with latest results.

github-actions · 2023-08-02T06:45:30Z

@Garzas looks like you are rolling back kalium to a previous commitish.

This means that the PR's target branch (develop) is using a newer version of Kalium, and the changes in this PR will rollback Kalium to an older version.

develop	This PR
67514c7ec1394fbb477c9c3fb92600838f2642a5	a269dd393d8f86ae627c9fe9a1846c09e289622f

Is this intentional?

AndroidBob · 2023-08-02T06:57:15Z

Build 819 failed.

github-actions · 2023-08-02T07:17:12Z

@Garzas looks like you are rolling back kalium to a previous commitish.

This means that the PR's target branch (develop) is using a newer version of Kalium, and the changes in this PR will rollback Kalium to an older version.

develop	This PR
67514c7ec1394fbb477c9c3fb92600838f2642a5	43504d88c947bd196a3642155f633c2c14755a1d

Is this intentional?

AndroidBob · 2023-08-02T07:29:01Z

Build 820 failed.

ohassine · 2023-08-02T09:08:10Z

app/src/main/kotlin/com/wire/android/mapper/MessagePreviewContentMapper.kt

+        is MessagePreviewContent.FederatedMembersRemoved -> {
+            val membersRemovedContent = (content as MessagePreviewContent.FederatedMembersRemoved)
+            val isSelfRemoved = membersRemovedContent.isSelfUserRemoved
+            val otherUsersSize = membersRemovedContent.otherUserIdList.size
+
+            val previewMessageContent = when {
+                isSelfMessage && otherUsersSize > 0 -> {
+                    UIText.PluralResource(R.plurals.last_message_self_removed_users, otherUsersSize, otherUsersSize)
+                }
+
+                !isSelfMessage && isSelfRemoved -> {
+                    if (otherUsersSize == 0) {
+                        UIText.StringResource(R.string.last_message_other_removed_only_self_user)
+                    } else {
+                        UIText.PluralResource(
+                            R.plurals.last_message_other_removed_self_user_and_others,
+                            otherUsersSize,
+                            otherUsersSize
+                        )
+                    }
+                }
+
+                else -> {
+                    UIText.PluralResource(R.plurals.last_message_other_removed_other_users, otherUsersSize, otherUsersSize)
+                }
+            }
+
+            UILastMessageContent.TextMessage(MessageBody(previewMessageContent))
+        }
+


Can you cover this section with test ?

Sure, I didn't start writing any test until kalium PR will be approved: wireapp/kalium#1930

github-actions · 2023-08-02T11:05:42Z

@Garzas looks like you are rolling back kalium to a previous commitish.

This means that the PR's target branch (develop) is using a newer version of Kalium, and the changes in this PR will rollback Kalium to an older version.

develop	This PR
67514c7ec1394fbb477c9c3fb92600838f2642a5	cb7159437ccb25bfd10468d0de057e33add85150

Is this intentional?

codecov · 2023-08-02T11:16:08Z

Codecov Report

Merging #2040 (e8c80fa) into develop (34ca0ab) will increase coverage by 0.70%.
The diff coverage is 74.28%.

@@              Coverage Diff              @@
##             develop    #2040      +/-   ##
=============================================
+ Coverage      39.63%   40.34%   +0.70%     
- Complexity       939      953      +14     
=============================================
  Files            305      305              
  Lines          11269    11297      +28     
  Branches        1506     1512       +6     
=============================================
+ Hits            4467     4558      +91     
+ Misses          6373     6302      -71     
- Partials         429      437       +8

Files Changed	Coverage Δ
...tlin/com/wire/android/migration/MigrationMapper.kt	`0.00% <0.00%> (ø)`
...lin/com/wire/android/mapper/UIParticipantMapper.kt	`36.36% <16.66%> (-2.67%)`	⬇️
...e/android/ui/home/conversations/model/UIMessage.kt	`57.98% <88.23%> (+13.65%)`	⬆️
.../wire/android/mapper/SystemMessageContentMapper.kt	`67.76% <100.00%> (+31.80%)`	⬆️
...ations/details/participants/model/UIParticipant.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 34ca0ab...e8c80fa. Read the comment docs.

github-actions · 2023-08-02T11:23:29Z

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

AndroidBob · 2023-08-08T10:54:54Z

Build 952 succeeded.

The build produced the following APK's:

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

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

yamilmedina

I left a comment, about the localization of the link :D

Co-authored-by: Yamil Medina <yamilmedina@users.noreply.github.com>

AndroidBob · 2023-08-08T14:54:44Z

Build 965 succeeded.

The build produced the following APK's:

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

github-actions · 2023-08-08T15:45:15Z

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

…wire-android-reloaded into feat/federation-system-messages

AndroidBob · 2023-08-10T11:34:42Z

Build 1009 succeeded.

The build produced the following APK's:

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

github-actions · 2023-08-10T13:29:45Z

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

AndroidBob · 2023-08-10T13:40:15Z

Build 1010 succeeded.

The build produced the following APK's:

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

github-actions · 2023-08-16T06:21:24Z

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

AndroidBob · 2023-08-16T06:37:50Z

Build 1120 succeeded.

The build produced the following APK's:

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

AndroidBob · 2023-08-16T07:50:21Z

Build 1121 failed.

github-actions · 2023-08-16T08:23:55Z

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

AndroidBob · 2023-08-16T08:39:30Z

Build 1124 succeeded.

The build produced the following APK's:

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

Garzas added 12 commits July 12, 2023 11:59

feat: federation system messages

86ed786

Merge branch 'develop' into feat/federation-system-messages

c20da47

feat: show federation system message

aca0c04

Merge branch 'develop' into feat/federation-system-messages

5ac61b3

disable MLS

c212b30

Merge branch 'develop' into feat/federation-system-messages

88ea5f4

fix: button null pointer exception

fcd66bb

Merge branch 'develop' into feat/federation-system-messages

7e001bf

kalium update

65abbbd

Merge branch 'develop' into feat/federation-system-messages

432837e

kalium update

3bc7474

added previews

f4a0f87

Garzas requested review from yamilmedina, alexandreferris and borichellow August 2, 2023 06:36

Garzas self-assigned this Aug 2, 2023

pull-request-size bot added the size/L label Aug 2, 2023

detekt fix

1342fe8

test fix

72f3c6f

ohassine reviewed Aug 2, 2023

View reviewed changes

kalium update

4a70cf4

yamilmedina reviewed Aug 8, 2023

View reviewed changes

app/src/main/res/values/strings.xml Outdated Show resolved Hide resolved

yamilmedina reviewed Aug 8, 2023

View reviewed changes

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

a1d06dd

Co-authored-by: Yamil Medina <yamilmedina@users.noreply.github.com>

yamilmedina changed the title ~~feat: federation system messages [WPB-1815]~~ feat: federation stopped system messages [WPB-1815] Aug 8, 2023

Garzas added 2 commits August 10, 2023 12:55

kalium update

34f1927

Merge branch 'feat/federation-system-messages' of github.com:wireapp/…

c6af39e

…wire-android-reloaded into feat/federation-system-messages

Garzas added 2 commits August 10, 2023 13:46

kalium update

97cb0b2

Merge branch 'develop' into feat/federation-system-messages

2daa103

Merge branch 'develop' into feat/federation-system-messages

40c3ed5

kalium update

8f760dd

Garzas enabled auto-merge August 16, 2023 07:25

Garzas added 2 commits August 16, 2023 09:57

temporary ignored test

340123a

enabled mls support

e8c80fa

Garzas added this pull request to the merge queue Aug 16, 2023

github-merge-queue bot removed this pull request from the merge queue due to failed status checks Aug 16, 2023

Garzas added this pull request to the merge queue Aug 16, 2023

Merged via the queue into develop with commit 1138c26 Aug 16, 2023
14 checks passed

Garzas deleted the feat/federation-system-messages branch August 16, 2023 08:55

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: federation stopped system messages [WPB-1815] #2040

feat: federation stopped system messages [WPB-1815] #2040

Garzas commented Aug 2, 2023 •

edited

github-actions bot commented Aug 2, 2023

github-actions bot commented Aug 2, 2023 •

edited

github-actions bot commented Aug 2, 2023

AndroidBob commented Aug 2, 2023

github-actions bot commented Aug 2, 2023

AndroidBob commented Aug 2, 2023

ohassine Aug 2, 2023

Garzas Aug 2, 2023

github-actions bot commented Aug 2, 2023

codecov bot commented Aug 2, 2023 •

edited

github-actions bot commented Aug 2, 2023

AndroidBob commented Aug 8, 2023

yamilmedina left a comment

AndroidBob commented Aug 8, 2023

github-actions bot commented Aug 8, 2023

AndroidBob commented Aug 10, 2023

github-actions bot commented Aug 10, 2023

AndroidBob commented Aug 10, 2023

github-actions bot commented Aug 16, 2023

AndroidBob commented Aug 16, 2023

AndroidBob commented Aug 16, 2023

github-actions bot commented Aug 16, 2023

AndroidBob commented Aug 16, 2023

feat: federation stopped system messages [WPB-1815] #2040

feat: federation stopped system messages [WPB-1815] #2040

Conversation

Garzas commented Aug 2, 2023 • edited

PR Submission Checklist for internal contributors

What's new in this PR?

Attachments (Optional)

github-actions bot commented Aug 2, 2023

github-actions bot commented Aug 2, 2023 • edited

Test Results

github-actions bot commented Aug 2, 2023

AndroidBob commented Aug 2, 2023

github-actions bot commented Aug 2, 2023

AndroidBob commented Aug 2, 2023

ohassine Aug 2, 2023

Choose a reason for hiding this comment

Garzas Aug 2, 2023

Choose a reason for hiding this comment

github-actions bot commented Aug 2, 2023

codecov bot commented Aug 2, 2023 • edited

Codecov Report

github-actions bot commented Aug 2, 2023

AndroidBob commented Aug 8, 2023

yamilmedina left a comment

Choose a reason for hiding this comment

AndroidBob commented Aug 8, 2023

github-actions bot commented Aug 8, 2023

AndroidBob commented Aug 10, 2023

github-actions bot commented Aug 10, 2023

AndroidBob commented Aug 10, 2023

github-actions bot commented Aug 16, 2023

AndroidBob commented Aug 16, 2023

AndroidBob commented Aug 16, 2023

github-actions bot commented Aug 16, 2023

AndroidBob commented Aug 16, 2023

Garzas commented Aug 2, 2023 •

edited

github-actions bot commented Aug 2, 2023 •

edited

codecov bot commented Aug 2, 2023 •

edited