Archives/iceraven-browser
2
0
Fork 0
mirror of https://github.com/fork-maintainers/iceraven-browser synced 2024-11-05 21:20:45 +00:00
Code Issues Releases Wiki Activity

Fix breaking change in KeyProvider

Browse Source 
`key` was renamed to `getOrGenerateKey` and is now a `suspend`.
This commit is contained in:
Grisha Kruglov 2021-12-09 15:15:14 -08:00 committed by mergify[bot]
parent 8de4c0b4db
commit 33af7d8729
4 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/org/mozilla/fenix/settings/creditcards/CreditCardEditorFragment.kt
View File

@ -12,6 +12,9 @@ import android.view.View
import androidx.lifecycle.lifecycleScope
import androidx.navigation.fragment.findNavController
import androidx.navigation.fragment.navArgs
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import org.mozilla.fenix.R
import org.mozilla.fenix.SecureFragment
import org.mozilla.fenix.databinding.FragmentCreditCardEditorBinding
@ -65,10 +68,14 @@ class CreditCardEditorFragment : SecureFragment(R.layout.fragment_credit_card_ed
val binding = FragmentCreditCardEditorBinding.bind(view)
creditCardEditorState =
args.creditCard?.toCreditCardEditorState(storage) ?: getInitialCreditCardEditorState()
creditCardEditorView = CreditCardEditorView(binding, interactor)
creditCardEditorView.bind(creditCardEditorState)
lifecycleScope.launch(Dispatchers.Main) {
creditCardEditorState = withContext(Dispatchers.IO) {
args.creditCard?.toCreditCardEditorState(storage)
?: getInitialCreditCardEditorState()
}
creditCardEditorView = CreditCardEditorView(binding, interactor)
creditCardEditorView.bind(creditCardEditorState)
}
}
/**

4
app/src/main/java/org/mozilla/fenix/settings/creditcards/CreditCardEditorState.kt
View File

@ -31,9 +31,9 @@ data class CreditCardEditorState(
/**
* Returns a [CreditCardEditorState] from the given [CreditCard].
*/
fun CreditCard.toCreditCardEditorState(storage: AutofillCreditCardsAddressesStorage): CreditCardEditorState {
suspend fun CreditCard.toCreditCardEditorState(storage: AutofillCreditCardsAddressesStorage): CreditCardEditorState {
val crypto = storage.getCreditCardCrypto()
val key = crypto.key()
val key = crypto.getOrGenerateKey()
val cardNumber = crypto.decrypt(key, encryptedCardNumber)?.number ?: ""
val startYear = expiryYear.toInt()
val endYear = startYear + NUMBER_OF_YEARS_TO_SHOW

3
app/src/test/java/org/mozilla/fenix/settings/creditcards/CreditCardEditorStateTest.kt
View File

@ -6,6 +6,7 @@ package org.mozilla.fenix.settings.creditcards
import io.mockk.every
import io.mockk.mockk
import kotlinx.coroutines.runBlocking
import mozilla.components.concept.storage.CreditCard
import mozilla.components.concept.storage.CreditCardNumber
import mozilla.components.service.sync.autofill.AutofillCreditCardsAddressesStorage
@ -36,7 +37,7 @@ class CreditCardEditorStateTest {
)
@Test
fun testToCreditCardEditorState() {
fun testToCreditCardEditorState() = runBlocking {
val storage: AutofillCreditCardsAddressesStorage = mockk(relaxed = true)
val crypto: AutofillCrypto = mockk(relaxed = true)

7
app/src/test/java/org/mozilla/fenix/settings/creditcards/CreditCardEditorViewTest.kt
View File

@ -10,6 +10,7 @@ import io.mockk.every
import io.mockk.mockk
import io.mockk.spyk
import io.mockk.verify
import kotlinx.coroutines.runBlocking
import mozilla.components.concept.storage.CreditCard
import mozilla.components.concept.storage.CreditCardNumber
import mozilla.components.concept.storage.NewCreditCardFields
@ -99,7 +100,7 @@ class CreditCardEditorViewTest {
}
@Test
fun `GIVEN a credit card THEN credit card form inputs are displaying the provided credit card information`() {
fun `GIVEN a credit card THEN credit card form inputs are displaying the provided credit card information`() = runBlocking {
creditCardEditorView.bind(creditCard.toCreditCardEditorState(storage))
assertEquals(cardNumber, fragmentCreditCardEditorBinding.cardNumberInput.text.toString())
@ -120,7 +121,7 @@ class CreditCardEditorViewTest {
}
@Test
fun `GIVEN a credit card WHEN the delete card button is clicked THEN interactor is called`() {
fun `GIVEN a credit card WHEN the delete card button is clicked THEN interactor is called`() = runBlocking {
creditCardEditorView.bind(creditCard.toCreditCardEditorState(storage))
assertEquals(View.VISIBLE, fragmentCreditCardEditorBinding.deleteButton.visibility)
@ -271,7 +272,7 @@ class CreditCardEditorViewTest {
}
@Test
fun `GIVEN a valid credit card WHEN the save button is clicked THEN interactor is called`() {
fun `GIVEN a valid credit card WHEN the save button is clicked THEN interactor is called`() = runBlocking {
creditCardEditorView.bind(creditCard.toCreditCardEditorState(storage))
fragmentCreditCardEditorBinding.saveButton.performClick()