mirror of
https://github.com/bitwarden/android.git
synced 2026-11-19 17:40:12 -06:00
BIT-1320: Add inline UI (#624)
This commit is contained in:
committed by
Álison Fernandes
parent
fd8293ba55
commit
224395004f
@@ -60,6 +60,7 @@ class FillResponseBuilderTest {
|
||||
val filledData = FilledData(
|
||||
filledPartitions = emptyList(),
|
||||
ignoreAutofillIds = emptyList(),
|
||||
vaultItemInlinePresentationSpec = null,
|
||||
)
|
||||
val actual = fillResponseBuilder.build(
|
||||
autofillAppInfo = appInfo,
|
||||
@@ -76,12 +77,14 @@ class FillResponseBuilderTest {
|
||||
val filledPartitions = FilledPartition(
|
||||
autofillCipher = mockk(),
|
||||
filledItems = emptyList(),
|
||||
inlinePresentationSpec = null,
|
||||
)
|
||||
val filledData = FilledData(
|
||||
filledPartitions = listOf(
|
||||
filledPartitions,
|
||||
),
|
||||
ignoreAutofillIds = emptyList(),
|
||||
vaultItemInlinePresentationSpec = null,
|
||||
)
|
||||
val actual = fillResponseBuilder.build(
|
||||
autofillAppInfo = appInfo,
|
||||
@@ -108,6 +111,7 @@ class FillResponseBuilderTest {
|
||||
val filledData = FilledData(
|
||||
filledPartitions = filledPartitions,
|
||||
ignoreAutofillIds = ignoreAutofillIds,
|
||||
vaultItemInlinePresentationSpec = null,
|
||||
)
|
||||
every {
|
||||
filledPartitionOne.buildDataset(
|
||||
|
||||
@@ -2,6 +2,7 @@ package com.x8bit.bitwarden.data.autofill.builder
|
||||
|
||||
import android.view.autofill.AutofillId
|
||||
import android.view.autofill.AutofillValue
|
||||
import android.widget.inline.InlinePresentationSpec
|
||||
import com.x8bit.bitwarden.data.autofill.model.AutofillCipher
|
||||
import com.x8bit.bitwarden.data.autofill.model.AutofillPartition
|
||||
import com.x8bit.bitwarden.data.autofill.model.AutofillRequest
|
||||
@@ -83,6 +84,8 @@ class FilledDataBuilderTest {
|
||||
val ignoreAutofillIds: List<AutofillId> = mockk()
|
||||
val autofillRequest = AutofillRequest.Fillable(
|
||||
ignoreAutofillIds = ignoreAutofillIds,
|
||||
inlinePresentationSpecs = emptyList(),
|
||||
maxInlineSuggestionsCount = 0,
|
||||
partition = autofillPartition,
|
||||
uri = URI,
|
||||
)
|
||||
@@ -96,12 +99,14 @@ class FilledDataBuilderTest {
|
||||
filledItemPassword,
|
||||
filledItemUsername,
|
||||
),
|
||||
inlinePresentationSpec = null,
|
||||
)
|
||||
val expected = FilledData(
|
||||
filledPartitions = listOf(
|
||||
filledPartition,
|
||||
),
|
||||
ignoreAutofillIds = ignoreAutofillIds,
|
||||
vaultItemInlinePresentationSpec = null,
|
||||
)
|
||||
coEvery {
|
||||
autofillCipherProvider.getLoginAutofillCiphers(
|
||||
@@ -154,12 +159,15 @@ class FilledDataBuilderTest {
|
||||
val ignoreAutofillIds: List<AutofillId> = mockk()
|
||||
val autofillRequest = AutofillRequest.Fillable(
|
||||
ignoreAutofillIds = ignoreAutofillIds,
|
||||
inlinePresentationSpecs = emptyList(),
|
||||
maxInlineSuggestionsCount = 0,
|
||||
partition = autofillPartition,
|
||||
uri = null,
|
||||
)
|
||||
val expected = FilledData(
|
||||
filledPartitions = emptyList(),
|
||||
ignoreAutofillIds = ignoreAutofillIds,
|
||||
vaultItemInlinePresentationSpec = null,
|
||||
)
|
||||
|
||||
// Test
|
||||
@@ -210,6 +218,8 @@ class FilledDataBuilderTest {
|
||||
val ignoreAutofillIds: List<AutofillId> = mockk()
|
||||
val autofillRequest = AutofillRequest.Fillable(
|
||||
ignoreAutofillIds = ignoreAutofillIds,
|
||||
inlinePresentationSpecs = emptyList(),
|
||||
maxInlineSuggestionsCount = 0,
|
||||
partition = autofillPartition,
|
||||
uri = URI,
|
||||
)
|
||||
@@ -225,12 +235,14 @@ class FilledDataBuilderTest {
|
||||
filledItemExpirationYear,
|
||||
filledItemNumber,
|
||||
),
|
||||
inlinePresentationSpec = null,
|
||||
)
|
||||
val expected = FilledData(
|
||||
filledPartitions = listOf(
|
||||
filledPartition,
|
||||
),
|
||||
ignoreAutofillIds = ignoreAutofillIds,
|
||||
vaultItemInlinePresentationSpec = null,
|
||||
)
|
||||
coEvery { autofillCipherProvider.getCardAutofillCiphers() } returns listOf(autofillCipher)
|
||||
every { autofillViewCode.buildFilledItemOrNull(code) } returns filledItemCode
|
||||
@@ -258,6 +270,107 @@ class FilledDataBuilderTest {
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `build should return filled data with max count of inline specs with one spec repeated`() =
|
||||
runTest {
|
||||
// Setup
|
||||
val password = "Password"
|
||||
val username = "johnDoe"
|
||||
val autofillCipher = AutofillCipher.Login(
|
||||
name = "Cipher One",
|
||||
password = password,
|
||||
username = username,
|
||||
subtitle = "Subtitle",
|
||||
)
|
||||
val autofillViewEmail = AutofillView.Login.EmailAddress(
|
||||
data = autofillViewData,
|
||||
)
|
||||
val autofillViewPassword = AutofillView.Login.Password(
|
||||
data = autofillViewData,
|
||||
)
|
||||
val autofillViewUsername = AutofillView.Login.Username(
|
||||
data = autofillViewData,
|
||||
)
|
||||
val autofillPartition = AutofillPartition.Login(
|
||||
views = listOf(
|
||||
autofillViewEmail,
|
||||
autofillViewPassword,
|
||||
autofillViewUsername,
|
||||
),
|
||||
)
|
||||
val inlinePresentationSpec: InlinePresentationSpec = mockk()
|
||||
val autofillRequest = AutofillRequest.Fillable(
|
||||
ignoreAutofillIds = emptyList(),
|
||||
inlinePresentationSpecs = listOf(
|
||||
inlinePresentationSpec,
|
||||
),
|
||||
maxInlineSuggestionsCount = 3,
|
||||
partition = autofillPartition,
|
||||
uri = URI,
|
||||
)
|
||||
val filledItemEmail: FilledItem = mockk()
|
||||
val filledItemPassword: FilledItem = mockk()
|
||||
val filledItemUsername: FilledItem = mockk()
|
||||
val filledPartitionOne = FilledPartition(
|
||||
autofillCipher = autofillCipher,
|
||||
filledItems = listOf(
|
||||
filledItemEmail,
|
||||
filledItemPassword,
|
||||
filledItemUsername,
|
||||
),
|
||||
inlinePresentationSpec = inlinePresentationSpec,
|
||||
)
|
||||
val filledPartitionTwo = filledPartitionOne.copy()
|
||||
val filledPartitionThree = FilledPartition(
|
||||
autofillCipher = autofillCipher,
|
||||
filledItems = listOf(
|
||||
filledItemEmail,
|
||||
filledItemPassword,
|
||||
filledItemUsername,
|
||||
),
|
||||
inlinePresentationSpec = null,
|
||||
)
|
||||
val expected = FilledData(
|
||||
filledPartitions = listOf(
|
||||
filledPartitionOne,
|
||||
filledPartitionTwo,
|
||||
filledPartitionThree,
|
||||
),
|
||||
ignoreAutofillIds = emptyList(),
|
||||
vaultItemInlinePresentationSpec = inlinePresentationSpec,
|
||||
)
|
||||
coEvery {
|
||||
autofillCipherProvider.getLoginAutofillCiphers(
|
||||
uri = URI,
|
||||
)
|
||||
} returns listOf(autofillCipher, autofillCipher, autofillCipher)
|
||||
every { autofillViewEmail.buildFilledItemOrNull(username) } returns filledItemEmail
|
||||
every {
|
||||
autofillViewPassword.buildFilledItemOrNull(password)
|
||||
} returns filledItemPassword
|
||||
every {
|
||||
autofillViewUsername.buildFilledItemOrNull(username)
|
||||
} returns filledItemUsername
|
||||
|
||||
// Test
|
||||
val actual = filledDataBuilder.build(
|
||||
autofillRequest = autofillRequest,
|
||||
)
|
||||
|
||||
// Verify
|
||||
assertEquals(expected, actual)
|
||||
coVerify(exactly = 1) {
|
||||
autofillCipherProvider.getLoginAutofillCiphers(
|
||||
uri = URI,
|
||||
)
|
||||
}
|
||||
verify(exactly = 3) {
|
||||
autofillViewEmail.buildFilledItemOrNull(username)
|
||||
autofillViewPassword.buildFilledItemOrNull(password)
|
||||
autofillViewUsername.buildFilledItemOrNull(username)
|
||||
}
|
||||
}
|
||||
|
||||
companion object {
|
||||
private const val URI: String = "androidapp://com.x8bit.bitwarden"
|
||||
}
|
||||
|
||||
@@ -5,11 +5,15 @@ import android.service.autofill.FillContext
|
||||
import android.service.autofill.FillRequest
|
||||
import android.view.View
|
||||
import android.view.autofill.AutofillId
|
||||
import android.widget.inline.InlinePresentationSpec
|
||||
import com.x8bit.bitwarden.data.autofill.model.AutofillAppInfo
|
||||
import com.x8bit.bitwarden.data.autofill.model.AutofillPartition
|
||||
import com.x8bit.bitwarden.data.autofill.model.AutofillRequest
|
||||
import com.x8bit.bitwarden.data.autofill.model.AutofillView
|
||||
import com.x8bit.bitwarden.data.autofill.model.ViewNodeTraversalData
|
||||
import com.x8bit.bitwarden.data.autofill.util.buildUriOrNull
|
||||
import com.x8bit.bitwarden.data.autofill.util.getInlinePresentationSpecs
|
||||
import com.x8bit.bitwarden.data.autofill.util.getMaxInlineSuggestionsCount
|
||||
import com.x8bit.bitwarden.data.autofill.util.toAutofillView
|
||||
import io.mockk.every
|
||||
import io.mockk.mockk
|
||||
@@ -24,6 +28,7 @@ import org.junit.jupiter.api.Test
|
||||
class AutofillParserTests {
|
||||
private lateinit var parser: AutofillParser
|
||||
|
||||
private val autofillAppInfo: AutofillAppInfo = mockk()
|
||||
private val autofillViewData = AutofillView.Data(
|
||||
autofillId = mockk(),
|
||||
isFocused = true,
|
||||
@@ -58,11 +63,26 @@ class AutofillParserTests {
|
||||
private val fillRequest: FillRequest = mockk {
|
||||
every { this@mockk.fillContexts } returns listOf(fillContext)
|
||||
}
|
||||
private val inlinePresentationSpecs: List<InlinePresentationSpec> = mockk()
|
||||
|
||||
@BeforeEach
|
||||
fun setup() {
|
||||
mockkStatic(AssistStructure.ViewNode::toAutofillView)
|
||||
mockkStatic(
|
||||
FillRequest::getMaxInlineSuggestionsCount,
|
||||
FillRequest::getInlinePresentationSpecs,
|
||||
)
|
||||
mockkStatic(List<ViewNodeTraversalData>::buildUriOrNull)
|
||||
every {
|
||||
fillRequest.getInlinePresentationSpecs(
|
||||
autofillAppInfo = autofillAppInfo,
|
||||
)
|
||||
} returns inlinePresentationSpecs
|
||||
every {
|
||||
fillRequest.getMaxInlineSuggestionsCount(
|
||||
autofillAppInfo = autofillAppInfo,
|
||||
)
|
||||
} returns MAX_INLINE_SUGGESTION_COUNT
|
||||
every { any<List<ViewNodeTraversalData>>().buildUriOrNull(assistStructure) } returns URI
|
||||
parser = AutofillParserImpl()
|
||||
}
|
||||
@@ -70,6 +90,10 @@ class AutofillParserTests {
|
||||
@AfterEach
|
||||
fun teardown() {
|
||||
unmockkStatic(AssistStructure.ViewNode::toAutofillView)
|
||||
unmockkStatic(
|
||||
FillRequest::getMaxInlineSuggestionsCount,
|
||||
FillRequest::getInlinePresentationSpecs,
|
||||
)
|
||||
unmockkStatic(List<ViewNodeTraversalData>::buildUriOrNull)
|
||||
}
|
||||
|
||||
@@ -80,7 +104,10 @@ class AutofillParserTests {
|
||||
every { fillRequest.fillContexts } returns emptyList()
|
||||
|
||||
// Test
|
||||
val actual = parser.parse(fillRequest)
|
||||
val actual = parser.parse(
|
||||
autofillAppInfo = autofillAppInfo,
|
||||
fillRequest = fillRequest,
|
||||
)
|
||||
|
||||
// Verify
|
||||
assertEquals(expected, actual)
|
||||
@@ -93,7 +120,10 @@ class AutofillParserTests {
|
||||
every { assistStructure.windowNodeCount } returns 0
|
||||
|
||||
// Test
|
||||
val actual = parser.parse(fillRequest)
|
||||
val actual = parser.parse(
|
||||
autofillAppInfo = autofillAppInfo,
|
||||
fillRequest = fillRequest,
|
||||
)
|
||||
|
||||
// Verify
|
||||
assertEquals(expected, actual)
|
||||
@@ -134,6 +164,8 @@ class AutofillParserTests {
|
||||
)
|
||||
val expected = AutofillRequest.Fillable(
|
||||
ignoreAutofillIds = listOf(childAutofillId),
|
||||
inlinePresentationSpecs = inlinePresentationSpecs,
|
||||
maxInlineSuggestionsCount = MAX_INLINE_SUGGESTION_COUNT,
|
||||
partition = autofillPartition,
|
||||
uri = URI,
|
||||
)
|
||||
@@ -141,11 +173,20 @@ class AutofillParserTests {
|
||||
every { assistStructure.getWindowNodeAt(0) } returns windowNode
|
||||
|
||||
// Test
|
||||
val actual = parser.parse(fillRequest)
|
||||
val actual = parser.parse(
|
||||
autofillAppInfo = autofillAppInfo,
|
||||
fillRequest = fillRequest,
|
||||
)
|
||||
|
||||
// Verify
|
||||
assertEquals(expected, actual)
|
||||
verify(exactly = 1) {
|
||||
fillRequest.getInlinePresentationSpecs(
|
||||
autofillAppInfo = autofillAppInfo,
|
||||
)
|
||||
fillRequest.getMaxInlineSuggestionsCount(
|
||||
autofillAppInfo = autofillAppInfo,
|
||||
)
|
||||
any<List<ViewNodeTraversalData>>().buildUriOrNull(assistStructure)
|
||||
}
|
||||
}
|
||||
@@ -171,6 +212,8 @@ class AutofillParserTests {
|
||||
)
|
||||
val expected = AutofillRequest.Fillable(
|
||||
ignoreAutofillIds = emptyList(),
|
||||
inlinePresentationSpecs = inlinePresentationSpecs,
|
||||
maxInlineSuggestionsCount = MAX_INLINE_SUGGESTION_COUNT,
|
||||
partition = autofillPartition,
|
||||
uri = URI,
|
||||
)
|
||||
@@ -178,11 +221,20 @@ class AutofillParserTests {
|
||||
every { loginViewNode.toAutofillView() } returns loginAutofillView
|
||||
|
||||
// Test
|
||||
val actual = parser.parse(fillRequest)
|
||||
val actual = parser.parse(
|
||||
autofillAppInfo = autofillAppInfo,
|
||||
fillRequest = fillRequest,
|
||||
)
|
||||
|
||||
// Verify
|
||||
assertEquals(expected, actual)
|
||||
verify(exactly = 1) {
|
||||
fillRequest.getInlinePresentationSpecs(
|
||||
autofillAppInfo = autofillAppInfo,
|
||||
)
|
||||
fillRequest.getMaxInlineSuggestionsCount(
|
||||
autofillAppInfo = autofillAppInfo,
|
||||
)
|
||||
any<List<ViewNodeTraversalData>>().buildUriOrNull(assistStructure)
|
||||
}
|
||||
}
|
||||
@@ -208,6 +260,8 @@ class AutofillParserTests {
|
||||
)
|
||||
val expected = AutofillRequest.Fillable(
|
||||
ignoreAutofillIds = emptyList(),
|
||||
inlinePresentationSpecs = inlinePresentationSpecs,
|
||||
maxInlineSuggestionsCount = MAX_INLINE_SUGGESTION_COUNT,
|
||||
partition = autofillPartition,
|
||||
uri = URI,
|
||||
)
|
||||
@@ -215,11 +269,20 @@ class AutofillParserTests {
|
||||
every { loginViewNode.toAutofillView() } returns loginAutofillView
|
||||
|
||||
// Test
|
||||
val actual = parser.parse(fillRequest)
|
||||
val actual = parser.parse(
|
||||
autofillAppInfo = autofillAppInfo,
|
||||
fillRequest = fillRequest,
|
||||
)
|
||||
|
||||
// Verify
|
||||
assertEquals(expected, actual)
|
||||
verify(exactly = 1) {
|
||||
fillRequest.getInlinePresentationSpecs(
|
||||
autofillAppInfo = autofillAppInfo,
|
||||
)
|
||||
fillRequest.getMaxInlineSuggestionsCount(
|
||||
autofillAppInfo = autofillAppInfo,
|
||||
)
|
||||
any<List<ViewNodeTraversalData>>().buildUriOrNull(assistStructure)
|
||||
}
|
||||
}
|
||||
@@ -245,6 +308,8 @@ class AutofillParserTests {
|
||||
)
|
||||
val expected = AutofillRequest.Fillable(
|
||||
ignoreAutofillIds = emptyList(),
|
||||
inlinePresentationSpecs = inlinePresentationSpecs,
|
||||
maxInlineSuggestionsCount = MAX_INLINE_SUGGESTION_COUNT,
|
||||
partition = autofillPartition,
|
||||
uri = URI,
|
||||
)
|
||||
@@ -252,11 +317,20 @@ class AutofillParserTests {
|
||||
every { loginViewNode.toAutofillView() } returns loginAutofillView
|
||||
|
||||
// Test
|
||||
val actual = parser.parse(fillRequest)
|
||||
val actual = parser.parse(
|
||||
autofillAppInfo = autofillAppInfo,
|
||||
fillRequest = fillRequest,
|
||||
)
|
||||
|
||||
// Verify
|
||||
assertEquals(expected, actual)
|
||||
verify(exactly = 1) {
|
||||
fillRequest.getInlinePresentationSpecs(
|
||||
autofillAppInfo = autofillAppInfo,
|
||||
)
|
||||
fillRequest.getMaxInlineSuggestionsCount(
|
||||
autofillAppInfo = autofillAppInfo,
|
||||
)
|
||||
any<List<ViewNodeTraversalData>>().buildUriOrNull(assistStructure)
|
||||
}
|
||||
}
|
||||
@@ -270,8 +344,7 @@ class AutofillParserTests {
|
||||
every { assistStructure.getWindowNodeAt(0) } returns cardWindowNode
|
||||
every { assistStructure.getWindowNodeAt(1) } returns loginWindowNode
|
||||
}
|
||||
|
||||
companion object {
|
||||
private const val URI: String = "androidapp://com.x8bit.bitwarden"
|
||||
}
|
||||
}
|
||||
|
||||
private const val MAX_INLINE_SUGGESTION_COUNT: Int = 42
|
||||
private const val URI: String = "androidapp://com.x8bit.bitwarden"
|
||||
|
||||
+21
-4
@@ -76,7 +76,12 @@ class AutofillProcessorTest {
|
||||
val autofillRequest = AutofillRequest.Unfillable
|
||||
val fillRequest: FillRequest = mockk()
|
||||
every { cancellationSignal.setOnCancelListener(any()) } just runs
|
||||
every { parser.parse(fillRequest) } returns autofillRequest
|
||||
every {
|
||||
parser.parse(
|
||||
autofillAppInfo = appInfo,
|
||||
fillRequest = fillRequest,
|
||||
)
|
||||
} returns autofillRequest
|
||||
every { fillCallback.onSuccess(null) } just runs
|
||||
|
||||
// Test
|
||||
@@ -90,7 +95,10 @@ class AutofillProcessorTest {
|
||||
// Verify
|
||||
verify(exactly = 1) {
|
||||
cancellationSignal.setOnCancelListener(any())
|
||||
parser.parse(fillRequest)
|
||||
parser.parse(
|
||||
autofillAppInfo = appInfo,
|
||||
fillRequest = fillRequest,
|
||||
)
|
||||
fillCallback.onSuccess(null)
|
||||
}
|
||||
}
|
||||
@@ -103,6 +111,7 @@ class AutofillProcessorTest {
|
||||
val filledData = FilledData(
|
||||
filledPartitions = listOf(mockk()),
|
||||
ignoreAutofillIds = emptyList(),
|
||||
vaultItemInlinePresentationSpec = null,
|
||||
)
|
||||
val fillResponse: FillResponse = mockk()
|
||||
val autofillRequest: AutofillRequest.Fillable = mockk()
|
||||
@@ -112,7 +121,12 @@ class AutofillProcessorTest {
|
||||
)
|
||||
} returns filledData
|
||||
every { cancellationSignal.setOnCancelListener(any()) } just runs
|
||||
every { parser.parse(fillRequest) } returns autofillRequest
|
||||
every {
|
||||
parser.parse(
|
||||
autofillAppInfo = appInfo,
|
||||
fillRequest = fillRequest,
|
||||
)
|
||||
} returns autofillRequest
|
||||
every {
|
||||
fillResponseBuilder.build(
|
||||
autofillAppInfo = appInfo,
|
||||
@@ -137,7 +151,10 @@ class AutofillProcessorTest {
|
||||
}
|
||||
verify(exactly = 1) {
|
||||
cancellationSignal.setOnCancelListener(any())
|
||||
parser.parse(fillRequest)
|
||||
parser.parse(
|
||||
autofillAppInfo = appInfo,
|
||||
fillRequest = fillRequest,
|
||||
)
|
||||
fillResponseBuilder.build(
|
||||
autofillAppInfo = appInfo,
|
||||
filledData = filledData,
|
||||
|
||||
@@ -0,0 +1,99 @@
|
||||
package com.x8bit.bitwarden.data.autofill.util
|
||||
|
||||
import android.service.autofill.FillRequest
|
||||
import android.view.inputmethod.InlineSuggestionsRequest
|
||||
import android.widget.inline.InlinePresentationSpec
|
||||
import com.x8bit.bitwarden.data.autofill.model.AutofillAppInfo
|
||||
import io.mockk.every
|
||||
import io.mockk.mockk
|
||||
import org.junit.jupiter.api.Assertions.assertEquals
|
||||
import org.junit.jupiter.api.Test
|
||||
|
||||
class FillRequestExtensionsTest {
|
||||
private val expectedInlinePresentationSpecs: List<InlinePresentationSpec> = mockk()
|
||||
private val expectedInlineSuggestionsRequest: InlineSuggestionsRequest = mockk {
|
||||
every { this@mockk.inlinePresentationSpecs } returns expectedInlinePresentationSpecs
|
||||
every { this@mockk.maxSuggestionCount } returns MAX_INLINE_SUGGESTIONS_COUNT
|
||||
}
|
||||
private val fillRequest: FillRequest = mockk {
|
||||
every { this@mockk.inlineSuggestionsRequest } returns expectedInlineSuggestionsRequest
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `getInlinePresentationSpecs should return empty list when pre-R`() {
|
||||
// Setup
|
||||
val autofillAppInfo = AutofillAppInfo(
|
||||
context = mockk(),
|
||||
packageName = "com.x8bit.bitwarden",
|
||||
sdkInt = 17,
|
||||
)
|
||||
val expected: List<InlinePresentationSpec> = emptyList()
|
||||
|
||||
// Test
|
||||
val actual = fillRequest.getInlinePresentationSpecs(
|
||||
autofillAppInfo = autofillAppInfo,
|
||||
)
|
||||
|
||||
// Verify
|
||||
assertEquals(expected, actual)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `getInlinePresentationSpecs should return populated list when post-R`() {
|
||||
// Setup
|
||||
val autofillAppInfo = AutofillAppInfo(
|
||||
context = mockk(),
|
||||
packageName = "com.x8bit.bitwarden",
|
||||
sdkInt = 34,
|
||||
)
|
||||
val expected = expectedInlinePresentationSpecs
|
||||
|
||||
// Test
|
||||
val actual = fillRequest.getInlinePresentationSpecs(
|
||||
autofillAppInfo = autofillAppInfo,
|
||||
)
|
||||
|
||||
// Verify
|
||||
assertEquals(expected, actual)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `getMaxInlineSuggestionsCount should return 0 when pre-R`() {
|
||||
// Setup
|
||||
val autofillAppInfo = AutofillAppInfo(
|
||||
context = mockk(),
|
||||
packageName = "com.x8bit.bitwarden",
|
||||
sdkInt = 17,
|
||||
)
|
||||
val expected = 0
|
||||
|
||||
// Test
|
||||
val actual = fillRequest.getMaxInlineSuggestionsCount(
|
||||
autofillAppInfo = autofillAppInfo,
|
||||
)
|
||||
|
||||
// Verify
|
||||
assertEquals(expected, actual)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `getMaxInlineSuggestionsCount should return the max count when post-R`() {
|
||||
// Setup
|
||||
val autofillAppInfo = AutofillAppInfo(
|
||||
context = mockk(),
|
||||
packageName = "com.x8bit.bitwarden",
|
||||
sdkInt = 34,
|
||||
)
|
||||
val expected = MAX_INLINE_SUGGESTIONS_COUNT
|
||||
|
||||
// Test
|
||||
val actual = fillRequest.getMaxInlineSuggestionsCount(
|
||||
autofillAppInfo = autofillAppInfo,
|
||||
)
|
||||
|
||||
// Verify
|
||||
assertEquals(expected, actual)
|
||||
}
|
||||
}
|
||||
|
||||
private const val MAX_INLINE_SUGGESTIONS_COUNT: Int = 42
|
||||
+78
-1
@@ -3,14 +3,17 @@ package com.x8bit.bitwarden.data.autofill.util
|
||||
import android.content.Context
|
||||
import android.content.res.Resources
|
||||
import android.service.autofill.Dataset
|
||||
import android.service.autofill.InlinePresentation
|
||||
import android.service.autofill.Presentations
|
||||
import android.widget.RemoteViews
|
||||
import android.widget.inline.InlinePresentationSpec
|
||||
import com.x8bit.bitwarden.data.autofill.model.AutofillAppInfo
|
||||
import com.x8bit.bitwarden.data.autofill.model.AutofillCipher
|
||||
import com.x8bit.bitwarden.data.autofill.model.FilledItem
|
||||
import com.x8bit.bitwarden.data.autofill.model.FilledPartition
|
||||
import com.x8bit.bitwarden.data.util.mockBuilder
|
||||
import com.x8bit.bitwarden.ui.autofill.buildAutofillRemoteViews
|
||||
import com.x8bit.bitwarden.ui.autofill.util.createCipherInlinePresentationOrNull
|
||||
import io.mockk.every
|
||||
import io.mockk.just
|
||||
import io.mockk.mockk
|
||||
@@ -35,11 +38,13 @@ class FilledPartitionExtensionsTest {
|
||||
}
|
||||
private val dataset: Dataset = mockk()
|
||||
private val filledItem: FilledItem = mockk()
|
||||
private val inlinePresentationSpec: InlinePresentationSpec = mockk()
|
||||
private val filledPartition = FilledPartition(
|
||||
autofillCipher = autofillCipher,
|
||||
filledItems = listOf(
|
||||
filledItem,
|
||||
),
|
||||
inlinePresentationSpec = inlinePresentationSpec,
|
||||
)
|
||||
private val presentations: Presentations = mockk()
|
||||
private val remoteViews: RemoteViews = mockk()
|
||||
@@ -51,6 +56,7 @@ class FilledPartitionExtensionsTest {
|
||||
mockkStatic(::buildAutofillRemoteViews)
|
||||
mockkStatic(FilledItem::applyToDatasetPostTiramisu)
|
||||
mockkStatic(FilledItem::applyToDatasetPreTiramisu)
|
||||
mockkStatic(InlinePresentationSpec::createCipherInlinePresentationOrNull)
|
||||
every { anyConstructed<Dataset.Builder>().build() } returns dataset
|
||||
}
|
||||
|
||||
@@ -61,6 +67,7 @@ class FilledPartitionExtensionsTest {
|
||||
unmockkStatic(::buildAutofillRemoteViews)
|
||||
unmockkStatic(FilledItem::applyToDatasetPostTiramisu)
|
||||
unmockkStatic(FilledItem::applyToDatasetPreTiramisu)
|
||||
unmockkStatic(InlinePresentationSpec::createCipherInlinePresentationOrNull)
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -71,12 +78,20 @@ class FilledPartitionExtensionsTest {
|
||||
packageName = PACKAGE_NAME,
|
||||
sdkInt = 34,
|
||||
)
|
||||
val inlinePresentation: InlinePresentation = mockk()
|
||||
every {
|
||||
buildAutofillRemoteViews(
|
||||
packageName = PACKAGE_NAME,
|
||||
title = CIPHER_NAME,
|
||||
)
|
||||
} returns remoteViews
|
||||
every {
|
||||
inlinePresentationSpec.createCipherInlinePresentationOrNull(
|
||||
autofillAppInfo = autofillAppInfo,
|
||||
autofillCipher = autofillCipher,
|
||||
)
|
||||
} returns inlinePresentation
|
||||
mockBuilder<Presentations.Builder> { it.setInlinePresentation(inlinePresentation) }
|
||||
mockBuilder<Presentations.Builder> { it.setMenuPresentation(remoteViews) }
|
||||
every {
|
||||
filledItem.applyToDatasetPostTiramisu(
|
||||
@@ -98,6 +113,11 @@ class FilledPartitionExtensionsTest {
|
||||
packageName = PACKAGE_NAME,
|
||||
title = CIPHER_NAME,
|
||||
)
|
||||
inlinePresentationSpec.createCipherInlinePresentationOrNull(
|
||||
autofillAppInfo = autofillAppInfo,
|
||||
autofillCipher = autofillCipher,
|
||||
)
|
||||
anyConstructed<Presentations.Builder>().setInlinePresentation(inlinePresentation)
|
||||
anyConstructed<Presentations.Builder>().setMenuPresentation(remoteViews)
|
||||
anyConstructed<Presentations.Builder>().build()
|
||||
filledItem.applyToDatasetPostTiramisu(
|
||||
@@ -108,14 +128,16 @@ class FilledPartitionExtensionsTest {
|
||||
}
|
||||
}
|
||||
|
||||
@Suppress("MaxLineLength")
|
||||
@Test
|
||||
fun `buildDataset should applyToDatasetPreTiramisu when sdkInt is less than 33`() {
|
||||
fun `buildDataset should skip inline and applyToDatasetPreTiramisu when sdkInt is less than 30`() {
|
||||
// Setup
|
||||
val autofillAppInfo = AutofillAppInfo(
|
||||
context = context,
|
||||
packageName = PACKAGE_NAME,
|
||||
sdkInt = 18,
|
||||
)
|
||||
val inlinePresentation: InlinePresentation = mockk()
|
||||
every {
|
||||
buildAutofillRemoteViews(
|
||||
packageName = PACKAGE_NAME,
|
||||
@@ -149,6 +171,61 @@ class FilledPartitionExtensionsTest {
|
||||
}
|
||||
}
|
||||
|
||||
@Suppress("Deprecation", "MaxLineLength")
|
||||
@Test
|
||||
fun `buildDataset should skip inline and applyToDatasetPreTiramisu when sdkInt is less than 33 but more than 29`() {
|
||||
// Setup
|
||||
val autofillAppInfo = AutofillAppInfo(
|
||||
context = context,
|
||||
packageName = PACKAGE_NAME,
|
||||
sdkInt = 30,
|
||||
)
|
||||
val inlinePresentation: InlinePresentation = mockk()
|
||||
every {
|
||||
buildAutofillRemoteViews(
|
||||
packageName = PACKAGE_NAME,
|
||||
title = CIPHER_NAME,
|
||||
)
|
||||
} returns remoteViews
|
||||
every {
|
||||
inlinePresentationSpec.createCipherInlinePresentationOrNull(
|
||||
autofillAppInfo = autofillAppInfo,
|
||||
autofillCipher = autofillCipher,
|
||||
)
|
||||
} returns inlinePresentation
|
||||
mockBuilder<Dataset.Builder> { it.setInlinePresentation(inlinePresentation) }
|
||||
every {
|
||||
filledItem.applyToDatasetPreTiramisu(
|
||||
datasetBuilder = any(),
|
||||
remoteViews = remoteViews,
|
||||
)
|
||||
} just runs
|
||||
|
||||
// Test
|
||||
val actual = filledPartition.buildDataset(
|
||||
autofillAppInfo = autofillAppInfo,
|
||||
)
|
||||
|
||||
// Verify
|
||||
assertEquals(dataset, actual)
|
||||
verify(exactly = 1) {
|
||||
buildAutofillRemoteViews(
|
||||
packageName = PACKAGE_NAME,
|
||||
title = CIPHER_NAME,
|
||||
)
|
||||
inlinePresentationSpec.createCipherInlinePresentationOrNull(
|
||||
autofillAppInfo = autofillAppInfo,
|
||||
autofillCipher = autofillCipher,
|
||||
)
|
||||
anyConstructed<Dataset.Builder>().setInlinePresentation(inlinePresentation)
|
||||
filledItem.applyToDatasetPreTiramisu(
|
||||
datasetBuilder = any(),
|
||||
remoteViews = remoteViews,
|
||||
)
|
||||
anyConstructed<Dataset.Builder>().build()
|
||||
}
|
||||
}
|
||||
|
||||
companion object {
|
||||
private const val CIPHER_NAME: String = "Autofill Cipher"
|
||||
private const val PACKAGE_NAME: String = "com.x8bit.bitwarden"
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
package com.x8bit.bitwarden.ui.autofill.util
|
||||
|
||||
import android.content.Context
|
||||
import android.content.res.Configuration
|
||||
import android.content.res.Resources
|
||||
import io.mockk.every
|
||||
import io.mockk.mockk
|
||||
import org.junit.jupiter.api.Assertions.assertFalse
|
||||
import org.junit.jupiter.api.Assertions.assertTrue
|
||||
import org.junit.jupiter.api.Test
|
||||
|
||||
class ContextExtensionsTest {
|
||||
private val testConfiguration: Configuration = mockk()
|
||||
private val testResources: Resources = mockk {
|
||||
every { this@mockk.configuration } returns testConfiguration
|
||||
}
|
||||
private val context: Context = mockk {
|
||||
every { this@mockk.resources } returns testResources
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `isSystemDarkMode should return true when UI_MODE_NIGHT_YES`() {
|
||||
// Setup
|
||||
testConfiguration.uiMode = Configuration.UI_MODE_NIGHT_YES
|
||||
|
||||
// Test & Verify
|
||||
assertTrue(context.isSystemDarkMode)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `isSystemDarkMode should return false when UI_MODE_NIGHT_NO`() {
|
||||
// Setup
|
||||
testConfiguration.uiMode = Configuration.UI_MODE_NIGHT_NO
|
||||
|
||||
// Test & Verify
|
||||
assertFalse(context.isSystemDarkMode)
|
||||
}
|
||||
}
|
||||
+225
@@ -0,0 +1,225 @@
|
||||
package com.x8bit.bitwarden.ui.autofill.util
|
||||
|
||||
import android.app.PendingIntent
|
||||
import android.app.slice.Slice
|
||||
import android.content.Context
|
||||
import android.content.Intent
|
||||
import android.graphics.drawable.Icon
|
||||
import android.os.Bundle
|
||||
import android.widget.inline.InlinePresentationSpec
|
||||
import androidx.autofill.inline.UiVersions
|
||||
import androidx.autofill.inline.v1.InlineSuggestionUi
|
||||
import com.x8bit.bitwarden.R
|
||||
import com.x8bit.bitwarden.data.autofill.model.AutofillAppInfo
|
||||
import com.x8bit.bitwarden.data.autofill.model.AutofillCipher
|
||||
import io.mockk.every
|
||||
import io.mockk.mockk
|
||||
import io.mockk.mockkStatic
|
||||
import io.mockk.unmockkStatic
|
||||
import io.mockk.verify
|
||||
import org.junit.jupiter.api.AfterEach
|
||||
import org.junit.jupiter.api.Assertions
|
||||
import org.junit.jupiter.api.BeforeEach
|
||||
import org.junit.jupiter.api.Test
|
||||
|
||||
class InlinePresentationSpecExtensionsTest {
|
||||
private val testContext: Context = mockk()
|
||||
private val autofillAppInfo: AutofillAppInfo = mockk {
|
||||
every { this@mockk.context } returns testContext
|
||||
}
|
||||
private val testStyle: Bundle = mockk()
|
||||
private val inlinePresentationSpec: InlinePresentationSpec = mockk {
|
||||
every { this@mockk.style } returns testStyle
|
||||
}
|
||||
|
||||
@BeforeEach
|
||||
fun setup() {
|
||||
mockkStatic(Context::isSystemDarkMode)
|
||||
mockkStatic(Icon::class)
|
||||
mockkStatic(InlineSuggestionUi::class)
|
||||
mockkStatic(PendingIntent::getService)
|
||||
mockkStatic(UiVersions::getVersions)
|
||||
}
|
||||
|
||||
@AfterEach
|
||||
fun teardown() {
|
||||
mockkStatic(Context::isSystemDarkMode)
|
||||
unmockkStatic(Icon::class)
|
||||
unmockkStatic(InlineSuggestionUi::class)
|
||||
unmockkStatic(PendingIntent::getService)
|
||||
unmockkStatic(UiVersions::getVersions)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `createCipherInlinePresentationOrNull should return null if incompatible`() {
|
||||
// Setup
|
||||
every {
|
||||
UiVersions.getVersions(testStyle)
|
||||
} returns emptyList()
|
||||
|
||||
// Test
|
||||
val actual = inlinePresentationSpec.createCipherInlinePresentationOrNull(
|
||||
autofillAppInfo = autofillAppInfo,
|
||||
autofillCipher = mockk(),
|
||||
)
|
||||
|
||||
// Verify
|
||||
Assertions.assertNull(actual)
|
||||
verify(exactly = 1) {
|
||||
UiVersions.getVersions(testStyle)
|
||||
}
|
||||
}
|
||||
|
||||
@Suppress("MaxLineLength")
|
||||
@Test
|
||||
fun `createCipherInlinePresentationOrNull should return presentation with card icon when card cipher and compatible`() {
|
||||
// Setup
|
||||
val icon: Icon = mockk()
|
||||
val autofillCipher: AutofillCipher.Card = mockk {
|
||||
every { this@mockk.name } returns AUTOFILL_CIPHER_NAME
|
||||
every { this@mockk.subtitle } returns AUTOFILL_CIPHER_SUBTITLE
|
||||
every { this@mockk.iconRes } returns R.drawable.ic_card_item
|
||||
}
|
||||
val pendingIntent: PendingIntent = mockk()
|
||||
val slice: Slice = mockk()
|
||||
every {
|
||||
UiVersions.getVersions(testStyle)
|
||||
} returns listOf(UiVersions.INLINE_UI_VERSION_1)
|
||||
every {
|
||||
PendingIntent.getService(
|
||||
testContext,
|
||||
PENDING_INTENT_CODE,
|
||||
any<Intent>(),
|
||||
PENDING_INTENT_FLAGS,
|
||||
)
|
||||
} returns pendingIntent
|
||||
every { testContext.isSystemDarkMode } returns true
|
||||
every { testContext.getColor(R.color.dark_on_surface) } returns ICON_TINT
|
||||
every {
|
||||
Icon.createWithResource(
|
||||
testContext,
|
||||
R.drawable.ic_card_item,
|
||||
)
|
||||
.setTint(ICON_TINT)
|
||||
} returns icon
|
||||
every {
|
||||
InlineSuggestionUi.newContentBuilder(pendingIntent)
|
||||
.setTitle(AUTOFILL_CIPHER_NAME)
|
||||
.setSubtitle(AUTOFILL_CIPHER_SUBTITLE)
|
||||
.setStartIcon(icon)
|
||||
.build()
|
||||
.slice
|
||||
} returns slice
|
||||
|
||||
// Test
|
||||
val actual = inlinePresentationSpec.createCipherInlinePresentationOrNull(
|
||||
autofillAppInfo = autofillAppInfo,
|
||||
autofillCipher = autofillCipher,
|
||||
)
|
||||
|
||||
// Verify not-null because we can't properly mock Intent constructors.
|
||||
Assertions.assertNotNull(actual)
|
||||
verify(exactly = 1) {
|
||||
UiVersions.getVersions(testStyle)
|
||||
PendingIntent.getService(
|
||||
testContext,
|
||||
PENDING_INTENT_CODE,
|
||||
any<Intent>(),
|
||||
PENDING_INTENT_FLAGS,
|
||||
)
|
||||
testContext.isSystemDarkMode
|
||||
testContext.getColor(R.color.dark_on_surface)
|
||||
Icon.createWithResource(
|
||||
testContext,
|
||||
R.drawable.ic_card_item,
|
||||
)
|
||||
.setTint(ICON_TINT)
|
||||
InlineSuggestionUi.newContentBuilder(pendingIntent)
|
||||
.setTitle(AUTOFILL_CIPHER_NAME)
|
||||
.setSubtitle(AUTOFILL_CIPHER_SUBTITLE)
|
||||
.setStartIcon(icon)
|
||||
.build()
|
||||
.slice
|
||||
}
|
||||
}
|
||||
|
||||
@Suppress("MaxLineLength")
|
||||
@Test
|
||||
fun `createCipherInlinePresentationOrNull should return presentation with login icon when login cipher and compatible`() {
|
||||
// Setup
|
||||
val icon: Icon = mockk()
|
||||
val autofillCipher: AutofillCipher.Login = mockk {
|
||||
every { this@mockk.name } returns AUTOFILL_CIPHER_NAME
|
||||
every { this@mockk.subtitle } returns AUTOFILL_CIPHER_SUBTITLE
|
||||
every { this@mockk.iconRes } returns R.drawable.ic_login_item
|
||||
}
|
||||
val pendingIntent: PendingIntent = mockk()
|
||||
val slice: Slice = mockk()
|
||||
every {
|
||||
UiVersions.getVersions(testStyle)
|
||||
} returns listOf(UiVersions.INLINE_UI_VERSION_1)
|
||||
every {
|
||||
PendingIntent.getService(
|
||||
testContext,
|
||||
PENDING_INTENT_CODE,
|
||||
any<Intent>(),
|
||||
PENDING_INTENT_FLAGS,
|
||||
)
|
||||
} returns pendingIntent
|
||||
every { testContext.isSystemDarkMode } returns false
|
||||
every { testContext.getColor(R.color.on_surface) } returns ICON_TINT
|
||||
every {
|
||||
Icon.createWithResource(
|
||||
testContext,
|
||||
R.drawable.ic_login_item,
|
||||
)
|
||||
.setTint(ICON_TINT)
|
||||
} returns icon
|
||||
every {
|
||||
InlineSuggestionUi.newContentBuilder(pendingIntent)
|
||||
.setTitle(AUTOFILL_CIPHER_NAME)
|
||||
.setSubtitle(AUTOFILL_CIPHER_SUBTITLE)
|
||||
.setStartIcon(icon)
|
||||
.build()
|
||||
.slice
|
||||
} returns slice
|
||||
|
||||
// Test
|
||||
val actual = inlinePresentationSpec.createCipherInlinePresentationOrNull(
|
||||
autofillAppInfo = autofillAppInfo,
|
||||
autofillCipher = autofillCipher,
|
||||
)
|
||||
|
||||
// Verify not-null because we can't properly mock Intent constructors.
|
||||
Assertions.assertNotNull(actual)
|
||||
verify(exactly = 1) {
|
||||
UiVersions.getVersions(testStyle)
|
||||
PendingIntent.getService(
|
||||
testContext,
|
||||
PENDING_INTENT_CODE,
|
||||
any<Intent>(),
|
||||
PENDING_INTENT_FLAGS,
|
||||
)
|
||||
testContext.isSystemDarkMode
|
||||
testContext.getColor(R.color.on_surface)
|
||||
Icon.createWithResource(
|
||||
testContext,
|
||||
R.drawable.ic_login_item,
|
||||
)
|
||||
.setTint(ICON_TINT)
|
||||
InlineSuggestionUi.newContentBuilder(pendingIntent)
|
||||
.setTitle(AUTOFILL_CIPHER_NAME)
|
||||
.setSubtitle(AUTOFILL_CIPHER_SUBTITLE)
|
||||
.setStartIcon(icon)
|
||||
.build()
|
||||
.slice
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private const val AUTOFILL_CIPHER_NAME = "Cipher1"
|
||||
private const val AUTOFILL_CIPHER_SUBTITLE = "Subtitle"
|
||||
private const val ICON_TINT: Int = 6123751
|
||||
private const val PENDING_INTENT_CODE: Int = 0
|
||||
private const val PENDING_INTENT_FLAGS: Int =
|
||||
PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
|
||||
Reference in New Issue
Block a user