From 35bae17e86856ca45f583804f662b2eef7e40a7b Mon Sep 17 00:00:00 2001
From: Gabriel Luong <gabriel.luong@gmail.com>
Date: Tue, 9 Mar 2021 15:54:15 -0500
Subject: [PATCH] For #18408 - Add a lazy getter for
 AutofillCreditCardsAddressStorage

---
 app/build.gradle                                       | 1 +
 app/src/main/java/org/mozilla/fenix/components/Core.kt | 3 +++
 buildSrc/src/main/java/Dependencies.kt                 | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/app/build.gradle b/app/build.gradle
index 8090f300b..da5d7bfdf 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -498,6 +498,7 @@ dependencies {
     implementation Deps.mozilla_feature_webcompat_reporter
 
     implementation Deps.mozilla_service_digitalassetlinks
+    implementation Deps.mozilla_service_sync_autofill
     implementation Deps.mozilla_service_sync_logins
     implementation Deps.mozilla_service_firefox_accounts
     implementation Deps.mozilla_service_glean
diff --git a/app/src/main/java/org/mozilla/fenix/components/Core.kt b/app/src/main/java/org/mozilla/fenix/components/Core.kt
index 41dfa2543..a560f1288 100644
--- a/app/src/main/java/org/mozilla/fenix/components/Core.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/Core.kt
@@ -56,6 +56,7 @@ import mozilla.components.service.digitalassetlinks.local.StatementApi
 import mozilla.components.service.digitalassetlinks.local.StatementRelationChecker
 import mozilla.components.service.location.LocationService
 import mozilla.components.service.location.MozillaLocationService
+import mozilla.components.service.sync.autofill.AutofillCreditCardsAddressesStorage
 import mozilla.components.service.sync.logins.SyncableLoginsStorage
 import mozilla.components.support.locale.LocaleManager
 import org.mozilla.fenix.AppRequestInterceptor
@@ -288,6 +289,7 @@ class Core(
     val lazyHistoryStorage = lazyMonitored { PlacesHistoryStorage(context, crashReporter) }
     val lazyBookmarksStorage = lazyMonitored { PlacesBookmarksStorage(context) }
     val lazyPasswordsStorage = lazyMonitored { SyncableLoginsStorage(context, passwordsEncryptionKey) }
+    val lazyAutofillStorage = lazyMonitored { AutofillCreditCardsAddressesStorage(context) }
 
     /**
      * The storage component to sync and persist tabs in a Firefox Sync account.
@@ -298,6 +300,7 @@ class Core(
     val historyStorage: PlacesHistoryStorage get() = lazyHistoryStorage.value
     val bookmarksStorage: PlacesBookmarksStorage get() = lazyBookmarksStorage.value
     val passwordsStorage: SyncableLoginsStorage get() = lazyPasswordsStorage.value
+    val autofillStorage: AutofillCreditCardsAddressesStorage get() = lazyAutofillStorage.value
 
     val tabCollectionStorage by lazyMonitored {
         TabCollectionStorage(
diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
index c28def136..3e117e06c 100644
--- a/buildSrc/src/main/java/Dependencies.kt
+++ b/buildSrc/src/main/java/Dependencies.kt
@@ -132,6 +132,8 @@ object Deps {
 
     const val mozilla_service_digitalassetlinks =
         "org.mozilla.components:service-digitalassetlinks:${Versions.mozilla_android_components}"
+    const val mozilla_service_sync_autofill =
+        "org.mozilla.components:service-sync-autofill:${Versions.mozilla_android_components}"
     const val mozilla_service_sync_logins =
         "org.mozilla.components:service-sync-logins:${Versions.mozilla_android_components}"
     const val mozilla_service_firefox_accounts = "org.mozilla.components:service-firefox-accounts:${Versions.mozilla_android_components}"