Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 34 commits into from
Nov 8, 2023
Merged

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

merged 34 commits into from
Nov 8, 2023

Commits on Oct 19, 2023

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

    @ohassine
    ohassine committed Oct 19, 2023
    Configuration menu
    Copy the full SHA
    37434b6 View commit details
    Browse the repository at this point in the history

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

    # Conflicts:
#	app/src/main/kotlin/com/wire/android/ui/WireActivity.kt
    @ohassine
    ohassine committed Oct 19, 2023
    Configuration menu
    Copy the full SHA
    96ac249 View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2023

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

    …ures
    @ohassine
    ohassine committed Oct 23, 2023
    Configuration menu
    Copy the full SHA
    8f3e6eb View commit details
    Browse the repository at this point in the history

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

    …_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
    @ohassine
    ohassine committed Oct 23, 2023
    Configuration menu
    Copy the full SHA
    f70de8d View commit details
    Browse the repository at this point in the history

  3. chore: detekt

    @ohassine
    ohassine committed Oct 23, 2023
    Configuration menu
    Copy the full SHA
    198aa81 View commit details
    Browse the repository at this point in the history

  4. chore: kalium reference

    @ohassine
    ohassine committed Oct 23, 2023
    Configuration menu
    Copy the full SHA
    8fd6940 View commit details
    Browse the repository at this point in the history

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

    …_App_lock_is_on
    @ohassine
    ohassine committed Oct 23, 2023
    Configuration menu
    Copy the full SHA
    983f37a View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2023

  1. Merge branch 'develop' into notifications_when_App_lock_is_on

    @ohassine
    ohassine committed Oct 24, 2023
    Configuration menu
    Copy the full SHA
    22e0127 View commit details
    Browse the repository at this point in the history

Commits on Oct 27, 2023

  1. feat: observe team app lock config

    @ohassine
    ohassine committed Oct 27, 2023
    Configuration menu
    Copy the full SHA
    a1958dd View commit details
    Browse the repository at this point in the history

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

    # Conflicts:
#	kalium
    @ohassine
    ohassine committed Oct 27, 2023
    Configuration menu
    Copy the full SHA
    ad673ca View commit details
    Browse the repository at this point in the history

  3. chore: kalium reference

    @ohassine
    ohassine committed Oct 27, 2023
    Configuration menu
    Copy the full SHA
    8c1e0a3 View commit details
    Browse the repository at this point in the history

  4. chore: pass timeout to app lock disabled status

    @ohassine
    ohassine committed Oct 27, 2023
    Configuration menu
    Copy the full SHA
    9c1e823 View commit details
    Browse the repository at this point in the history

  5. chore: detekt :)

    @ohassine
    ohassine committed Oct 27, 2023
    Configuration menu
    Copy the full SHA
    640de6d View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2023

  1. feat: show team app lock change dialog

    @ohassine
    ohassine committed Oct 31, 2023
    Configuration menu
    Copy the full SHA
    9012111 View commit details
    Browse the repository at this point in the history

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

    …_App_lock_is_on

# Conflicts:
#	app/src/main/res/values/strings.xml
    @ohassine
    ohassine committed Oct 31, 2023
    Configuration menu
    Copy the full SHA
    581306a View commit details
    Browse the repository at this point in the history

  3. chore: kalium reference

    @ohassine
    ohassine committed Oct 31, 2023
    Configuration menu
    Copy the full SHA
    8173e85 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'notifications_when_App_lock_is_on' into show_team_applo… 

    …ck_change_dialog

# Conflicts:
#	app/src/test/kotlin/com/wire/android/ui/home/appLock/LockCodeTimeManagerTest.kt
#	kalium
    @ohassine
    ohassine committed Oct 31, 2023
    Configuration menu
    Copy the full SHA
    5c25ae3 View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2023

  1. feat: show set app lock screen

    @ohassine
    ohassine committed Nov 1, 2023
    Configuration menu
    Copy the full SHA
    acd4d3d View commit details
    Browse the repository at this point in the history

Commits on Nov 2, 2023

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

    …change_dialog

# Conflicts:
#	app/src/main/kotlin/com/wire/android/datastore/GlobalDataStore.kt
#	app/src/main/kotlin/com/wire/android/ui/WireActivity.kt
    @ohassine
    ohassine committed Nov 2, 2023
    Configuration menu
    Copy the full SHA
    d00cf29 View commit details
    Browse the repository at this point in the history

  2. chore: detekt

    @ohassine
    ohassine committed Nov 2, 2023
    Configuration menu
    Copy the full SHA
    1a77eda View commit details
    Browse the repository at this point in the history

  3. chore: unit test

    @ohassine
    ohassine committed Nov 2, 2023
    Configuration menu
    Copy the full SHA
    feef673 View commit details
    Browse the repository at this point in the history

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

    …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
    @ohassine
    ohassine committed Nov 2, 2023
    Configuration menu
    Copy the full SHA
    4471c33 View commit details
    Browse the repository at this point in the history

  5. fix: check session before using usecase

    @ohassine
    ohassine committed Nov 2, 2023
    Configuration menu
    Copy the full SHA
    df749e7 View commit details
    Browse the repository at this point in the history

  6. chore: make context private

    @ohassine
    ohassine committed Nov 2, 2023
    Configuration menu
    Copy the full SHA
    6aab2f4 View commit details
    Browse the repository at this point in the history

  7. chore: cleanup

    @ohassine
    ohassine committed Nov 2, 2023
    Configuration menu
    Copy the full SHA
    82fba4c View commit details
    Browse the repository at this point in the history

  8. chore: detekt

    @ohassine
    ohassine committed Nov 2, 2023
    Configuration menu
    Copy the full SHA
    f706db1 View commit details
    Browse the repository at this point in the history

  9. feat: cleanup

    @ohassine
    ohassine committed Nov 2, 2023
    Configuration menu
    Copy the full SHA
    d4ace4e View commit details
    Browse the repository at this point in the history

  10. feat: detekt

    @ohassine
    ohassine committed Nov 2, 2023
    Configuration menu
    Copy the full SHA
    ebc5f0f View commit details
    Browse the repository at this point in the history

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

    …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
    @ohassine
    ohassine committed Nov 2, 2023
    Configuration menu
    Copy the full SHA
    9ac94ea View commit details
    Browse the repository at this point in the history

  12. feat: kalium reference

    @ohassine
    ohassine committed Nov 2, 2023
    Configuration menu
    Copy the full SHA
    023b5ba View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2023

  1. chore: cleanup

    @ohassine
    ohassine committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    a0c6e38 View commit details
    Browse the repository at this point in the history

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

    …change_dialog

# Conflicts:
#	app/src/main/kotlin/com/wire/android/ui/AppLockActivity.kt
#	app/src/main/res/values/strings.xml
#	kalium
    @ohassine
    ohassine committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    b6d1bd5 View commit details
    Browse the repository at this point in the history

  3. chore: kalium reference

    @ohassine
    ohassine committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    b4fd6a4 View commit details
    Browse the repository at this point in the history

  4. chore: kalium reference

    @ohassine
    ohassine committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    92296ee View commit details
    Browse the repository at this point in the history