github-starred/android
2
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2026-05-11 02:06:58 -05:00
Code Issues 1.1k Packages Projects Releases 124 Wiki Activity

BIT-1432: Add FifteenMinutes to VaultTimeout (#565)

Browse Source
This commit is contained in:
Brian Yencho
2024-01-10 14:26:33 -06:00
committed by GitHub
parent 121c22b36f
commit a232211fc5
5 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/com/x8bit/bitwarden/data/platform/repository/model/VaultTimeout.kt
View File

@@ -46,6 +46,15 @@ sealed class VaultTimeout : Parcelable {
override val vaultTimeoutInMinutes: Int get() = 5
}
/**
* The vault should time out after fifteen minutes.
*/
@Parcelize
data object FifteenMinutes : VaultTimeout() {
override val type: Type get() = Type.FIFTEEN_MINUTES
override val vaultTimeoutInMinutes: Int get() = 15
}
/**
* The vault should time out after thirty minutes.
*/
@@ -108,6 +117,7 @@ sealed class VaultTimeout : Parcelable {
IMMEDIATELY,
ONE_MINUTE,
FIVE_MINUTES,
FIFTEEN_MINUTES,
THIRTY_MINUTES,
ONE_HOUR,
FOUR_HOURS,

1
app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/AccountSecurityViewModel.kt
View File

@@ -133,6 +133,7 @@ class AccountSecurityViewModel @Inject constructor(
VaultTimeout.Type.IMMEDIATELY -> VaultTimeout.Immediately
VaultTimeout.Type.ONE_MINUTE -> VaultTimeout.OneMinute
VaultTimeout.Type.FIVE_MINUTES -> VaultTimeout.FiveMinutes
VaultTimeout.Type.FIFTEEN_MINUTES -> VaultTimeout.FifteenMinutes
VaultTimeout.Type.THIRTY_MINUTES -> VaultTimeout.ThirtyMinutes
VaultTimeout.Type.ONE_HOUR -> VaultTimeout.OneHour
VaultTimeout.Type.FOUR_HOURS -> VaultTimeout.FourHours

1
app/src/main/java/com/x8bit/bitwarden/ui/platform/util/VaultTimeoutExtensions.kt
View File

@@ -13,6 +13,7 @@ val VaultTimeout.Type.displayLabel: Text
VaultTimeout.Type.IMMEDIATELY -> R.string.immediately
VaultTimeout.Type.ONE_MINUTE -> R.string.one_minute
VaultTimeout.Type.FIVE_MINUTES -> R.string.five_minutes
VaultTimeout.Type.FIFTEEN_MINUTES -> R.string.fifteen_minutes
VaultTimeout.Type.THIRTY_MINUTES -> R.string.thirty_minutes
VaultTimeout.Type.ONE_HOUR -> R.string.one_hour
VaultTimeout.Type.FOUR_HOURS -> R.string.four_hours

5
app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/AccountSecurityScreenTest.kt
View File

@@ -164,6 +164,10 @@ class AccountSecurityScreenTest : BaseComposeTest() {
.onAllNodesWithText("5 minutes")
.filterToOne(hasAnyAncestor(isDialog()))
.assertIsDisplayed()
composeTestRule
.onAllNodesWithText("15 minutes")
.filterToOne(hasAnyAncestor(isDialog()))
.assertIsDisplayed()
composeTestRule
.onAllNodesWithText("30 minutes")
.filterToOne(hasAnyAncestor(isDialog()))
@@ -179,6 +183,7 @@ class AccountSecurityScreenTest : BaseComposeTest() {
composeTestRule
.onAllNodesWithText("On app restart")
.filterToOne(hasAnyAncestor(isDialog()))
.performScrollTo()
.assertIsDisplayed()
composeTestRule
.onAllNodesWithText("Never")

1
app/src/test/java/com/x8bit/bitwarden/ui/platform/util/VaultTimeoutExtensionsTest.kt
View File

@@ -13,6 +13,7 @@ class VaultTimeoutExtensionsTest {
VaultTimeout.Type.IMMEDIATELY to R.string.immediately.asText(),
VaultTimeout.Type.ONE_MINUTE to R.string.one_minute.asText(),
VaultTimeout.Type.FIVE_MINUTES to R.string.five_minutes.asText(),
VaultTimeout.Type.FIFTEEN_MINUTES to R.string.fifteen_minutes.asText(),
VaultTimeout.Type.THIRTY_MINUTES to R.string.thirty_minutes.asText(),
VaultTimeout.Type.ONE_HOUR to R.string.one_hour.asText(),
VaultTimeout.Type.FOUR_HOURS to R.string.four_hours.asText(),