1
0
Fork 0

Closes #7450: Lazy storage initialization

Make sure that we actually lazily initialize our storage layers.

With this patch applied, storage layers (history, logins, bookmarks) will be initialized when first
accessed. We will no longer block GeckoEngine init, for example, on waiting for the logins storage
to initialize (which needs to access the costly securePrefStorage).
Similarly, BackgroundServices init will no longer require initialized instances of the storage
components - references to their "lazy wrappers" will suffice.

In practice, this change changes when our storage layers are initialized in the following ways.
Currently, we will initialize everything on startup. This includes loading our megazord, as well.

With this change, init path depends on if the user is signed-into FxA or not.

If user is not an FxA user:
- on startup, none of the storage layers are initialized
- history storage will be initialized once, whenever:
  - first non-customTab page is loaded (access to the HistoryDelegate)
  - first interaction with the awesomebar
  - history UI is accessed
- bookmarks storage will be initialized once, whenever:
  - something is bookmarked, or we need to figure out if something's bookmarked
  - bookmarks UI is accessed
- logins storage will be initialized once, whenever:
  - first page is loaded with a login/password fields that can be autofilled
  - (or some other interaction by GV with the autofill/loginStorage delegates)
  - logins UI is accessed
- all of these storages will be initialized if the user logs into FxA and starts syncing data
  - except, if a storage is not chosen to be synced, it will not be initialized

If user is an FxA user:
- on startup, none of the storage layers are initialized
- sometime shortly after startup is complete, when a sync worker runs in the background, all storage
layers that are enabled to sync will be initialized.

This change also means that we delay loading the megazord until first access (as described above).
master
Grisha Kruglov 2020-03-17 23:30:49 -07:00 committed by Grisha Kruglov
parent 3ea8023a27
commit eb14532c3c
7 changed files with 39 additions and 23 deletions

View File

@ -23,7 +23,7 @@ object GeckoProvider {
@Synchronized @Synchronized
fun getOrCreateRuntime( fun getOrCreateRuntime(
context: Context, context: Context,
storage: LoginsStorage storage: Lazy<LoginsStorage>
): GeckoRuntime { ): GeckoRuntime {
if (runtime == null) { if (runtime == null) {
runtime = createRuntime(context, storage) runtime = createRuntime(context, storage)
@ -34,7 +34,7 @@ object GeckoProvider {
private fun createRuntime( private fun createRuntime(
context: Context, context: Context,
storage: LoginsStorage storage: Lazy<LoginsStorage>
): GeckoRuntime { ): GeckoRuntime {
val builder = GeckoRuntimeSettings.Builder() val builder = GeckoRuntimeSettings.Builder()

View File

@ -22,7 +22,7 @@ object GeckoProvider {
@Synchronized @Synchronized
fun getOrCreateRuntime( fun getOrCreateRuntime(
context: Context, context: Context,
storage: LoginsStorage storage: Lazy<LoginsStorage>
): GeckoRuntime { ): GeckoRuntime {
if (runtime == null) { if (runtime == null) {
runtime = createRuntime(context, storage) runtime = createRuntime(context, storage)
@ -33,7 +33,7 @@ object GeckoProvider {
private fun createRuntime( private fun createRuntime(
context: Context, context: Context,
storage: LoginsStorage storage: Lazy<LoginsStorage>
): GeckoRuntime { ): GeckoRuntime {
val builder = GeckoRuntimeSettings.Builder() val builder = GeckoRuntimeSettings.Builder()

View File

@ -331,7 +331,7 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Session
customTabId = customTabSessionId, customTabId = customTabSessionId,
fragmentManager = parentFragmentManager, fragmentManager = parentFragmentManager,
loginValidationDelegate = DefaultLoginValidationDelegate( loginValidationDelegate = DefaultLoginValidationDelegate(
context.components.core.passwordsStorage context.components.core.lazyPasswordsStorage
), ),
isSaveLoginEnabled = { isSaveLoginEnabled = {
context.settings().shouldPromptToSaveLogins context.settings().shouldPromptToSaveLogins

View File

@ -46,9 +46,9 @@ class BackgroundServices(
private val context: Context, private val context: Context,
private val push: Push, private val push: Push,
crashReporter: CrashReporter, crashReporter: CrashReporter,
historyStorage: PlacesHistoryStorage, historyStorage: Lazy<PlacesHistoryStorage>,
bookmarkStorage: PlacesBookmarksStorage, bookmarkStorage: Lazy<PlacesBookmarksStorage>,
passwordsStorage: SyncableLoginsStorage passwordsStorage: Lazy<SyncableLoginsStorage>
) { ) {
fun defaultDeviceName(context: Context): String = fun defaultDeviceName(context: Context): String =
context.getString( context.getString(

View File

@ -33,9 +33,9 @@ class Components(private val context: Context) {
context, context,
push, push,
analytics.crashReporter, analytics.crashReporter,
core.historyStorage, core.lazyHistoryStorage,
core.bookmarksStorage, core.lazyBookmarksStorage,
core.passwordsStorage core.lazyPasswordsStorage
) )
} }
val services by lazy { Services(context, backgroundServices.accountManager) } val services by lazy { Services(context, backgroundServices.accountManager) }

View File

@ -38,6 +38,7 @@ import mozilla.components.feature.webnotifications.WebNotificationFeature
import mozilla.components.lib.dataprotect.SecureAbove22Preferences import mozilla.components.lib.dataprotect.SecureAbove22Preferences
import mozilla.components.lib.dataprotect.generateEncryptionKey import mozilla.components.lib.dataprotect.generateEncryptionKey
import mozilla.components.service.sync.logins.SyncableLoginsStorage import mozilla.components.service.sync.logins.SyncableLoginsStorage
import mozilla.components.support.base.log.logger.Logger
import org.mozilla.fenix.AppRequestInterceptor import org.mozilla.fenix.AppRequestInterceptor
import org.mozilla.fenix.Config import org.mozilla.fenix.Config
import org.mozilla.fenix.FeatureFlags import org.mozilla.fenix.FeatureFlags
@ -52,6 +53,8 @@ import java.util.concurrent.TimeUnit
*/ */
@Mockable @Mockable
class Core(private val context: Context) { class Core(private val context: Context) {
private val logger = Logger("Core")
/** /**
* The browser engine component initialized based on the build * The browser engine component initialized based on the build
* configuration (see build variants). * configuration (see build variants).
@ -62,7 +65,7 @@ class Core(private val context: Context) {
remoteDebuggingEnabled = context.settings().isRemoteDebuggingEnabled, remoteDebuggingEnabled = context.settings().isRemoteDebuggingEnabled,
testingModeEnabled = false, testingModeEnabled = false,
trackingProtectionPolicy = trackingProtectionPolicyFactory.createTrackingProtectionPolicy(), trackingProtectionPolicy = trackingProtectionPolicyFactory.createTrackingProtectionPolicy(),
historyTrackingDelegate = HistoryDelegate(historyStorage), historyTrackingDelegate = HistoryDelegate(lazyHistoryStorage),
preferredColorScheme = getPreferredColorScheme(), preferredColorScheme = getPreferredColorScheme(),
automaticFontSizeAdjustment = context.settings().shouldUseAutoSize, automaticFontSizeAdjustment = context.settings().shouldUseAutoSize,
fontInflationEnabled = context.settings().shouldUseAutoSize, fontInflationEnabled = context.settings().shouldUseAutoSize,
@ -73,7 +76,7 @@ class Core(private val context: Context) {
GeckoEngine( GeckoEngine(
context, context,
defaultSettings, defaultSettings,
GeckoProvider.getOrCreateRuntime(context, passwordsStorage) GeckoProvider.getOrCreateRuntime(context, lazyPasswordsStorage)
).also { ).also {
WebCompatFeature.install(it) WebCompatFeature.install(it)
} }
@ -85,7 +88,7 @@ class Core(private val context: Context) {
val client: Client by lazy { val client: Client by lazy {
GeckoViewFetchClient( GeckoViewFetchClient(
context, context,
GeckoProvider.getOrCreateRuntime(context, passwordsStorage) GeckoProvider.getOrCreateRuntime(context, lazyPasswordsStorage)
) )
} }
@ -184,15 +187,28 @@ class Core(private val context: Context) {
) )
} }
/** // Lazy wrappers around storage components are used to pass references to these components without
* The storage component to persist browsing history (with the exception of // initializing them until they're accessed.
* private sessions). // Use these for startup-path code, where we don't want to do any work that's not strictly necessary.
*/ // For example, this is how the GeckoEngine delegates (history, logins) are configured.
val historyStorage by lazy { PlacesHistoryStorage(context) } // We can fully initialize GeckoEngine without initialized our storage.
val lazyHistoryStorage = lazy {
logger.info("Initializing history storage")
PlacesHistoryStorage(context)
}
val lazyBookmarksStorage = lazy {
logger.info("Initializing bookmarks storage")
PlacesBookmarksStorage(context)
}
val lazyPasswordsStorage = lazy {
logger.info("Initializing logins storage")
SyncableLoginsStorage(context, passwordsEncryptionKey)
}
val bookmarksStorage by lazy { PlacesBookmarksStorage(context) } // For most other application code (non-startup), these wrappers are perfectly fine and more ergonomic.
val historyStorage by lazy { lazyHistoryStorage.value }
val passwordsStorage by lazy { SyncableLoginsStorage(context, passwordsEncryptionKey) } val bookmarksStorage by lazy { lazyBookmarksStorage.value }
val passwordsStorage by lazy { lazyPasswordsStorage.value }
val tabCollectionStorage by lazy { TabCollectionStorage(context, sessionManager) } val tabCollectionStorage by lazy { TabCollectionStorage(context, sessionManager) }

View File

@ -3,5 +3,5 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
object AndroidComponents { object AndroidComponents {
const val VERSION = "37.0.20200318190037" const val VERSION = "37.0.20200319130119"
} }