feat: Handle app dialogs with team applock (WPB -2388) #2390
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Conflicts: # app/src/main/kotlin/com/wire/android/ui/WireActivity.kt
…_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
# 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
…change_dialog # Conflicts: # app/src/main/kotlin/com/wire/android/datastore/GlobalDataStore.kt # app/src/main/kotlin/com/wire/android/ui/WireActivity.kt
…change_dialog # Conflicts: # app/src/main/kotlin/com/wire/android/ui/AppLockActivity.kt # app/src/test/kotlin/com/wire/android/ui/home/appLock/LockCodeTimeManagerTest.kt
…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
|
APKs built during tests are available here. Scroll down to Artifacts! |
…h_team_applock # Conflicts: # app/src/main/kotlin/com/wire/android/datastore/GlobalDataStore.kt # app/src/main/kotlin/com/wire/android/ui/AppLockActivity.kt # app/src/main/kotlin/com/wire/android/ui/WireActivity.kt # app/src/main/res/values/strings.xml
ohassine
requested review from
a team,
alexandreferris,
borichellow,
MohamadJaara,
mchenani and
Garzas
and removed request for
a team
alexandreferris
approved these changes
Nov 8, 2023
Codecov Report
@@ Coverage Diff @@
## develop #2390 +/- ##
=============================================
- Coverage 41.48% 41.46% -0.02%
Complexity 1083 1083
=============================================
Files 344 344
Lines 12401 12408 +7
Branches 1630 1630
=============================================
+ Hits 5144 5145 +1
- Misses 6773 6779 +6
Partials 484 484
Continue to review full report in Codecov by Sentry.
|
|
APKs built during tests are available here. Scroll down to Artifacts! |
|
Build 1704 succeeded. The build produced the following APK's: |
|
APKs built during tests are available here. Scroll down to Artifacts! |
|
Build 1714 succeeded. The build produced the following APK's: |
saleniuk
approved these changes
Nov 9, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
PR Submission Checklist for internal contributors
The PR Title
SQPIT-764The PR Description
What's new in this PR?
Description
When app lock is enabled from team console, the dialog should be shown on top and no other dialog should be shown on top of it.
This PR will hide all other types of dialog if team dialog is displayed
Testing
Test Coverage (Optional)
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)
PR Post Merge Checklist for internal contributors
References
feat(conversation-list): Sort conversations by most emojis in the title #SQPIT-764.