mirror of
https://github.com/bitwarden/android.git
synced 2025-02-18 21:09:55 +03:00
BIT-1432: Add FifteenMinutes to VaultTimeout (#565)
This commit is contained in:
parent
6b12dbdc4c
commit
9f95c26c2f
5 changed files with 18 additions and 0 deletions
|
@ -46,6 +46,15 @@ sealed class VaultTimeout : Parcelable {
|
||||||
override val vaultTimeoutInMinutes: Int get() = 5
|
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.
|
* The vault should time out after thirty minutes.
|
||||||
*/
|
*/
|
||||||
|
@ -108,6 +117,7 @@ sealed class VaultTimeout : Parcelable {
|
||||||
IMMEDIATELY,
|
IMMEDIATELY,
|
||||||
ONE_MINUTE,
|
ONE_MINUTE,
|
||||||
FIVE_MINUTES,
|
FIVE_MINUTES,
|
||||||
|
FIFTEEN_MINUTES,
|
||||||
THIRTY_MINUTES,
|
THIRTY_MINUTES,
|
||||||
ONE_HOUR,
|
ONE_HOUR,
|
||||||
FOUR_HOURS,
|
FOUR_HOURS,
|
||||||
|
|
|
@ -133,6 +133,7 @@ class AccountSecurityViewModel @Inject constructor(
|
||||||
VaultTimeout.Type.IMMEDIATELY -> VaultTimeout.Immediately
|
VaultTimeout.Type.IMMEDIATELY -> VaultTimeout.Immediately
|
||||||
VaultTimeout.Type.ONE_MINUTE -> VaultTimeout.OneMinute
|
VaultTimeout.Type.ONE_MINUTE -> VaultTimeout.OneMinute
|
||||||
VaultTimeout.Type.FIVE_MINUTES -> VaultTimeout.FiveMinutes
|
VaultTimeout.Type.FIVE_MINUTES -> VaultTimeout.FiveMinutes
|
||||||
|
VaultTimeout.Type.FIFTEEN_MINUTES -> VaultTimeout.FifteenMinutes
|
||||||
VaultTimeout.Type.THIRTY_MINUTES -> VaultTimeout.ThirtyMinutes
|
VaultTimeout.Type.THIRTY_MINUTES -> VaultTimeout.ThirtyMinutes
|
||||||
VaultTimeout.Type.ONE_HOUR -> VaultTimeout.OneHour
|
VaultTimeout.Type.ONE_HOUR -> VaultTimeout.OneHour
|
||||||
VaultTimeout.Type.FOUR_HOURS -> VaultTimeout.FourHours
|
VaultTimeout.Type.FOUR_HOURS -> VaultTimeout.FourHours
|
||||||
|
|
|
@ -13,6 +13,7 @@ val VaultTimeout.Type.displayLabel: Text
|
||||||
VaultTimeout.Type.IMMEDIATELY -> R.string.immediately
|
VaultTimeout.Type.IMMEDIATELY -> R.string.immediately
|
||||||
VaultTimeout.Type.ONE_MINUTE -> R.string.one_minute
|
VaultTimeout.Type.ONE_MINUTE -> R.string.one_minute
|
||||||
VaultTimeout.Type.FIVE_MINUTES -> R.string.five_minutes
|
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.THIRTY_MINUTES -> R.string.thirty_minutes
|
||||||
VaultTimeout.Type.ONE_HOUR -> R.string.one_hour
|
VaultTimeout.Type.ONE_HOUR -> R.string.one_hour
|
||||||
VaultTimeout.Type.FOUR_HOURS -> R.string.four_hours
|
VaultTimeout.Type.FOUR_HOURS -> R.string.four_hours
|
||||||
|
|
|
@ -164,6 +164,10 @@ class AccountSecurityScreenTest : BaseComposeTest() {
|
||||||
.onAllNodesWithText("5 minutes")
|
.onAllNodesWithText("5 minutes")
|
||||||
.filterToOne(hasAnyAncestor(isDialog()))
|
.filterToOne(hasAnyAncestor(isDialog()))
|
||||||
.assertIsDisplayed()
|
.assertIsDisplayed()
|
||||||
|
composeTestRule
|
||||||
|
.onAllNodesWithText("15 minutes")
|
||||||
|
.filterToOne(hasAnyAncestor(isDialog()))
|
||||||
|
.assertIsDisplayed()
|
||||||
composeTestRule
|
composeTestRule
|
||||||
.onAllNodesWithText("30 minutes")
|
.onAllNodesWithText("30 minutes")
|
||||||
.filterToOne(hasAnyAncestor(isDialog()))
|
.filterToOne(hasAnyAncestor(isDialog()))
|
||||||
|
@ -179,6 +183,7 @@ class AccountSecurityScreenTest : BaseComposeTest() {
|
||||||
composeTestRule
|
composeTestRule
|
||||||
.onAllNodesWithText("On app restart")
|
.onAllNodesWithText("On app restart")
|
||||||
.filterToOne(hasAnyAncestor(isDialog()))
|
.filterToOne(hasAnyAncestor(isDialog()))
|
||||||
|
.performScrollTo()
|
||||||
.assertIsDisplayed()
|
.assertIsDisplayed()
|
||||||
composeTestRule
|
composeTestRule
|
||||||
.onAllNodesWithText("Never")
|
.onAllNodesWithText("Never")
|
||||||
|
|
|
@ -13,6 +13,7 @@ class VaultTimeoutExtensionsTest {
|
||||||
VaultTimeout.Type.IMMEDIATELY to R.string.immediately.asText(),
|
VaultTimeout.Type.IMMEDIATELY to R.string.immediately.asText(),
|
||||||
VaultTimeout.Type.ONE_MINUTE to R.string.one_minute.asText(),
|
VaultTimeout.Type.ONE_MINUTE to R.string.one_minute.asText(),
|
||||||
VaultTimeout.Type.FIVE_MINUTES to R.string.five_minutes.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.THIRTY_MINUTES to R.string.thirty_minutes.asText(),
|
||||||
VaultTimeout.Type.ONE_HOUR to R.string.one_hour.asText(),
|
VaultTimeout.Type.ONE_HOUR to R.string.one_hour.asText(),
|
||||||
VaultTimeout.Type.FOUR_HOURS to R.string.four_hours.asText(),
|
VaultTimeout.Type.FOUR_HOURS to R.string.four_hours.asText(),
|
||||||
|
|
Loading…
Add table
Reference in a new issue