From 8f29882f604d059d55b30544306c27a0483759ae Mon Sep 17 00:00:00 2001 From: Gabriel Luong Date: Wed, 6 Sep 2023 22:04:51 -0400 Subject: [PATCH] Bug 1851678 - Catch AutofillApiException exception when fetching autofill data and setting startup metrics (cherry picked from commit 6449e3ca8fef0b87de285d28889d3694b3df24a6) --- .../main/java/org/mozilla/fenix/FenixApplication.kt | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/FenixApplication.kt b/app/src/main/java/org/mozilla/fenix/FenixApplication.kt index 561758c40..cfe33e9ac 100644 --- a/app/src/main/java/org/mozilla/fenix/FenixApplication.kt +++ b/app/src/main/java/org/mozilla/fenix/FenixApplication.kt @@ -28,6 +28,7 @@ import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.async import kotlinx.coroutines.launch import mozilla.appservices.Megazord +import mozilla.appservices.autofill.AutofillApiException import mozilla.components.browser.state.action.SystemAction import mozilla.components.browser.state.selector.selectedTab import mozilla.components.browser.state.state.searchEngines @@ -837,9 +838,13 @@ open class FenixApplication : LocaleAwareApplication(), Provider { @OptIn(DelicateCoroutinesApi::class) GlobalScope.launch(IO) { - val autoFillStorage = applicationContext.components.core.autofillStorage - Addresses.savedAll.set(autoFillStorage.getAllAddresses().size.toLong()) - CreditCards.savedAll.set(autoFillStorage.getAllCreditCards().size.toLong()) + try { + val autoFillStorage = applicationContext.components.core.autofillStorage + Addresses.savedAll.set(autoFillStorage.getAllAddresses().size.toLong()) + CreditCards.savedAll.set(autoFillStorage.getAllCreditCards().size.toLong()) + } catch (e: AutofillApiException) { + logger.error("Failed to fetch autofill data", e) + } try { val passwordsStorage = applicationContext.components.core.passwordsStorage