feat: screenshot censoring [WPB-2880] #1950

saleniuk · 2023-07-14T13:54: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?

Issues

We need to restrict team members from taking screenshots of the app when self deleting messages are enforced in team settings.

Solutions

Implement blocking content when making screenshots or screen recording when the team self-deleting setting is enforced. Also, provide a switch in the privacy settings for the user to enable it manually.

Dependencies (Optional)

Needs releases with:

feat: screenshot censoring [WPB-2880] kalium#1887

Testing

How to Test

Enforce team self-deleting setting or enable screenshot censoring in the privacy settings and make a screenshot.

Attachments (Optional)

censor.screenshots.mov

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.

…nsoring # Conflicts: # kalium

github-actions · 2023-07-14T13:58:25Z

Test Results

500 tests 499 ✔️ 21s ⏱️
  73 suites     1 💤
  73 files     0 ❌

Results for commit 044cb2e.

♻️ This comment has been updated with latest results.

AndroidBob · 2023-07-14T14:15:00Z

Build 448 failed.

codecov · 2023-07-14T14:44:03Z

Codecov Report

Merging #1950 (9f1fa6e) into develop (0c375a7) will increase coverage by 1.70%.
The diff coverage is 37.50%.

❗ Current head 9f1fa6e differs from pull request most recent head 044cb2e. Consider uploading reports for the commit 044cb2e to get more accurate results

@@              Coverage Diff              @@
##             develop    #1950      +/-   ##
=============================================
+ Coverage      36.56%   38.26%   +1.70%     
- Complexity       847      886      +39     
=============================================
  Files            287      287              
  Lines          11299    11334      +35     
  Branches        1449     1452       +3     
=============================================
+ Hits            4131     4337     +206     
+ Misses          6760     6568     -192     
- Partials         408      429      +21

Impacted Files	Coverage Δ
...rc/main/kotlin/com/wire/android/ui/WireActivity.kt	`0.00% <0.00%> (ø)`
...d/ui/home/settings/privacy/PrivacySettingsState.kt	`0.00% <0.00%> (ø)`
.../home/settings/privacy/PrivacySettingsViewModel.kt	`0.00% <0.00%> (ø)`
...otlin/com/wire/android/ui/WireActivityViewModel.kt	`69.25% <100.00%> (+69.25%)`	⬆️
...me/conversations/info/ConversationInfoViewModel.kt	`65.97% <100.00%> (+0.71%)`	⬆️
...me/conversations/info/ConversationInfoViewState.kt	`100.00% <100.00%> (ø)`

... and 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 d461832...044cb2e. Read the comment docs.

github-actions · 2023-07-14T14:49:14Z

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

github-actions · 2023-07-14T14:49:32Z

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

AndroidBob · 2023-07-14T14:59:40Z

Build 450 succeeded.

The build produced the following APK's:

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

AndroidBob · 2023-07-14T15:03:53Z

Build 450 failed.

vitorhugods

Incredible 👨🏻‍🍳🤌🏻

Really awesome. Just one tiny tiny tiny thing.

app/src/main/kotlin/com/wire/android/ui/home/settings/privacy/PrivacySettingsViewModel.kt

github-actions · 2023-07-14T16:20:05Z

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

github-actions · 2023-07-14T16:22:54Z

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

AndroidBob · 2023-07-14T16:31:04Z

Build 451 succeeded.

The build produced the following APK's:

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

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

AndroidBob · 2023-07-17T15:49:37Z

Build 459 failed.

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

github-actions · 2023-07-17T16:26:18Z

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

github-actions · 2023-07-17T16:27:01Z

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

AndroidBob · 2023-07-17T16:36:32Z

Build 461 succeeded.

The build produced the following APK's:

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

app/src/main/kotlin/com/wire/android/di/ObserveScreenshotCensoringConfigUseCaseProvider.kt

github-actions · 2023-07-17T17:06:57Z

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

github-actions · 2023-07-17T17:07:35Z

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

AndroidBob · 2023-07-17T17:18:30Z

Build 462 succeeded.

The build produced the following APK's:

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

…nsoring # Conflicts: # kalium

github-actions · 2023-07-18T12:19:34Z

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

github-actions · 2023-07-18T12:19:40Z

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

AndroidBob · 2023-07-18T12:35:00Z

Build 470 succeeded.

The build produced the following APK's:

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

…nsoring

github-actions · 2023-07-18T15:37:48Z

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

github-actions · 2023-07-18T15:38:44Z

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

AndroidBob · 2023-07-18T15:53:09Z

Build 488 succeeded.

The build produced the following APK's:

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

saleniuk added 3 commits July 14, 2023 15:48

feat: screenshot censoring [WPB-2880]

55b7756

Merge remote-tracking branch 'origin/develop' into feat/screenshot_ce…

94474f8

…nsoring # Conflicts: # kalium

change kalium ref

8eead35

pull-request-size bot added the size/L label Jul 14, 2023

github-actions bot assigned saleniuk Jul 14, 2023

detekt

d6ac5a8

saleniuk added 2 commits July 14, 2023 16:24

add tests

b5603ca

detekt

ce915e0

saleniuk requested review from a team, typfel, alexandreferris, vitorhugods, mchenani and trOnk12 and removed request for a team July 14, 2023 14:52

vitorhugods approved these changes Jul 14, 2023

View reviewed changes

app/src/main/kotlin/com/wire/android/ui/home/settings/privacy/PrivacySettingsViewModel.kt Outdated Show resolved Hide resolved

change after review

1f20426

MohamadJaara reviewed Jul 15, 2023

View reviewed changes

app/src/main/kotlin/com/wire/android/ui/home/conversations/ConversationScreen.kt Outdated Show resolved Hide resolved

saleniuk requested a review from MohamadJaara July 17, 2023 14:45

move screenshot censoring to the WireActivity

771ed2f

saleniuk added 2 commits July 17, 2023 18:04

move and fix tests

8a4f29a

detekt

1a66d4b

MohamadJaara requested changes Jul 17, 2023

View reviewed changes

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

MohamadJaara mentioned this pull request Jul 17, 2023

feat: screenshot censoring [WPB-2880] wireapp/kalium#1887

Merged

7 tasks

observe current session changes

5b81aae

saleniuk requested a review from MohamadJaara July 17, 2023 16:50

MohamadJaara reviewed Jul 17, 2023

View reviewed changes

app/src/main/kotlin/com/wire/android/di/ObserveScreenshotCensoringConfigUseCaseProvider.kt Show resolved Hide resolved

saleniuk requested a review from MohamadJaara July 17, 2023 17:14

MohamadJaara approved these changes Jul 17, 2023

View reviewed changes

Merge remote-tracking branch 'origin/develop' into feat/screenshot_ce…

9f1fa6e

…nsoring # Conflicts: # kalium

saleniuk added 2 commits July 18, 2023 17:00

Merge remote-tracking branch 'origin/develop' into feat/screenshot_ce…

8bdb50a

…nsoring

Merge remote-tracking branch 'origin/develop' into feat/screenshot_ce…

044cb2e

…nsoring

saleniuk added this pull request to the merge queue Jul 18, 2023

Merged via the queue into develop with commit a44c67b Jul 18, 2023

saleniuk deleted the feat/screenshot_censoring branch July 18, 2023 16:49

echoes-hq bot added the echoes: product-roadmap Work aligned with the customer-announced roadmap, targeting a specific release date. label Aug 14, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: screenshot censoring [WPB-2880] #1950

feat: screenshot censoring [WPB-2880] #1950

saleniuk commented Jul 14, 2023

github-actions bot commented Jul 14, 2023 •

edited

Loading

AndroidBob commented Jul 14, 2023

codecov bot commented Jul 14, 2023 •

edited

Loading

github-actions bot commented Jul 14, 2023

github-actions bot commented Jul 14, 2023

AndroidBob commented Jul 14, 2023

AndroidBob commented Jul 14, 2023

vitorhugods left a comment

github-actions bot commented Jul 14, 2023

github-actions bot commented Jul 14, 2023

AndroidBob commented Jul 14, 2023

AndroidBob commented Jul 17, 2023

github-actions bot commented Jul 17, 2023

github-actions bot commented Jul 17, 2023

AndroidBob commented Jul 17, 2023

github-actions bot commented Jul 17, 2023

github-actions bot commented Jul 17, 2023

AndroidBob commented Jul 17, 2023

github-actions bot commented Jul 18, 2023

github-actions bot commented Jul 18, 2023

AndroidBob commented Jul 18, 2023

github-actions bot commented Jul 18, 2023

github-actions bot commented Jul 18, 2023

AndroidBob commented Jul 18, 2023

feat: screenshot censoring [WPB-2880] #1950

feat: screenshot censoring [WPB-2880] #1950

Conversation

saleniuk commented Jul 14, 2023

PR Submission Checklist for internal contributors

What's new in this PR?

Issues

Solutions

Dependencies (Optional)

Testing

How to Test

Attachments (Optional)

PR Post Submission Checklist for internal contributors (Optional)

PR Post Merge Checklist for internal contributors

References

github-actions bot commented Jul 14, 2023 • edited Loading

Test Results

AndroidBob commented Jul 14, 2023

codecov bot commented Jul 14, 2023 • edited Loading

Codecov Report

github-actions bot commented Jul 14, 2023

github-actions bot commented Jul 14, 2023

AndroidBob commented Jul 14, 2023

AndroidBob commented Jul 14, 2023

vitorhugods left a comment

Choose a reason for hiding this comment

github-actions bot commented Jul 14, 2023

github-actions bot commented Jul 14, 2023

AndroidBob commented Jul 14, 2023

AndroidBob commented Jul 17, 2023

github-actions bot commented Jul 17, 2023

github-actions bot commented Jul 17, 2023

AndroidBob commented Jul 17, 2023

github-actions bot commented Jul 17, 2023

github-actions bot commented Jul 17, 2023

AndroidBob commented Jul 17, 2023

github-actions bot commented Jul 18, 2023

github-actions bot commented Jul 18, 2023

AndroidBob commented Jul 18, 2023

github-actions bot commented Jul 18, 2023

github-actions bot commented Jul 18, 2023

AndroidBob commented Jul 18, 2023

github-actions bot commented Jul 14, 2023 •

edited

Loading

codecov bot commented Jul 14, 2023 •

edited

Loading