For #27667 - Remove import-ordering from the list of disabled ktlint rules

.editorconfig

@@ -1,9 +1,4 @@
 [*.{kt,kts}]
-# Disabling rules that were added in the latest versions of ktlint
-# tracking here: https://github.com/mozilla-mobile/fenix/issues/4861
-
-ktlint_disabled_rules=import-ordering
-
 ij_kotlin_allow_trailing_comma_on_call_site=true
 ij_kotlin_allow_trailing_comma=true
 

.git-blame-ignore-revs

@@ -1,3 +1,5 @@
 # .git-blame-ignore-revs
-# 26901: Fix issues from ktlint baseline
+# For #27667 - Remove import-ordering from the list of disabled ktlint rules (#27680)
+463fcd53b8db5a43b0be7bf1a4c4bbe8f2a163e0
+# For #26844: Fix ktlint issues and remove them from baseline. (#26901)
 ffcef5ff2e3f78b6972dd16551f3f653b7035ccc

app/src/androidTest/java/org/mozilla/fenix/components/FxaServer.kt

@@ -5,8 +5,8 @@
 package org.mozilla.fenix.components
 
 import android.content.Context
-import mozilla.components.service.fxa.ServerConfig.Server
 import mozilla.components.service.fxa.ServerConfig
+import mozilla.components.service.fxa.ServerConfig.Server
 
 /**
  * Utility to configure Firefox Account stage servers.

app/src/androidTest/java/org/mozilla/fenix/glean/BaselinePingTest.kt

@@ -24,8 +24,8 @@ import mozilla.components.service.glean.net.ConceptFetchHttpUploader
 import mozilla.components.service.glean.testing.GleanTestLocalServer
 import okhttp3.mockwebserver.RecordedRequest
 import org.json.JSONObject
-import org.junit.Assert.assertTrue
 import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.BeforeClass
 import org.junit.Rule
@@ -36,9 +36,9 @@ import org.mozilla.fenix.HomeActivity
 import org.mozilla.fenix.R
 import org.mozilla.fenix.helpers.HomeActivityTestRule
 import org.mozilla.fenix.helpers.MockWebServerHelper
-import java.util.concurrent.TimeUnit
 import java.io.BufferedReader
 import java.io.ByteArrayInputStream
+import java.util.concurrent.TimeUnit
 import java.util.zip.GZIPInputStream
 
 /**

app/src/androidTest/java/org/mozilla/fenix/helpers/Assert.kt

@@ -5,11 +5,6 @@
 package org.mozilla.fenix.helpers
 
 import android.graphics.Bitmap
-
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
 import android.graphics.Color
 import org.junit.Assert.assertEquals
 

app/src/androidTest/java/org/mozilla/fenix/helpers/MockLocationUpdatesRule.kt

@@ -12,9 +12,9 @@ import android.os.SystemClock
 import android.util.Log
 import androidx.test.core.app.ApplicationProvider
 import org.junit.rules.ExternalResource
+import org.mozilla.fenix.helpers.TestHelper.mDevice
 import java.util.Date
 import kotlin.random.Random
-import org.mozilla.fenix.helpers.TestHelper.mDevice
 
 private const val mockProviderName = LocationManager.GPS_PROVIDER
 

app/src/androidTest/java/org/mozilla/fenix/helpers/SearchDispatcher.kt

@@ -7,14 +7,14 @@ package org.mozilla.fenix.helpers
 import android.os.Handler
 import android.os.Looper
 import androidx.test.platform.app.InstrumentationRegistry
-import java.io.IOException
-import java.io.InputStream
 import okhttp3.mockwebserver.Dispatcher
 import okhttp3.mockwebserver.MockResponse
 import okhttp3.mockwebserver.MockWebServer
 import okhttp3.mockwebserver.RecordedRequest
 import okio.Buffer
 import okio.source
+import java.io.IOException
+import java.io.InputStream
 
 /**
  * A [MockWebServer] [Dispatcher] that will return a generic search results page in the body of

app/src/androidTest/java/org/mozilla/fenix/helpers/TestHelper.kt

@@ -45,8 +45,6 @@ import androidx.test.uiautomator.UiObjectNotFoundException
 import androidx.test.uiautomator.UiScrollable
 import androidx.test.uiautomator.UiSelector
 import androidx.test.uiautomator.Until
-import java.util.Locale
-import java.util.regex.Pattern
 import junit.framework.AssertionFailedError
 import mozilla.components.browser.state.search.SearchEngine
 import mozilla.components.support.ktx.android.content.appName
@@ -67,6 +65,8 @@ import org.mozilla.fenix.helpers.idlingresource.NetworkConnectionIdlingResource
 import org.mozilla.fenix.ui.robots.BrowserRobot
 import org.mozilla.fenix.utils.IntentUtils
 import org.mozilla.gecko.util.ThreadUtils
+import java.util.Locale
+import java.util.regex.Pattern
 
 object TestHelper {
 

app/src/androidTest/java/org/mozilla/fenix/helpers/matchers/BitmapDrawableMatcher.kt

@@ -5,13 +5,13 @@
 package org.mozilla.fenix.helpers.matchers
 
 import android.graphics.Bitmap
+import android.graphics.drawable.BitmapDrawable
+import android.graphics.drawable.Drawable
+import android.graphics.drawable.StateListDrawable
 import android.view.View
 import android.widget.ImageView
 import androidx.test.espresso.matcher.BoundedMatcher
 import org.hamcrest.Description
-import android.graphics.drawable.BitmapDrawable
-import android.graphics.drawable.StateListDrawable
-import android.graphics.drawable.Drawable
 
 class BitmapDrawableMatcher(private val bitmap: Bitmap, private val name: String) :
     BoundedMatcher<View, ImageView>(ImageView::class.java) {

app/src/androidTest/java/org/mozilla/fenix/screenshots/DefaultHomeScreenTest.kt

@@ -14,8 +14,8 @@ import org.junit.After
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
-import org.mozilla.fenix.helpers.HomeActivityTestRule
 import org.mozilla.fenix.HomeActivity
+import org.mozilla.fenix.helpers.HomeActivityTestRule
 import org.mozilla.fenix.helpers.TestAssetHelper
 import org.mozilla.fenix.ui.robots.homeScreen
 import tools.fastlane.screengrab.Screengrab

app/src/androidTest/java/org/mozilla/fenix/ui/SettingsDeveloperToolsTest.kt

@@ -7,10 +7,10 @@ package org.mozilla.fenix.ui
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.uiautomator.UiDevice
 import okhttp3.mockwebserver.MockWebServer
-import org.junit.Rule
-import org.junit.Before
 import org.junit.After
+import org.junit.Before
 import org.junit.Ignore
+import org.junit.Rule
 import org.junit.Test
 import org.mozilla.fenix.helpers.AndroidAssetDispatcher
 import org.mozilla.fenix.helpers.HomeActivityTestRule

app/src/androidTest/java/org/mozilla/fenix/ui/SettingsSearchTest.kt

@@ -16,8 +16,8 @@ import org.mozilla.fenix.helpers.SearchDispatcher
 import org.mozilla.fenix.helpers.TestAssetHelper.getGenericAsset
 import org.mozilla.fenix.helpers.TestHelper
 import org.mozilla.fenix.helpers.TestHelper.appContext
-import org.mozilla.fenix.helpers.TestHelper.setTextToClipBoard
 import org.mozilla.fenix.helpers.TestHelper.exitMenu
+import org.mozilla.fenix.helpers.TestHelper.setTextToClipBoard
 import org.mozilla.fenix.ui.robots.homeScreen
 import org.mozilla.fenix.ui.robots.navigationToolbar
 import org.mozilla.fenix.ui.util.ARABIC_LANGUAGE_HEADER

app/src/androidTest/java/org/mozilla/fenix/ui/SettingsSyncTest.kt

@@ -7,10 +7,10 @@ package org.mozilla.fenix.ui
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.uiautomator.UiDevice
 import okhttp3.mockwebserver.MockWebServer
-import org.junit.Rule
-import org.junit.Before
 import org.junit.After
+import org.junit.Before
 import org.junit.Ignore
+import org.junit.Rule
 import org.junit.Test
 import org.mozilla.fenix.helpers.AndroidAssetDispatcher
 import org.mozilla.fenix.helpers.HomeActivityTestRule

app/src/androidTest/java/org/mozilla/fenix/ui/SettingsTest.kt

@@ -7,10 +7,10 @@ package org.mozilla.fenix.ui
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.uiautomator.UiDevice
 import okhttp3.mockwebserver.MockWebServer
-import org.junit.Rule
-import org.junit.Before
 import org.junit.After
+import org.junit.Before
 import org.junit.Ignore
+import org.junit.Rule
 import org.junit.Test
 import org.mozilla.fenix.helpers.AndroidAssetDispatcher
 import org.mozilla.fenix.helpers.HomeActivityTestRule

app/src/androidTest/java/org/mozilla/fenix/ui/robots/DownloadRobot.kt

@@ -28,8 +28,8 @@ import org.mozilla.fenix.helpers.TestAssetHelper.waitingTime
 import org.mozilla.fenix.helpers.TestAssetHelper.waitingTimeLong
 import org.mozilla.fenix.helpers.TestHelper
 import org.mozilla.fenix.helpers.TestHelper.assertExternalAppOpens
-import org.mozilla.fenix.helpers.TestHelper.packageName
 import org.mozilla.fenix.helpers.TestHelper.mDevice
+import org.mozilla.fenix.helpers.TestHelper.packageName
 import org.mozilla.fenix.helpers.click
 import org.mozilla.fenix.helpers.ext.waitNotNull
 

app/src/androidTest/java/org/mozilla/fenix/ui/robots/LibrarySubMenusMultipleSelectionToolbarRobot.kt

@@ -9,22 +9,22 @@ import android.widget.TextView
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withChild
 import androidx.test.espresso.matcher.ViewMatchers.withContentDescription
 import androidx.test.espresso.matcher.ViewMatchers.withId
-import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.espresso.matcher.ViewMatchers.withParent
-import androidx.test.espresso.matcher.ViewMatchers.withChild
+import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.uiautomator.By
 import androidx.test.uiautomator.UiSelector
 import androidx.test.uiautomator.Until
-import org.mozilla.fenix.R
-import org.mozilla.fenix.helpers.TestAssetHelper.waitingTime
-import org.mozilla.fenix.helpers.click
-import org.mozilla.fenix.helpers.ext.waitNotNull
 import org.hamcrest.Matchers.allOf
+import org.mozilla.fenix.R
 import org.mozilla.fenix.helpers.TestAssetHelper
+import org.mozilla.fenix.helpers.TestAssetHelper.waitingTime
 import org.mozilla.fenix.helpers.TestHelper.mDevice
 import org.mozilla.fenix.helpers.TestHelper.packageName
+import org.mozilla.fenix.helpers.click
+import org.mozilla.fenix.helpers.ext.waitNotNull
 
 /*
  * Implementation of Robot Pattern for the multiple selection toolbar of History and Bookmarks menus.

app/src/androidTest/java/org/mozilla/fenix/ui/robots/NotificationRobot.kt

@@ -13,12 +13,12 @@ import androidx.test.uiautomator.Until
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertTrue
 import org.mozilla.fenix.helpers.TestAssetHelper.waitingTime
+import org.mozilla.fenix.helpers.TestAssetHelper.waitingTimeShort
 import org.mozilla.fenix.helpers.TestHelper
 import org.mozilla.fenix.helpers.TestHelper.appName
 import org.mozilla.fenix.helpers.TestHelper.mDevice
 import org.mozilla.fenix.helpers.ext.waitNotNull
 import java.lang.AssertionError
-import org.mozilla.fenix.helpers.TestAssetHelper.waitingTimeShort
 
 class NotificationRobot {
 

app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuSitePermissionsCommonRobot.kt

@@ -17,9 +17,9 @@ import org.junit.Assert.assertFalse
 import org.junit.Assert.assertTrue
 import org.mozilla.fenix.R
 import org.mozilla.fenix.helpers.TestAssetHelper.waitingTime
-import org.mozilla.fenix.helpers.TestHelper.mDevice
 import org.mozilla.fenix.helpers.TestAssetHelper.waitingTimeShort
 import org.mozilla.fenix.helpers.TestHelper.getStringResource
+import org.mozilla.fenix.helpers.TestHelper.mDevice
 import org.mozilla.fenix.helpers.TestHelper.packageName
 import org.mozilla.fenix.helpers.assertIsChecked
 import org.mozilla.fenix.helpers.click

app/src/main/java/org/mozilla/fenix/FenixApplication.kt

@@ -77,9 +77,9 @@ import org.mozilla.fenix.components.metrics.MozillaProductDetector
 import org.mozilla.fenix.components.toolbar.ToolbarPosition
 import org.mozilla.fenix.ext.containsQueryParameters
 import org.mozilla.fenix.ext.getCustomGleanServerUrlIfAvailable
-import org.mozilla.fenix.ext.setCustomEndpointIfAvailable
 import org.mozilla.fenix.ext.isCustomEngine
 import org.mozilla.fenix.ext.isKnownSearchDomain
+import org.mozilla.fenix.ext.setCustomEndpointIfAvailable
 import org.mozilla.fenix.ext.settings
 import org.mozilla.fenix.nimbus.FxNimbus
 import org.mozilla.fenix.perf.MarkersActivityLifecycleCallbacks

app/src/main/java/org/mozilla/fenix/addons/AddonPopupBaseFragment.kt

@@ -10,10 +10,10 @@ import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.findNavController
 import mozilla.components.browser.state.action.ContentAction
 import mozilla.components.browser.state.action.CustomTabListAction
-import mozilla.components.browser.state.state.createCustomTab
 import mozilla.components.browser.state.state.CustomTabSessionState
 import mozilla.components.browser.state.state.EngineState
 import mozilla.components.browser.state.state.SessionState
+import mozilla.components.browser.state.state.createCustomTab
 import mozilla.components.concept.engine.EngineSession
 import mozilla.components.concept.engine.prompt.PromptRequest
 import mozilla.components.concept.engine.window.WindowRequest

app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt

@@ -35,9 +35,9 @@ import org.mozilla.fenix.components.FenixSnackbar
 import org.mozilla.fenix.databinding.FragmentAddOnsManagementBinding
 import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.ext.getRootView
+import org.mozilla.fenix.ext.runIfFragmentIsAttached
 import org.mozilla.fenix.ext.settings
 import org.mozilla.fenix.ext.showToolbar
-import org.mozilla.fenix.ext.runIfFragmentIsAttached
 import org.mozilla.fenix.theme.ThemeManager
 import java.lang.ref.WeakReference
 import java.util.concurrent.CancellationException

app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt

@@ -54,6 +54,7 @@ import mozilla.components.browser.state.state.TabSessionState
 import mozilla.components.browser.state.state.content.DownloadState
 import mozilla.components.browser.state.store.BrowserStore
 import mozilla.components.browser.thumbnails.BrowserThumbnails
+import mozilla.components.concept.engine.permission.SitePermissions
 import mozilla.components.concept.engine.prompt.ShareData
 import mozilla.components.feature.accounts.FxaCapability
 import mozilla.components.feature.accounts.FxaWebChannelFeature
@@ -68,31 +69,38 @@ import mozilla.components.feature.media.fullscreen.MediaSessionFullscreenFeature
 import mozilla.components.feature.privatemode.feature.SecureWindowFeature
 import mozilla.components.feature.prompts.PromptFeature
 import mozilla.components.feature.prompts.PromptFeature.Companion.PIN_REQUEST
+import mozilla.components.feature.prompts.address.AddressDelegate
+import mozilla.components.feature.prompts.creditcard.CreditCardDelegate
+import mozilla.components.feature.prompts.login.LoginDelegate
 import mozilla.components.feature.prompts.share.ShareDelegate
 import mozilla.components.feature.readerview.ReaderViewFeature
 import mozilla.components.feature.search.SearchFeature
 import mozilla.components.feature.session.FullScreenFeature
 import mozilla.components.feature.session.PictureInPictureFeature
+import mozilla.components.feature.session.ScreenOrientationFeature
 import mozilla.components.feature.session.SessionFeature
 import mozilla.components.feature.session.SwipeRefreshFeature
-import mozilla.components.concept.engine.permission.SitePermissions
+import mozilla.components.feature.session.behavior.EngineViewBrowserToolbarBehavior
-import mozilla.components.feature.prompts.address.AddressDelegate
-import mozilla.components.feature.prompts.creditcard.CreditCardDelegate
-import mozilla.components.feature.prompts.login.LoginDelegate
-import mozilla.components.feature.session.ScreenOrientationFeature
 import mozilla.components.feature.sitepermissions.SitePermissionsFeature
+import mozilla.components.feature.webauthn.WebAuthnFeature
 import mozilla.components.lib.state.ext.consumeFlow
 import mozilla.components.lib.state.ext.flowScoped
+import mozilla.components.service.glean.private.NoExtras
+import mozilla.components.service.sync.autofill.DefaultCreditCardValidationDelegate
 import mozilla.components.service.sync.logins.DefaultLoginValidationDelegate
+import mozilla.components.support.base.feature.ActivityResultHandler
 import mozilla.components.support.base.feature.PermissionsFeature
 import mozilla.components.support.base.feature.UserInteractionHandler
 import mozilla.components.support.base.feature.ViewBoundFeatureWrapper
+import mozilla.components.support.ktx.android.view.enterToImmersiveMode
 import mozilla.components.support.ktx.android.view.exitImmersiveMode
 import mozilla.components.support.ktx.android.view.hideKeyboard
+import mozilla.components.support.ktx.kotlin.getOrigin
 import mozilla.components.support.ktx.kotlinx.coroutines.flow.ifAnyChanged
 import mozilla.components.support.ktx.kotlinx.coroutines.flow.ifChanged
 import org.mozilla.fenix.BuildConfig
 import org.mozilla.fenix.FeatureFlags
+import org.mozilla.fenix.GleanMetrics.MediaState
 import org.mozilla.fenix.HomeActivity
 import org.mozilla.fenix.IntentReceiverActivity
 import org.mozilla.fenix.NavGraphDirections
@@ -109,6 +117,10 @@ import org.mozilla.fenix.components.toolbar.BrowserToolbarView
 import org.mozilla.fenix.components.toolbar.DefaultBrowserToolbarController
 import org.mozilla.fenix.components.toolbar.DefaultBrowserToolbarMenuController
 import org.mozilla.fenix.components.toolbar.ToolbarIntegration
+import org.mozilla.fenix.components.toolbar.interactor.BrowserToolbarInteractor
+import org.mozilla.fenix.components.toolbar.interactor.DefaultBrowserToolbarInteractor
+import org.mozilla.fenix.crashes.CrashContentIntegration
+import org.mozilla.fenix.databinding.FragmentBrowserBinding
 import org.mozilla.fenix.downloads.DownloadService
 import org.mozilla.fenix.downloads.DynamicDownloadDialog
 import org.mozilla.fenix.ext.accessibilityManager
@@ -118,31 +130,19 @@ import org.mozilla.fenix.ext.getPreferenceKey
 import org.mozilla.fenix.ext.hideToolbar
 import org.mozilla.fenix.ext.nav
 import org.mozilla.fenix.ext.requireComponents
-import org.mozilla.fenix.ext.settings
 import org.mozilla.fenix.ext.runIfFragmentIsAttached
+import org.mozilla.fenix.ext.secure
+import org.mozilla.fenix.ext.settings
 import org.mozilla.fenix.home.HomeScreenViewModel
 import org.mozilla.fenix.home.SharedViewModel
 import org.mozilla.fenix.onboarding.FenixOnboarding
+import org.mozilla.fenix.perf.MarkersFragmentLifecycleCallbacks
 import org.mozilla.fenix.settings.SupportUtils
+import org.mozilla.fenix.settings.biometric.BiometricPromptFeature
 import org.mozilla.fenix.theme.ThemeManager
 import org.mozilla.fenix.utils.allowUndo
 import org.mozilla.fenix.wifi.SitePermissionsWifiIntegration
 import java.lang.ref.WeakReference
-import mozilla.components.feature.session.behavior.EngineViewBrowserToolbarBehavior
-import mozilla.components.feature.webauthn.WebAuthnFeature
-import mozilla.components.service.glean.private.NoExtras
-import mozilla.components.service.sync.autofill.DefaultCreditCardValidationDelegate
-import mozilla.components.support.base.feature.ActivityResultHandler
-import mozilla.components.support.ktx.android.view.enterToImmersiveMode
-import mozilla.components.support.ktx.kotlin.getOrigin
-import org.mozilla.fenix.GleanMetrics.MediaState
-import org.mozilla.fenix.components.toolbar.interactor.BrowserToolbarInteractor
-import org.mozilla.fenix.components.toolbar.interactor.DefaultBrowserToolbarInteractor
-import org.mozilla.fenix.crashes.CrashContentIntegration
-import org.mozilla.fenix.databinding.FragmentBrowserBinding
-import org.mozilla.fenix.ext.secure
-import org.mozilla.fenix.perf.MarkersFragmentLifecycleCallbacks
-import org.mozilla.fenix.settings.biometric.BiometricPromptFeature
 import mozilla.components.feature.session.behavior.ToolbarPosition as MozacToolbarPosition
 
 /**

app/src/main/java/org/mozilla/fenix/components/Analytics.kt

@@ -10,10 +10,10 @@ import android.content.Context
 import android.content.Intent
 import android.os.Build
 import mozilla.components.lib.crash.CrashReporter
+import mozilla.components.lib.crash.sentry.SentryService
 import mozilla.components.lib.crash.service.CrashReporterService
 import mozilla.components.lib.crash.service.GleanCrashReporterService
 import mozilla.components.lib.crash.service.MozillaSocorroService
-import mozilla.components.lib.crash.sentry.SentryService
 import mozilla.components.service.nimbus.NimbusApi
 import org.mozilla.fenix.BuildConfig
 import org.mozilla.fenix.Config
@@ -27,8 +27,8 @@ import org.mozilla.fenix.components.metrics.MetricController
 import org.mozilla.fenix.experiments.createNimbus
 import org.mozilla.fenix.ext.settings
 import org.mozilla.fenix.gleanplumb.CustomAttributeProvider
-import org.mozilla.fenix.gleanplumb.OnDiskMessageMetadataStorage
 import org.mozilla.fenix.gleanplumb.NimbusMessagingStorage
+import org.mozilla.fenix.gleanplumb.OnDiskMessageMetadataStorage
 import org.mozilla.fenix.nimbus.FxNimbus
 import org.mozilla.fenix.perf.lazyMonitored
 import org.mozilla.geckoview.BuildConfig.MOZ_APP_BUILDID

app/src/main/java/org/mozilla/fenix/components/Push.kt

@@ -7,8 +7,8 @@ package org.mozilla.fenix.components
 import android.content.Context
 import androidx.core.net.toUri
 import mozilla.components.feature.push.AutoPushFeature
-import mozilla.components.feature.push.PushConfig
 import mozilla.components.feature.push.Protocol
+import mozilla.components.feature.push.PushConfig
 import mozilla.components.lib.crash.CrashReporter
 import mozilla.components.support.base.log.logger.Logger
 import org.mozilla.fenix.R

app/src/main/java/org/mozilla/fenix/components/ReviewPromptController.kt

@@ -10,8 +10,8 @@ import com.google.android.play.core.review.ReviewInfo
 import com.google.android.play.core.review.ReviewManager
 import kotlinx.coroutines.Dispatchers.Main
 import kotlinx.coroutines.withContext
-import org.mozilla.fenix.utils.Settings
 import org.mozilla.fenix.GleanMetrics.ReviewPrompt
+import org.mozilla.fenix.utils.Settings
 import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.Locale

app/src/main/java/org/mozilla/fenix/components/appstate/AppAction.kt

@@ -11,17 +11,17 @@ import mozilla.components.lib.state.Action
 import mozilla.components.service.pocket.PocketStory
 import mozilla.components.service.pocket.PocketStory.PocketSponsoredStory
 import org.mozilla.fenix.components.AppStore
+import org.mozilla.fenix.gleanplumb.Message
+import org.mozilla.fenix.gleanplumb.MessagingState
 import org.mozilla.fenix.home.Mode
 import org.mozilla.fenix.home.pocket.PocketRecommendedStoriesCategory
 import org.mozilla.fenix.home.pocket.PocketRecommendedStoriesSelectedCategory
 import org.mozilla.fenix.home.recentbookmarks.RecentBookmark
+import org.mozilla.fenix.home.recentsyncedtabs.RecentSyncedTab
 import org.mozilla.fenix.home.recentsyncedtabs.RecentSyncedTabState
 import org.mozilla.fenix.home.recenttabs.RecentTab
 import org.mozilla.fenix.home.recentvisits.RecentlyVisitedItem
 import org.mozilla.fenix.library.history.PendingDeletionHistory
-import org.mozilla.fenix.gleanplumb.Message
-import org.mozilla.fenix.gleanplumb.MessagingState
-import org.mozilla.fenix.home.recentsyncedtabs.RecentSyncedTab
 import org.mozilla.fenix.wallpapers.Wallpaper
 
 /**

app/src/main/java/org/mozilla/fenix/components/appstate/AppState.kt

@@ -12,6 +12,7 @@ import mozilla.components.lib.state.State
 import mozilla.components.service.pocket.PocketStory
 import mozilla.components.service.pocket.PocketStory.PocketRecommendedStory
 import mozilla.components.service.pocket.PocketStory.PocketSponsoredStory
+import org.mozilla.fenix.gleanplumb.MessagingState
 import org.mozilla.fenix.home.HomeFragment
 import org.mozilla.fenix.home.Mode
 import org.mozilla.fenix.home.pocket.PocketRecommendedStoriesCategory
@@ -21,7 +22,6 @@ import org.mozilla.fenix.home.recentsyncedtabs.RecentSyncedTabState
 import org.mozilla.fenix.home.recenttabs.RecentTab
 import org.mozilla.fenix.home.recentvisits.RecentlyVisitedItem
 import org.mozilla.fenix.library.history.PendingDeletionHistory
-import org.mozilla.fenix.gleanplumb.MessagingState
 import org.mozilla.fenix.wallpapers.WallpaperState
 
 /**

app/src/main/java/org/mozilla/fenix/components/metrics/MetricController.kt

@@ -36,10 +36,10 @@ import mozilla.telemetry.glean.private.NoExtras
 import org.mozilla.fenix.BuildConfig
 import org.mozilla.fenix.GleanMetrics.Addons
 import org.mozilla.fenix.GleanMetrics.Addresses
-import org.mozilla.fenix.GleanMetrics.ContextMenu
 import org.mozilla.fenix.GleanMetrics.AndroidAutofill
 import org.mozilla.fenix.GleanMetrics.Awesomebar
 import org.mozilla.fenix.GleanMetrics.BrowserSearch
+import org.mozilla.fenix.GleanMetrics.ContextMenu
 import org.mozilla.fenix.GleanMetrics.ContextualMenu
 import org.mozilla.fenix.GleanMetrics.CreditCards
 import org.mozilla.fenix.GleanMetrics.LoginDialog

app/src/main/java/org/mozilla/fenix/customtabs/ExternalAppBrowserFragment.kt

@@ -14,13 +14,13 @@ import mozilla.components.browser.state.state.SessionState
 import mozilla.components.browser.toolbar.BrowserToolbar
 import mozilla.components.concept.engine.manifest.WebAppManifestParser
 import mozilla.components.concept.engine.manifest.getOrNull
+import mozilla.components.concept.engine.permission.SitePermissions
 import mozilla.components.feature.contextmenu.ContextMenuCandidate
 import mozilla.components.feature.customtabs.CustomTabWindowFeature
 import mozilla.components.feature.pwa.feature.ManifestUpdateFeature
 import mozilla.components.feature.pwa.feature.WebAppActivityFeature
 import mozilla.components.feature.pwa.feature.WebAppHideToolbarFeature
 import mozilla.components.feature.pwa.feature.WebAppSiteControlsFeature
-import mozilla.components.concept.engine.permission.SitePermissions
 import mozilla.components.support.base.feature.UserInteractionHandler
 import mozilla.components.support.base.feature.ViewBoundFeatureWrapper
 import mozilla.components.support.ktx.android.arch.lifecycle.addObservers

app/src/main/java/org/mozilla/fenix/ext/Activity.kt

@@ -5,16 +5,16 @@
 package org.mozilla.fenix.ext
 
 import android.app.Activity
-import android.view.View
-import android.view.WindowManager
-import mozilla.components.concept.base.crash.Breadcrumb
 import android.app.role.RoleManager
 import android.content.Intent
 import android.os.Build
 import android.provider.Settings
+import android.view.View
+import android.view.WindowManager
 import androidx.annotation.DrawableRes
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.os.bundleOf
+import mozilla.components.concept.base.crash.Breadcrumb
 import mozilla.components.concept.engine.EngineSession
 import org.mozilla.fenix.BrowserDirection
 import org.mozilla.fenix.HomeActivity

app/src/main/java/org/mozilla/fenix/gleanplumb/CustomAttributeProvider.kt

@@ -9,8 +9,8 @@ import org.json.JSONObject
 import org.mozilla.fenix.ext.settings
 import org.mozilla.fenix.utils.BrowsersCache
 import java.text.SimpleDateFormat
-import java.util.Locale
 import java.util.Calendar
+import java.util.Locale
 
 /**
  * Custom attributes that the messaging framework will use to evaluate if message is eligible

app/src/main/java/org/mozilla/fenix/home/intent/CrashReporterIntentProcessor.kt

@@ -9,9 +9,9 @@ import android.util.Log
 import androidx.navigation.NavController
 import mozilla.components.lib.crash.Crash
 import mozilla.components.lib.crash.Crash.NativeCodeCrash
+import mozilla.components.lib.crash.CrashReporter
 import org.mozilla.fenix.components.AppStore
 import org.mozilla.fenix.components.appstate.AppAction
-import mozilla.components.lib.crash.CrashReporter
 
 /**
  * Process the [Intent] from [CrashReporter] through which the app is informed about

app/src/main/java/org/mozilla/fenix/library/LibraryPageFragment.kt

@@ -6,8 +6,8 @@ package org.mozilla.fenix.library
 
 import androidx.appcompat.widget.Toolbar
 import androidx.fragment.app.Fragment
-import mozilla.components.support.ktx.android.content.getColorFromAttr
 import androidx.navigation.fragment.findNavController
+import mozilla.components.support.ktx.android.content.getColorFromAttr
 import org.mozilla.fenix.HomeActivity
 import org.mozilla.fenix.R
 import org.mozilla.fenix.browser.browsingmode.BrowsingMode

app/src/main/java/org/mozilla/fenix/library/bookmarks/viewholders/BookmarkNodeViewHolder.kt

@@ -12,11 +12,11 @@ import kotlinx.coroutines.launch
 import mozilla.components.concept.storage.BookmarkNode
 import mozilla.components.concept.storage.BookmarkNodeType
 import org.mozilla.fenix.R
-import org.mozilla.fenix.ext.removeAndDisable
-import org.mozilla.fenix.ext.hideAndDisable
-import org.mozilla.fenix.ext.showAndEnable
 import org.mozilla.fenix.ext.components
+import org.mozilla.fenix.ext.hideAndDisable
 import org.mozilla.fenix.ext.loadIntoView
+import org.mozilla.fenix.ext.removeAndDisable
+import org.mozilla.fenix.ext.showAndEnable
 import org.mozilla.fenix.library.LibrarySiteItemView
 import org.mozilla.fenix.library.bookmarks.BookmarkFragmentState
 import org.mozilla.fenix.library.bookmarks.BookmarkItemMenu

app/src/main/java/org/mozilla/fenix/library/downloads/DownloadFragment.kt

@@ -19,8 +19,8 @@ import androidx.lifecycle.Lifecycle
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers.IO
 import kotlinx.coroutines.MainScope
-import mozilla.components.browser.state.state.BrowserState
 import kotlinx.coroutines.launch
+import mozilla.components.browser.state.state.BrowserState
 import mozilla.components.browser.state.state.content.DownloadState
 import mozilla.components.feature.downloads.AbstractFetchDownloadService
 import mozilla.components.lib.state.ext.consumeFrom
@@ -32,10 +32,10 @@ import org.mozilla.fenix.components.StoreProvider
 import org.mozilla.fenix.databinding.FragmentDownloadsBinding
 import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.ext.filterNotExistsOnDisk
+import org.mozilla.fenix.ext.getRootView
 import org.mozilla.fenix.ext.requireComponents
 import org.mozilla.fenix.ext.setTextColor
 import org.mozilla.fenix.ext.showToolbar
-import org.mozilla.fenix.ext.getRootView
 import org.mozilla.fenix.library.LibraryPageFragment
 import org.mozilla.fenix.utils.allowUndo
 

app/src/main/java/org/mozilla/fenix/library/downloads/viewholders/DownloadsListItemViewHolder.kt

@@ -10,14 +10,14 @@ import mozilla.components.feature.downloads.toMegabyteOrKilobyteString
 import org.mozilla.fenix.R
 import org.mozilla.fenix.databinding.DownloadListItemBinding
 import org.mozilla.fenix.databinding.LibrarySiteItemBinding
-import org.mozilla.fenix.selection.SelectionHolder
-import org.mozilla.fenix.library.downloads.DownloadInteractor
-import org.mozilla.fenix.library.downloads.DownloadItem
 import org.mozilla.fenix.ext.getIcon
 import org.mozilla.fenix.ext.hideAndDisable
 import org.mozilla.fenix.ext.showAndEnable
 import org.mozilla.fenix.library.downloads.DownloadFragmentState
+import org.mozilla.fenix.library.downloads.DownloadInteractor
+import org.mozilla.fenix.library.downloads.DownloadItem
 import org.mozilla.fenix.library.downloads.DownloadItemMenu
+import org.mozilla.fenix.selection.SelectionHolder
 
 class DownloadsListItemViewHolder(
     view: View,

app/src/main/java/org/mozilla/fenix/library/history/HistoryAdapter.kt

@@ -8,8 +8,8 @@ import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.paging.PagingDataAdapter
 import androidx.recyclerview.widget.DiffUtil
-import org.mozilla.fenix.selection.SelectionHolder
 import org.mozilla.fenix.library.history.viewholders.HistoryListItemViewHolder
+import org.mozilla.fenix.selection.SelectionHolder
 
 /**
  * Adapter for the list of visited pages, that uses Paging 3 versions of the Paging library.

app/src/main/java/org/mozilla/fenix/library/historymetadata/HistoryMetadataGroupFragment.kt

@@ -33,12 +33,12 @@ import org.mozilla.fenix.addons.showSnackBar
 import org.mozilla.fenix.browser.browsingmode.BrowsingMode
 import org.mozilla.fenix.components.StoreProvider
 import org.mozilla.fenix.databinding.FragmentHistoryMetadataGroupBinding
+import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.ext.nav
 import org.mozilla.fenix.ext.requireComponents
+import org.mozilla.fenix.ext.runIfFragmentIsAttached
 import org.mozilla.fenix.ext.setTextColor
 import org.mozilla.fenix.ext.showToolbar
-import org.mozilla.fenix.ext.components
-import org.mozilla.fenix.ext.runIfFragmentIsAttached
 import org.mozilla.fenix.ext.toShortUrl
 import org.mozilla.fenix.library.LibraryPageFragment
 import org.mozilla.fenix.library.history.History

app/src/main/java/org/mozilla/fenix/library/historymetadata/controller/HistoryMetadataGroupController.kt

@@ -14,11 +14,11 @@ import mozilla.components.browser.state.store.BrowserStore
 import mozilla.components.browser.storage.sync.PlacesHistoryStorage
 import mozilla.components.concept.engine.prompt.ShareData
 import mozilla.components.feature.tabs.TabsUseCases
+import mozilla.components.service.glean.private.NoExtras
 import org.mozilla.fenix.R
 import org.mozilla.fenix.components.AppStore
 import org.mozilla.fenix.components.appstate.AppAction
 import org.mozilla.fenix.ext.components
-import mozilla.components.service.glean.private.NoExtras
 import org.mozilla.fenix.library.history.History
 import org.mozilla.fenix.library.history.toPendingDeletionHistory
 import org.mozilla.fenix.library.historymetadata.HistoryMetadataGroupFragment.DeleteAllConfirmationDialogFragment

app/src/main/java/org/mozilla/fenix/onboarding/DefaultBrowserNotificationWorker.kt

@@ -19,13 +19,13 @@ import androidx.work.OneTimeWorkRequest
 import androidx.work.WorkManager
 import androidx.work.Worker
 import androidx.work.WorkerParameters
-import java.util.concurrent.TimeUnit
 import mozilla.components.support.base.ids.SharedIdsHelper
 import org.mozilla.fenix.HomeActivity
 import org.mozilla.fenix.R
 import org.mozilla.fenix.ext.settings
 import org.mozilla.fenix.utils.IntentUtils
 import org.mozilla.fenix.utils.Settings
+import java.util.concurrent.TimeUnit
 
 class DefaultBrowserNotificationWorker(
     context: Context,

app/src/main/java/org/mozilla/fenix/perf/ProfilerReusableComposable.kt

@@ -12,7 +12,6 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
-
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.Card
 import androidx.compose.material.CircularProgressIndicator

app/src/main/java/org/mozilla/fenix/perf/ProfilerStartDialogFragment.kt

@@ -37,7 +37,6 @@ import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
-
 import mozilla.components.concept.base.profiler.Profiler
 import org.mozilla.fenix.R
 import org.mozilla.fenix.ext.components

app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt

@@ -49,9 +49,9 @@ import org.mozilla.fenix.ext.application
 import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.ext.getPreferenceKey
 import org.mozilla.fenix.ext.navigateToNotificationsSettings
+import org.mozilla.fenix.ext.openSetDefaultBrowserOption
 import org.mozilla.fenix.ext.requireComponents
 import org.mozilla.fenix.ext.settings
-import org.mozilla.fenix.ext.openSetDefaultBrowserOption
 import org.mozilla.fenix.ext.showToolbar
 import org.mozilla.fenix.nimbus.FxNimbus
 import org.mozilla.fenix.perf.ProfilerViewModel

app/src/main/java/org/mozilla/fenix/settings/SyncDebugFragment.kt

@@ -9,11 +9,11 @@ import androidx.preference.EditTextPreference
 import androidx.preference.Preference
 import androidx.preference.Preference.OnPreferenceClickListener
 import androidx.preference.PreferenceFragmentCompat
-import kotlin.system.exitProcess
 import mozilla.components.support.base.log.logger.Logger
 import org.mozilla.fenix.R
 import org.mozilla.fenix.ext.settings
 import org.mozilla.fenix.ext.showToolbar
+import kotlin.system.exitProcess
 
 /**
  * Lets the user customize Private browsing options.

app/src/main/java/org/mozilla/fenix/settings/TextPercentageSeekBarPreference.kt

@@ -37,7 +37,6 @@ import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.RangeInfoCom
 import androidx.preference.Preference
 import androidx.preference.PreferenceViewHolder
 import org.mozilla.fenix.R
-
 import java.text.NumberFormat
 import kotlin.math.PI
 import kotlin.math.abs

app/src/main/java/org/mozilla/fenix/settings/account/SignOutFragment.kt

@@ -10,11 +10,11 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.FrameLayout
-import com.google.android.material.bottomsheet.BottomSheetDialog
+import androidx.appcompat.app.AppCompatDialogFragment
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
 import com.google.android.material.bottomsheet.BottomSheetBehavior
-import androidx.appcompat.app.AppCompatDialogFragment
+import com.google.android.material.bottomsheet.BottomSheetDialog
 import kotlinx.coroutines.launch
 import mozilla.components.service.fxa.manager.FxaAccountManager
 import org.mozilla.fenix.R

app/src/main/java/org/mozilla/fenix/settings/address/view/AddressEditorView.kt

@@ -8,11 +8,11 @@ import android.content.Context
 import android.content.DialogInterface
 import android.view.View
 import android.widget.AdapterView
+import android.widget.ArrayAdapter
 import androidx.appcompat.app.AlertDialog
 import androidx.core.view.isVisible
-import mozilla.components.concept.storage.Address
-import android.widget.ArrayAdapter
 import mozilla.components.browser.state.search.RegionState
+import mozilla.components.concept.storage.Address
 import mozilla.components.concept.storage.UpdatableAddressFields
 import mozilla.components.support.ktx.android.view.hideKeyboard
 import mozilla.components.support.ktx.android.view.showKeyboard

app/src/main/java/org/mozilla/fenix/settings/logins/controller/SavedLoginsStorageController.kt

@@ -23,8 +23,8 @@ import mozilla.components.service.sync.logins.SyncableLoginsStorage
 import org.mozilla.fenix.R
 import org.mozilla.fenix.settings.logins.LoginsAction
 import org.mozilla.fenix.settings.logins.LoginsFragmentStore
-import org.mozilla.fenix.settings.logins.fragment.EditLoginFragmentDirections
 import org.mozilla.fenix.settings.logins.fragment.AddLoginFragmentDirections
+import org.mozilla.fenix.settings.logins.fragment.EditLoginFragmentDirections
 import org.mozilla.fenix.settings.logins.mapToSavedLogin
 
 /**

app/src/main/java/org/mozilla/fenix/settings/quicksettings/WebsitePermissionsView.kt

@@ -19,12 +19,12 @@ import org.mozilla.fenix.databinding.QuicksettingsPermissionsBinding
 import org.mozilla.fenix.settings.PhoneFeature
 import org.mozilla.fenix.settings.PhoneFeature.AUTOPLAY
 import org.mozilla.fenix.settings.PhoneFeature.CAMERA
-import org.mozilla.fenix.settings.PhoneFeature.MICROPHONE
+import org.mozilla.fenix.settings.PhoneFeature.CROSS_ORIGIN_STORAGE_ACCESS
 import org.mozilla.fenix.settings.PhoneFeature.LOCATION
+import org.mozilla.fenix.settings.PhoneFeature.MEDIA_KEY_SYSTEM_ACCESS
+import org.mozilla.fenix.settings.PhoneFeature.MICROPHONE
 import org.mozilla.fenix.settings.PhoneFeature.NOTIFICATION
 import org.mozilla.fenix.settings.PhoneFeature.PERSISTENT_STORAGE
-import org.mozilla.fenix.settings.PhoneFeature.MEDIA_KEY_SYSTEM_ACCESS
-import org.mozilla.fenix.settings.PhoneFeature.CROSS_ORIGIN_STORAGE_ACCESS
 import org.mozilla.fenix.settings.quicksettings.WebsitePermissionsView.PermissionViewHolder.SpinnerPermission
 import org.mozilla.fenix.settings.quicksettings.WebsitePermissionsView.PermissionViewHolder.ToggleablePermission
 import java.util.EnumMap

app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsDetailsExceptionsFragment.kt

@@ -25,14 +25,14 @@ import org.mozilla.fenix.ext.requireComponents
 import org.mozilla.fenix.ext.settings
 import org.mozilla.fenix.ext.showToolbar
 import org.mozilla.fenix.settings.PhoneFeature
+import org.mozilla.fenix.settings.PhoneFeature.AUTOPLAY
 import org.mozilla.fenix.settings.PhoneFeature.CAMERA
+import org.mozilla.fenix.settings.PhoneFeature.CROSS_ORIGIN_STORAGE_ACCESS
 import org.mozilla.fenix.settings.PhoneFeature.LOCATION
+import org.mozilla.fenix.settings.PhoneFeature.MEDIA_KEY_SYSTEM_ACCESS
 import org.mozilla.fenix.settings.PhoneFeature.MICROPHONE
 import org.mozilla.fenix.settings.PhoneFeature.NOTIFICATION
 import org.mozilla.fenix.settings.PhoneFeature.PERSISTENT_STORAGE
-import org.mozilla.fenix.settings.PhoneFeature.MEDIA_KEY_SYSTEM_ACCESS
-import org.mozilla.fenix.settings.PhoneFeature.AUTOPLAY
-import org.mozilla.fenix.settings.PhoneFeature.CROSS_ORIGIN_STORAGE_ACCESS
 import org.mozilla.fenix.settings.quicksettings.AutoplayValue
 import org.mozilla.fenix.settings.requirePreference
 import org.mozilla.fenix.utils.Settings

app/src/main/java/org/mozilla/fenix/share/ShareController.kt

@@ -20,10 +20,10 @@ import androidx.navigation.NavController
 import com.google.android.material.snackbar.Snackbar
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.Deferred
 import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import mozilla.components.concept.engine.prompt.ShareData
 import mozilla.components.concept.sync.Device

app/src/main/java/org/mozilla/fenix/tabstray/NavigationInteractor.kt

@@ -12,7 +12,6 @@ import mozilla.components.browser.state.selector.getNormalOrPrivateTabs
 import mozilla.components.browser.state.selector.normalTabs
 import mozilla.components.browser.state.state.TabSessionState
 import mozilla.components.browser.state.store.BrowserStore
-import mozilla.components.browser.storage.sync.Tab as SyncTab
 import mozilla.components.concept.engine.prompt.ShareData
 import mozilla.components.service.fxa.manager.FxaAccountManager
 import mozilla.components.service.glean.private.NoExtras
@@ -29,6 +28,7 @@ import org.mozilla.fenix.home.HomeFragment
 import org.mozilla.fenix.tabstray.ext.getTabSessionState
 import org.mozilla.fenix.tabstray.ext.isActiveDownload
 import kotlin.coroutines.CoroutineContext
+import mozilla.components.browser.storage.sync.Tab as SyncTab
 
 /**
  * An interactor that helps with navigating to different parts of the app from the tabs tray.

app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayFragment.kt

@@ -63,8 +63,8 @@ import org.mozilla.fenix.tabstray.ext.bookmarkMessage
 import org.mozilla.fenix.tabstray.ext.collectionMessage
 import org.mozilla.fenix.tabstray.ext.make
 import org.mozilla.fenix.tabstray.ext.showWithTheme
-import org.mozilla.fenix.theme.ThemeManager
 import org.mozilla.fenix.tabstray.syncedtabs.SyncedTabsIntegration
+import org.mozilla.fenix.theme.ThemeManager
 import org.mozilla.fenix.utils.allowUndo
 import kotlin.math.max
 

app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayInfoBannerBinding.kt

@@ -8,7 +8,6 @@ import android.content.Context
 import android.view.View.VISIBLE
 import android.view.ViewGroup
 import androidx.annotation.VisibleForTesting
-import kotlin.math.max
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.collect
@@ -22,6 +21,7 @@ import mozilla.components.support.ktx.kotlinx.coroutines.flow.ifChanged
 import org.mozilla.fenix.R
 import org.mozilla.fenix.browser.infobanner.InfoBanner
 import org.mozilla.fenix.utils.Settings
+import kotlin.math.max
 
 @OptIn(ExperimentalCoroutinesApi::class)
 class TabsTrayInfoBannerBinding(

app/src/main/java/org/mozilla/fenix/utils/ToolbarPopupWindow.kt

@@ -14,17 +14,17 @@ import android.widget.PopupWindow
 import androidx.annotation.VisibleForTesting
 import androidx.core.view.isVisible
 import com.google.android.material.snackbar.Snackbar
+import mozilla.components.browser.state.selector.findCustomTab
 import mozilla.components.browser.state.selector.selectedTab
 import mozilla.components.browser.state.store.BrowserStore
-import org.mozilla.fenix.R
-import org.mozilla.fenix.components.FenixSnackbar
-import org.mozilla.fenix.ext.components
-import java.lang.ref.WeakReference
-import mozilla.components.browser.state.selector.findCustomTab
 import mozilla.components.service.glean.private.NoExtras
 import mozilla.components.support.base.log.logger.Logger
 import org.mozilla.fenix.GleanMetrics.Events
+import org.mozilla.fenix.R
+import org.mozilla.fenix.components.FenixSnackbar
 import org.mozilla.fenix.databinding.BrowserToolbarPopupWindowBinding
+import org.mozilla.fenix.ext.components
+import java.lang.ref.WeakReference
 
 object ToolbarPopupWindow {
     fun show(

app/src/test/java/org/mozilla/fenix/IntentReceiverActivityTest.kt

@@ -31,8 +31,8 @@ import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.mozilla.fenix.components.IntentProcessorType
 import org.mozilla.fenix.GleanMetrics.Events
+import org.mozilla.fenix.components.IntentProcessorType
 import org.mozilla.fenix.components.IntentProcessors
 import org.mozilla.fenix.customtabs.ExternalAppBrowserActivity
 import org.mozilla.fenix.ext.components

app/src/test/java/org/mozilla/fenix/browser/BaseBrowserFragmentTest.kt

@@ -18,9 +18,9 @@ import mozilla.components.browser.state.state.SessionState
 import mozilla.components.browser.state.state.content.DownloadState
 import mozilla.components.browser.state.state.createTab
 import mozilla.components.concept.engine.EngineView
+import mozilla.components.concept.engine.permission.SitePermissions
 import mozilla.components.feature.contextmenu.ContextMenuCandidate
 import mozilla.components.feature.session.behavior.EngineViewBrowserToolbarBehavior
-import mozilla.components.concept.engine.permission.SitePermissions
 import mozilla.components.support.test.robolectric.testContext
 import mozilla.components.ui.widgets.VerticalSwipeRefreshLayout
 import org.junit.Before

app/src/test/java/org/mozilla/fenix/components/AccountAbnormalitiesTest.kt

@@ -8,7 +8,6 @@ import io.mockk.Called
 import io.mockk.every
 import io.mockk.mockk
 import io.mockk.verify
-import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
 import kotlinx.coroutines.test.runTest
 import mozilla.components.lib.crash.CrashReporter
 import mozilla.components.service.fxa.manager.FxaAccountManager
@@ -17,8 +16,9 @@ import org.junit.Assert.assertEquals
 import org.junit.Assert.fail
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.mozilla.fenix.perf.StrictModeManager
+import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
 import org.mozilla.fenix.helpers.perf.TestStrictModeManager
+import org.mozilla.fenix.perf.StrictModeManager
 
 @RunWith(FenixRobolectricTestRunner::class)
 class AccountAbnormalitiesTest {

app/src/test/java/org/mozilla/fenix/components/InflationAwareFeatureTest.kt

@@ -9,8 +9,8 @@ import android.view.ViewStub
 import io.mockk.mockk
 import io.mockk.spyk
 import io.mockk.verify
-import mozilla.components.support.base.feature.UserInteractionHandler
 import mozilla.components.support.base.feature.LifecycleAwareFeature
+import mozilla.components.support.base.feature.UserInteractionHandler
 import org.junit.Test
 import java.lang.ref.WeakReference
 

app/src/test/java/org/mozilla/fenix/components/ReviewPromptControllerTest.kt

@@ -13,9 +13,9 @@ import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertNull
 import org.junit.Assert.assertTrue
-import org.junit.Test
 import org.junit.Before
 import org.junit.Rule
+import org.junit.Test
 import org.junit.runner.RunWith
 import org.mozilla.fenix.GleanMetrics.ReviewPrompt
 import org.mozilla.fenix.HomeActivity

app/src/test/java/org/mozilla/fenix/components/metrics/MetricControllerTest.kt

@@ -6,10 +6,10 @@ package org.mozilla.fenix.components.metrics
 
 import io.mockk.MockKAnnotations
 import io.mockk.every
+import io.mockk.impl.annotations.MockK
 import io.mockk.mockk
 import io.mockk.verify
 import io.mockk.verifyAll
-import io.mockk.impl.annotations.MockK
 import mozilla.components.feature.autofill.facts.AutofillFacts
 import mozilla.components.feature.awesomebar.facts.AwesomeBarFacts
 import mozilla.components.feature.awesomebar.provider.BookmarksStorageSuggestionProvider

app/src/test/java/org/mozilla/fenix/components/toolbar/BrowserToolbarCFRPresenterTest.kt

@@ -26,6 +26,7 @@ import mozilla.components.browser.toolbar.BrowserToolbar
 import mozilla.components.support.test.ext.joinBlocking
 import mozilla.components.support.test.robolectric.testContext
 import mozilla.components.support.test.rule.MainCoroutineRule
+import mozilla.telemetry.glean.testing.GleanTestRule
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertNotNull
@@ -33,13 +34,12 @@ import org.junit.Assert.assertNull
 import org.junit.Assert.assertTrue
 import org.junit.Rule
 import org.junit.Test
-import org.mozilla.fenix.R
-import org.mozilla.fenix.compose.cfr.CFRPopup
-import org.mozilla.fenix.utils.Settings
-import mozilla.telemetry.glean.testing.GleanTestRule
 import org.junit.runner.RunWith
 import org.mozilla.fenix.GleanMetrics.TrackingProtection
+import org.mozilla.fenix.R
+import org.mozilla.fenix.compose.cfr.CFRPopup
 import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
+import org.mozilla.fenix.utils.Settings
 
 @RunWith(FenixRobolectricTestRunner::class)
 class BrowserToolbarCFRPresenterTest {

app/src/test/java/org/mozilla/fenix/components/toolbar/BrowserToolbarViewTest.kt

@@ -6,20 +6,19 @@ package org.mozilla.fenix.components.toolbar
 
 import androidx.coordinatorlayout.widget.CoordinatorLayout
 import io.mockk.confirmVerified
-
 import io.mockk.every
 import io.mockk.mockk
 import io.mockk.spyk
 import io.mockk.verify
-import mozilla.components.support.test.robolectric.testContext
-import org.junit.Test
-import org.junit.runner.RunWith
 import mozilla.components.browser.toolbar.BrowserToolbar
 import mozilla.components.browser.toolbar.behavior.BrowserToolbarBehavior
 import mozilla.components.lib.publicsuffixlist.PublicSuffixList
+import mozilla.components.support.test.robolectric.testContext
 import org.junit.Assert.assertNotNull
 import org.junit.Assert.assertNull
 import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
 import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
 import org.mozilla.fenix.utils.Settings

app/src/test/java/org/mozilla/fenix/crashes/CrashReporterControllerTest.kt

@@ -18,7 +18,6 @@ import org.mozilla.fenix.components.AppStore
 import org.mozilla.fenix.components.Components
 import org.mozilla.fenix.components.appstate.AppAction
 import org.mozilla.fenix.components.appstate.AppState
-
 import org.mozilla.fenix.utils.Settings
 
 class CrashReporterControllerTest {

app/src/test/java/org/mozilla/fenix/ext/AtomicIntegerTest.kt

@@ -4,10 +4,10 @@
 
 package org.mozilla.fenix.ext
 
-import org.junit.Assert.assertEquals
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
+import org.junit.Assert.assertEquals
 import org.junit.Test
 import java.util.concurrent.atomic.AtomicInteger
 

app/src/test/java/org/mozilla/fenix/ext/DownloadItemKtTest.kt

@@ -5,9 +5,8 @@
 package org.mozilla.fenix.ext
 
 import mozilla.components.browser.state.state.content.DownloadState
-import org.junit.Test
-
 import org.junit.Assert.assertEquals
+import org.junit.Test
 import org.mozilla.fenix.R
 import org.mozilla.fenix.library.downloads.DownloadItem
 

app/src/test/java/org/mozilla/fenix/ext/ImageButtonTest.kt

@@ -5,14 +5,14 @@
 package org.mozilla.fenix.ext
 
 import android.view.View
+import android.widget.ImageButton
 import mozilla.components.support.test.robolectric.testContext
-import org.junit.Test
+import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertTrue
-import org.junit.Assert.assertEquals
+import org.junit.Test
 import org.junit.runner.RunWith
 import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
-import android.widget.ImageButton
 
 @RunWith(FenixRobolectricTestRunner::class)
 class ImageButtonTest {

app/src/test/java/org/mozilla/fenix/home/DefaultSessionControlControllerTest.kt

@@ -51,8 +51,8 @@ import org.mozilla.fenix.GleanMetrics.Collections
 import org.mozilla.fenix.GleanMetrics.Events
 import org.mozilla.fenix.GleanMetrics.HomeScreen
 import org.mozilla.fenix.GleanMetrics.Pings
-import org.mozilla.fenix.GleanMetrics.RecentTabs
 import org.mozilla.fenix.GleanMetrics.RecentBookmarks
+import org.mozilla.fenix.GleanMetrics.RecentTabs
 import org.mozilla.fenix.GleanMetrics.TopSites
 import org.mozilla.fenix.HomeActivity
 import org.mozilla.fenix.R

app/src/test/java/org/mozilla/fenix/home/PrivateBrowsingButtonViewTest.kt

@@ -11,9 +11,9 @@ import io.mockk.verify
 import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
+import org.mozilla.fenix.R
 import org.mozilla.fenix.browser.browsingmode.BrowsingMode
 import org.mozilla.fenix.browser.browsingmode.BrowsingModeManager
-import org.mozilla.fenix.R
 
 class PrivateBrowsingButtonViewTest {
 

app/src/test/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingToolbarPositionPickerViewHolderTest.kt

@@ -18,9 +18,9 @@ import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.mozilla.fenix.GleanMetrics.Onboarding
-import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.components.toolbar.ToolbarPosition
 import org.mozilla.fenix.databinding.OnboardingToolbarPositionPickerBinding
+import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
 import org.mozilla.fenix.utils.Settings
 

app/src/test/java/org/mozilla/fenix/library/bookmarks/BookmarkAdapterTest.kt

@@ -9,8 +9,8 @@ import io.mockk.spyk
 import io.mockk.verifyOrder
 import mozilla.components.concept.storage.BookmarkNode
 import org.junit.Assert.assertEquals
-import org.junit.Assert.assertTrue
 import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith

app/src/test/java/org/mozilla/fenix/library/history/HistoryInteractorTest.kt

@@ -15,8 +15,8 @@ import org.junit.Assert.assertTrue
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.mozilla.fenix.GleanMetrics.History as GleanHistory
 import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
+import org.mozilla.fenix.GleanMetrics.History as GleanHistory
 
 @RunWith(FenixRobolectricTestRunner::class) // For GleanTestRule
 class HistoryInteractorTest {

app/src/test/java/org/mozilla/fenix/library/recentlyclosed/DefaultRecentlyClosedControllerTest.kt

@@ -6,13 +6,13 @@ package org.mozilla.fenix.library.recentlyclosed
 
 import androidx.navigation.NavController
 import androidx.navigation.NavOptions
-import io.mockk.mockk
+import io.mockk.Runs
 import io.mockk.coEvery
-import io.mockk.every
-import io.mockk.verify
 import io.mockk.coVerify
+import io.mockk.every
 import io.mockk.just
-import io.mockk.Runs
+import io.mockk.mockk
+import io.mockk.verify
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.test.runCurrent

app/src/test/java/org/mozilla/fenix/settings/DropDownListPreferenceTest.kt

@@ -3,11 +3,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 package org.mozilla.fenix.settings
 
+import androidx.preference.ListPreference
 import io.mockk.every
 import io.mockk.mockk
 import org.junit.Assert.assertEquals
-
-import androidx.preference.ListPreference
 import org.junit.Assert.assertNull
 import org.junit.Before
 import org.junit.Test

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

@@ -22,9 +22,9 @@ import mozilla.components.support.test.robolectric.testContext
 import mozilla.components.support.utils.CreditCardNetworkType
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
-import org.junit.Assert.assertTrue
 import org.junit.Assert.assertNotNull
 import org.junit.Assert.assertNull
+import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith

app/src/test/java/org/mozilla/fenix/settings/quicksettings/AutoplayValueTest.kt

@@ -11,12 +11,12 @@ import io.mockk.mockk
 import mozilla.components.concept.engine.permission.SitePermissions
 import mozilla.components.concept.engine.permission.SitePermissions.AutoplayStatus
 import mozilla.components.feature.sitepermissions.SitePermissionsRules
-import mozilla.components.feature.sitepermissions.SitePermissionsRules.AutoplayAction
 import mozilla.components.feature.sitepermissions.SitePermissionsRules.Action
+import mozilla.components.feature.sitepermissions.SitePermissionsRules.AutoplayAction
 import mozilla.components.support.test.robolectric.testContext
-import org.junit.Assert.assertTrue
-import org.junit.Assert.assertFalse
 import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith

app/src/test/java/org/mozilla/fenix/settings/quicksettings/WebsitePermissionViewTest.kt

@@ -8,15 +8,15 @@ import android.widget.FrameLayout
 import android.widget.TextView
 import androidx.appcompat.widget.AppCompatSpinner
 import androidx.core.view.isVisible
-import io.mockk.every
-import io.mockk.spyk
 import io.mockk.MockKAnnotations
-import io.mockk.verify
+import io.mockk.every
 import io.mockk.impl.annotations.MockK
 import io.mockk.mockk
+import io.mockk.spyk
+import io.mockk.verify
+import junit.framework.TestCase.assertEquals
 import junit.framework.TestCase.assertFalse
 import junit.framework.TestCase.assertTrue
-import junit.framework.TestCase.assertEquals
 import mozilla.components.support.test.robolectric.testContext
 import org.junit.Before
 import org.junit.Test

app/src/test/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsManageExceptionsPhoneFeatureFragmentTest.kt

@@ -8,21 +8,21 @@ import android.view.LayoutInflater
 import android.view.View
 import android.widget.RadioButton
 import androidx.core.view.isVisible
+import io.mockk.MockKAnnotations
 import io.mockk.every
+import io.mockk.impl.annotations.MockK
 import io.mockk.mockk
 import io.mockk.spyk
 import io.mockk.verify
-import io.mockk.MockKAnnotations
-import io.mockk.impl.annotations.MockK
 import mozilla.components.concept.engine.permission.SitePermissions
 import mozilla.components.concept.engine.permission.SitePermissions.AutoplayStatus
 import mozilla.components.feature.sitepermissions.SitePermissionsRules
-import mozilla.components.feature.sitepermissions.SitePermissionsRules.AutoplayAction
 import mozilla.components.feature.sitepermissions.SitePermissionsRules.Action
+import mozilla.components.feature.sitepermissions.SitePermissionsRules.AutoplayAction
 import mozilla.components.support.test.robolectric.testContext
-import org.junit.Assert.assertTrue
-import org.junit.Assert.assertFalse
 import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith

app/src/test/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsWifiIntegrationTest.kt

@@ -5,8 +5,8 @@
 package org.mozilla.fenix.settings.sitepermissions
 
 import io.mockk.every
-import io.mockk.verify
 import io.mockk.mockk
+import io.mockk.verify
 import mozilla.components.feature.sitepermissions.SitePermissionsRules.Action.ALLOWED
 import mozilla.components.feature.sitepermissions.SitePermissionsRules.Action.BLOCKED
 import org.junit.Before

app/src/test/java/org/mozilla/fenix/share/listadapters/AccountDevicesShareAdapterTest.kt

@@ -15,9 +15,9 @@ import mozilla.components.support.test.robolectric.testContext
 import org.junit.Assert.assertEquals
 import org.junit.Test
 import org.junit.runner.RunWith
+import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
 import org.mozilla.fenix.share.ShareInteractor
 import org.mozilla.fenix.share.viewholders.AccountDeviceViewHolder
-import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
 
 @RunWith(FenixRobolectricTestRunner::class)
 class AccountDevicesShareAdapterTest {

app/src/test/java/org/mozilla/fenix/share/listadapters/AppShareAdapterTest.kt

@@ -16,9 +16,9 @@ import mozilla.components.support.test.robolectric.testContext
 import org.junit.Assert.assertEquals
 import org.junit.Test
 import org.junit.runner.RunWith
+import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
 import org.mozilla.fenix.share.ShareInteractor
 import org.mozilla.fenix.share.viewholders.AppViewHolder
-import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
 
 @RunWith(FenixRobolectricTestRunner::class)
 class AppShareAdapterTest {

app/src/test/java/org/mozilla/fenix/tabhistory/TabHistoryAdapterTest.kt

@@ -9,10 +9,10 @@ import android.widget.FrameLayout
 import androidx.appcompat.view.ContextThemeWrapper
 import io.mockk.MockKAnnotations
 import io.mockk.every
-import io.mockk.verify
-import io.mockk.spyk
-import io.mockk.mockk
 import io.mockk.impl.annotations.MockK
+import io.mockk.mockk
+import io.mockk.spyk
+import io.mockk.verify
 import mozilla.components.browser.icons.BrowserIcons
 import mozilla.components.support.test.robolectric.testContext
 import org.junit.Assert.assertFalse

app/src/test/java/org/mozilla/fenix/tabstray/TabsTrayFragmentTest.kt

@@ -35,9 +35,9 @@ import mozilla.components.service.glean.testing.GleanTestRule
 import mozilla.components.support.test.robolectric.testContext
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
-import org.junit.Assert.assertSame
 import org.junit.Assert.assertNotNull
 import org.junit.Assert.assertNull
+import org.junit.Assert.assertSame
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test

app/src/test/java/org/mozilla/fenix/tabstray/browser/AbstractBrowserTabViewHolderTest.kt

@@ -13,25 +13,25 @@ import io.mockk.verify
 import mozilla.components.browser.state.state.BrowserState
 import mozilla.components.browser.state.state.MediaSessionState
 import mozilla.components.browser.state.state.TabSessionState
+import mozilla.components.browser.state.state.createTab
 import mozilla.components.browser.state.store.BrowserStore
 import mozilla.components.concept.base.images.ImageLoader
-import mozilla.components.support.test.robolectric.testContext
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.mozilla.fenix.R
-import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
-import org.mozilla.fenix.selection.SelectionHolder
-import org.mozilla.fenix.tabstray.TabsTrayStore
-import mozilla.components.browser.state.state.createTab
 import mozilla.components.concept.engine.mediasession.MediaSession
 import mozilla.components.lib.publicsuffixlist.PublicSuffixList
+import mozilla.components.support.test.robolectric.testContext
 import mozilla.telemetry.glean.testing.GleanTestRule
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotNull
 import org.junit.Assert.assertNull
 import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
 import org.mozilla.fenix.GleanMetrics.Tab
+import org.mozilla.fenix.R
 import org.mozilla.fenix.ext.components
+import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
+import org.mozilla.fenix.selection.SelectionHolder
+import org.mozilla.fenix.tabstray.TabsTrayStore
 
 @RunWith(FenixRobolectricTestRunner::class)
 class AbstractBrowserTabViewHolderTest {

app/src/test/java/org/mozilla/fenix/tabstray/browser/BrowserTabsAdapterTest.kt

@@ -10,18 +10,18 @@ import io.mockk.mockk
 import io.mockk.spyk
 import io.mockk.verify
 import mozilla.components.browser.state.state.TabSessionState
+import mozilla.components.browser.state.state.createTab
+import mozilla.components.browser.state.store.BrowserStore
 import mozilla.components.browser.tabstray.TabsAdapter.Companion.PAYLOAD_DONT_HIGHLIGHT_SELECTED_ITEM
 import mozilla.components.browser.tabstray.TabsAdapter.Companion.PAYLOAD_HIGHLIGHT_SELECTED_ITEM
 import mozilla.components.support.test.robolectric.testContext
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.mozilla.fenix.databinding.TabTrayItemBinding
+import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
 import org.mozilla.fenix.selection.SelectionHolder
 import org.mozilla.fenix.tabstray.TabsTrayStore
-import mozilla.components.browser.state.state.createTab
-import mozilla.components.browser.state.store.BrowserStore
-import org.mozilla.fenix.ext.components
 
 @RunWith(FenixRobolectricTestRunner::class)
 class BrowserTabsAdapterTest {

app/src/test/java/org/mozilla/fenix/trackingprotection/TrackerBucketsTest.kt

@@ -4,10 +4,10 @@
 
 package org.mozilla.fenix.trackingprotection
 
-import mozilla.components.concept.engine.EngineSession.TrackingProtectionPolicy.TrackingCategory.SCRIPTS_AND_SUB_RESOURCES
 import mozilla.components.concept.engine.EngineSession.TrackingProtectionPolicy.TrackingCategory.CRYPTOMINING
 import mozilla.components.concept.engine.EngineSession.TrackingProtectionPolicy.TrackingCategory.FINGERPRINTING
 import mozilla.components.concept.engine.EngineSession.TrackingProtectionPolicy.TrackingCategory.MOZILLA_SOCIAL
+import mozilla.components.concept.engine.EngineSession.TrackingProtectionPolicy.TrackingCategory.SCRIPTS_AND_SUB_RESOURCES
 import mozilla.components.concept.engine.content.blocking.TrackerLog
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertTrue

app/src/test/java/org/mozilla/fenix/utils/BrowsersCacheTest.kt

@@ -10,7 +10,6 @@ import android.content.pm.ActivityInfo
 import android.content.pm.PackageInfo
 import android.content.pm.ResolveInfo
 import android.net.Uri
-import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
 import mozilla.components.support.test.robolectric.testContext
 import mozilla.components.support.utils.Browsers
 import org.junit.Assert.assertEquals
@@ -18,6 +17,7 @@ import org.junit.Assert.assertNotNull
 import org.junit.Assert.assertNull
 import org.junit.Test
 import org.junit.runner.RunWith
+import org.mozilla.fenix.helpers.FenixRobolectricTestRunner
 import org.robolectric.Shadows.shadowOf
 
 @RunWith(FenixRobolectricTestRunner::class)

app/src/test/java/org/mozilla/fenix/wifi/WifiConnectionMonitorTest.kt

@@ -10,9 +10,9 @@ import io.mockk.mockk
 import io.mockk.spyk
 import io.mockk.verify
 import mozilla.components.support.test.robolectric.testContext
-import org.junit.Assert.assertTrue
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertNull
+import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith

buildSrc/src/main/java/org/mozilla/fenix/gradle/tasks/ApkSizeTask.kt

@@ -11,7 +11,6 @@ import org.json.JSONArray
 import org.json.JSONException
 import org.json.JSONObject
 import java.io.File
-import java.io.IOException
 import java.nio.file.Files
 import java.nio.file.Paths
 

docs/architectureexample/ContactsController.kt

@@ -6,7 +6,7 @@
 // /docs/architecture-overview.md
 class ContactsController(
     private val store: ContactsStore,
-    private val navController: NavController
+    private val navController: NavController,
 ) {
 
     fun contactRenamed(contactId: Int, newName: String) {
@@ -17,7 +17,7 @@ class ContactsController(
         // This is how we pass arguments between fragments using Google's navigation library.
         // See https://developer.android.com/guide/navigation/navigation-getting-started
         val directions = ContactsFragment.actionContactsFragmentToChatFragment(
-            contactId = contactId
+            contactId = contactId,
         )
         navController.nav(R.id.contactFragment, directions)
     }

docs/architectureexample/ContactsInteractor.kt

@@ -6,7 +6,7 @@
 // /docs/architecture-overview.md
 class ContactsInteractor(
     private val contactsController: ContactsController,
-    private val themeController: ThemeController
+    private val themeController: ThemeController,
 ) {
 
     fun onThemeSelected(theme: Theme) {

docs/architectureexample/ContactsStore.kt

@@ -5,7 +5,7 @@
 // This is example code for the 'Simplified Example' section of
 // /docs/architecture-overview.md
 class ContactsStore(
-    private val initialState: ContactsState
+    private val initialState: ContactsState,
 ) : Store<ContactsState, Reducer<ContactState, ContactsAction>>(initialState, ::reducer)
 
 sealed class ContactsAction {
@@ -15,13 +15,13 @@ sealed class ContactsAction {
 
 data class ContactsState(
     val contacts: List<Contact>,
-    val theme: Theme
+    val theme: Theme,
 )
 
 data class Contact(
     val name: String,
     val id: Int,
-    val imageUrl: Uri
+    val imageUrl: Uri,
 )
 
 enum class Theme {

docs/architectureexample/ContactsView.kt

@@ -6,7 +6,7 @@
 // /docs/architecture-overview.md
 class ContactsView(
     private val container: ViewGroup,
-    private val interactor: ContactsInteractor
+    private val interactor: ContactsInteractor,
 ) {
 
     val view: View = LayoutInflater.from(container.context)

mozilla-detekt-rules/src/main/java/org/mozilla/fenix/detektrules/CustomRulesetProvider.kt

@@ -8,8 +8,8 @@ import io.gitlab.arturbosch.detekt.api.Config
 import io.gitlab.arturbosch.detekt.api.RuleSet
 import io.gitlab.arturbosch.detekt.api.RuleSetProvider
 import org.mozilla.fenix.detektrules.perf.MozillaBannedPropertyAccess
-import org.mozilla.fenix.detektrules.perf.MozillaStrictModeSuppression
 import org.mozilla.fenix.detektrules.perf.MozillaRunBlockingCheck
+import org.mozilla.fenix.detektrules.perf.MozillaStrictModeSuppression
 import org.mozilla.fenix.detektrules.perf.MozillaUseLazyMonitored
 
 class CustomRulesetProvider : RuleSetProvider {
@@ -23,6 +23,6 @@ class CustomRulesetProvider : RuleSetProvider {
             MozillaCorrectUnitTestRunner(config),
             MozillaRunBlockingCheck(config),
             MozillaUseLazyMonitored(config),
-        )
+        ),
     )
 }

mozilla-detekt-rules/src/main/java/org/mozilla/fenix/detektrules/MozillaCorrectUnitTestRunner.kt

@@ -17,7 +17,7 @@ import org.jetbrains.kotlin.psi.KtAnnotationEntry
 private val BANNED_TEST_RUNNERS = setOf(
     // When updating this list, also update the violation message.
     "AndroidJUnit4",
-    "RobolectricTestRunner"
+    "RobolectricTestRunner",
 )
 
 // There is a change to how we output violations in a different PR so the formatting for message
@@ -48,13 +48,13 @@ class MozillaCorrectUnitTestRunner(config: Config) : Rule(config) {
         MozillaCorrectUnitTestRunner::class.simpleName!!,
         Severity.Defect,
         "Verifies we're using the correct Robolectric unit test runner",
-        Debt.FIVE_MINS
+        Debt.FIVE_MINS,
     )
 
     override val filters: PathFilters?
         get() = PathFilters.of(
             includes = listOf("**/test/**"), // unit tests only.
-            excludes = emptyList()
+            excludes = emptyList(),
         )
 
     override fun visitAnnotationEntry(annotationEntry: KtAnnotationEntry) {

mozilla-detekt-rules/src/main/java/org/mozilla/fenix/detektrules/perf/MozillaBannedPropertyAccess.kt

@@ -18,7 +18,7 @@ class MozillaBannedPropertyAccess(config: Config = Config.empty) : Rule(config)
         "MozillaBannedPropertyAccess",
         Severity.Defect,
         DESCR,
-        Debt.FIVE_MINS
+        Debt.FIVE_MINS,
     )
 
     private val banned by lazy {
@@ -43,7 +43,7 @@ class MozillaBannedPropertyAccess(config: Config = Config.empty) : Rule(config)
             CodeSmell(
                 issue,
                 Entity.from(expression),
-                "Using $possiblyBannedPropertyAccess is not allowed because accessing property $it is against Mozilla policy. See 'mozilla-detekt-rules' stanza in 'config/detekt.yml' for more information.\n"
+                "Using $possiblyBannedPropertyAccess is not allowed because accessing property $it is against Mozilla policy. See 'mozilla-detekt-rules' stanza in 'config/detekt.yml' for more information.\n",
             )
         }.forEach { report(it) }
     }

mozilla-detekt-rules/src/main/java/org/mozilla/fenix/detektrules/perf/MozillaRunBlockingCheck.kt

@@ -8,7 +8,7 @@ import io.gitlab.arturbosch.detekt.api.*
 import org.jetbrains.kotlin.psi.*
 
 private const val VIOLATION_MSG = "Please use `org.mozilla.fenix.perf.runBlockingImplement` instead" +
-        "because it allows us to monitor the code for performance regressions."
+    "because it allows us to monitor the code for performance regressions."
 
 /**
  * A check to prevent us from working around mechanisms we implemented in
@@ -21,8 +21,8 @@ class MozillaRunBlockingCheck(config: Config) : Rule(config) {
         "MozillaRunBlockingCheck",
         Severity.Performance,
         "Prevents us from working around mechanisms we implemented to count how many " +
-                "runBlocking are used",
+            "runBlocking are used",
-        Debt.TWENTY_MINS
+        Debt.TWENTY_MINS,
     )
 
     override fun visitImportDirective(importDirective: KtImportDirective) {

mozilla-detekt-rules/src/main/java/org/mozilla/fenix/detektrules/perf/MozillaStrictModeSuppression.kt

@@ -25,7 +25,7 @@ class MozillaStrictModeSuppression(config: Config) : Rule(config) {
         "MozillaStrictModeSuppression",
         Severity.Performance,
         "Prevents us from working around mechanisms we implemented to prevent suppressing StrictMode",
-        Debt.TEN_MINS
+        Debt.TEN_MINS,
     )
 
     override fun visitImportDirective(importDirective: KtImportDirective) {
@@ -55,9 +55,10 @@ class MozillaStrictModeSuppression(config: Config) : Rule(config) {
         if (receiver == "StrictMode") {
             val violationMsg = when (calledMethod) {
                 "setThreadPolicy" -> VIOLATION_MSG
-                "setVmPolicy" -> "NOT YET IMPLEMENTED: please consult the perf team about implementing" +
+                "setVmPolicy" ->
-                    "`StrictModeManager.resetAfter`: we want to understand the performance implications " +
+                    "NOT YET IMPLEMENTED: please consult the perf team about implementing" +
-                    "of suppressing setVmPolicy before allowing it."
+                        "`StrictModeManager.resetAfter`: we want to understand the performance implications " +
+                        "of suppressing setVmPolicy before allowing it."
                 else -> null
             }
 

mozilla-detekt-rules/src/main/java/org/mozilla/fenix/detektrules/perf/MozillaUseLazyMonitored.kt

@@ -31,12 +31,12 @@ open class MozillaUseLazyMonitored(config: Config) : Rule(config) {
         this::class.java.simpleName,
         Severity.Performance,
         "Prevents use of lazy in component groups files where lazyMonitored should be used instead",
-        Debt.FIVE_MINS
+        Debt.FIVE_MINS,
     )
 
     override val filters = PathFilters.of(
         includes = COMPONENT_GROUP_FILES.map { "**$it" },
-        excludes = emptyList()
+        excludes = emptyList(),
     )
 
     override fun visitPropertyDelegate(delegate: KtPropertyDelegate) {
@@ -79,7 +79,7 @@ open class MozillaUseLazyMonitored(config: Config) : Rule(config) {
             "PerformanceComponent",
             "Push",
             "Services",
-            "UseCases"
+            "UseCases",
         ).map { "app/src/main/java/org/mozilla/fenix/components/$it.kt" }
     }
 }

mozilla-detekt-rules/src/test/java/org/mozilla/fenix/detektrules/perf/MozillaBannedPropertyAccessTest.kt

@@ -27,14 +27,13 @@ internal class MozillaBannedPropertyAccessTest {
     @BeforeEach
     fun setup() {
         config = yamlConfig("/config.yml")
-
     }
 
     @Test
     internal fun `non compliant property access should warn`() {
         val findings =
             MozillaBannedPropertyAccess(config).lint(
-                NONCOMPLIANT_ACCESS.trimIndent()
+                NONCOMPLIANT_ACCESS.trimIndent(),
             )
         assertEquals(1, findings.size)
         assertEquals(DESCR, findings[0].issue.description)
@@ -46,7 +45,7 @@ internal class MozillaBannedPropertyAccessTest {
     internal fun testCompliantWhen(source: String) {
         val findings =
             MozillaBannedPropertyAccess(config).lint(
-                source
+                source,
             )
         assertTrue(findings.isEmpty())
     }
@@ -55,7 +54,7 @@ internal class MozillaBannedPropertyAccessTest {
         @JvmStatic
         fun compliantProvider(): Stream<Arguments> =
             Stream.of(
-                arguments(COMPLIANT_ACCESS, "Safe property access")
+                arguments(COMPLIANT_ACCESS, "Safe property access"),
             )
     }
 }