feat: Show team applock change dialog (WPB-4476) #2388

ohassine · 2023-11-01T15:09:42Z

WPB-4476 Enforcing App Lock Based on Team Settings

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?

Description

Display a dialog when team's app lock config has changed
Setup team applock when clicking on OK button in the dialog
Distinguish between user app lock and team app lock by storing them separtely

Dependencies (Optional)

needs to be merged after #2380 #2363

Needs releases with:

GitHub link to other pull request

Notes

Please review #2380 before this one as some changes from it are in this PR

Testing

Test Coverage (Optional)

I have added automated test to this contribution

Attachments (Optional)

screen-20231102-115801.mp4

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.

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

…ures

…_App_lock_is_on # Conflicts: # app/src/main/kotlin/com/wire/android/biomitric/BiometricPromptUtils.kt # app/src/main/kotlin/com/wire/android/ui/WireActivity.kt

…_App_lock_is_on

# Conflicts: # kalium

…_App_lock_is_on # Conflicts: # app/src/main/res/values/strings.xml

…ck_change_dialog # Conflicts: # app/src/test/kotlin/com/wire/android/ui/home/appLock/LockCodeTimeManagerTest.kt # kalium

AndroidBob · 2023-11-01T15:22:47Z

Build 1627 failed.

…change_dialog # Conflicts: # app/src/main/kotlin/com/wire/android/datastore/GlobalDataStore.kt # app/src/main/kotlin/com/wire/android/ui/WireActivity.kt

github-actions · 2023-11-02T07:59:31Z

Test Results

678 tests +4 678 ✔️ +4 9m 44s ⏱️ +24s
  98 suites ±0     0 💤 ±0
  98 files ±0     0 ❌ ±0

Results for commit 92296ee. ± Comparison against base commit 162eded.

♻️ This comment has been updated with latest results.

AndroidBob · 2023-11-02T08:06:18Z

Build 1628 failed.

AndroidBob · 2023-11-02T08:39:59Z

Build 1629 failed.

codecov · 2023-11-02T09:37:33Z

Codecov Report

Merging #2388 (a0c6e38) into develop (162eded) will decrease coverage by 0.09%.
The diff coverage is 27.81%.

❗ Current head a0c6e38 differs from pull request most recent head 92296ee. Consider uploading reports for the commit 92296ee to get more accurate results

@@              Coverage Diff              @@
##             develop    #2388      +/-   ##
=============================================
- Coverage      41.57%   41.49%   -0.09%     
- Complexity      1078     1080       +2     
=============================================
  Files            344      343       -1     
  Lines          12292    12368      +76     
  Branches        1615     1626      +11     
=============================================
+ Hits            5111     5132      +21     
- Misses          6699     6753      +54     
- Partials         482      483       +1

Files	Coverage Δ
...otlin/com/wire/android/ui/home/FeatureFlagState.kt	`100.00% <100.00%> (ø)`
...re/android/ui/home/appLock/SetLockCodeViewState.kt	`100.00% <100.00%> (ø)`
...ire/android/ui/home/appLock/LockCodeTimeManager.kt	`84.21% <75.00%> (-4.03%)`	⬇️
...main/kotlin/com/wire/android/ui/AppLockActivity.kt	`0.00% <0.00%> (ø)`
...rc/main/kotlin/com/wire/android/ui/WireActivity.kt	`0.00% <0.00%> (ø)`
...tlin/com/wire/android/datastore/GlobalDataStore.kt	`13.54% <18.60%> (+1.77%)`	⬆️
...d/ui/home/sync/FeatureFlagNotificationViewModel.kt	`61.64% <37.87%> (-6.59%)`	⬇️

... and 7 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 162eded...92296ee. Read the comment docs.

github-actions · 2023-11-02T09:43:27Z

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

AndroidBob · 2023-11-02T14:56:15Z

Build 1638 succeeded.

The build produced the following APK's:

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

AndroidBob · 2023-11-02T15:32:09Z

Build 1639 failed.

…change_dialog # Conflicts: # app/src/main/kotlin/com/wire/android/ui/home/appLock/SetLockCodeViewState.kt # app/src/test/kotlin/com/wire/android/feature/ObserveAppLockConfigUseCaseTest.kt # app/src/test/kotlin/com/wire/android/ui/home/appLock/LockCodeTimeManagerTest.kt # app/src/test/kotlin/com/wire/android/ui/home/appLock/SetLockScreenViewModelTest.kt

AndroidBob · 2023-11-02T16:40:54Z

Build 1644 succeeded.

The build produced the following APK's:

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

github-actions · 2023-11-02T18:55:02Z

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

app/src/main/kotlin/com/wire/android/datastore/GlobalDataStore.kt

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

github-actions · 2023-11-07T09:10:58Z

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

AndroidBob · 2023-11-07T09:31:29Z

Build 1664 succeeded.

The build produced the following APK's:

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

…change_dialog # Conflicts: # app/src/main/kotlin/com/wire/android/ui/AppLockActivity.kt # app/src/main/res/values/strings.xml # kalium

github-actions · 2023-11-07T10:18:55Z

@ohassine 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
76b3f9528612aa950f464b44ed347914ed837c92	6473f76f8410b9b9b12be8bc2e091b36b137b473

Is this intentional?

github-actions · 2023-11-07T10:58:04Z

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

AndroidBob · 2023-11-07T11:42:50Z

Build 1676 succeeded.

The build produced the following APK's:

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

ohassine added 18 commits October 19, 2023 13:04

fix: app crash when user fails to unlock app with fingerprint

37434b6

Merge remote-tracking branch 'origin/develop' into develop

96ac249

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

feat(appLock): adjust appLock to be handled correctly with other feat…

8f3e6eb

…ures

Merge remote-tracking branch 'origin/develop' into notifications_when…

f70de8d

…_App_lock_is_on # Conflicts: # app/src/main/kotlin/com/wire/android/biomitric/BiometricPromptUtils.kt # app/src/main/kotlin/com/wire/android/ui/WireActivity.kt

chore: detekt

198aa81

chore: kalium reference

8fd6940

Merge remote-tracking branch 'origin/develop' into notifications_when…

983f37a

…_App_lock_is_on

Merge branch 'develop' into notifications_when_App_lock_is_on

22e0127

feat: observe team app lock config

a1958dd

Merge remote-tracking branch 'origin/develop' into team_applock

ad673ca

# Conflicts: # kalium

chore: kalium reference

8c1e0a3

chore: pass timeout to app lock disabled status

9c1e823

chore: detekt :)

640de6d

feat: show team app lock change dialog

9012111

Merge remote-tracking branch 'origin/develop' into notifications_when…

581306a

…_App_lock_is_on # Conflicts: # app/src/main/res/values/strings.xml

chore: kalium reference

8173e85

Merge branch 'notifications_when_App_lock_is_on' into show_team_applo…

5c25ae3

…ck_change_dialog # Conflicts: # app/src/test/kotlin/com/wire/android/ui/home/appLock/LockCodeTimeManagerTest.kt # kalium

feat: show set app lock screen

acd4d3d

pull-request-size bot added the size/XXL label Nov 1, 2023

github-actions bot assigned ohassine Nov 1, 2023

Merge remote-tracking branch 'origin/develop' into show_team_applock_…

d00cf29

…change_dialog # Conflicts: # app/src/main/kotlin/com/wire/android/datastore/GlobalDataStore.kt # app/src/main/kotlin/com/wire/android/ui/WireActivity.kt

ohassine mentioned this pull request Nov 2, 2023

feat: detect team app lock change (WPB-4476) wireapp/kalium#2183

Merged

6 tasks

chore: detekt

1a77eda

chore: unit test

feef673

ohassine requested review from alexandreferris and vitorhugods November 2, 2023 14:52

ohassine added 2 commits November 2, 2023 16:20

feat: cleanup

d4ace4e

feat: detekt

ebc5f0f

ohassine added 2 commits November 2, 2023 16:52

feat: kalium reference

023b5ba

pull-request-size bot added size/L and removed size/XL labels Nov 2, 2023

alexandreferris approved these changes Nov 3, 2023

View reviewed changes

Garzas approved these changes Nov 6, 2023

View reviewed changes

saleniuk reviewed Nov 6, 2023

View reviewed changes

app/src/main/kotlin/com/wire/android/datastore/GlobalDataStore.kt Outdated Show resolved Hide resolved

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

chore: cleanup

a0c6e38

ohassine added 2 commits November 7, 2023 11:17

Merge remote-tracking branch 'origin/develop' into show_team_applock_…

b6d1bd5

…change_dialog # Conflicts: # app/src/main/kotlin/com/wire/android/ui/AppLockActivity.kt # app/src/main/res/values/strings.xml # kalium

chore: kalium reference

b4fd6a4

chore: kalium reference

92296ee

ohassine requested a review from saleniuk November 7, 2023 11:27

saleniuk approved these changes Nov 7, 2023

View reviewed changes

ohassine added this pull request to the merge queue Nov 8, 2023

Merged via the queue into develop with commit 1e614ca Nov 8, 2023
13 checks passed

ohassine deleted the show_team_applock_change_dialog branch November 8, 2023 09:43

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: Show team applock change dialog (WPB-4476) #2388

feat: Show team applock change dialog (WPB-4476) #2388

ohassine commented Nov 1, 2023 •

edited by github-actions bot

AndroidBob commented Nov 1, 2023

github-actions bot commented Nov 2, 2023 •

edited

AndroidBob commented Nov 2, 2023

AndroidBob commented Nov 2, 2023

codecov bot commented Nov 2, 2023 •

edited

github-actions bot commented Nov 2, 2023

AndroidBob commented Nov 2, 2023

AndroidBob commented Nov 2, 2023

AndroidBob commented Nov 2, 2023

github-actions bot commented Nov 2, 2023

github-actions bot commented Nov 7, 2023

AndroidBob commented Nov 7, 2023

github-actions bot commented Nov 7, 2023

github-actions bot commented Nov 7, 2023

AndroidBob commented Nov 7, 2023

feat: Show team applock change dialog (WPB-4476) #2388

feat: Show team applock change dialog (WPB-4476) #2388

Conversation

ohassine commented Nov 1, 2023 • edited by github-actions bot

PR Submission Checklist for internal contributors

What's new in this PR?

Description

Dependencies (Optional)

Notes

Testing

Test Coverage (Optional)

Attachments (Optional)

PR Post Submission Checklist for internal contributors (Optional)

PR Post Merge Checklist for internal contributors

References

AndroidBob commented Nov 1, 2023

github-actions bot commented Nov 2, 2023 • edited

Test Results

AndroidBob commented Nov 2, 2023

AndroidBob commented Nov 2, 2023

codecov bot commented Nov 2, 2023 • edited

Codecov Report

github-actions bot commented Nov 2, 2023

AndroidBob commented Nov 2, 2023

AndroidBob commented Nov 2, 2023

AndroidBob commented Nov 2, 2023

github-actions bot commented Nov 2, 2023

github-actions bot commented Nov 7, 2023

AndroidBob commented Nov 7, 2023

github-actions bot commented Nov 7, 2023

github-actions bot commented Nov 7, 2023

AndroidBob commented Nov 7, 2023

ohassine commented Nov 1, 2023 •

edited by github-actions bot

github-actions bot commented Nov 2, 2023 •

edited

codecov bot commented Nov 2, 2023 •

edited