diff --git a/app/src/androidTest/java/org/mozilla/fenix/glean/BaselinePingTest.kt b/app/src/androidTest/java/org/mozilla/fenix/glean/BaselinePingTest.kt index 104de91a6..8d4a76464 100644 --- a/app/src/androidTest/java/org/mozilla/fenix/glean/BaselinePingTest.kt +++ b/app/src/androidTest/java/org/mozilla/fenix/glean/BaselinePingTest.kt @@ -79,9 +79,11 @@ class BaselinePingTest { @JvmStatic @OptIn(DelicateCoroutinesApi::class) // GlobalScope usage fun setupOnce() { - val httpClient = ConceptFetchHttpUploader(lazy { - GeckoViewFetchClient(ApplicationProvider.getApplicationContext()) - }) + val httpClient = ConceptFetchHttpUploader( + lazy { + GeckoViewFetchClient(ApplicationProvider.getApplicationContext()) + } + ) // Fenix does not initialize the Glean SDK in tests/debug builds, but this test // requires Glean to be initialized so we need to do it manually. Additionally, @@ -151,8 +153,11 @@ class BaselinePingTest { // sending the ping that was submitted on background. This can go away once bug 1634375 // is fixed. device.pressRecentApps() - device.findObject(UiSelector().descriptionContains( - ApplicationProvider.getApplicationContext().getString(R.string.app_name))) + device.findObject( + UiSelector().descriptionContains( + ApplicationProvider.getApplicationContext().getString(R.string.app_name) + ) + ) .click() // Validate the received data. diff --git a/app/src/androidTest/java/org/mozilla/fenix/helpers/TestHelper.kt b/app/src/androidTest/java/org/mozilla/fenix/helpers/TestHelper.kt index f5bb51d70..1f7771e4b 100644 --- a/app/src/androidTest/java/org/mozilla/fenix/helpers/TestHelper.kt +++ b/app/src/androidTest/java/org/mozilla/fenix/helpers/TestHelper.kt @@ -83,7 +83,7 @@ object TestHelper { fun getPermissionAllowID(): String { return when - (Build.VERSION.SDK_INT > Build.VERSION_CODES.P) { + (Build.VERSION.SDK_INT > Build.VERSION_CODES.P) { true -> "com.android.permissioncontroller" false -> "com.android.packageinstaller" } diff --git a/app/src/androidTest/java/org/mozilla/fenix/perf/StartupExcessiveResourceUseTest.kt b/app/src/androidTest/java/org/mozilla/fenix/perf/StartupExcessiveResourceUseTest.kt index f88ea09d6..5640d9166 100644 --- a/app/src/androidTest/java/org/mozilla/fenix/perf/StartupExcessiveResourceUseTest.kt +++ b/app/src/androidTest/java/org/mozilla/fenix/perf/StartupExcessiveResourceUseTest.kt @@ -58,7 +58,7 @@ private val failureMsgRecyclerViewConstraintLayoutChildren = getErrorMessage( private val failureMsgNumberOfInflation = getErrorMessage( shortName = "Number of inflation on start up doesn't match expected count", implications = "The number of inflation can negatively impact start up time. Having more inflations" + - "will most likely mean we're adding extra work on the UI thread." + "will most likely mean we're adding extra work on the UI thread." ) /** * A performance test to limit the number of StrictMode suppressions and number of runBlocking used diff --git a/app/src/androidTest/java/org/mozilla/fenix/screenshots/MenuScreenShotTest.kt b/app/src/androidTest/java/org/mozilla/fenix/screenshots/MenuScreenShotTest.kt index ab2465a79..342dcc14d 100644 --- a/app/src/androidTest/java/org/mozilla/fenix/screenshots/MenuScreenShotTest.kt +++ b/app/src/androidTest/java/org/mozilla/fenix/screenshots/MenuScreenShotTest.kt @@ -83,14 +83,14 @@ class MenuScreenShotTest : ScreenshotTest() { }.openLanguageSubMenu { Screengrab.screenshot("SettingsSubMenuAccessibilityRobot_settings-language") }.goBack { - // From about here we need to scroll up to ensure all settings options are visible. + // From about here we need to scroll up to ensure all settings options are visible. }.openSetDefaultBrowserSubMenu { Screengrab.screenshot("SettingsSubMenuDefaultBrowserRobot_settings-default-browser") }.goBack { - // Disabled for Pixel 2 - // }.openEnhancedTrackingProtectionSubMenu { - // Screengrab.screenshot("settings-enhanced-tp") - // }.goBack { + // Disabled for Pixel 2 + // }.openEnhancedTrackingProtectionSubMenu { + // Screengrab.screenshot("settings-enhanced-tp") + // }.goBack { }.openLoginsAndPasswordSubMenu { Screengrab.screenshot("SettingsSubMenuLoginsAndPasswords-settings-logins-passwords") }.goBack { @@ -176,7 +176,7 @@ class MenuScreenShotTest : ScreenshotTest() { @Test fun saveLoginPromptTest() { val saveLoginTest = - TestAssetHelper.getSaveLoginAsset(mockWebServer) + TestAssetHelper.getSaveLoginAsset(mockWebServer) navigationToolbar { }.enterURLAndEnterToBrowser(saveLoginTest.url) { verifySaveLoginPromptIsShownNotSave() diff --git a/app/src/androidTest/java/org/mozilla/fenix/syncintegration/SyncIntegrationTest.kt b/app/src/androidTest/java/org/mozilla/fenix/syncintegration/SyncIntegrationTest.kt index 2ab2cecca..9b8c973bf 100644 --- a/app/src/androidTest/java/org/mozilla/fenix/syncintegration/SyncIntegrationTest.kt +++ b/app/src/androidTest/java/org/mozilla/fenix/syncintegration/SyncIntegrationTest.kt @@ -173,9 +173,11 @@ class SyncIntegrationTest { // Useful functions for the tests fun typeEmail() { - val emailInput = mDevice.findObject(UiSelector() + val emailInput = mDevice.findObject( + UiSelector() .instance(0) - .className(EditText::class.java)) + .className(EditText::class.java) + ) emailInput.waitForExists(TestAssetHelper.waitingTime) val emailAddress = javaClass.classLoader!!.getResource("email.txt").readText() @@ -188,9 +190,11 @@ class SyncIntegrationTest { } fun typePassword() { - val passwordInput = mDevice.findObject(UiSelector() + val passwordInput = mDevice.findObject( + UiSelector() .instance(0) - .className(EditText::class.java)) + .className(EditText::class.java) + ) val passwordValue = javaClass.classLoader!!.getResource("password.txt").readText() passwordInput.setText(passwordValue) diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsAddonsTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsAddonsTest.kt index 9bd09b80b..ea683c369 100644 --- a/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsAddonsTest.kt +++ b/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsAddonsTest.kt @@ -96,7 +96,7 @@ class SettingsAddonsTest { acceptInstallAddon() verifyDownloadAddonPrompt(addonName, activityTestRule) - } + } } // Opens the addons settings menu, installs an addon, then uninstalls diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/AccountSettingsRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/AccountSettingsRobot.kt index 62e8ca844..a20e0941e 100644 --- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/AccountSettingsRobot.kt +++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/AccountSettingsRobot.kt @@ -44,19 +44,19 @@ private fun deviceName() = Espresso.onView(CoreMatchers.allOf(ViewMatchers.withT private fun disconnectButton() = Espresso.onView(CoreMatchers.allOf(ViewMatchers.withId(R.id.signOutDisconnect))) private fun assertBookmarksCheckbox() = bookmarksCheckbox().check( - ViewAssertions.matches( - ViewMatchers.withEffectiveVisibility( - ViewMatchers.Visibility.VISIBLE - ) + ViewAssertions.matches( + ViewMatchers.withEffectiveVisibility( + ViewMatchers.Visibility.VISIBLE ) + ) ) private fun assertHistoryCheckbox() = historyCheckbox().check( - ViewAssertions.matches( - ViewMatchers.withEffectiveVisibility( - ViewMatchers.Visibility.VISIBLE - ) + ViewAssertions.matches( + ViewMatchers.withEffectiveVisibility( + ViewMatchers.Visibility.VISIBLE ) + ) ) private fun assertSignOutButton() = signOutButton().check(ViewAssertions.matches(ViewMatchers.withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE))) diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/AddToHomeScreenRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/AddToHomeScreenRobot.kt index 7a7219ef7..859bd317b 100644 --- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/AddToHomeScreenRobot.kt +++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/AddToHomeScreenRobot.kt @@ -91,8 +91,12 @@ fun addToHomeScreen(interact: AddToHomeScreenRobot.() -> Unit): AddToHomeScreenR private fun shortcutNameField() = onView(withId(R.id.shortcut_text)) private fun assertShortcutNameField(expectedText: String) { - onView(allOf(withId(R.id.shortcut_text), - withText(expectedText))) + onView( + allOf( + withId(R.id.shortcut_text), + withText(expectedText) + ) + ) .check(matches(isCompletelyDisplayed())) } diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BookmarksRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BookmarksRobot.kt index 3f15b840e..6a222b947 100644 --- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BookmarksRobot.kt +++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BookmarksRobot.kt @@ -105,8 +105,10 @@ class BookmarksRobot { fun verifySelectDefaultFolderSnackBarText() = assertSnackBarText("Can’t edit default folders") fun verifyCurrentFolderTitle(title: String) { - mDevice.findObject(UiSelector().resourceId("$packageName:id/navigationToolbar") - .textContains(title)) + mDevice.findObject( + UiSelector().resourceId("$packageName:id/navigationToolbar") + .textContains(title) + ) .waitForExists(waitingTime) onView( @@ -119,8 +121,10 @@ class BookmarksRobot { } fun waitForBookmarksFolderContentToExist(parentFolderName: String, childFolderName: String) { - mDevice.findObject(UiSelector().resourceId("$packageName:id/navigationToolbar") - .textContains(parentFolderName)) + mDevice.findObject( + UiSelector().resourceId("$packageName:id/navigationToolbar") + .textContains(parentFolderName) + ) .waitForExists(waitingTime) mDevice.waitNotNull(Until.findObject(By.text(childFolderName)), waitingTime) diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BrowserRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BrowserRobot.kt index eb047a70a..0390756d8 100644 --- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BrowserRobot.kt +++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BrowserRobot.kt @@ -509,8 +509,10 @@ class BrowserRobot { fun openTabDrawer(interact: TabDrawerRobot.() -> Unit): TabDrawerRobot.Transition { mDevice.waitForIdle(waitingTime) tabsCounter().click() - mDevice.waitNotNull(Until.findObject(By.res("$packageName:id/tab_layout")), - waitingTime) + mDevice.waitNotNull( + Until.findObject(By.res("$packageName:id/tab_layout")), + waitingTime + ) TabDrawerRobot().interact() return TabDrawerRobot.Transition() diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/DownloadRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/DownloadRobot.kt index 00e1a091e..b2fdff296 100644 --- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/DownloadRobot.kt +++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/DownloadRobot.kt @@ -58,8 +58,10 @@ class DownloadRobot { } fun waitForDownloadsListToExist() = - assertTrue(mDevice.findObject(UiSelector().resourceId("$packageName:id/download_list")) - .waitForExists(waitingTime)) + assertTrue( + mDevice.findObject(UiSelector().resourceId("$packageName:id/download_list")) + .waitForExists(waitingTime) + ) class Transition { fun clickDownload(interact: DownloadRobot.() -> Unit): Transition { diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/EnhancedTrackingProtectionRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/EnhancedTrackingProtectionRobot.kt index 5fb906ad7..e9dde4763 100644 --- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/EnhancedTrackingProtectionRobot.kt +++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/EnhancedTrackingProtectionRobot.kt @@ -179,8 +179,8 @@ private fun assertBasicLevelTrackingContentBlocked() { withText( containsString( "social-track-digest256.dummytracker.org\n" + - "ads-track-digest256.dummytracker.org\n" + - "analytics-track-digest256.dummytracker.org" + "ads-track-digest256.dummytracker.org\n" + + "analytics-track-digest256.dummytracker.org" ) ) ) diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HistoryRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HistoryRobot.kt index c7eb8dcec..430d6e310 100644 --- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HistoryRobot.kt +++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HistoryRobot.kt @@ -94,7 +94,7 @@ class HistoryRobot { } fun openThreeDotMenu(interact: ThreeDotMenuHistoryItemRobot.() -> Unit): - ThreeDotMenuHistoryItemRobot.Transition { + ThreeDotMenuHistoryItemRobot.Transition { threeDotMenu().click() diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HomeScreenRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HomeScreenRobot.kt index 3340fad7c..20abd2e87 100644 --- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HomeScreenRobot.kt +++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/HomeScreenRobot.kt @@ -61,9 +61,9 @@ import org.mozilla.fenix.ui.util.STRING_ONBOARDING_TRACKING_PROTECTION_HEADER class HomeScreenRobot { val privateSessionMessage = "$appName clears your search and browsing history from private tabs when you close them" + - " or quit the app. While this doesn’t make you anonymous to websites or your internet" + - " service provider, it makes it easier to keep what you do online private from anyone" + - " else who uses this device." + " or quit the app. While this doesn’t make you anonymous to websites or your internet" + + " service provider, it makes it easier to keep what you do online private from anyone" + + " else who uses this device." fun verifyNavigationToolbar() = assertNavigationToolbar() fun verifyFocusedNavigationToolbar() = assertFocusedNavigationToolbar() @@ -207,7 +207,7 @@ class HomeScreenRobot { } fun triggerPrivateBrowsingShortcutPrompt(interact: AddToHomeScreenRobot.() -> Unit): AddToHomeScreenRobot.Transition { - // Loop to press the PB icon for 5 times to display the Add the Private Browsing Shortcut CFR + // Loop to press the PB icon for 5 times to display the Add the Private Browsing Shortcut CFR for (i in 1..5) { mDevice.findObject(UiSelector().resourceId("$packageName:id/privateBrowsingButton")) .waitForExists( @@ -356,7 +356,7 @@ private fun assertFocusedNavigationToolbar() = private fun assertHomeScreen() { mDevice.findObject(UiSelector().resourceId("$packageName:id/homeLayout")).waitForExists(waitingTime) onView(ViewMatchers.withResourceName("homeLayout")) - .check(matches(withEffectiveVisibility(Visibility.VISIBLE))) + .check(matches(withEffectiveVisibility(Visibility.VISIBLE))) } private fun assertHomeMenu() = onView(ViewMatchers.withResourceName("menuButton")) @@ -383,7 +383,8 @@ private fun assertCollectionsHeader() = private fun assertNoCollectionsText() = onView( withText( - containsString("Collect the things that matter to you.\n" + + containsString( + "Collect the things that matter to you.\n" + "Group together similar searches, sites, and tabs for quick access later." ) ) diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/LibrarySubMenusMultipleSelectionToolbarRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/LibrarySubMenusMultipleSelectionToolbarRobot.kt index 10d39cca5..b38ec59eb 100644 --- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/LibrarySubMenusMultipleSelectionToolbarRobot.kt +++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/LibrarySubMenusMultipleSelectionToolbarRobot.kt @@ -58,7 +58,8 @@ class LibrarySubMenusMultipleSelectionToolbarRobot { mDevice.waitNotNull( Until.findObject( By.text("ALL ACTIONS") - ), waitingTime + ), + waitingTime ) } @@ -68,7 +69,8 @@ class LibrarySubMenusMultipleSelectionToolbarRobot { mDevice.waitNotNull( Until.findObject( By.text("ALL ACTIONS") - ), waitingTime + ), + waitingTime ) } diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/NavigationToolbarRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/NavigationToolbarRobot.kt index ce5e2ad25..d8ee7b7f1 100644 --- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/NavigationToolbarRobot.kt +++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/NavigationToolbarRobot.kt @@ -70,8 +70,10 @@ class NavigationToolbarRobot { fun typeSearchTerm(searchTerm: String) = awesomeBar().perform(typeText(searchTerm)) fun toggleReaderView() { - mDevice.findObject(UiSelector() - .resourceId("$packageName:id/mozac_browser_toolbar_page_actions")) + mDevice.findObject( + UiSelector() + .resourceId("$packageName:id/mozac_browser_toolbar_page_actions") + ) .waitForExists(waitingTime) readerViewToggle().click() @@ -133,7 +135,8 @@ class NavigationToolbarRobot { when (etpEnabled) { true -> try { - assertTrue("Onboarding message not displayed", + assertTrue( + "Onboarding message not displayed", onboardingDisplayed ) } catch (e: AssertionError) { @@ -184,8 +187,10 @@ class NavigationToolbarRobot { fun openTabTray(interact: TabDrawerRobot.() -> Unit): TabDrawerRobot.Transition { mDevice.waitForIdle(waitingTime) tabTrayButton().click() - mDevice.waitNotNull(Until.findObject(By.res("$packageName:id/tab_layout")), - waitingTime) + mDevice.waitNotNull( + Until.findObject(By.res("$packageName:id/tab_layout")), + waitingTime + ) TabDrawerRobot().interact() return TabDrawerRobot.Transition() @@ -251,7 +256,8 @@ class NavigationToolbarRobot { RecyclerViewActions.actionOnItem( hasDescendant( withText("Close tab") - ), ViewActions.click() + ), + ViewActions.click() ) ) @@ -267,7 +273,8 @@ class NavigationToolbarRobot { RecyclerViewActions.actionOnItem( hasDescendant( withText("New tab") - ), ViewActions.click() + ), + ViewActions.click() ) ) @@ -283,7 +290,8 @@ class NavigationToolbarRobot { RecyclerViewActions.actionOnItem( hasDescendant( withText("New private tab") - ), ViewActions.click() + ), + ViewActions.click() ) ) @@ -352,8 +360,10 @@ private fun readerViewToggle() = onView(withParent(withId(R.id.mozac_browser_toolbar_page_actions))) private fun assertReaderViewDetected(visible: Boolean) { - mDevice.findObject(UiSelector() - .description("Reader view")) + mDevice.findObject( + UiSelector() + .description("Reader view") + ) .waitForExists(waitingTime) onView( @@ -368,8 +378,10 @@ private fun assertReaderViewDetected(visible: Boolean) { } private fun assertCloseReaderViewDetected(visible: Boolean) { - mDevice.findObject(UiSelector() - .description("Close reader view")) + mDevice.findObject( + UiSelector() + .description("Close reader view") + ) .waitForExists(waitingTime) onView( diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ReaderViewRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ReaderViewRobot.kt index 8532d5af3..2ebaafc8b 100644 --- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ReaderViewRobot.kt +++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ReaderViewRobot.kt @@ -55,9 +55,9 @@ class ReaderViewRobot { val prefs = InstrumentationRegistry.getInstrumentation() .targetContext.getSharedPreferences( - "mozac_feature_reader_view", - Context.MODE_PRIVATE - ) + "mozac_feature_reader_view", + Context.MODE_PRIVATE + ) assertEquals(fontType, prefs.getString(fontTypeKey, "")) } @@ -67,9 +67,9 @@ class ReaderViewRobot { val prefs = InstrumentationRegistry.getInstrumentation() .targetContext.getSharedPreferences( - "mozac_feature_reader_view", - Context.MODE_PRIVATE - ) + "mozac_feature_reader_view", + Context.MODE_PRIVATE + ) val fontSizeKeyValue = prefs.getInt(fontSizeKey, 3) @@ -81,9 +81,9 @@ class ReaderViewRobot { val prefs = InstrumentationRegistry.getInstrumentation() .targetContext.getSharedPreferences( - "mozac_feature_reader_view", - Context.MODE_PRIVATE - ) + "mozac_feature_reader_view", + Context.MODE_PRIVATE + ) assertEquals(expectedColorScheme, prefs.getString(colorSchemeKey, "")) } diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/RecentlyClosedTabsRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/RecentlyClosedTabsRobot.kt index a817051cc..b112db7e2 100644 --- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/RecentlyClosedTabsRobot.kt +++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/RecentlyClosedTabsRobot.kt @@ -94,7 +94,8 @@ private fun assertRecentlyClosedTabsMenuView() { ) ) .check( - matches(withEffectiveVisibility(Visibility.VISIBLE))) + matches(withEffectiveVisibility(Visibility.VISIBLE)) + ) } private fun assertEmptyRecentlyClosedTabsList() = @@ -105,7 +106,8 @@ private fun assertEmptyRecentlyClosedTabsList() = ) ) .check( - matches(withText("No recently closed tabs here"))) + matches(withText("No recently closed tabs here")) + ) private fun assertPageUrl(expectedUrl: Uri) = onView( allOf( @@ -116,7 +118,8 @@ private fun assertPageUrl(expectedUrl: Uri) = onView( ) ) .check( - matches(withText(Matchers.containsString(expectedUrl.toString())))) + matches(withText(Matchers.containsString(expectedUrl.toString()))) + ) private fun recentlyClosedTabsPageTitle() = onView( allOf( @@ -128,9 +131,11 @@ private fun recentlyClosedTabsPageTitle() = onView( private fun assertRecentlyClosedTabsPageTitle(title: String) { recentlyClosedTabsPageTitle() .check( - matches(withEffectiveVisibility(Visibility.VISIBLE))) + matches(withEffectiveVisibility(Visibility.VISIBLE)) + ) .check( - matches(withText(title))) + matches(withText(title)) + ) } private fun recentlyClosedTabsThreeDotButton() = @@ -138,45 +143,50 @@ private fun recentlyClosedTabsThreeDotButton() = allOf( withId(R.id.overflow_menu), withEffectiveVisibility( - Visibility.VISIBLE + Visibility.VISIBLE + ) ) ) -) private fun assertRecentlyClosedTabsMenuCopy() = onView(withText("Copy")) .check( matches( - withEffectiveVisibility(Visibility.VISIBLE))) + withEffectiveVisibility(Visibility.VISIBLE) + ) + ) private fun assertRecentlyClosedTabsMenuShare() = onView(withText("Share")) .check( matches( - withEffectiveVisibility(Visibility.VISIBLE))) + withEffectiveVisibility(Visibility.VISIBLE) + ) + ) private fun assertRecentlyClosedTabsOverlayNewTab() = onView(withText("Open in new tab")) .check( matches( - withEffectiveVisibility(Visibility.VISIBLE)) -) + withEffectiveVisibility(Visibility.VISIBLE) + ) + ) private fun assertRecentlyClosedTabsMenuPrivateTab() = onView(withText("Open in private tab")) .check( matches( withEffectiveVisibility(Visibility.VISIBLE) + ) ) - ) private fun assertRecentlyClosedTabsMenuDelete() = onView(withText("Delete")) .check( matches( withEffectiveVisibility(Visibility.VISIBLE) - ) -) + ) + ) private fun recentlyClosedTabsCopyButton() = onView(withText("Copy")) @@ -185,26 +195,31 @@ private fun copySnackBarText() = onView(withId(R.id.snackbar_text)) private fun assertCopySnackBarText() = copySnackBarText() .check( matches - (withText("URL copied"))) + (withText("URL copied")) + ) private fun recentlyClosedTabsShareButton() = onView(withText("Share")) private fun assertRecentlyClosedShareOverlay() = onView(withId(R.id.shareWrapper)) .check( - matches(ViewMatchers.isDisplayed())) + matches(ViewMatchers.isDisplayed()) + ) private fun assetRecentlyClosedShareTitle(title: String) = onView(withId(R.id.share_tab_title)) .check( - matches(ViewMatchers.isDisplayed())) + matches(ViewMatchers.isDisplayed()) + ) .check( - matches(withText(title))) + matches(withText(title)) + ) private fun assertRecentlyClosedShareFavicon() = onView(withId(R.id.share_tab_favicon)) .check( - matches(ViewMatchers.isDisplayed())) + matches(ViewMatchers.isDisplayed()) + ) private fun assertRecentlyClosedShareUrl(expectedUrl: Uri) = onView( @@ -214,7 +229,8 @@ private fun assertRecentlyClosedShareUrl(expectedUrl: Uri) = ) ) .check( - matches(withText(Matchers.containsString(expectedUrl.toString())))) + matches(withText(Matchers.containsString(expectedUrl.toString()))) + ) private fun recentlyClosedTabsNewTabButton() = onView(withText("Open in new tab")) diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SearchRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SearchRobot.kt index a306c0914..3048f1876 100644 --- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SearchRobot.kt +++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SearchRobot.kt @@ -73,8 +73,10 @@ class SearchRobot { selectDefaultSearchEngine(searchEngineName) fun clickSearchEngineShortcutButton() { - val searchEnginesShortcutButton = mDevice.findObject(UiSelector() - .resourceId("$packageName:id/search_engines_shortcut_button")) + val searchEnginesShortcutButton = mDevice.findObject( + UiSelector() + .resourceId("$packageName:id/search_engines_shortcut_button") + ) searchEnginesShortcutButton.waitForExists(waitingTime) searchEnginesShortcutButton.click() } @@ -270,7 +272,8 @@ private fun assertKeyboardVisibility(isExpectedToBeVisible: Boolean) = { mDevice.waitNotNull( Until.findObject( By.text("Search Engine") - ), waitingTime + ), + waitingTime ) assertEquals( isExpectedToBeVisible, diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsRobot.kt index 34c6a998f..411795c4a 100644 --- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsRobot.kt +++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsRobot.kt @@ -111,7 +111,7 @@ class SettingsRobot { } fun openAboutFirefoxPreview(interact: SettingsSubMenuAboutRobot.() -> Unit): - SettingsSubMenuAboutRobot.Transition { + SettingsSubMenuAboutRobot.Transition { assertAboutFirefoxPreview().click() @@ -120,7 +120,7 @@ class SettingsRobot { } fun openSearchSubMenu(interact: SettingsSubMenuSearchRobot.() -> Unit): - SettingsSubMenuSearchRobot.Transition { + SettingsSubMenuSearchRobot.Transition { fun searchEngineButton() = onView(withText("Search")) searchEngineButton().click() @@ -401,7 +401,7 @@ private fun assertNotificationsButton() { private fun assertDataCollectionButton() { scrollToElementByText("Data collection") onView(withText("Data collection")) - .check(matches(withEffectiveVisibility(Visibility.VISIBLE))) + .check(matches(withEffectiveVisibility(Visibility.VISIBLE))) } private fun openLinksInAppsButton() = onView(withText("Open links in apps")) diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAboutRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAboutRobot.kt index 612311542..0c651c857 100644 --- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAboutRobot.kt +++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAboutRobot.kt @@ -117,8 +117,8 @@ private fun assertCurrentTimestamp() { // Currently UI tests run against debug builds, which display a hard-coded string 'debug build' // instead of the date. See https://github.com/mozilla-mobile/fenix/pull/10812#issuecomment-633746833 .check(matches(withText(containsString("debug build")))) - // This assertion should be valid for non-debug build types. - // .check(BuildDateAssertion.isDisplayedDateAccurate()) + // This assertion should be valid for non-debug build types. + // .check(BuildDateAssertion.isDisplayedDateAccurate()) } private fun assertWhatIsNewInFirefoxPreview() { diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuDataCollectionRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuDataCollectionRobot.kt index 3b638d688..9e561038a 100644 --- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuDataCollectionRobot.kt +++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuDataCollectionRobot.kt @@ -59,8 +59,11 @@ private fun goBackButton() = onView(withContentDescription("Navigate up")) private fun assertNavigationToolBarHeader() = onView( - allOf(withParent(withId(R.id.navigationToolbar)), - withText(R.string.preferences_data_collection))) + allOf( + withParent(withId(R.id.navigationToolbar)), + withText(R.string.preferences_data_collection) + ) +) .check(matches(withEffectiveVisibility(Visibility.VISIBLE))) private fun assertDataCollectionOptions() { diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuDeleteBrowsingDataOnQuitRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuDeleteBrowsingDataOnQuitRobot.kt index 8d0395e5b..ffc8060a6 100644 --- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuDeleteBrowsingDataOnQuitRobot.kt +++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuDeleteBrowsingDataOnQuitRobot.kt @@ -62,18 +62,27 @@ class SettingsSubMenuDeleteBrowsingDataOnQuitRobot { private fun goBackButton() = onView(withContentDescription("Navigate up")) -private fun assertNavigationToolBarHeader() = onView(allOf(withId(R.id.navigationToolbar), - withChild(withText(R.string.preferences_delete_browsing_data_on_quit)))) +private fun assertNavigationToolBarHeader() = onView( + allOf( + withId(R.id.navigationToolbar), + withChild(withText(R.string.preferences_delete_browsing_data_on_quit)) + ) +) .check(matches(withEffectiveVisibility(Visibility.VISIBLE))) -private fun deleteBrowsingOnQuitButton() = onView(allOf(withParentIndex(0), - withChild(withText(R.string.preferences_delete_browsing_data_on_quit)))) +private fun deleteBrowsingOnQuitButton() = onView( + allOf( + withParentIndex(0), + withChild(withText(R.string.preferences_delete_browsing_data_on_quit)) + ) +) private fun assertDeleteBrowsingOnQuitButton() = deleteBrowsingOnQuitButton() .check(matches(withEffectiveVisibility(Visibility.VISIBLE))) private fun assertDeleteBrowsingOnQuitButtonSummary() = onView( - withText(R.string.preference_summary_delete_browsing_data_on_quit_2)) + withText(R.string.preference_summary_delete_browsing_data_on_quit_2) +) .check(matches(withEffectiveVisibility(Visibility.VISIBLE))) private fun assertDeleteBrowsingOnQuitButtonSwitchDefault() = onView(withResourceName("switch_widget")) diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuDeleteBrowsingDataRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuDeleteBrowsingDataRobot.kt index dcea2d465..53a86f37e 100644 --- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuDeleteBrowsingDataRobot.kt +++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuDeleteBrowsingDataRobot.kt @@ -86,8 +86,12 @@ private fun goBackButton() = onView(allOf(withContentDescription("Navigate up"))) private fun assertNavigationToolBarHeader() { - onView(allOf(withId(R.id.navigationToolbar), - withChild(withText(R.string.preferences_delete_browsing_data)))) + onView( + allOf( + withId(R.id.navigationToolbar), + withChild(withText(R.string.preferences_delete_browsing_data)) + ) + ) .check((matches(withEffectiveVisibility(Visibility.VISIBLE)))) } diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuEnhancedTrackingProtectionRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuEnhancedTrackingProtectionRobot.kt index 3a30b2e25..c60f8e965 100644 --- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuEnhancedTrackingProtectionRobot.kt +++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuEnhancedTrackingProtectionRobot.kt @@ -111,8 +111,12 @@ class SettingsSubMenuEnhancedTrackingProtectionRobot { } private fun assertNavigationToolBarHeader() { - onView(allOf(withParent(withId(org.mozilla.fenix.R.id.navigationToolbar)), - withText("Enhanced Tracking Protection"))) + onView( + allOf( + withParent(withId(org.mozilla.fenix.R.id.navigationToolbar)), + withText("Enhanced Tracking Protection") + ) + ) .check(matches(withEffectiveVisibility(Visibility.VISIBLE))) } @@ -122,21 +126,32 @@ private fun assertEnhancedTrackingProtectionHeader() { } private fun assertEnhancedTrackingProtectionHeaderDescription() { - onView(allOf(withParent(withParentIndex(0)), - withText("Keep your data to yourself. $appName protects you from many of the most common trackers that follow what you do online."))) + onView( + allOf( + withParent(withParentIndex(0)), + withText("Keep your data to yourself. $appName protects you from many of the most common trackers that follow what you do online.") + ) + ) .check(matches(withEffectiveVisibility(Visibility.VISIBLE))) } private fun assertLearnMoreText() { - onView(allOf(withParent(withParentIndex(0)), - withText("Learn more"))) + onView( + allOf( + withParent(withParentIndex(0)), + withText("Learn more") + ) + ) .check(matches(withEffectiveVisibility(Visibility.VISIBLE))) } private fun assertEnhancedTrackingProtectionTextWithSwitchWidget() { - onView(allOf( + onView( + allOf( withParentIndex(1), - withChild(withText("Enhanced Tracking Protection")))) + withChild(withText("Enhanced Tracking Protection")) + ) + ) .check(matches(withEffectiveVisibility(Visibility.VISIBLE))) } @@ -195,7 +210,8 @@ private fun assertTrackingProtectionSwitchEnabled() { } private fun assertRadioButtonDefaults() { - onView(withText("Strict") + onView( + withText("Strict") ).assertIsChecked(false) onView( @@ -205,7 +221,8 @@ private fun assertRadioButtonDefaults() { ) ).assertIsChecked(true) - onView(withText("Custom") + onView( + withText("Custom") ).assertIsChecked(false) } diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuLoginsAndPasswordOptionsToSaveRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuLoginsAndPasswordOptionsToSaveRobot.kt index b7e3199db..581782744 100644 --- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuLoginsAndPasswordOptionsToSaveRobot.kt +++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuLoginsAndPasswordOptionsToSaveRobot.kt @@ -18,10 +18,10 @@ import org.hamcrest.CoreMatchers class SettingsSubMenuLoginsAndPasswordOptionsToSaveRobot { fun verifySaveLoginsOptionsView() { onView(ViewMatchers.withText("Ask to save")) - .check(matches(withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE))) + .check(matches(withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE))) onView(ViewMatchers.withText("Never save")) - .check(matches(withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE))) + .check(matches(withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE))) } class Transition { @@ -35,4 +35,4 @@ class SettingsSubMenuLoginsAndPasswordOptionsToSaveRobot { } private fun goBackButton() = - onView(CoreMatchers.allOf(ViewMatchers.withContentDescription("Navigate up"))) + onView(CoreMatchers.allOf(ViewMatchers.withContentDescription("Navigate up"))) diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuLoginsAndPasswordRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuLoginsAndPasswordRobot.kt index 74a6805de..5db63ad9b 100644 --- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuLoginsAndPasswordRobot.kt +++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuLoginsAndPasswordRobot.kt @@ -92,10 +92,10 @@ fun settingsSubMenuLoginsAndPassword(interact: SettingsSubMenuLoginsAndPasswordR } private fun goBackButton() = - onView(CoreMatchers.allOf(ViewMatchers.withContentDescription("Navigate up"))) + onView(CoreMatchers.allOf(ViewMatchers.withContentDescription("Navigate up"))) private fun assertDefaultView() = onView(ViewMatchers.withText("Sync logins across devices")) - .check(matches(withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE))) + .check(matches(withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE))) private fun assertDefaultValueAutofillLogins() = onView(ViewMatchers.withText("Autofill")) .check(matches(withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE))) @@ -104,4 +104,4 @@ private fun assertDefaultValueExceptions() = onView(ViewMatchers.withText("Excep .check(matches(withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE))) private fun assertDefaultValueSyncLogins() = onView(ViewMatchers.withText("Sign in to Sync")) - .check(matches(withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE))) + .check(matches(withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE))) diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsTurnOnSyncRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsTurnOnSyncRobot.kt index 5faa2840b..70c00dbb5 100644 --- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsTurnOnSyncRobot.kt +++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsTurnOnSyncRobot.kt @@ -46,13 +46,13 @@ class SettingsTurnOnSyncRobot { } private fun goBackButton() = - Espresso.onView(CoreMatchers.allOf(ViewMatchers.withContentDescription("Navigate up"))) + Espresso.onView(CoreMatchers.allOf(ViewMatchers.withContentDescription("Navigate up"))) private fun assertUseEmailField() = Espresso.onView(ViewMatchers.withText("Use email instead")) - .check(ViewAssertions.matches(ViewMatchers.withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE))) + .check(ViewAssertions.matches(ViewMatchers.withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE))) private fun assertReadyToScan() = Espresso.onView(ViewMatchers.withText("Ready to scan")) - .check(ViewAssertions.matches(ViewMatchers.withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE))) + .check(ViewAssertions.matches(ViewMatchers.withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE))) private fun useEmailButton() = Espresso.onView(ViewMatchers.withText("Use email instead")) diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SystemSettingsRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SystemSettingsRobot.kt index daf9ae8c7..03a1796e8 100644 --- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SystemSettingsRobot.kt +++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SystemSettingsRobot.kt @@ -39,7 +39,8 @@ fun systemSettings(interact: SystemSettingsRobot.() -> Unit): SystemSettingsRobo private fun assertSystemNotificationsView() { mDevice.findObject(UiSelector().resourceId("com.android.settings:id/list")) .waitForExists(waitingTime) - assertTrue(mDevice.findObject(UiSelector().textContains("Show notifications")) - .waitForExists(waitingTime) + assertTrue( + mDevice.findObject(UiSelector().textContains("Show notifications")) + .waitForExists(waitingTime) ) } diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/TabDrawerRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/TabDrawerRobot.kt index e780d6250..d74a23236 100644 --- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/TabDrawerRobot.kt +++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/TabDrawerRobot.kt @@ -230,8 +230,10 @@ class TabDrawerRobot { fun openTabDrawer(interact: TabDrawerRobot.() -> Unit): TabDrawerRobot.Transition { mDevice.waitForIdle(waitingTime) tabsCounter().click() - mDevice.waitNotNull(Until.findObject(By.res("$packageName:id/tab_layout")), - waitingTime) + mDevice.waitNotNull( + Until.findObject(By.res("$packageName:id/tab_layout")), + waitingTime + ) TabDrawerRobot().interact() return TabDrawerRobot.Transition() @@ -338,7 +340,7 @@ class TabDrawerRobot { } fun openRecentlyClosedTabs(interact: RecentlyClosedTabsRobot.() -> Unit): - RecentlyClosedTabsRobot.Transition { + RecentlyClosedTabsRobot.Transition { threeDotMenu().click() @@ -356,7 +358,7 @@ class TabDrawerRobot { } fun clickSaveCollection(interact: CollectionRobot.() -> Unit): - CollectionRobot.Transition { + CollectionRobot.Transition { saveTabsToCollectionButton().click() CollectionRobot().interact() @@ -395,9 +397,11 @@ private fun threeDotMenu() = onView(withId(R.id.tab_tray_overflow)) private fun assertExistingOpenTabs(title: String) { try { - mDevice.findObject(UiSelector() - .resourceId("$packageName:id/mozac_browser_tabstray_title") - .textContains(title)) + mDevice.findObject( + UiSelector() + .resourceId("$packageName:id/mozac_browser_tabstray_title") + .textContains(title) + ) .waitForExists(waitingTime) tab(title).check(matches(isDisplayed())) diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ThreeDotMenuHistoryItemRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ThreeDotMenuHistoryItemRobot.kt index 850a9cec9..46af9d03b 100644 --- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ThreeDotMenuHistoryItemRobot.kt +++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ThreeDotMenuHistoryItemRobot.kt @@ -34,7 +34,8 @@ class ThreeDotMenuHistoryItemRobot { mDevice.waitNotNull( Until.findObject( By.text("ALL ACTIONS") - ), TestAssetHelper.waitingTime + ), + TestAssetHelper.waitingTime ) LibrarySubMenusMultipleSelectionToolbarRobot().interact() diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ThreeDotMenuMainRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ThreeDotMenuMainRobot.kt index c4cb1e47d..05991877d 100644 --- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ThreeDotMenuMainRobot.kt +++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ThreeDotMenuMainRobot.kt @@ -512,7 +512,8 @@ private fun tabSettingsButton() = private fun assertTabSettingsButton() { tabSettingsButton() .check( - matches(isDisplayed())) + matches(isDisplayed()) + ) } private fun recentlyClosedTabsButton() = @@ -521,7 +522,8 @@ private fun recentlyClosedTabsButton() = private fun assertRecentlyClosedTabsButton() { recentlyClosedTabsButton() .check( - matches(isDisplayed())) + matches(isDisplayed()) + ) } private fun shareAllTabsButton() = @@ -530,7 +532,8 @@ private fun shareAllTabsButton() = private fun assertShareAllTabsButton() { shareAllTabsButton() .check( - matches(isDisplayed())) + matches(isDisplayed()) + ) } private fun assertNewTabButton() = onView(withText("New tab")).check(matches(isDisplayed())) diff --git a/app/src/main/java/org/mozilla/fenix/FenixApplication.kt b/app/src/main/java/org/mozilla/fenix/FenixApplication.kt index d5e45e300..451e76cfb 100644 --- a/app/src/main/java/org/mozilla/fenix/FenixApplication.kt +++ b/app/src/main/java/org/mozilla/fenix/FenixApplication.kt @@ -140,7 +140,8 @@ open class FenixApplication : LocaleAwareApplication(), Provider { channel = BuildConfig.BUILD_TYPE, httpClient = ConceptFetchHttpUploader( lazy(LazyThreadSafetyMode.NONE) { components.core.client } - )), + ) + ), uploadEnabled = telemetryEnabled, buildInfo = GleanBuildInfo.buildInfo ) @@ -392,15 +393,17 @@ open class FenixApplication : LocaleAwareApplication(), Provider { logger.info("onTrimMemory(), level=$level, main=${isMainProcess()}") - components.analytics.crashReporter.recordCrashBreadcrumb(Breadcrumb( - category = "Memory", - message = "onTrimMemory()", - data = mapOf( - "level" to level.toString(), - "main" to isMainProcess().toString() - ), - level = Breadcrumb.Level.INFO - )) + components.analytics.crashReporter.recordCrashBreadcrumb( + Breadcrumb( + category = "Memory", + message = "onTrimMemory()", + data = mapOf( + "level" to level.toString(), + "main" to isMainProcess().toString() + ), + level = Breadcrumb.Level.INFO + ) + ) runOnlyInMainProcess { components.core.icons.onTrimMemory(level) @@ -473,22 +476,24 @@ open class FenixApplication : LocaleAwareApplication(), Provider { components.core.store, onNewTabOverride = { _, engineSession, url -> - val shouldCreatePrivateSession = - components.core.store.state.selectedTab?.content?.private - ?: components.settings.openLinksInAPrivateTab - - components.useCases.tabsUseCases.addTab( - url = url, - selectTab = true, - engineSession = engineSession, - private = shouldCreatePrivateSession - ) + val shouldCreatePrivateSession = + components.core.store.state.selectedTab?.content?.private + ?: components.settings.openLinksInAPrivateTab + + components.useCases.tabsUseCases.addTab( + url = url, + selectTab = true, + engineSession = engineSession, + private = shouldCreatePrivateSession + ) }, onCloseTabOverride = { - _, sessionId -> components.useCases.tabsUseCases.removeTab(sessionId) + _, sessionId -> + components.useCases.tabsUseCases.removeTab(sessionId) }, onSelectTabOverride = { - _, sessionId -> components.useCases.tabsUseCases.selectTab(sessionId) + _, sessionId -> + components.useCases.tabsUseCases.selectTab(sessionId) }, onExtensionsLoaded = { extensions -> components.addonUpdater.registerForFutureUpdates(extensions) diff --git a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt index eeac21c6d..1e49d3ba4 100644 --- a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt +++ b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt @@ -964,9 +964,9 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity { // First time opening this activity in the task. // Cold start / start from Recents after back press. return activityIcicle == null && - // Activity was restarted from Recents after it was destroyed by Android while in background - // in cases of memory pressure / "Don't keep activities". - startingIntent.flags and Intent.FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY == 0 + // Activity was restarted from Recents after it was destroyed by Android while in background + // in cases of memory pressure / "Don't keep activities". + startingIntent.flags and Intent.FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY == 0 } /** diff --git a/app/src/main/java/org/mozilla/fenix/addons/AddonPermissionsDetailsFragment.kt b/app/src/main/java/org/mozilla/fenix/addons/AddonPermissionsDetailsFragment.kt index 53c04615a..c34974725 100644 --- a/app/src/main/java/org/mozilla/fenix/addons/AddonPermissionsDetailsFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/addons/AddonPermissionsDetailsFragment.kt @@ -18,7 +18,8 @@ import org.mozilla.fenix.ext.showToolbar /** * A fragment to show the permissions of an add-on. */ -class AddonPermissionsDetailsFragment : Fragment(R.layout.fragment_add_on_permissions), +class AddonPermissionsDetailsFragment : + Fragment(R.layout.fragment_add_on_permissions), AddonPermissionsDetailsInteractor { private val args by navArgs() diff --git a/app/src/main/java/org/mozilla/fenix/addons/AddonPopupBaseFragment.kt b/app/src/main/java/org/mozilla/fenix/addons/AddonPopupBaseFragment.kt index 01ed98cca..cd1189cbb 100644 --- a/app/src/main/java/org/mozilla/fenix/addons/AddonPopupBaseFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/addons/AddonPopupBaseFragment.kt @@ -45,7 +45,8 @@ abstract class AddonPopupBaseFragment : Fragment(), EngineSession.Observer, User fragmentManager = parentFragmentManager, onNeedToRequestPermissions = { permissions -> requestPermissions(permissions, REQUEST_CODE_PROMPT_PERMISSIONS) - }), + } + ), owner = this, view = view ) diff --git a/app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt b/app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt index 5ac5ea3aa..cee178ad7 100644 --- a/app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt @@ -108,8 +108,9 @@ class AddonsManagementFragment : Fragment(R.layout.fragment_add_ons_management) val addons = requireContext().components.addonManager.getAddons(allowCache = allowCache) // Add-ons that should be excluded in Mozilla Online builds val excludedAddonIDs = if (Config.channel.isMozillaOnline && - !BuildConfig.MOZILLA_ONLINE_ADDON_EXCLUSIONS.isNullOrEmpty()) { - BuildConfig.MOZILLA_ONLINE_ADDON_EXCLUSIONS.toList() + !BuildConfig.MOZILLA_ONLINE_ADDON_EXCLUSIONS.isNullOrEmpty() + ) { + BuildConfig.MOZILLA_ONLINE_ADDON_EXCLUSIONS.toList() } else { emptyList() } @@ -200,7 +201,7 @@ class AddonsManagementFragment : Fragment(R.layout.fragment_add_ons_management) private fun hasExistingAddonInstallationDialogFragment(): Boolean { return parentFragmentManager.findFragmentByTag(INSTALLATION_DIALOG_FRAGMENT_TAG) - as? AddonInstallationDialogFragment != null + as? AddonInstallationDialogFragment != null } @VisibleForTesting diff --git a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt index 380b613f7..71b0bbc8c 100644 --- a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt @@ -148,8 +148,12 @@ import mozilla.components.feature.session.behavior.ToolbarPosition as MozacToolb */ @ExperimentalCoroutinesApi @Suppress("TooManyFunctions", "LargeClass") -abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, ActivityResultHandler, - OnBackLongPressedListener, AccessibilityManager.AccessibilityStateChangeListener { +abstract class BaseBrowserFragment : + Fragment(), + UserInteractionHandler, + ActivityResultHandler, + OnBackLongPressedListener, + AccessibilityManager.AccessibilityStateChangeListener { private lateinit var browserFragmentStore: BrowserFragmentStore private lateinit var browserAnimator: BrowserAnimator @@ -235,25 +239,25 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Activit } final override fun onViewCreated(view: View, savedInstanceState: Bundle?) = - PerfStartup.baseBfragmentOnViewCreated.measureNoInline { // weird indentation to avoid breaking blame. - initializeUI(view) - - if (customTabSessionId == null) { - // We currently only need this observer to navigate to home - // in case all tabs have been removed on startup. No need to - // this if we have a known session to display. - observeRestoreComplete(requireComponents.core.store, findNavController()) - } + PerfStartup.baseBfragmentOnViewCreated.measureNoInline { // weird indentation to avoid breaking blame. + initializeUI(view) + + if (customTabSessionId == null) { + // We currently only need this observer to navigate to home + // in case all tabs have been removed on startup. No need to + // this if we have a known session to display. + observeRestoreComplete(requireComponents.core.store, findNavController()) + } - observeTabSelection(requireComponents.core.store) + observeTabSelection(requireComponents.core.store) - if (!onboarding.userHasBeenOnboarded()) { - observeTabSource(requireComponents.core.store) - } + if (!onboarding.userHasBeenOnboarded()) { + observeTabSource(requireComponents.core.store) + } - requireContext().accessibilityManager.addAccessibilityStateChangeListener(this) - Unit - } + requireContext().accessibilityManager.addAccessibilityStateChangeListener(this) + Unit + } private fun initializeUI(view: View) { val tab = getCurrentTab() @@ -823,15 +827,17 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Activit internal fun expandToolbarOnNavigation(store: BrowserStore) { consumeFlow(store) { flow -> flow.mapNotNull { - state -> state.findCustomTabOrSelectedTab(customTabSessionId) - } - .ifAnyChanged { - tab -> arrayOf(tab.content.url, tab.content.loadRequest) - } - .collect { - findInPageIntegration.onBackPressed() - browserToolbarView.expand() + state -> + state.findCustomTabOrSelectedTab(customTabSessionId) } + .ifAnyChanged { + tab -> + arrayOf(tab.content.url, tab.content.loadRequest) + } + .collect { + findInPageIntegration.onBackPressed() + browserToolbarView.expand() + } } } @@ -907,8 +913,8 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Activit @VisibleForTesting internal fun shouldPullToRefreshBeEnabled(inFullScreen: Boolean): Boolean { return FeatureFlags.pullToRefreshEnabled && - requireContext().settings().isPullToRefreshEnabledInBrowser && - !inFullScreen + requireContext().settings().isPullToRefreshEnabledInBrowser && + !inFullScreen } @VisibleForTesting @@ -981,12 +987,12 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Activit flow.ifChanged { it.selectedTabId } - .mapNotNull { - it.selectedTab - } - .collect { - handleTabSelected(it) - } + .mapNotNull { + it.selectedTab + } + .collect { + handleTabSelected(it) + } } } @@ -998,14 +1004,14 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Activit state.selectedTab } .collect { - if (!onboarding.userHasBeenOnboarded() && - it.content.loadRequest?.triggeredByRedirect != true && - it.source !in intentSourcesList && - it.content.url !in onboardingLinksList - ) { - onboarding.finish() + if (!onboarding.userHasBeenOnboarded() && + it.content.loadRequest?.triggeredByRedirect != true && + it.source !in intentSourcesList && + it.content.url !in onboardingLinksList + ) { + onboarding.finish() + } } - } } } @@ -1070,10 +1076,10 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Activit @CallSuper override fun onBackPressed(): Boolean { return findInPageIntegration.onBackPressed() || - fullScreenFeature.onBackPressed() || - promptsFeature.onBackPressed() || - sessionFeature.onBackPressed() || - removeSessionIfNeeded() + fullScreenFeature.onBackPressed() || + promptsFeature.onBackPressed() || + sessionFeature.onBackPressed() || + removeSessionIfNeeded() } override fun onBackLongPressed(): Boolean { diff --git a/app/src/main/java/org/mozilla/fenix/browser/FenixSnackbarDelegate.kt b/app/src/main/java/org/mozilla/fenix/browser/FenixSnackbarDelegate.kt index 6d2a4cdfc..5de15a759 100644 --- a/app/src/main/java/org/mozilla/fenix/browser/FenixSnackbarDelegate.kt +++ b/app/src/main/java/org/mozilla/fenix/browser/FenixSnackbarDelegate.kt @@ -28,7 +28,8 @@ class FenixSnackbarDelegate(private val view: View) : ContextMenuCandidate.Snack .setAction(view.context.getString(action)) { listener.invoke(view) } .show() } else { - FenixSnackbar.make(view, + FenixSnackbar.make( + view, duration = FenixSnackbar.LENGTH_SHORT, isDisplayedWithBrowserToolbar = true ) diff --git a/app/src/main/java/org/mozilla/fenix/browser/OpenInAppOnboardingObserver.kt b/app/src/main/java/org/mozilla/fenix/browser/OpenInAppOnboardingObserver.kt index 9205a26bd..c22183a2a 100644 --- a/app/src/main/java/org/mozilla/fenix/browser/OpenInAppOnboardingObserver.kt +++ b/app/src/main/java/org/mozilla/fenix/browser/OpenInAppOnboardingObserver.kt @@ -58,22 +58,23 @@ class OpenInAppOnboardingObserver( flow.mapNotNull { state -> state.selectedTab } - .ifAnyChanged { - tab -> arrayOf(tab.content.url, tab.content.loading) - } - .collect { tab -> - if (tab.content.url != currentUrl) { - sessionDomainForDisplayedBanner?.let { - if (tab.content.url.tryGetHostFromUrl() != it) { - infoBanner?.dismiss() + .ifAnyChanged { + tab -> + arrayOf(tab.content.url, tab.content.loading) + } + .collect { tab -> + if (tab.content.url != currentUrl) { + sessionDomainForDisplayedBanner?.let { + if (tab.content.url.tryGetHostFromUrl() != it) { + infoBanner?.dismiss() + } } + currentUrl = tab.content.url + } else { + // Loading state has changed + maybeShowOpenInAppBanner(tab.content.url, tab.content.loading) } - currentUrl = tab.content.url - } else { - // Loading state has changed - maybeShowOpenInAppBanner(tab.content.url, tab.content.loading) } - } } } diff --git a/app/src/main/java/org/mozilla/fenix/browser/ToolbarGestureHandler.kt b/app/src/main/java/org/mozilla/fenix/browser/ToolbarGestureHandler.kt index 757d4e828..4c69cbf73 100644 --- a/app/src/main/java/org/mozilla/fenix/browser/ToolbarGestureHandler.kt +++ b/app/src/main/java/org/mozilla/fenix/browser/ToolbarGestureHandler.kt @@ -214,8 +214,10 @@ class ToolbarGestureHandler( val reverseFling = abs(velocityX) >= minimumFlingVelocity && !velocityMatchesDirection - return !reverseFling && (previewWidth / windowWidth >= GESTURE_FINISH_PERCENT || - abs(velocityX) >= minimumFlingVelocity) + return !reverseFling && ( + previewWidth / windowWidth >= GESTURE_FINISH_PERCENT || + abs(velocityX) >= minimumFlingVelocity + ) } private fun getAnimator(finalContextX: Float, duration: Long): ValueAnimator { diff --git a/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationView.kt b/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationView.kt index 7b23249a9..34db0f881 100644 --- a/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationView.kt +++ b/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationView.kt @@ -170,9 +170,12 @@ class CollectionCreationView( setOnClickListener { name_collection_edittext.hideKeyboard() val handler = Handler(Looper.getMainLooper()) - handler.postDelayed({ - interactor.onBackPressed(SaveCollectionStep.NameCollection) - }, TRANSITION_DURATION) + handler.postDelayed( + { + interactor.onBackPressed(SaveCollectionStep.NameCollection) + }, + TRANSITION_DURATION + ) } } @@ -216,9 +219,12 @@ class CollectionCreationView( setOnClickListener { name_collection_edittext.hideKeyboard() val handler = Handler(Looper.getMainLooper()) - handler.postDelayed({ - interactor.onBackPressed(SaveCollectionStep.RenameCollection) - }, TRANSITION_DURATION) + handler.postDelayed( + { + interactor.onBackPressed(SaveCollectionStep.RenameCollection) + }, + TRANSITION_DURATION + ) } } transition.addListener(object : Transition.TransitionListener { diff --git a/app/src/main/java/org/mozilla/fenix/components/Components.kt b/app/src/main/java/org/mozilla/fenix/components/Components.kt index 84415ba2e..4a844349c 100644 --- a/app/src/main/java/org/mozilla/fenix/components/Components.kt +++ b/app/src/main/java/org/mozilla/fenix/components/Components.kt @@ -129,7 +129,8 @@ class Components(private val context: Context) { @Suppress("MagicNumber") val supportedAddonsChecker by lazyMonitored { - DefaultSupportedAddonsChecker(context, SupportedAddonsChecker.Frequency(12, TimeUnit.HOURS), + DefaultSupportedAddonsChecker( + context, SupportedAddonsChecker.Frequency(12, TimeUnit.HOURS), onNotificationClickIntent = Intent(context, HomeActivity::class.java).apply { action = Intent.ACTION_VIEW flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK 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 f722b3711..140d92cfa 100644 --- a/app/src/main/java/org/mozilla/fenix/components/Core.kt +++ b/app/src/main/java/org/mozilla/fenix/components/Core.kt @@ -105,7 +105,7 @@ class Core( val defaultSettings = DefaultSettings( requestInterceptor = requestInterceptor, remoteDebuggingEnabled = context.settings().isRemoteDebuggingEnabled && - Build.VERSION.SDK_INT >= Build.VERSION_CODES.M, + Build.VERSION.SDK_INT >= Build.VERSION_CODES.M, testingModeEnabled = false, trackingProtectionPolicy = trackingProtectionPolicyFactory.createTrackingProtectionPolicy(), historyTrackingDelegate = HistoryDelegate(lazyHistoryStorage), @@ -432,7 +432,7 @@ class Core( fun getPreferredColorScheme(): PreferredColorScheme { val inDark = (context.resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK) == - Configuration.UI_MODE_NIGHT_YES + Configuration.UI_MODE_NIGHT_YES return when { context.settings().shouldUseDarkTheme -> PreferredColorScheme.Dark context.settings().shouldUseLightTheme -> PreferredColorScheme.Light diff --git a/app/src/main/java/org/mozilla/fenix/components/IntentProcessorType.kt b/app/src/main/java/org/mozilla/fenix/components/IntentProcessorType.kt index ea4dca70e..80f452a3c 100644 --- a/app/src/main/java/org/mozilla/fenix/components/IntentProcessorType.kt +++ b/app/src/main/java/org/mozilla/fenix/components/IntentProcessorType.kt @@ -39,10 +39,10 @@ enum class IntentProcessorType { fun IntentProcessors.getType(processor: IntentProcessor?) = when { migrationIntentProcessor == processor -> IntentProcessorType.MIGRATION externalAppIntentProcessors.contains(processor) || - customTabIntentProcessor == processor || - privateCustomTabIntentProcessor == processor -> IntentProcessorType.EXTERNAL_APP + customTabIntentProcessor == processor || + privateCustomTabIntentProcessor == processor -> IntentProcessorType.EXTERNAL_APP intentProcessor == processor || - privateIntentProcessor == processor || - fennecPageShortcutIntentProcessor == processor -> IntentProcessorType.NEW_TAB + privateIntentProcessor == processor || + fennecPageShortcutIntentProcessor == processor -> IntentProcessorType.NEW_TAB else -> IntentProcessorType.OTHER } diff --git a/app/src/main/java/org/mozilla/fenix/components/PrivateShortcutCreateManager.kt b/app/src/main/java/org/mozilla/fenix/components/PrivateShortcutCreateManager.kt index 95c840e92..9aa3d6364 100644 --- a/app/src/main/java/org/mozilla/fenix/components/PrivateShortcutCreateManager.kt +++ b/app/src/main/java/org/mozilla/fenix/components/PrivateShortcutCreateManager.kt @@ -38,15 +38,17 @@ object PrivateShortcutCreateManager { ) ) .setIcon(icon) - .setIntent(Intent(context, HomeActivity::class.java).apply { - action = Intent.ACTION_VIEW - flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK - putExtra(HomeActivity.PRIVATE_BROWSING_MODE, true) - putExtra( - HomeActivity.OPEN_TO_SEARCH, - StartSearchIntentProcessor.PRIVATE_BROWSING_PINNED_SHORTCUT - ) - }) + .setIntent( + Intent(context, HomeActivity::class.java).apply { + action = Intent.ACTION_VIEW + flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK + putExtra(HomeActivity.PRIVATE_BROWSING_MODE, true) + putExtra( + HomeActivity.OPEN_TO_SEARCH, + StartSearchIntentProcessor.PRIVATE_BROWSING_PINNED_SHORTCUT + ) + } + ) .build() val homeScreenIntent = Intent(Intent.ACTION_MAIN) .addCategory(Intent.CATEGORY_HOME) diff --git a/app/src/main/java/org/mozilla/fenix/components/Services.kt b/app/src/main/java/org/mozilla/fenix/components/Services.kt index a9405285f..d8922d0b4 100644 --- a/app/src/main/java/org/mozilla/fenix/components/Services.kt +++ b/app/src/main/java/org/mozilla/fenix/components/Services.kt @@ -41,7 +41,8 @@ class Services( interceptLinkClicks = true, launchInApp = { PreferenceManager.getDefaultSharedPreferences(context).getBoolean( - context.getPreferenceKey(R.string.pref_key_open_links_in_external_app), false) + context.getPreferenceKey(R.string.pref_key_open_links_in_external_app), false + ) } ) } diff --git a/app/src/main/java/org/mozilla/fenix/components/metrics/ActivationPing.kt b/app/src/main/java/org/mozilla/fenix/components/metrics/ActivationPing.kt index 7b8dc8b8a..5d8492a27 100644 --- a/app/src/main/java/org/mozilla/fenix/components/metrics/ActivationPing.kt +++ b/app/src/main/java/org/mozilla/fenix/components/metrics/ActivationPing.kt @@ -25,7 +25,8 @@ class ActivationPing(private val context: Context) { private val prefs: SharedPreferences by lazy { context.getSharedPreferences( - "${this.javaClass.canonicalName}.prefs", Context.MODE_PRIVATE) + "${this.javaClass.canonicalName}.prefs", Context.MODE_PRIVATE + ) } /** diff --git a/app/src/main/java/org/mozilla/fenix/components/metrics/SecurePrefsTelemetry.kt b/app/src/main/java/org/mozilla/fenix/components/metrics/SecurePrefsTelemetry.kt index c88841f16..23c1998fa 100644 --- a/app/src/main/java/org/mozilla/fenix/components/metrics/SecurePrefsTelemetry.kt +++ b/app/src/main/java/org/mozilla/fenix/components/metrics/SecurePrefsTelemetry.kt @@ -27,7 +27,7 @@ class SecurePrefsTelemetry( experiments.withExperiment(FeatureId.ANDROID_KEYSTORE) { experimentBranch -> // .. and this device is not in the control group. if (experimentBranch == ExperimentBranch.TREATMENT) { - SecurePrefsReliabilityExperiment(appContext)() + SecurePrefsReliabilityExperiment(appContext)() } } } diff --git a/app/src/main/java/org/mozilla/fenix/components/tips/providers/MasterPasswordTipProvider.kt b/app/src/main/java/org/mozilla/fenix/components/tips/providers/MasterPasswordTipProvider.kt index 604f34e2f..7ad40f868 100644 --- a/app/src/main/java/org/mozilla/fenix/components/tips/providers/MasterPasswordTipProvider.kt +++ b/app/src/main/java/org/mozilla/fenix/components/tips/providers/MasterPasswordTipProvider.kt @@ -59,7 +59,7 @@ class MasterPasswordTipProvider( override val shouldDisplay: Boolean by lazy { context.settings().shouldDisplayMasterPasswordMigrationTip && - fennecLoginsMPImporter?.hasMasterPassword() == true + fennecLoginsMPImporter?.hasMasterPassword() == true } private fun masterPasswordMigrationTip(): Tip = diff --git a/app/src/main/java/org/mozilla/fenix/components/tips/providers/MigrationTipProvider.kt b/app/src/main/java/org/mozilla/fenix/components/tips/providers/MigrationTipProvider.kt index f84c1e7ed..9eea0d6ed 100644 --- a/app/src/main/java/org/mozilla/fenix/components/tips/providers/MigrationTipProvider.kt +++ b/app/src/main/java/org/mozilla/fenix/components/tips/providers/MigrationTipProvider.kt @@ -92,9 +92,11 @@ class MigrationTipProvider(private val context: Context) : TipProvider { return if (MozillaProductDetector.packageIsInstalled(context, FENIX.productName)) { context.startActivity(context.packageManager.getLaunchIntentForPackage(FENIX.productName)) } else { - context.startActivity(Intent( - Intent.ACTION_VIEW, Uri.parse(SupportUtils.FIREFOX_NIGHTLY_PLAY_STORE_URL) - )) + context.startActivity( + Intent( + Intent.ACTION_VIEW, Uri.parse(SupportUtils.FIREFOX_NIGHTLY_PLAY_STORE_URL) + ) + ) } } diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt index fb2ade78d..b232e9213 100644 --- a/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt +++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt @@ -180,8 +180,10 @@ private fun BrowserStore.updateSearchTermsOfSelectedSession( ) { val selectedTabId = state.selectedTabId ?: return - dispatch(ContentAction.UpdateSearchTermsAction( - selectedTabId, - searchTerms - )) + dispatch( + ContentAction.UpdateSearchTermsAction( + selectedTabId, + searchTerms + ) + ) } diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarMenuController.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarMenuController.kt index 2053cca83..4b3c3db88 100644 --- a/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarMenuController.kt +++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarMenuController.kt @@ -118,13 +118,15 @@ class DefaultBrowserToolbarMenuController( customTabUseCases.migrate(customTabSessionId, select = true) // Switch to the actual browser which should now display our new selected session - activity.startActivity(openInFenixIntent.apply { - // We never want to launch the browser in the same task as the external app - // activity. So we force a new task here. IntentReceiverActivity will do the - // right thing and take care of routing to an already existing browser and avoid - // cloning a new one. - flags = flags or Intent.FLAG_ACTIVITY_NEW_TASK - }) + activity.startActivity( + openInFenixIntent.apply { + // We never want to launch the browser in the same task as the external app + // activity. So we force a new task here. IntentReceiverActivity will do the + // right thing and take care of routing to an already existing browser and avoid + // cloning a new one. + flags = flags or Intent.FLAG_ACTIVITY_NEW_TASK + } + ) // Close this activity (and the task) since it is no longer displaying any session activity.finishAndRemoveTask() diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarView.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarView.kt index 9e5e1cb5b..330a58dee 100644 --- a/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarView.kt +++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarView.kt @@ -68,7 +68,7 @@ class BrowserToolbarView( @VisibleForTesting internal val isPwaTabOrTwaTab: Boolean get() = customTabSession?.config?.externalAppType == ExternalAppType.PROGRESSIVE_WEB_APP || - customTabSession?.config?.externalAppType == ExternalAppType.TRUSTED_WEB_ACTIVITY + customTabSession?.config?.externalAppType == ExternalAppType.TRUSTED_WEB_ACTIVITY init { val isCustomTabSession = customTabSession != null diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt index f439180d1..f39d95d1b 100644 --- a/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt +++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt @@ -158,12 +158,12 @@ open class DefaultToolbarMenu( @VisibleForTesting(otherwise = PRIVATE) fun canAddToHomescreen(): Boolean = selectedSession != null && isPinningSupported && - !context.components.useCases.webAppUseCases.isInstallable() + !context.components.useCases.webAppUseCases.isInstallable() @VisibleForTesting(otherwise = PRIVATE) fun canInstall(): Boolean = selectedSession != null && isPinningSupported && - context.components.useCases.webAppUseCases.isInstallable() + context.components.useCases.webAppUseCases.isInstallable() @VisibleForTesting(otherwise = PRIVATE) fun shouldShowOpenInApp(): Boolean = selectedSession?.let { session -> diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarIntegration.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarIntegration.kt index d778e7abe..5a248bf12 100644 --- a/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarIntegration.kt +++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarIntegration.kt @@ -134,7 +134,7 @@ class DefaultToolbarIntegration( DisplayToolbar.Indicators.HIGHLIGHT ) } - context.settings().shouldUseTrackingProtection + context.settings().shouldUseTrackingProtection toolbar.display.icons = toolbar.display.icons.copy( emptyIcon = null, @@ -155,11 +155,11 @@ class DefaultToolbarIntegration( interactor.onTabCounterMenuItemTapped(it) }, iconColor = - if (isPrivate) { - ContextCompat.getColor(context, R.color.primary_text_private_theme) - } else { - null - } + if (isPrivate) { + ContextCompat.getColor(context, R.color.primary_text_private_theme) + } else { + null + } ).also { it.updateMenu(context.settings().toolbarPosition) } diff --git a/app/src/main/java/org/mozilla/fenix/ext/Activity.kt b/app/src/main/java/org/mozilla/fenix/ext/Activity.kt index f38afd406..d142aee6e 100644 --- a/app/src/main/java/org/mozilla/fenix/ext/Activity.kt +++ b/app/src/main/java/org/mozilla/fenix/ext/Activity.kt @@ -37,11 +37,13 @@ fun Activity.enterToImmersiveMode() { window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON) // This will be addressed on https://github.com/mozilla-mobile/fenix/issues/17804 @Suppress("DEPRECATION") - window.decorView.systemUiVisibility = (View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION + window.decorView.systemUiVisibility = ( + View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION or View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN or View.SYSTEM_UI_FLAG_HIDE_NAVIGATION or View.SYSTEM_UI_FLAG_FULLSCREEN - or View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY) + or View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY + ) } fun Activity.breadcrumb( diff --git a/app/src/main/java/org/mozilla/fenix/ext/ConnectivityManager.kt b/app/src/main/java/org/mozilla/fenix/ext/ConnectivityManager.kt index 465090c35..7b60ad21a 100644 --- a/app/src/main/java/org/mozilla/fenix/ext/ConnectivityManager.kt +++ b/app/src/main/java/org/mozilla/fenix/ext/ConnectivityManager.kt @@ -18,7 +18,7 @@ fun ConnectivityManager.isOnline(network: Network? = null): Boolean { return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { getNetworkCapabilities(network ?: activeNetwork)?.let { it.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) && - it.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED) + it.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED) } ?: false } else { // for devices below android M, there's no better way to get this. diff --git a/app/src/main/java/org/mozilla/fenix/ext/TabCollection.kt b/app/src/main/java/org/mozilla/fenix/ext/TabCollection.kt index 71de2d2e4..0e89cde37 100644 --- a/app/src/main/java/org/mozilla/fenix/ext/TabCollection.kt +++ b/app/src/main/java/org/mozilla/fenix/ext/TabCollection.kt @@ -31,9 +31,15 @@ fun TabCollection.getIconColor(context: Context): Int { * Then get the numbers from all these default names, compute the maximum number and add one. */ fun List.getDefaultCollectionNumber(): Int { - return (this - .map { it.title } - .filter { it.matches(Regex("Collection\\s\\d+")) } - .map { Integer.valueOf(it.split(" ")[DefaultCollectionCreationController.DEFAULT_COLLECTION_NUMBER_POSITION]) } - .maxOrNull() ?: 0) + DefaultCollectionCreationController.DEFAULT_INCREMENT_VALUE + return ( + this + .map { it.title } + .filter { it.matches(Regex("Collection\\s\\d+")) } + .map { + Integer.valueOf( + it.split(" ")[DefaultCollectionCreationController.DEFAULT_COLLECTION_NUMBER_POSITION] + ) + } + .maxOrNull() ?: 0 + ) + DefaultCollectionCreationController.DEFAULT_INCREMENT_VALUE } diff --git a/app/src/main/java/org/mozilla/fenix/gecko/GeckoProvider.kt b/app/src/main/java/org/mozilla/fenix/gecko/GeckoProvider.kt index c1c66a2ad..0a41dc63b 100644 --- a/app/src/main/java/org/mozilla/fenix/gecko/GeckoProvider.kt +++ b/app/src/main/java/org/mozilla/fenix/gecko/GeckoProvider.kt @@ -77,16 +77,19 @@ object GeckoProvider { .getHashUrl(CN_GET_HASH_URL) .build() - runtimeSettings.contentBlocking.setSafeBrowsingProviders(mozcn, + runtimeSettings.contentBlocking.setSafeBrowsingProviders( + mozcn, // Keep the existing configuration ContentBlocking.GOOGLE_SAFE_BROWSING_PROVIDER, - ContentBlocking.GOOGLE_LEGACY_SAFE_BROWSING_PROVIDER) + ContentBlocking.GOOGLE_LEGACY_SAFE_BROWSING_PROVIDER + ) runtimeSettings.contentBlocking.setSafeBrowsingPhishingTable( "m6eb-phish-shavar", "m6ib-phish-shavar", // Existing configuration - "goog-phish-proto") + "goog-phish-proto" + ) } val geckoRuntime = GeckoRuntime.create(context, runtimeSettings) diff --git a/app/src/main/java/org/mozilla/fenix/historymetadata/HistoryMetadataMiddleware.kt b/app/src/main/java/org/mozilla/fenix/historymetadata/HistoryMetadataMiddleware.kt index 423c60614..335206c82 100644 --- a/app/src/main/java/org/mozilla/fenix/historymetadata/HistoryMetadataMiddleware.kt +++ b/app/src/main/java/org/mozilla/fenix/historymetadata/HistoryMetadataMiddleware.kt @@ -92,7 +92,7 @@ class HistoryMetadataMiddleware( // When history state is ready, we can record metadata for this page. val knownHistoryMetadata = tab.historyMetadata val metadataPresentForUrl = knownHistoryMetadata != null && - knownHistoryMetadata.url == tab.content.url + knownHistoryMetadata.url == tab.content.url // Record metadata for tab if there is no metadata present, or if url of the // tab changes since we last recorded metadata. if (!metadataPresentForUrl) { diff --git a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt index 6742764a4..0db032a74 100644 --- a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt @@ -198,7 +198,8 @@ class HomeFragment : Fragment() { if (!onboarding.userHasBeenOnboarded() && requireContext().settings().shouldShowPrivacyPopWindow && - Config.channel.isMozillaOnline) { + Config.channel.isMozillaOnline + ) { showPrivacyPopWindow(requireContext(), requireActivity()) } } @@ -665,22 +666,25 @@ class HomeFragment : Fragment() { currentMode, owner = this@HomeFragment.viewLifecycleOwner ) - requireComponents.backgroundServices.accountManager.register(object : AccountObserver { - override fun onAuthenticated(account: OAuthAccount, authType: AuthType) { - if (authType != AuthType.Existing) { - view?.let { - FenixSnackbar.make( - view = it, - duration = Snackbar.LENGTH_SHORT, - isDisplayedWithBrowserToolbar = false - ) - .setText(it.context.getString(R.string.onboarding_firefox_account_sync_is_on)) - .setAnchorView(toolbarLayout) - .show() + requireComponents.backgroundServices.accountManager.register( + object : AccountObserver { + override fun onAuthenticated(account: OAuthAccount, authType: AuthType) { + if (authType != AuthType.Existing) { + view?.let { + FenixSnackbar.make( + view = it, + duration = Snackbar.LENGTH_SHORT, + isDisplayedWithBrowserToolbar = false + ) + .setText(it.context.getString(R.string.onboarding_firefox_account_sync_is_on)) + .setAnchorView(toolbarLayout) + .show() + } } } - } - }, owner = this@HomeFragment.viewLifecycleOwner) + }, + owner = this@HomeFragment.viewLifecycleOwner + ) } if (browsingModeManager.mode.isPrivate && @@ -701,7 +705,8 @@ class HomeFragment : Fragment() { private fun navToSavedLogins() { findNavController().navigate( - HomeFragmentDirections.actionGlobalSavedLoginsAuthFragment()) + HomeFragmentDirections.actionGlobalSavedLoginsAuthFragment() + ) } private fun dispatchModeChanges(mode: Mode) { diff --git a/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt b/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt index 56cd69cdc..a2a7d413c 100644 --- a/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt +++ b/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt @@ -181,7 +181,8 @@ class HomeMenu( // We don't want to cause its initialization just for this check. val accountAuthItem = if (context.components.backgroundServices.accountManagerAvailableQueue.isReady() && - context.components.backgroundServices.accountManager.accountNeedsReauth()) { + context.components.backgroundServices.accountManager.accountNeedsReauth() + ) { reconnectToSyncItem } else { null @@ -220,37 +221,40 @@ class HomeMenu( if (lifecycleOwner.lifecycle.currentState == Lifecycle.State.DESTROYED) { return@runIfReadyOrQueue } - context.components.backgroundServices.accountManager.register(object : AccountObserver { - override fun onAuthenticationProblems() { - lifecycleOwner.lifecycleScope.launch(Dispatchers.Main) { - onMenuBuilderChanged( - BrowserMenuBuilder( - menuItems + context.components.backgroundServices.accountManager.register( + object : AccountObserver { + override fun onAuthenticationProblems() { + lifecycleOwner.lifecycleScope.launch(Dispatchers.Main) { + onMenuBuilderChanged( + BrowserMenuBuilder( + menuItems + ) ) - ) + } } - } - override fun onAuthenticated(account: OAuthAccount, authType: AuthType) { - lifecycleOwner.lifecycleScope.launch(Dispatchers.Main) { - onMenuBuilderChanged( - BrowserMenuBuilder( - menuItems + override fun onAuthenticated(account: OAuthAccount, authType: AuthType) { + lifecycleOwner.lifecycleScope.launch(Dispatchers.Main) { + onMenuBuilderChanged( + BrowserMenuBuilder( + menuItems + ) ) - ) + } } - } - override fun onLoggedOut() { - lifecycleOwner.lifecycleScope.launch(Dispatchers.Main) { - onMenuBuilderChanged( - BrowserMenuBuilder( - menuItems + override fun onLoggedOut() { + lifecycleOwner.lifecycleScope.launch(Dispatchers.Main) { + onMenuBuilderChanged( + BrowserMenuBuilder( + menuItems + ) ) - ) + } } - } - }, lifecycleOwner) + }, + lifecycleOwner + ) } } } diff --git a/app/src/main/java/org/mozilla/fenix/home/mozonline/PrivacyContentDisplayHelper.kt b/app/src/main/java/org/mozilla/fenix/home/mozonline/PrivacyContentDisplayHelper.kt index d34371a00..a721540a2 100644 --- a/app/src/main/java/org/mozilla/fenix/home/mozonline/PrivacyContentDisplayHelper.kt +++ b/app/src/main/java/org/mozilla/fenix/home/mozonline/PrivacyContentDisplayHelper.kt @@ -29,21 +29,31 @@ fun showPrivacyPopWindow(context: Context, activity: Activity) { val clickableSpan2 = PrivacyContentSpan(Position.POS2, context) val clickableSpan3 = PrivacyContentSpan(Position.POS3, context) - messageSpannable.setSpan(clickableSpan1, content.indexOf(messageClickable1), - content.indexOf(messageClickable1) + messageClickable1.length, Spanned.SPAN_INCLUSIVE_INCLUSIVE) - messageSpannable.setSpan(clickableSpan2, content.indexOf(messageClickable2), - content.indexOf(messageClickable2) + messageClickable2.length, Spanned.SPAN_INCLUSIVE_INCLUSIVE) - messageSpannable.setSpan(clickableSpan3, content.indexOf(messageClickable3), - content.indexOf(messageClickable3) + messageClickable3.length, Spanned.SPAN_INCLUSIVE_INCLUSIVE) + messageSpannable.setSpan( + clickableSpan1, content.indexOf(messageClickable1), + content.indexOf(messageClickable1) + messageClickable1.length, Spanned.SPAN_INCLUSIVE_INCLUSIVE + ) + messageSpannable.setSpan( + clickableSpan2, content.indexOf(messageClickable2), + content.indexOf(messageClickable2) + messageClickable2.length, Spanned.SPAN_INCLUSIVE_INCLUSIVE + ) + messageSpannable.setSpan( + clickableSpan3, content.indexOf(messageClickable3), + content.indexOf(messageClickable3) + messageClickable3.length, Spanned.SPAN_INCLUSIVE_INCLUSIVE + ) // Users can only use fenix after they agree with the privacy notice val builder = AlertDialog.Builder(activity) - .setPositiveButton(context.getString(R.string.privacy_notice_positive_button), + .setPositiveButton( + context.getString(R.string.privacy_notice_positive_button), DialogInterface.OnClickListener { _, _ -> context.settings().shouldShowPrivacyPopWindow = false - }) - .setNeutralButton(context.getString(R.string.privacy_notice_neutral_button), - DialogInterface.OnClickListener { _, _ -> exitProcess(0) }) + } + ) + .setNeutralButton( + context.getString(R.string.privacy_notice_neutral_button), + DialogInterface.OnClickListener { _, _ -> exitProcess(0) } + ) .setTitle(context.getString(R.string.privacy_notice_title)) .setMessage(messageSpannable) .setCancelable(false) diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlAdapter.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlAdapter.kt index eb4d38ee7..e24d99917 100644 --- a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlAdapter.kt +++ b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlAdapter.kt @@ -197,28 +197,28 @@ sealed class AdapterItem(@LayoutRes val viewType: Int) { data class RecentBookmarks(val recentBookmarks: List) : AdapterItem(RecentBookmarksViewHolder.LAYOUT_ID) { - override fun sameAs(other: AdapterItem): Boolean { - val newBookmarks = (other as? RecentBookmarks) ?: return false - if (newBookmarks.recentBookmarks.size != this.recentBookmarks.size) { - return false - } + override fun sameAs(other: AdapterItem): Boolean { + val newBookmarks = (other as? RecentBookmarks) ?: return false + if (newBookmarks.recentBookmarks.size != this.recentBookmarks.size) { + return false + } - return recentBookmarks.zip(newBookmarks.recentBookmarks).all { (new, old) -> - new.guid == old.guid - } + return recentBookmarks.zip(newBookmarks.recentBookmarks).all { (new, old) -> + new.guid == old.guid } + } - override fun contentsSameAs(other: AdapterItem): Boolean { - val newBookmarks = (other as? RecentBookmarks) ?: return false + override fun contentsSameAs(other: AdapterItem): Boolean { + val newBookmarks = (other as? RecentBookmarks) ?: return false - val newBookmarksSequence = newBookmarks.recentBookmarks.asSequence() - val oldBookmarksList = this.recentBookmarks.asSequence() + val newBookmarksSequence = newBookmarks.recentBookmarks.asSequence() + val oldBookmarksList = this.recentBookmarks.asSequence() - return newBookmarksSequence.zip(oldBookmarksList).all { (new, old) -> - new == old - } + return newBookmarksSequence.zip(oldBookmarksList).all { (new, old) -> + new == old } } + } data class HistoryMetadataItem(val historyMetadata: HistoryMetadata) : AdapterItem( HistoryMetadataViewHolder.LAYOUT_ID diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlController.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlController.kt index ac14a87bc..635def826 100644 --- a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlController.kt +++ b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlController.kt @@ -317,7 +317,7 @@ class DefaultSessionControlController( dismissSearchDialogIfDisplayed() activity.openToBrowserAndLoad( searchTermOrURL = SupportUtils.getGenericSumoURLForTopic - (SupportUtils.SumoTopic.PRIVATE_BROWSING_MYTHS), + (SupportUtils.SumoTopic.PRIVATE_BROWSING_MYTHS), newTab = true, from = BrowserDirection.FromHome ) @@ -401,9 +401,11 @@ class DefaultSessionControlController( val searchAccessPoint = Event.PerformedSearch.SearchAccessPoint.TOPSITE val event = availableEngines.firstOrNull { - engine -> engine.resultUrls.firstOrNull { it.contains(url) } != null + engine -> + engine.resultUrls.firstOrNull { it.contains(url) } != null }?.let { - searchEngine -> searchAccessPoint.let { sap -> + searchEngine -> + searchAccessPoint.let { sap -> MetricsUtils.createSearchEvent(searchEngine, store, sap) } } @@ -424,7 +426,7 @@ class DefaultSessionControlController( @VisibleForTesting internal fun getAvailableSearchEngines() = activity.components.core.store.state.search.searchEngines + - activity.components.core.store.state.search.availableSearchEngines + activity.components.core.store.state.search.availableSearchEngines /** * Append a search attribution query to any provided search engine URL based on the diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlInteractor.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlInteractor.kt index 15a00ce89..c65f4b77a 100644 --- a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlInteractor.kt +++ b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlInteractor.kt @@ -222,9 +222,16 @@ class SessionControlInteractor( private val recentTabController: RecentTabController, private val recentBookmarksController: RecentBookmarksController, private val historyMetadataController: HistoryMetadataController -) : CollectionInteractor, OnboardingInteractor, TopSiteInteractor, TipInteractor, - TabSessionInteractor, ToolbarInteractor, ExperimentCardInteractor, RecentTabInteractor, - RecentBookmarksInteractor, HistoryMetadataInteractor { +) : CollectionInteractor, + OnboardingInteractor, + TopSiteInteractor, + TipInteractor, + TabSessionInteractor, + ToolbarInteractor, + ExperimentCardInteractor, + RecentTabInteractor, + RecentBookmarksInteractor, + HistoryMetadataInteractor { override fun onCollectionAddTabTapped(collection: TabCollection) { controller.handleCollectionAddTabTapped(collection) diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingPrivateBrowsingViewHolder.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingPrivateBrowsingViewHolder.kt index 06f727563..b87f68330 100644 --- a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingPrivateBrowsingViewHolder.kt +++ b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingPrivateBrowsingViewHolder.kt @@ -43,7 +43,7 @@ class OnboardingPrivateBrowsingViewHolder( val text = SpannableString(view.context.getString(R.string.onboarding_private_browsing_description1)).apply { val spanStartIndex = indexOf(IMAGE_PLACEHOLDER) setSpan( - inlineIcon, + inlineIcon, spanStartIndex, spanStartIndex + IMAGE_PLACEHOLDER.length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE diff --git a/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkAdapter.kt b/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkAdapter.kt index e85ded68a..95d5f2634 100644 --- a/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkAdapter.kt +++ b/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkAdapter.kt @@ -73,8 +73,8 @@ class BookmarkAdapter(private val emptyView: View, private val interactor: Bookm override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean = oldMode::class == newMode::class && - old[oldItemPosition] in oldMode.selectedItems == new[newItemPosition] in newMode.selectedItems && - old[oldItemPosition] == new[newItemPosition] + old[oldItemPosition] in oldMode.selectedItems == new[newItemPosition] in newMode.selectedItems && + old[oldItemPosition] == new[newItemPosition] override fun getChangePayload(oldItemPosition: Int, newItemPosition: Int): Any? { val oldItem = old[oldItemPosition] diff --git a/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkDeselectNavigationListener.kt b/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkDeselectNavigationListener.kt index be3c90d1d..063954970 100644 --- a/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkDeselectNavigationListener.kt +++ b/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkDeselectNavigationListener.kt @@ -43,6 +43,6 @@ class BookmarkDeselectNavigationListener( */ private fun differentFromSelectedFolder(arguments: Bundle?): Boolean { return arguments != null && - BookmarkFragmentArgs.fromBundle(arguments).currentRoot != viewModel.selectedFolder?.guid + BookmarkFragmentArgs.fromBundle(arguments).currentRoot != viewModel.selectedFolder?.guid } } diff --git a/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt b/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt index 1a5a4a7d1..6443ed71f 100644 --- a/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt @@ -295,10 +295,12 @@ class BookmarkFragment : LibraryPageFragment(), UserInteractionHan } private fun deleteMulti(selected: Set, eventType: Event = Event.RemoveBookmarks) { - selected.iterator().forEach { if (it.type == BookmarkNodeType.FOLDER) { - showRemoveFolderDialog(selected) - return - } } + selected.iterator().forEach { + if (it.type == BookmarkNodeType.FOLDER) { + showRemoveFolderDialog(selected) + return + } + } updatePendingBookmarksToDelete(selected) pendingBookmarkDeletionJob = getDeleteOperation(eventType) @@ -320,9 +322,11 @@ class BookmarkFragment : LibraryPageFragment(), UserInteractionHan viewLifecycleOwner.lifecycleScope.allowUndo( requireView(), message, - getString(R.string.bookmark_undo_deletion), { + getString(R.string.bookmark_undo_deletion), + { undoPendingDeletion(selected) - }, operation = getDeleteOperation(eventType) + }, + operation = getDeleteOperation(eventType) ) } diff --git a/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragmentStore.kt b/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragmentStore.kt index 26901ddeb..3d18f9caf 100644 --- a/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragmentStore.kt +++ b/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragmentStore.kt @@ -89,8 +89,8 @@ private fun bookmarkFragmentStateReducer( ) } is BookmarkFragmentAction.Select -> state.copy( - mode = BookmarkFragmentState.Mode.Selecting(state.mode.selectedItems + action.item) - ) + mode = BookmarkFragmentState.Mode.Selecting(state.mode.selectedItems + action.item) + ) is BookmarkFragmentAction.Deselect -> { val items = state.mode.selectedItems - action.item val mode = if (items.isEmpty()) { diff --git a/app/src/main/java/org/mozilla/fenix/library/bookmarks/selectfolder/SelectBookmarkFolderAdapter.kt b/app/src/main/java/org/mozilla/fenix/library/bookmarks/selectfolder/SelectBookmarkFolderAdapter.kt index 938426bed..3fc46631d 100644 --- a/app/src/main/java/org/mozilla/fenix/library/bookmarks/selectfolder/SelectBookmarkFolderAdapter.kt +++ b/app/src/main/java/org/mozilla/fenix/library/bookmarks/selectfolder/SelectBookmarkFolderAdapter.kt @@ -77,8 +77,12 @@ class SelectBookmarkFolderAdapter(private val sharedViewModel: BookmarksSharedVi containerView.context, R.drawable.ic_folder_icon )?.apply { - setTint(ContextCompat.getColor(containerView.context, - R.color.primary_text_light_theme)) + setTint( + ContextCompat.getColor( + containerView.context, + R.color.primary_text_light_theme + ) + ) } ) view.titleView.text = folder.node.title diff --git a/app/src/main/java/org/mozilla/fenix/library/downloads/DownloadFragment.kt b/app/src/main/java/org/mozilla/fenix/library/downloads/DownloadFragment.kt index 2ce209b92..71473e906 100644 --- a/app/src/main/java/org/mozilla/fenix/library/downloads/DownloadFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/library/downloads/DownloadFragment.kt @@ -231,7 +231,8 @@ class DownloadFragment : LibraryPageFragment(), UserInteractionHan String.format( requireContext().getString( R.string.download_delete_single_item_snackbar - ), downloadItems.first().fileName + ), + downloadItems.first().fileName ) } } diff --git a/app/src/main/java/org/mozilla/fenix/library/history/HistoryFragment.kt b/app/src/main/java/org/mozilla/fenix/library/history/HistoryFragment.kt index 37cf66dbd..4181a14c8 100644 --- a/app/src/main/java/org/mozilla/fenix/library/history/HistoryFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/library/history/HistoryFragment.kt @@ -122,9 +122,12 @@ class HistoryFragment : LibraryPageFragment(), UserInteractionHandl requireComponents.core.historyStorage.createSynchronousPagedHistoryProvider() ) - viewModel.userHasHistory.observe(this, Observer { - historyView.updateEmptyState(it) - }) + viewModel.userHasHistory.observe( + this, + Observer { + historyView.updateEmptyState(it) + } + ) requireComponents.analytics.metrics.track(Event.HistoryOpened) @@ -154,9 +157,12 @@ class HistoryFragment : LibraryPageFragment(), UserInteractionHandl historyView.update(it) } - viewModel.history.observe(viewLifecycleOwner, Observer { - historyView.historyAdapter.submitList(it) - }) + viewModel.history.observe( + viewLifecycleOwner, + Observer { + historyView.historyAdapter.submitList(it) + } + ) } override fun onResume() { @@ -229,7 +235,8 @@ class HistoryFragment : LibraryPageFragment(), UserInteractionHandl String.format( requireContext().getString( R.string.history_delete_single_item_snackbar - ), historyItems.first().url.toShortUrl(requireComponents.publicSuffixList) + ), + historyItems.first().url.toShortUrl(requireComponents.publicSuffixList) ) } } diff --git a/app/src/main/java/org/mozilla/fenix/library/history/HistoryView.kt b/app/src/main/java/org/mozilla/fenix/library/history/HistoryView.kt index 5afbdc3d6..b13f4a813 100644 --- a/app/src/main/java/org/mozilla/fenix/library/history/HistoryView.kt +++ b/app/src/main/java/org/mozilla/fenix/library/history/HistoryView.kt @@ -175,7 +175,8 @@ class HistoryView( view.context.getString( if (numRecentTabs == 1) R.string.recently_closed_tab else R.string.recently_closed_tabs - ), numRecentTabs + ), + numRecentTabs ) isVisible = !userHasHistory } diff --git a/app/src/main/java/org/mozilla/fenix/library/history/viewholders/HistoryListItemViewHolder.kt b/app/src/main/java/org/mozilla/fenix/library/history/viewholders/HistoryListItemViewHolder.kt index 2198713a9..ca1c60d18 100644 --- a/app/src/main/java/org/mozilla/fenix/library/history/viewholders/HistoryListItemViewHolder.kt +++ b/app/src/main/java/org/mozilla/fenix/library/history/viewholders/HistoryListItemViewHolder.kt @@ -116,7 +116,8 @@ class HistoryListItemViewHolder( itemView.context.getString( if (numRecentTabs == 1) R.string.recently_closed_tab else R.string.recently_closed_tabs - ), numRecentTabs + ), + numRecentTabs ) itemView.findViewById(R.id.recently_closed_nav).run { if (isNormalMode) { diff --git a/app/src/main/java/org/mozilla/fenix/onboarding/DefaultBrowserNotificationWorker.kt b/app/src/main/java/org/mozilla/fenix/onboarding/DefaultBrowserNotificationWorker.kt index 3727c9b4a..479fb090b 100644 --- a/app/src/main/java/org/mozilla/fenix/onboarding/DefaultBrowserNotificationWorker.kt +++ b/app/src/main/java/org/mozilla/fenix/onboarding/DefaultBrowserNotificationWorker.kt @@ -62,9 +62,11 @@ class DefaultBrowserNotificationWorker( return NotificationCompat.Builder(this, channelId) .setSmallIcon(R.drawable.ic_status_logo) .setContentTitle( - applicationContext.getString(R.string.notification_default_browser_title, appName)) + applicationContext.getString(R.string.notification_default_browser_title, appName) + ) .setContentText( - applicationContext.getString(R.string.notification_default_browser_text, appName)) + applicationContext.getString(R.string.notification_default_browser_text, appName) + ) .setBadgeIconType(NotificationCompat.BADGE_ICON_SMALL) .setColor(ContextCompat.getColor(this, R.color.primary_text_light_theme)) .setPriority(NotificationCompat.PRIORITY_DEFAULT) diff --git a/app/src/main/java/org/mozilla/fenix/perf/Performance.kt b/app/src/main/java/org/mozilla/fenix/perf/Performance.kt index 6fe32e802..d990442de 100644 --- a/app/src/main/java/org/mozilla/fenix/perf/Performance.kt +++ b/app/src/main/java/org/mozilla/fenix/perf/Performance.kt @@ -49,7 +49,7 @@ object Performance { val batteryStatus = context.registerReceiver(null, IntentFilter(Intent.ACTION_BATTERY_CHANGED)) batteryStatus?.let { val isPhonePlugged = it.getIntExtra(BatteryManager.EXTRA_PLUGGED, -1) == - BatteryManager.BATTERY_PLUGGED_USB + BatteryManager.BATTERY_PLUGGED_USB val isAdbEnabled = AndroidSettings.Global.getInt( context.contentResolver, AndroidSettings.Global.ADB_ENABLED, 0 diff --git a/app/src/main/java/org/mozilla/fenix/perf/PerformanceInflater.kt b/app/src/main/java/org/mozilla/fenix/perf/PerformanceInflater.kt index e34d7a8d0..2476cb8b5 100644 --- a/app/src/main/java/org/mozilla/fenix/perf/PerformanceInflater.kt +++ b/app/src/main/java/org/mozilla/fenix/perf/PerformanceInflater.kt @@ -15,9 +15,9 @@ import java.lang.reflect.Modifier.PRIVATE import java.util.concurrent.atomic.AtomicInteger private val classPrefixList = arrayOf( - "android.widget.", - "android.webkit.", - "android.app." + "android.widget.", + "android.webkit.", + "android.app." ) /** * Counts the number of inflations fenix does. This class behaves only as an inflation counter since diff --git a/app/src/main/java/org/mozilla/fenix/perf/StartupActivityLog.kt b/app/src/main/java/org/mozilla/fenix/perf/StartupActivityLog.kt index 279a576de..d84e5b6a7 100644 --- a/app/src/main/java/org/mozilla/fenix/perf/StartupActivityLog.kt +++ b/app/src/main/java/org/mozilla/fenix/perf/StartupActivityLog.kt @@ -52,13 +52,15 @@ class StartupActivityLog { return } - val transformedEntries = log.map { when (it) { - is LogEntry.AppStarted -> "App-STARTED" - is LogEntry.AppStopped -> "App-STOPPED" - is LogEntry.ActivityCreated -> "${it.activityClass.simpleName}-CREATED" - is LogEntry.ActivityStarted -> "${it.activityClass.simpleName}-STARTED" - is LogEntry.ActivityStopped -> "${it.activityClass.simpleName}-STOPPED" - } } + val transformedEntries = log.map { + when (it) { + is LogEntry.AppStarted -> "App-STARTED" + is LogEntry.AppStopped -> "App-STOPPED" + is LogEntry.ActivityCreated -> "${it.activityClass.simpleName}-CREATED" + is LogEntry.ActivityStarted -> "${it.activityClass.simpleName}-STARTED" + is LogEntry.ActivityStopped -> "${it.activityClass.simpleName}-STOPPED" + } + } loggerArg.debug(transformedEntries.toString()) } diff --git a/app/src/main/java/org/mozilla/fenix/perf/StartupReportFullyDrawn.kt b/app/src/main/java/org/mozilla/fenix/perf/StartupReportFullyDrawn.kt index 004feb0ff..0199542e1 100644 --- a/app/src/main/java/org/mozilla/fenix/perf/StartupReportFullyDrawn.kt +++ b/app/src/main/java/org/mozilla/fenix/perf/StartupReportFullyDrawn.kt @@ -33,7 +33,8 @@ class StartupReportFullyDrawn { */ fun onActivityCreateEndHome(state: StartupState, activity: HomeActivity) { if (!isInstrumented && - state is StartupState.Cold && state.destination == APP_LINK) { + state is StartupState.Cold && state.destination == APP_LINK + ) { // Instrumenting the first frame drawn should be good enough for app link for now. isInstrumented = true attachReportFullyDrawn(activity, activity.findViewById(R.id.rootContainer)) @@ -50,7 +51,8 @@ class StartupReportFullyDrawn { */ fun onTopSitesItemBound(state: StartupState, holder: TopSiteItemViewHolder) { if (!isInstrumented && - state is StartupState.Cold && state.destination == HOMESCREEN) { + state is StartupState.Cold && state.destination == HOMESCREEN + ) { isInstrumented = true // Ideally we wouldn't cast to HomeActivity but we want to save implementation time. diff --git a/app/src/main/java/org/mozilla/fenix/perf/VisualCompletenessQueue.kt b/app/src/main/java/org/mozilla/fenix/perf/VisualCompletenessQueue.kt index 2dd88c289..659b03fad 100644 --- a/app/src/main/java/org/mozilla/fenix/perf/VisualCompletenessQueue.kt +++ b/app/src/main/java/org/mozilla/fenix/perf/VisualCompletenessQueue.kt @@ -25,9 +25,12 @@ class VisualCompletenessQueue(val queue: RunWhenReadyQueue) { containerWeakReference.get()?.doOnPreDraw { // This delay is temporary. We are delaying 5 seconds until the performance // team can locate the real point of visual completeness. - it.postDelayed({ - queue.ready() - }, delay) + it.postDelayed( + { + queue.ready() + }, + delay + ) } } } diff --git a/app/src/main/java/org/mozilla/fenix/push/WebPushEngineIntegration.kt b/app/src/main/java/org/mozilla/fenix/push/WebPushEngineIntegration.kt index 646b20ee9..485624279 100644 --- a/app/src/main/java/org/mozilla/fenix/push/WebPushEngineIntegration.kt +++ b/app/src/main/java/org/mozilla/fenix/push/WebPushEngineIntegration.kt @@ -81,7 +81,8 @@ internal class WebPushEngineDelegate( }, onSubscribe = { subscription -> onSubscribe(subscription.toEnginePushSubscription()) - }) + } + ) } override fun onUnsubscribe(scope: String, onUnsubscribe: (Boolean) -> Unit) { @@ -93,7 +94,8 @@ internal class WebPushEngineDelegate( }, onUnsubscribe = { result -> onUnsubscribe(result) - }) + } + ) } } diff --git a/app/src/main/java/org/mozilla/fenix/search/SearchDialogController.kt b/app/src/main/java/org/mozilla/fenix/search/SearchDialogController.kt index a3484f633..4e44381de 100644 --- a/app/src/main/java/org/mozilla/fenix/search/SearchDialogController.kt +++ b/app/src/main/java/org/mozilla/fenix/search/SearchDialogController.kt @@ -132,15 +132,15 @@ class SearchDialogController( fragmentStore.dispatch( SearchFragmentAction.ShowSearchShortcutEnginePicker( (textMatchesCurrentUrl || textMatchesCurrentSearch || text.isEmpty()) && - settings.shouldShowSearchShortcuts + settings.shouldShowSearchShortcuts ) ) fragmentStore.dispatch( SearchFragmentAction.AllowSearchSuggestionsInPrivateModePrompt( text.isNotEmpty() && - activity.browsingModeManager.mode.isPrivate && - !settings.shouldShowSearchSuggestionsInPrivate && - !settings.showSearchSuggestionsInPrivateOnboardingFinished + activity.browsingModeManager.mode.isPrivate && + !settings.shouldShowSearchSuggestionsInPrivate && + !settings.showSearchSuggestionsInPrivateOnboardingFinished ) ) } @@ -244,7 +244,7 @@ class SearchDialogController( dismissDialog() } setPositiveButton(R.string.camera_permissions_needed_positive_button_text) { - dialog: DialogInterface, _ -> + dialog: DialogInterface, _ -> val intent: Intent = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { Intent(android.provider.Settings.ACTION_APPLICATION_DETAILS_SETTINGS) } else { diff --git a/app/src/main/java/org/mozilla/fenix/search/SearchDialogFragment.kt b/app/src/main/java/org/mozilla/fenix/search/SearchDialogFragment.kt index dab7fdee6..bf74af4b6 100644 --- a/app/src/main/java/org/mozilla/fenix/search/SearchDialogFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/search/SearchDialogFragment.kt @@ -508,8 +508,8 @@ class SearchDialogFragment : AppCompatDialogFragment(), UserInteractionHandler { private fun updateSearchSuggestionsHintVisibility(state: SearchFragmentState) { view?.apply { val showHint = state.showSearchSuggestionsHint && - !state.showSearchShortcuts && - state.url != state.query + !state.showSearchShortcuts && + state.url != state.query findViewById(R.id.search_suggestions_hint)?.isVisible = showHint search_suggestions_hint_divider?.isVisible = showHint @@ -522,8 +522,8 @@ class SearchDialogFragment : AppCompatDialogFragment(), UserInteractionHandler { val isVisible = searchEngine?.id?.contains("google") == true && - isSpeechAvailable() && - requireContext().settings().shouldShowVoiceSearch + isSpeechAvailable() && + requireContext().settings().shouldShowVoiceSearch if (isVisible) { toolbarView.view.addEditAction( @@ -559,8 +559,8 @@ class SearchDialogFragment : AppCompatDialogFragment(), UserInteractionHandler { private fun updateClipboardSuggestion(searchState: SearchFragmentState, clipboardUrl: String?) { val shouldShowView = searchState.showClipboardSuggestions && - searchState.query.isEmpty() && - !clipboardUrl.isNullOrEmpty() && !searchState.showSearchShortcuts + searchState.query.isEmpty() && + !clipboardUrl.isNullOrEmpty() && !searchState.showSearchShortcuts fill_link_from_clipboard.isVisible = shouldShowView fill_link_divider.isVisible = shouldShowView diff --git a/app/src/main/java/org/mozilla/fenix/session/PerformanceActivityLifecycleCallbacks.kt b/app/src/main/java/org/mozilla/fenix/session/PerformanceActivityLifecycleCallbacks.kt index c46c08b5e..a6d3044fe 100644 --- a/app/src/main/java/org/mozilla/fenix/session/PerformanceActivityLifecycleCallbacks.kt +++ b/app/src/main/java/org/mozilla/fenix/session/PerformanceActivityLifecycleCallbacks.kt @@ -34,9 +34,9 @@ class PerformanceActivityLifecycleCallbacks( // They have been whitelisted in case new activities are added to the application // to ensure these new activities would not crash the application. return isTransientActivityInMigrationVariant(activity) || - (activity is IntentReceiverActivity) || - (activity is VoiceSearchActivity) || - (activity is AuthIntentReceiverActivity) + (activity is IntentReceiverActivity) || + (activity is VoiceSearchActivity) || + (activity is AuthIntentReceiverActivity) } /** diff --git a/app/src/main/java/org/mozilla/fenix/settings/CustomizationFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/CustomizationFragment.kt index 8f399240a..135eab05f 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/CustomizationFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/CustomizationFragment.kt @@ -116,16 +116,20 @@ class CustomizationFragment : PreferenceFragmentCompat() { private fun setupToolbarCategory() { val topPreference = requirePreference(R.string.pref_key_toolbar_top) topPreference.onClickListener { - requireContext().components.analytics.metrics.track(Event.ToolbarPositionChanged( - Event.ToolbarPositionChanged.Position.TOP - )) + requireContext().components.analytics.metrics.track( + Event.ToolbarPositionChanged( + Event.ToolbarPositionChanged.Position.TOP + ) + ) } val bottomPreference = requirePreference(R.string.pref_key_toolbar_bottom) bottomPreference.onClickListener { - requireContext().components.analytics.metrics.track(Event.ToolbarPositionChanged( - Event.ToolbarPositionChanged.Position.BOTTOM - )) + requireContext().components.analytics.metrics.track( + Event.ToolbarPositionChanged( + Event.ToolbarPositionChanged.Position.BOTTOM + ) + ) } val toolbarPosition = requireContext().settings().toolbarPosition diff --git a/app/src/main/java/org/mozilla/fenix/settings/Extensions.kt b/app/src/main/java/org/mozilla/fenix/settings/Extensions.kt index c8fd2a942..bae8d6a1e 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/Extensions.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/Extensions.kt @@ -20,8 +20,10 @@ fun SitePermissions.toggle(featurePhone: PhoneFeature): SitePermissions { fun SitePermissions.get(field: PhoneFeature) = when (field) { PhoneFeature.AUTOPLAY -> - throw IllegalAccessException("AUTOPLAY can't be accessed via get try " + - "using AUTOPLAY_AUDIBLE and AUTOPLAY_INAUDIBLE") + throw IllegalAccessException( + "AUTOPLAY can't be accessed via get try " + + "using AUTOPLAY_AUDIBLE and AUTOPLAY_INAUDIBLE" + ) PhoneFeature.CAMERA -> camera PhoneFeature.LOCATION -> location PhoneFeature.MICROPHONE -> microphone @@ -33,8 +35,10 @@ fun SitePermissions.get(field: PhoneFeature) = when (field) { } fun SitePermissions.update(field: PhoneFeature, value: SitePermissions.Status) = when (field) { - PhoneFeature.AUTOPLAY -> throw IllegalAccessException("AUTOPLAY can't be accessed via update " + - "try using AUTOPLAY_AUDIBLE and AUTOPLAY_INAUDIBLE") + PhoneFeature.AUTOPLAY -> throw IllegalAccessException( + "AUTOPLAY can't be accessed via update " + + "try using AUTOPLAY_AUDIBLE and AUTOPLAY_INAUDIBLE" + ) PhoneFeature.CAMERA -> copy(camera = value) PhoneFeature.LOCATION -> copy(location = value) PhoneFeature.MICROPHONE -> copy(microphone = value) diff --git a/app/src/main/java/org/mozilla/fenix/settings/PairFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/PairFragment.kt index 76dacf00f..e29880c51 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/PairFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/PairFragment.kt @@ -71,7 +71,8 @@ class PairFragment : Fragment(R.layout.fragment_pair), UserInteractionHandler { }, scanMessage = if (requireContext().settings().allowDomesticChinaFxaServer && - org.mozilla.fenix.Config.channel.isMozillaOnline) + org.mozilla.fenix.Config.channel.isMozillaOnline + ) R.string.pair_instructions_2_cn else R.string.pair_instructions_2 ), diff --git a/app/src/main/java/org/mozilla/fenix/settings/SecretDebugSettingsFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/SecretDebugSettingsFragment.kt index 8db2736fe..f9ea3d1a3 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/SecretDebugSettingsFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/SecretDebugSettingsFragment.kt @@ -55,7 +55,8 @@ private fun DebugInfo() { ) Text( text = store.state.search.region?.home ?: "Unknown", - modifier = Modifier.padding(4.dp)) + modifier = Modifier.padding(4.dp) + ) Text( text = stringResource(R.string.debug_info_region_current), style = MaterialTheme.typography.h6, diff --git a/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt index c0acaa5ec..cc8f6a591 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt @@ -370,9 +370,12 @@ class SettingsFragment : PreferenceFragmentCompat() { Toast.LENGTH_LONG ).show() - Handler(Looper.getMainLooper()).postDelayed({ - exitProcess(0) - }, AMO_COLLECTION_OVERRIDE_EXIT_DELAY) + Handler(Looper.getMainLooper()).postDelayed( + { + exitProcess(0) + }, + AMO_COLLECTION_OVERRIDE_EXIT_DELAY + ) } binding.customAmoCollection.setText(context.settings().overrideAmoCollection) @@ -435,9 +438,12 @@ class SettingsFragment : PreferenceFragmentCompat() { getString(R.string.toast_override_fxa_sync_server_done), Toast.LENGTH_LONG ).show() - Handler(Looper.getMainLooper()).postDelayed({ - exitProcess(0) - }, FXA_SYNC_OVERRIDE_EXIT_DELAY) + Handler(Looper.getMainLooper()).postDelayed( + { + exitProcess(0) + }, + FXA_SYNC_OVERRIDE_EXIT_DELAY + ) } } } @@ -538,8 +544,8 @@ class SettingsFragment : PreferenceFragmentCompat() { findPreference(getPreferenceKey(R.string.pref_key_override_sync_tokenserver)) val settings = requireContext().settings() val show = settings.overrideFxAServer.isNotEmpty() || - settings.overrideSyncTokenServer.isNotEmpty() || - settings.showSecretDebugMenuThisSession + settings.overrideSyncTokenServer.isNotEmpty() || + settings.showSecretDebugMenuThisSession // Only enable changes to these prefs when the user isn't connected to an account. val enabled = requireComponents.backgroundServices.accountManager.authenticatedAccount() == null @@ -560,9 +566,11 @@ class SettingsFragment : PreferenceFragmentCompat() { val preferenceAmoCollectionOverride = findPreference(getPreferenceKey(R.string.pref_key_override_amo_collection)) - val show = (Config.channel.isNightlyOrDebug && ( - settings.amoCollectionOverrideConfigured() || settings.showSecretDebugMenuThisSession) - ) + val show = ( + Config.channel.isNightlyOrDebug && ( + settings.amoCollectionOverrideConfigured() || settings.showSecretDebugMenuThisSession + ) + ) preferenceAmoCollectionOverride?.apply { isVisible = show summary = settings.overrideAmoCollection.ifEmpty { null } @@ -589,9 +597,12 @@ class SettingsFragment : PreferenceFragmentCompat() { getString(R.string.toast_override_fxa_sync_server_done), Toast.LENGTH_LONG ).show() - Handler(Looper.getMainLooper()).postDelayed({ - exitProcess(0) - }, FXA_SYNC_OVERRIDE_EXIT_DELAY) + Handler(Looper.getMainLooper()).postDelayed( + { + exitProcess(0) + }, + FXA_SYNC_OVERRIDE_EXIT_DELAY + ) } } } diff --git a/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt b/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt index 5c6681103..6f510a30a 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt @@ -29,11 +29,11 @@ object SupportUtils { const val GOOGLE_URL = "https://www.google.com/" const val BAIDU_URL = "https://m.baidu.com/?from=1000969a" const val JD_URL = "https://union-click.jd.com/jdc" + - "?e=&p=AyIGZRprFDJWWA1FBCVbV0IUWVALHFRBEwQAQB1AWQkFVUVXfFkAF14lRFRbJXstVWR3WQ1rJ08AZnhS" + - "HDJBYh4LZR9eEAMUBlccWCUBEQZRGFoXCxc3ZRteJUl8BmUZWhQ" + - "AEwdRGF0cMhIAVB5ZFAETBVAaXRwyFQdcKydLSUpaCEtYFAIXN2UrWCUyIgdVK1slXVZaCCtZFAMWDg%3D%3D" + "?e=&p=AyIGZRprFDJWWA1FBCVbV0IUWVALHFRBEwQAQB1AWQkFVUVXfFkAF14lRFRbJXstVWR3WQ1rJ08AZnhS" + + "HDJBYh4LZR9eEAMUBlccWCUBEQZRGFoXCxc3ZRteJUl8BmUZWhQ" + + "AEwdRGF0cMhIAVB5ZFAETBVAaXRwyFQdcKydLSUpaCEtYFAIXN2UrWCUyIgdVK1slXVZaCCtZFAMWDg%3D%3D" const val PDD_URL = "https://mobile.yangkeduo.com/duo_cms_mall.html?pid=13289095_194240604&" + - "cpsSign=CM_210309_13289095_194240604_8bcfd56d5db3c43d983014d2658ec26e&duoduo_type=2" + "cpsSign=CM_210309_13289095_194240604_8bcfd56d5db3c43d983014d2658ec26e&duoduo_type=2" const val GOOGLE_US_URL = "https://www.google.com/webhp?client=firefox-b-1-m&channel=ts" const val GOOGLE_XX_URL = "https://www.google.com/webhp?client=firefox-b-m&channel=ts" diff --git a/app/src/main/java/org/mozilla/fenix/settings/SyncPreferenceView.kt b/app/src/main/java/org/mozilla/fenix/settings/SyncPreferenceView.kt index e117a1a11..f022f4097 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/SyncPreferenceView.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/SyncPreferenceView.kt @@ -44,19 +44,22 @@ class SyncPreferenceView( ) { init { - accountManager.register(object : AccountObserver { - override fun onAuthenticated(account: OAuthAccount, authType: AuthType) { - MainScope().launch { updateSyncPreferenceStatus() } - } - - override fun onLoggedOut() { - MainScope().launch { updateSyncPreferenceNeedsLogin() } - } - - override fun onAuthenticationProblems() { - MainScope().launch { updateSyncPreferenceNeedsReauth() } - } - }, owner = lifecycleOwner) + accountManager.register( + object : AccountObserver { + override fun onAuthenticated(account: OAuthAccount, authType: AuthType) { + MainScope().launch { updateSyncPreferenceStatus() } + } + + override fun onLoggedOut() { + MainScope().launch { updateSyncPreferenceNeedsLogin() } + } + + override fun onAuthenticationProblems() { + MainScope().launch { updateSyncPreferenceNeedsReauth() } + } + }, + owner = lifecycleOwner + ) val accountExists = accountManager.authenticatedAccount() != null val needsReauth = accountManager.accountNeedsReauth() diff --git a/app/src/main/java/org/mozilla/fenix/settings/TextPercentageSeekBarPreference.kt b/app/src/main/java/org/mozilla/fenix/settings/TextPercentageSeekBarPreference.kt index 2415922ab..29956c910 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/TextPercentageSeekBarPreference.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/TextPercentageSeekBarPreference.kt @@ -353,23 +353,23 @@ class TextPercentageSeekBarPreference @JvmOverloads constructor( } mSeekBar?.setAccessibilityDelegate(object : - View.AccessibilityDelegate() { - override fun onInitializeAccessibilityNodeInfo( - host: View?, - info: AccessibilityNodeInfo? - ) { - super.onInitializeAccessibilityNodeInfo(host, info) - val initialInfo = info?.rangeInfo - info?.rangeInfo = initialInfo?.let { - AccessibilityNodeInfo.RangeInfo.obtain( - RANGE_TYPE_PERCENT, - MIN_VALUE.toFloat(), - SEEK_BAR_MAX.toFloat(), - convertCurrentValue(it.current) - ) + View.AccessibilityDelegate() { + override fun onInitializeAccessibilityNodeInfo( + host: View?, + info: AccessibilityNodeInfo? + ) { + super.onInitializeAccessibilityNodeInfo(host, info) + val initialInfo = info?.rangeInfo + info?.rangeInfo = initialInfo?.let { + AccessibilityNodeInfo.RangeInfo.obtain( + RANGE_TYPE_PERCENT, + MIN_VALUE.toFloat(), + SEEK_BAR_MAX.toFloat(), + convertCurrentValue(it.current) + ) + } } - } - }) + }) } /** diff --git a/app/src/main/java/org/mozilla/fenix/settings/TrackingProtectionFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/TrackingProtectionFragment.kt index 66bb347cc..7555e7d82 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/TrackingProtectionFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/TrackingProtectionFragment.kt @@ -76,7 +76,7 @@ class TrackingProtectionFragment : PreferenceFragmentCompat() { learnMorePreference.setOnPreferenceClickListener { (activity as HomeActivity).openToBrowserAndLoad( searchTermOrURL = SupportUtils.getGenericSumoURLForTopic - (SupportUtils.SumoTopic.TRACKING_PROTECTION), + (SupportUtils.SumoTopic.TRACKING_PROTECTION), newTab = true, from = BrowserDirection.FromTrackingProtection ) diff --git a/app/src/main/java/org/mozilla/fenix/settings/about/AboutFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/about/AboutFragment.kt index c962e573d..6adc1f03f 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/about/AboutFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/about/AboutFragment.kt @@ -138,13 +138,15 @@ class AboutFragment : Fragment(), AboutPageListener { AboutItem.ExternalLink( WHATS_NEW, SupportUtils.getWhatsNewUrl(context) - ), getString(R.string.about_whats_new, getString(R.string.app_name)) + ), + getString(R.string.about_whats_new, getString(R.string.app_name)) ), AboutPageItem( AboutItem.ExternalLink( SUPPORT, SupportUtils.getSumoURLForTopic(context, SupportUtils.SumoTopic.HELP) - ), getString(R.string.about_support) + ), + getString(R.string.about_support) ), AboutPageItem( AboutItem.Crashes, @@ -154,13 +156,15 @@ class AboutFragment : Fragment(), AboutPageListener { AboutItem.ExternalLink( PRIVACY_NOTICE, SupportUtils.getMozillaPageUrl(SupportUtils.MozillaPage.PRIVATE_NOTICE) - ), getString(R.string.about_privacy_notice) + ), + getString(R.string.about_privacy_notice) ), AboutPageItem( AboutItem.ExternalLink( RIGHTS, SupportUtils.getSumoURLForTopic(context, SupportUtils.SumoTopic.YOUR_RIGHTS) - ), getString(R.string.about_know_your_rights) + ), + getString(R.string.about_know_your_rights) ), AboutPageItem( AboutItem.ExternalLink(LICENSING_INFO, ABOUT_LICENSE_URL), diff --git a/app/src/main/java/org/mozilla/fenix/settings/advanced/DefaultLocaleSettingsController.kt b/app/src/main/java/org/mozilla/fenix/settings/advanced/DefaultLocaleSettingsController.kt index 381cc5d5f..96089aa20 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/advanced/DefaultLocaleSettingsController.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/advanced/DefaultLocaleSettingsController.kt @@ -24,7 +24,8 @@ class DefaultLocaleSettingsController( override fun handleLocaleSelected(locale: Locale) { if (localeSettingsStore.state.selectedLocale == locale && - !LocaleManager.isDefaultLocaleSelected(activity)) { + !LocaleManager.isDefaultLocaleSelected(activity) + ) { return } localeSettingsStore.dispatch(LocaleSettingsAction.Select(locale)) diff --git a/app/src/main/java/org/mozilla/fenix/settings/advanced/LocaleManagerExtension.kt b/app/src/main/java/org/mozilla/fenix/settings/advanced/LocaleManagerExtension.kt index 03de516e8..743e89313 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/advanced/LocaleManagerExtension.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/advanced/LocaleManagerExtension.kt @@ -17,14 +17,18 @@ fun LocaleManager.getSupportedLocales(): List { val resultLocaleList: MutableList = ArrayList() resultLocaleList.add(0, getSystemDefault()) - resultLocaleList.addAll(BuildConfig.SUPPORTED_LOCALE_ARRAY - .toList() - .map { - it.toLocale() - }.sortedWith(compareBy( - { it.displayLanguage }, - { it.displayCountry } - ))) + resultLocaleList.addAll( + BuildConfig.SUPPORTED_LOCALE_ARRAY + .toList() + .map { + it.toLocale() + }.sortedWith( + compareBy( + { it.displayLanguage }, + { it.displayCountry } + ) + ) + ) return resultLocaleList } diff --git a/app/src/main/java/org/mozilla/fenix/settings/advanced/LocaleSettingsStore.kt b/app/src/main/java/org/mozilla/fenix/settings/advanced/LocaleSettingsStore.kt index 59655c1b9..c2282f1d7 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/advanced/LocaleSettingsStore.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/advanced/LocaleSettingsStore.kt @@ -64,8 +64,8 @@ private fun localeSettingsStateReducer( is LocaleSettingsAction.Search -> { val searchedItems = state.localeList.filter { it.getDisplayLanguage(it).startsWith(action.query, ignoreCase = true) || - it.displayLanguage.startsWith(action.query, ignoreCase = true) || - it === state.localeList[0] + it.displayLanguage.startsWith(action.query, ignoreCase = true) || + it === state.localeList[0] } state.copy(searchedLocaleList = searchedItems) } diff --git a/app/src/main/java/org/mozilla/fenix/settings/logins/controller/SavedLoginsStorageController.kt b/app/src/main/java/org/mozilla/fenix/settings/logins/controller/SavedLoginsStorageController.kt index 5257c73f8..e8e52e216 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/logins/controller/SavedLoginsStorageController.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/logins/controller/SavedLoginsStorageController.kt @@ -187,7 +187,8 @@ open class SavedLoginsStorageController( withContext(Dispatchers.Main) { loginsFragmentStore.dispatch( LoginsAction.UpdateLoginsList( - logins.map { it.mapToSavedLogin() }) + logins.map { it.mapToSavedLogin() } + ) ) } } diff --git a/app/src/main/java/org/mozilla/fenix/settings/logins/fragment/SavedLoginsFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/logins/fragment/SavedLoginsFragment.kt index 3ccb5491f..a7a4cac1f 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/logins/fragment/SavedLoginsFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/logins/fragment/SavedLoginsFragment.kt @@ -198,12 +198,15 @@ class SavedLoginsFragment : Fragment() { } private fun attachMenu() { - sortingStrategyMenu.menuController.register(object : MenuController.Observer { - override fun onDismiss() { - // Deactivate button on dismiss - sortLoginsMenuRoot.isActivated = false - } - }, view = sortLoginsMenuRoot) + sortingStrategyMenu.menuController.register( + object : MenuController.Observer { + override fun onDismiss() { + // Deactivate button on dismiss + sortLoginsMenuRoot.isActivated = false + } + }, + view = sortLoginsMenuRoot + ) sortLoginsMenuRoot.setOnClickListener { // Activate button on show diff --git a/app/src/main/java/org/mozilla/fenix/settings/logins/view/SavedLoginsListView.kt b/app/src/main/java/org/mozilla/fenix/settings/logins/view/SavedLoginsListView.kt index 400d3442f..005e20bd5 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/logins/view/SavedLoginsListView.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/logins/view/SavedLoginsListView.kt @@ -49,7 +49,8 @@ class SavedLoginsListView( text = String.format( context.getString( R.string.preferences_passwords_saved_logins_description_empty_text - ), appName + ), + appName ) } } diff --git a/app/src/main/java/org/mozilla/fenix/settings/quicksettings/QuickSettingsSheetDialogFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/quicksettings/QuickSettingsSheetDialogFragment.kt index 6d8d96c0f..b219aff52 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/quicksettings/QuickSettingsSheetDialogFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/quicksettings/QuickSettingsSheetDialogFragment.kt @@ -205,10 +205,12 @@ class QuickSettingsSheetDialogFragment : AppCompatDialogFragment() { } private fun openSystemSettings() { - startActivity(Intent().apply { - action = android.provider.Settings.ACTION_APPLICATION_DETAILS_SETTINGS - data = Uri.fromParts("package", BuildConfig.APPLICATION_ID, null) - }) + startActivity( + Intent().apply { + action = android.provider.Settings.ACTION_APPLICATION_DETAILS_SETTINGS + data = Uri.fromParts("package", BuildConfig.APPLICATION_ID, null) + } + ) } private companion object { diff --git a/app/src/main/java/org/mozilla/fenix/settings/search/AddSearchEngineFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/search/AddSearchEngineFragment.kt index 9f3712c2a..3d67a3b9a 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/search/AddSearchEngineFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/search/AddSearchEngineFragment.kt @@ -43,7 +43,8 @@ import org.mozilla.fenix.ext.showToolbar import org.mozilla.fenix.settings.SupportUtils @SuppressWarnings("LargeClass", "TooManyFunctions") -class AddSearchEngineFragment : Fragment(R.layout.fragment_add_search_engine), +class AddSearchEngineFragment : + Fragment(R.layout.fragment_add_search_engine), CompoundButton.OnCheckedChangeListener { private var availableEngines: List = listOf() private var selectedIndex: Int = -1 diff --git a/app/src/main/java/org/mozilla/fenix/settings/search/SearchStringValidator.kt b/app/src/main/java/org/mozilla/fenix/settings/search/SearchStringValidator.kt index 7f8c0a493..9cf97ecb4 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/search/SearchStringValidator.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/search/SearchStringValidator.kt @@ -30,7 +30,8 @@ object SearchStringValidator { // read the response stream to ensure the body is closed correctly. workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=1603114 response.body.string() return if (response.isSuccess || - isTestQueryParamNotFound(response.status)) Result.Success else Result.CannotReach + isTestQueryParamNotFound(response.status) + ) Result.Success else Result.CannotReach } private fun createRequest(searchString: String): Request { diff --git a/app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsExceptionsFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsExceptionsFragment.kt index 975d823da..d545d364c 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsExceptionsFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsExceptionsFragment.kt @@ -67,15 +67,18 @@ class SitePermissionsExceptionsFragment : val adapter = ExceptionsAdapter(this@SitePermissionsExceptionsFragment) val liveData = LivePagedListBuilder(sitePermissionsPaged, MAX_ITEMS_PER_PAGE).build() - liveData.observe(viewLifecycleOwner, Observer> { - if (it.isEmpty()) { - showEmptyListMessage() - } else { - hideEmptyListMessage() - adapter.submitList(it) - recyclerView.adapter = adapter + liveData.observe( + viewLifecycleOwner, + Observer> { + if (it.isEmpty()) { + showEmptyListMessage() + } else { + hideEmptyListMessage() + adapter.submitList(it) + recyclerView.adapter = adapter + } } - }) + ) } } } diff --git a/app/src/main/java/org/mozilla/fenix/shortcut/PwaOnboardingObserver.kt b/app/src/main/java/org/mozilla/fenix/shortcut/PwaOnboardingObserver.kt index b13cd8cee..271e71834 100644 --- a/app/src/main/java/org/mozilla/fenix/shortcut/PwaOnboardingObserver.kt +++ b/app/src/main/java/org/mozilla/fenix/shortcut/PwaOnboardingObserver.kt @@ -41,19 +41,19 @@ class PwaOnboardingObserver( flow.mapNotNull { state -> state.selectedTab } - .ifChanged { - it.content.webAppManifest - } - .collect { - if (webAppUseCases.isInstallable() && !settings.userKnowsAboutPwas) { - settings.incrementVisitedInstallableCount() - if (settings.shouldShowPwaCfr) { - navigateToPwaOnboarding() - settings.lastCfrShownTimeInMillis = System.currentTimeMillis() - settings.userKnowsAboutPwas = true + .ifChanged { + it.content.webAppManifest + } + .collect { + if (webAppUseCases.isInstallable() && !settings.userKnowsAboutPwas) { + settings.incrementVisitedInstallableCount() + if (settings.shouldShowPwaCfr) { + navigateToPwaOnboarding() + settings.lastCfrShownTimeInMillis = System.currentTimeMillis() + settings.userKnowsAboutPwas = true + } } } - } } } diff --git a/app/src/main/java/org/mozilla/fenix/sync/SyncedTabsAdapter.kt b/app/src/main/java/org/mozilla/fenix/sync/SyncedTabsAdapter.kt index 6e30a4711..ca10648eb 100644 --- a/app/src/main/java/org/mozilla/fenix/sync/SyncedTabsAdapter.kt +++ b/app/src/main/java/org/mozilla/fenix/sync/SyncedTabsAdapter.kt @@ -42,11 +42,11 @@ class SyncedTabsAdapter( } override fun getItemViewType(position: Int) = when (getItem(position)) { - is AdapterItem.Device -> DeviceViewHolder.LAYOUT_ID - is AdapterItem.Tab -> TabViewHolder.LAYOUT_ID - is AdapterItem.Error -> ErrorViewHolder.LAYOUT_ID - is AdapterItem.Title -> TitleViewHolder.LAYOUT_ID - is AdapterItem.NoTabs -> NoTabsViewHolder.LAYOUT_ID + is AdapterItem.Device -> DeviceViewHolder.LAYOUT_ID + is AdapterItem.Tab -> TabViewHolder.LAYOUT_ID + is AdapterItem.Error -> ErrorViewHolder.LAYOUT_ID + is AdapterItem.Title -> TitleViewHolder.LAYOUT_ID + is AdapterItem.NoTabs -> NoTabsViewHolder.LAYOUT_ID } fun updateData(syncedTabs: List) { diff --git a/app/src/main/java/org/mozilla/fenix/sync/ext/ErrorType.kt b/app/src/main/java/org/mozilla/fenix/sync/ext/ErrorType.kt index 1a24ba455..ab4817b59 100644 --- a/app/src/main/java/org/mozilla/fenix/sync/ext/ErrorType.kt +++ b/app/src/main/java/org/mozilla/fenix/sync/ext/ErrorType.kt @@ -31,8 +31,10 @@ fun ErrorType.toAdapterItem( ErrorType.MULTIPLE_DEVICES_UNAVAILABLE, ErrorType.SYNC_ENGINE_UNAVAILABLE, ErrorType.SYNC_NEEDS_REAUTHENTICATION, - ErrorType.NO_TABS_AVAILABLE -> SyncedTabsAdapter.AdapterItem - .Error(descriptionResId = stringResId) - ErrorType.SYNC_UNAVAILABLE -> SyncedTabsAdapter.AdapterItem - .Error(descriptionResId = stringResId, navController = navController) + ErrorType.NO_TABS_AVAILABLE -> + SyncedTabsAdapter.AdapterItem + .Error(descriptionResId = stringResId) + ErrorType.SYNC_UNAVAILABLE -> + SyncedTabsAdapter.AdapterItem + .Error(descriptionResId = stringResId, navController = navController) } diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/SecureTabsTrayBinding.kt b/app/src/main/java/org/mozilla/fenix/tabstray/SecureTabsTrayBinding.kt index 088d1b8db..ba5577a3c 100644 --- a/app/src/main/java/org/mozilla/fenix/tabstray/SecureTabsTrayBinding.kt +++ b/app/src/main/java/org/mozilla/fenix/tabstray/SecureTabsTrayBinding.kt @@ -36,7 +36,8 @@ class SecureTabsTrayBinding( } .collect { state -> if (state.selectedPage == Page.PrivateTabs && - !settings.allowScreenshotsInPrivateMode) { + !settings.allowScreenshotsInPrivateMode + ) { fragment.secure() dialog.window?.addFlags(WindowManager.LayoutParams.FLAG_SECURE) } else if (!settings.lastKnownMode.isPrivate) { diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayController.kt b/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayController.kt index f2f86b746..4ffdd86a7 100644 --- a/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayController.kt +++ b/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayController.kt @@ -75,7 +75,8 @@ class DefaultTabsTrayController( val startTime = profiler?.getProfilerTime() browsingModeManager.mode = BrowsingMode.fromBoolean(isPrivate) navController.navigate( - TabsTrayFragmentDirections.actionGlobalHome(focusOnAddressBar = true)) + TabsTrayFragmentDirections.actionGlobalHome(focusOnAddressBar = true) + ) navigationInteractor.onTabTrayDismissed() profiler?.addMarker( "DefaultTabTrayController.onNewTabTapped", diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayFragment.kt b/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayFragment.kt index e53e72166..e3775a0c7 100644 --- a/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayFragment.kt @@ -216,7 +216,8 @@ class TabsTrayFragment : AppCompatDialogFragment() { browsingModeManager = activity.browsingModeManager, tabsTrayStore = tabsTrayStore, metrics = requireComponents.analytics.metrics - ), owner = this, + ), + owner = this, view = view ) diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/syncedtabs/SyncedTabsTrayLayout.kt b/app/src/main/java/org/mozilla/fenix/tabstray/syncedtabs/SyncedTabsTrayLayout.kt index f5e4002b1..84e789550 100644 --- a/app/src/main/java/org/mozilla/fenix/tabstray/syncedtabs/SyncedTabsTrayLayout.kt +++ b/app/src/main/java/org/mozilla/fenix/tabstray/syncedtabs/SyncedTabsTrayLayout.kt @@ -34,7 +34,8 @@ class SyncedTabsTrayLayout @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 -) : ConstraintLayout(context, attrs, defStyleAttr), SyncedTabsView, +) : ConstraintLayout(context, attrs, defStyleAttr), + SyncedTabsView, Observable by ObserverRegistry() { private val lifecycleProvider = LifecycleViewProvider(this) diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/viewholders/AbstractBrowserPageViewHolder.kt b/app/src/main/java/org/mozilla/fenix/tabstray/viewholders/AbstractBrowserPageViewHolder.kt index 9e06a3104..4ca9eed33 100644 --- a/app/src/main/java/org/mozilla/fenix/tabstray/viewholders/AbstractBrowserPageViewHolder.kt +++ b/app/src/main/java/org/mozilla/fenix/tabstray/viewholders/AbstractBrowserPageViewHolder.kt @@ -40,10 +40,12 @@ abstract class AbstractBrowserPageViewHolder( adapter: RecyclerView.Adapter, layoutManager: RecyclerView.LayoutManager ) { - adapter.registerAdapterDataObserver(OneTimeAdapterObserver(adapter) { - trayList.scrollToPosition(currentTabIndex) - updateTrayVisibility(adapter.itemCount) - }) + adapter.registerAdapterDataObserver( + OneTimeAdapterObserver(adapter) { + trayList.scrollToPosition(currentTabIndex) + updateTrayVisibility(adapter.itemCount) + } + ) trayList.layoutManager = layoutManager trayList.adapter = adapter } diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/viewholders/NormalBrowserPageViewHolder.kt b/app/src/main/java/org/mozilla/fenix/tabstray/viewholders/NormalBrowserPageViewHolder.kt index 4edb2a9c2..9cff6fdb5 100644 --- a/app/src/main/java/org/mozilla/fenix/tabstray/viewholders/NormalBrowserPageViewHolder.kt +++ b/app/src/main/java/org/mozilla/fenix/tabstray/viewholders/NormalBrowserPageViewHolder.kt @@ -27,7 +27,8 @@ class NormalBrowserPageViewHolder( store, interactor, currentTabIndex -), SelectionHolder { +), + SelectionHolder { init { trayList.browserTabType = NORMAL diff --git a/app/src/main/java/org/mozilla/fenix/telemetry/TelemetryLifecycleObserver.kt b/app/src/main/java/org/mozilla/fenix/telemetry/TelemetryLifecycleObserver.kt index a6796804a..1d30e1ac1 100644 --- a/app/src/main/java/org/mozilla/fenix/telemetry/TelemetryLifecycleObserver.kt +++ b/app/src/main/java/org/mozilla/fenix/telemetry/TelemetryLifecycleObserver.kt @@ -37,15 +37,17 @@ class TelemetryLifecycleObserver( @Suppress("DEPRECATION") // FIXME(#19967): Migrate to non-deprecated API. - EngineMetrics.foregroundMetrics.record(mapOf( - MetricsKeys.backgroundActiveTabs to lastState.activeEngineTabs.toString(), - MetricsKeys.backgroundCrashedTabs to lastState.crashedTabs.toString(), - MetricsKeys.backgroundTotalTabs to lastState.totalTabs.toString(), - MetricsKeys.foregroundActiveTabs to currentState.activeEngineTabs.toString(), - MetricsKeys.foregroundCrashedTabs to currentState.crashedTabs.toString(), - MetricsKeys.foregroundTotalTabs to currentState.totalTabs.toString(), - MetricsKeys.timeInBackground to (currentState.timestamp - lastState.timestamp).toString() - )) + EngineMetrics.foregroundMetrics.record( + mapOf( + MetricsKeys.backgroundActiveTabs to lastState.activeEngineTabs.toString(), + MetricsKeys.backgroundCrashedTabs to lastState.crashedTabs.toString(), + MetricsKeys.backgroundTotalTabs to lastState.totalTabs.toString(), + MetricsKeys.foregroundActiveTabs to currentState.activeEngineTabs.toString(), + MetricsKeys.foregroundCrashedTabs to currentState.crashedTabs.toString(), + MetricsKeys.foregroundTotalTabs to currentState.totalTabs.toString(), + MetricsKeys.timeInBackground to (currentState.timestamp - lastState.timestamp).toString() + ) + ) pausedState = null } diff --git a/app/src/main/java/org/mozilla/fenix/trackingprotection/TrackingProtectionOverlay.kt b/app/src/main/java/org/mozilla/fenix/trackingprotection/TrackingProtectionOverlay.kt index 167c78d18..3e03dc54d 100644 --- a/app/src/main/java/org/mozilla/fenix/trackingprotection/TrackingProtectionOverlay.kt +++ b/app/src/main/java/org/mozilla/fenix/trackingprotection/TrackingProtectionOverlay.kt @@ -87,8 +87,8 @@ class TrackingProtectionOverlay( private fun shouldShowTrackingProtectionOnboarding(tab: SessionState) = tab.trackingProtection.enabled && - tab.trackingProtection.blockedTrackers.isNotEmpty() && - settings.shouldShowTrackingProtectionCfr + tab.trackingProtection.blockedTrackers.isNotEmpty() && + settings.shouldShowTrackingProtectionCfr @Suppress("MagicNumber", "InflateParams") private fun showTrackingProtectionOnboarding() { diff --git a/app/src/main/java/org/mozilla/fenix/trackingprotection/TrackingProtectionPanelView.kt b/app/src/main/java/org/mozilla/fenix/trackingprotection/TrackingProtectionPanelView.kt index e278076e0..7b86e88a0 100644 --- a/app/src/main/java/org/mozilla/fenix/trackingprotection/TrackingProtectionPanelView.kt +++ b/app/src/main/java/org/mozilla/fenix/trackingprotection/TrackingProtectionPanelView.kt @@ -127,11 +127,13 @@ class TrackingProtectionPanelView( category_title.setText(category.title) blocking_text_list.text = bucketedTrackers.get(category, categoryBlocked).joinToString("\n") category_description.setText(category.description) - details_blocking_header.setText(if (categoryBlocked) { - R.string.enhanced_tracking_protection_blocked - } else { - R.string.enhanced_tracking_protection_allowed - }) + details_blocking_header.setText( + if (categoryBlocked) { + R.string.enhanced_tracking_protection_blocked + } else { + R.string.enhanced_tracking_protection_allowed + } + ) details_back.requestFocus() details_back.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_FOCUSED) @@ -249,15 +251,18 @@ class TrackingProtectionPanelView( * Makes sure [view1] is followed by [view2] when navigating in accessibility mode. * */ private fun setAccessibilityViewHierarchy(view1: View, view2: View) { - ViewCompat.setAccessibilityDelegate(view2, object : AccessibilityDelegateCompat() { - override fun onInitializeAccessibilityNodeInfo( - host: View?, - info: AccessibilityNodeInfoCompat - ) { - info.setTraversalAfter(view1) - super.onInitializeAccessibilityNodeInfo(host, info) + ViewCompat.setAccessibilityDelegate( + view2, + object : AccessibilityDelegateCompat() { + override fun onInitializeAccessibilityNodeInfo( + host: View?, + info: AccessibilityNodeInfoCompat + ) { + info.setTraversalAfter(view1) + super.onInitializeAccessibilityNodeInfo(host, info) + } } - }) + ) } companion object { diff --git a/app/src/main/java/org/mozilla/fenix/utils/ClearableEditText.kt b/app/src/main/java/org/mozilla/fenix/utils/ClearableEditText.kt index 9c5212504..4f081e0e6 100644 --- a/app/src/main/java/org/mozilla/fenix/utils/ClearableEditText.kt +++ b/app/src/main/java/org/mozilla/fenix/utils/ClearableEditText.kt @@ -76,5 +76,5 @@ class ClearableEditText @JvmOverloads constructor( */ private fun MotionEvent.endDrawableTouched() = (layoutDirection == LAYOUT_DIRECTION_LTR && rawX >= (right - compoundPaddingRight)) || - (layoutDirection == LAYOUT_DIRECTION_RTL && rawX <= (left + compoundPaddingLeft)) + (layoutDirection == LAYOUT_DIRECTION_RTL && rawX <= (left + compoundPaddingLeft)) } diff --git a/app/src/main/java/org/mozilla/fenix/utils/ClipboardHandler.kt b/app/src/main/java/org/mozilla/fenix/utils/ClipboardHandler.kt index 8f4ac35e5..e479c15c1 100644 --- a/app/src/main/java/org/mozilla/fenix/utils/ClipboardHandler.kt +++ b/app/src/main/java/org/mozilla/fenix/utils/ClipboardHandler.kt @@ -24,8 +24,10 @@ class ClipboardHandler(val context: Context) { var text: String? get() { if (!clipboard.isPrimaryClipEmpty() && - (clipboard.isPrimaryClipPlainText() || - clipboard.isPrimaryClipHtmlText()) + ( + clipboard.isPrimaryClipPlainText() || + clipboard.isPrimaryClipHtmlText() + ) ) { return firstSafePrimaryClipItemText } diff --git a/app/src/main/java/org/mozilla/fenix/utils/Settings.kt b/app/src/main/java/org/mozilla/fenix/utils/Settings.kt index 76d16897a..8d6c74688 100644 --- a/app/src/main/java/org/mozilla/fenix/utils/Settings.kt +++ b/app/src/main/java/org/mozilla/fenix/utils/Settings.kt @@ -181,14 +181,14 @@ class Settings(private val appContext: Context) : PreferencesHolder { appContext.getString(R.string.pref_key_migrating_from_fenix_nightly_tip), true ) && - preferences.getBoolean( - appContext.getString(R.string.pref_key_migrating_from_firefox_nightly_tip), - true - ) && - preferences.getBoolean( - appContext.getString(R.string.pref_key_migrating_from_fenix_tip), - true - ) + preferences.getBoolean( + appContext.getString(R.string.pref_key_migrating_from_firefox_nightly_tip), + true + ) && + preferences.getBoolean( + appContext.getString(R.string.pref_key_migrating_from_fenix_tip), + true + ) var defaultSearchEngineName by stringPreference( appContext.getPreferenceKey(R.string.pref_key_search_engine), @@ -212,10 +212,10 @@ class Settings(private val appContext: Context) : PreferencesHolder { val isCrashReportingEnabled: Boolean get() = isCrashReportEnabledInBuild && - preferences.getBoolean( - appContext.getPreferenceKey(R.string.pref_key_crash_reporter), - true - ) + preferences.getBoolean( + appContext.getPreferenceKey(R.string.pref_key_crash_reporter), + true + ) val isRemoteDebuggingEnabled by booleanPreference( appContext.getPreferenceKey(R.string.pref_key_remote_debugging), @@ -242,8 +242,10 @@ class Settings(private val appContext: Context) : PreferencesHolder { val shouldShowTrackingProtectionCfr: Boolean get() = !isOverrideTPPopupsForPerformanceTest && canShowCfr && - (trackingProtectionOnboardingCount.underMaxCount() && - !trackingProtectionOnboardingShownThisSession) + ( + trackingProtectionOnboardingCount.underMaxCount() && + !trackingProtectionOnboardingShownThisSession + ) var showSecretDebugMenuThisSession = false @@ -318,9 +320,9 @@ class Settings(private val appContext: Context) : PreferencesHolder { (experimentBranch == ExperimentBranch.DEFAULT_BROWSER_NEW_TAB_BANNER) } return isExperimentBranch == true && - !userDismissedExperimentCard && - !browsers.isFirefoxDefaultBrowser && - numberOfAppLaunches > APP_LAUNCHES_TO_SHOW_DEFAULT_BROWSER_CARD + !userDismissedExperimentCard && + !browsers.isFirefoxDefaultBrowser && + numberOfAppLaunches > APP_LAUNCHES_TO_SHOW_DEFAULT_BROWSER_CARD } var gridTabView by booleanPreference( diff --git a/app/src/main/java/org/mozilla/fenix/whatsnew/WhatsNew.kt b/app/src/main/java/org/mozilla/fenix/whatsnew/WhatsNew.kt index dd586ab47..4778fcac8 100644 --- a/app/src/main/java/org/mozilla/fenix/whatsnew/WhatsNew.kt +++ b/app/src/main/java/org/mozilla/fenix/whatsnew/WhatsNew.kt @@ -29,7 +29,8 @@ class WhatsNew private constructor(private val storage: WhatsNewStorage) { // Update the version and date if *just* updated if (lastKnownAppVersion == null || - currentVersion.majorVersionNumber > lastKnownAppVersion.majorVersionNumber) { + currentVersion.majorVersionNumber > lastKnownAppVersion.majorVersionNumber + ) { storage.setVersion(currentVersion) storage.setDateOfUpdate(System.currentTimeMillis()) return true diff --git a/app/src/main/java/org/mozilla/fenix/wifi/WifiConnectionMonitor.kt b/app/src/main/java/org/mozilla/fenix/wifi/WifiConnectionMonitor.kt index 682a2f1e0..bd941d620 100644 --- a/app/src/main/java/org/mozilla/fenix/wifi/WifiConnectionMonitor.kt +++ b/app/src/main/java/org/mozilla/fenix/wifi/WifiConnectionMonitor.kt @@ -32,7 +32,7 @@ class WifiConnectionMonitor(app: Application) { @VisibleForTesting internal var connectivityManager = app.getSystemService(Context.CONNECTIVITY_SERVICE) as - ConnectivityManager + ConnectivityManager @VisibleForTesting internal var lastKnownStateWasAvailable: Boolean? = null diff --git a/app/src/main/java/org/mozilla/gecko/search/SearchWidgetProvider.kt b/app/src/main/java/org/mozilla/gecko/search/SearchWidgetProvider.kt index 87d39ae32..c657c80c7 100644 --- a/app/src/main/java/org/mozilla/gecko/search/SearchWidgetProvider.kt +++ b/app/src/main/java/org/mozilla/gecko/search/SearchWidgetProvider.kt @@ -91,8 +91,10 @@ class SearchWidgetProvider : AppWidgetProvider() { .let { intent -> intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK intent.putExtra(HomeActivity.OPEN_TO_SEARCH, StartSearchIntentProcessor.SEARCH_WIDGET) - PendingIntent.getActivity(context, - REQUEST_CODE_NEW_TAB, intent, PendingIntent.FLAG_UPDATE_CURRENT) + PendingIntent.getActivity( + context, + REQUEST_CODE_NEW_TAB, intent, PendingIntent.FLAG_UPDATE_CURRENT + ) } } @@ -113,8 +115,10 @@ class SearchWidgetProvider : AppWidgetProvider() { val intentSpeech = Intent(RecognizerIntent.ACTION_RECOGNIZE_SPEECH) return intentSpeech.resolveActivity(context.packageManager)?.let { - PendingIntent.getActivity(context, - REQUEST_CODE_VOICE, voiceIntent, 0) + PendingIntent.getActivity( + context, + REQUEST_CODE_VOICE, voiceIntent, 0 + ) } } @@ -158,14 +162,16 @@ class SearchWidgetProvider : AppWidgetProvider() { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { setImageViewResource( R.id.button_search_widget_new_tab_icon, - R.drawable.ic_launcher_foreground) + R.drawable.ic_launcher_foreground + ) } else { setImageViewBitmap( R.id.button_search_widget_new_tab_icon, AppCompatResources.getDrawable( context, R.drawable.ic_launcher_foreground - )?.toBitmap()) + )?.toBitmap() + ) } } diff --git a/app/src/test/java/org/mozilla/fenix/AppRequestInterceptorTest.kt b/app/src/test/java/org/mozilla/fenix/AppRequestInterceptorTest.kt index c5be4053a..a09600ea7 100644 --- a/app/src/test/java/org/mozilla/fenix/AppRequestInterceptorTest.kt +++ b/app/src/test/java/org/mozilla/fenix/AppRequestInterceptorTest.kt @@ -200,7 +200,7 @@ class AppRequestInterceptorTest { private fun createActualErrorPage(error: ErrorType): String { val errorPage = interceptor.onErrorRequest(session = mockk(), errorType = error, uri = null) - as RequestInterceptor.ErrorResponse + as RequestInterceptor.ErrorResponse return errorPage.uri } diff --git a/app/src/test/java/org/mozilla/fenix/addons/AddonDetailsViewTest.kt b/app/src/test/java/org/mozilla/fenix/addons/AddonDetailsViewTest.kt index 252b26f45..988eba2d4 100644 --- a/app/src/test/java/org/mozilla/fenix/addons/AddonDetailsViewTest.kt +++ b/app/src/test/java/org/mozilla/fenix/addons/AddonDetailsViewTest.kt @@ -45,17 +45,21 @@ class AddonDetailsViewTest { @Test fun `bind addons rating`() { - detailsView.bind(baseAddon.copy( - rating = null - )) + detailsView.bind( + baseAddon.copy( + rating = null + ) + ) assertEquals(0f, view.rating_view.rating) - detailsView.bind(baseAddon.copy( - rating = Addon.Rating( - average = 4.3f, - reviews = 100 + detailsView.bind( + baseAddon.copy( + rating = Addon.Rating( + average = 4.3f, + reviews = 100 + ) ) - )) + ) assertEquals("4.30/5", view.rating_view.contentDescription) assertEquals(4.5f, view.rating_view.rating) assertEquals("100", view.users_count.text) @@ -63,9 +67,11 @@ class AddonDetailsViewTest { @Test fun `bind addons website`() { - detailsView.bind(baseAddon.copy( - siteUrl = "https://mozilla.org" - )) + detailsView.bind( + baseAddon.copy( + siteUrl = "https://mozilla.org" + ) + ) view.home_page_label.performClick() @@ -108,12 +114,14 @@ class AddonDetailsViewTest { @Test fun `bind addons authors`() { val baseAuthor = Addon.Author("", "", "", "") - detailsView.bind(baseAddon.copy( - authors = listOf( - baseAuthor.copy(name = " Sarah Jane"), - baseAuthor.copy(name = "John Smith ") + detailsView.bind( + baseAddon.copy( + authors = listOf( + baseAuthor.copy(name = " Sarah Jane"), + baseAuthor.copy(name = "John Smith ") + ) ) - )) + ) assertEquals("Sarah Jane, John Smith", view.author_text.text) } diff --git a/app/src/test/java/org/mozilla/fenix/addons/AddonPermissionsDetailsViewTest.kt b/app/src/test/java/org/mozilla/fenix/addons/AddonPermissionsDetailsViewTest.kt index 7a666c383..4cb640565 100644 --- a/app/src/test/java/org/mozilla/fenix/addons/AddonPermissionsDetailsViewTest.kt +++ b/app/src/test/java/org/mozilla/fenix/addons/AddonPermissionsDetailsViewTest.kt @@ -42,9 +42,11 @@ class AddonPermissionsDetailsViewTest { @Test fun `clicking learn more opens learn more page in browser`() { - permissionsDetailsView.bind(addon.copy( - rating = null - )) + permissionsDetailsView.bind( + addon.copy( + rating = null + ) + ) permissionsDetailsView.learn_more_label.performClick() diff --git a/app/src/test/java/org/mozilla/fenix/browser/BrowserFragmentTest.kt b/app/src/test/java/org/mozilla/fenix/browser/BrowserFragmentTest.kt index f274d97f2..f58602733 100644 --- a/app/src/test/java/org/mozilla/fenix/browser/BrowserFragmentTest.kt +++ b/app/src/test/java/org/mozilla/fenix/browser/BrowserFragmentTest.kt @@ -184,9 +184,11 @@ class BrowserFragmentTest { val toolbar: BrowserToolbarView = mockk(relaxed = true) every { browserFragment.browserToolbarView } returns toolbar - store.dispatch(ContentAction.UpdateLoadRequestAction( - testTab.id, - LoadRequestState("https://firefox.com", false, true)) + store.dispatch( + ContentAction.UpdateLoadRequestAction( + testTab.id, + LoadRequestState("https://firefox.com", false, true) + ) ).joinBlocking() verify(exactly = 1) { toolbar.expand() } } diff --git a/app/src/test/java/org/mozilla/fenix/browser/FenixSnackbarDelegateTest.kt b/app/src/test/java/org/mozilla/fenix/browser/FenixSnackbarDelegateTest.kt index bbf50f419..36faa746e 100644 --- a/app/src/test/java/org/mozilla/fenix/browser/FenixSnackbarDelegateTest.kt +++ b/app/src/test/java/org/mozilla/fenix/browser/FenixSnackbarDelegateTest.kt @@ -102,11 +102,16 @@ class FenixSnackbarDelegateTest { ) verify { snackbar.setText("Firefox") } - verify { snackbar.setAction("Edit", withArg { - verify(exactly = 0) { listener(view) } - it.invoke() - verify { listener(view) } - }) } + verify { + snackbar.setAction( + "Edit", + withArg { + verify(exactly = 0) { listener(view) } + it.invoke() + verify { listener(view) } + } + ) + } verify { snackbar.show() } } } diff --git a/app/src/test/java/org/mozilla/fenix/browser/OpenInAppOnboardingObserverTest.kt b/app/src/test/java/org/mozilla/fenix/browser/OpenInAppOnboardingObserverTest.kt index 3645bf604..14f754f2d 100644 --- a/app/src/test/java/org/mozilla/fenix/browser/OpenInAppOnboardingObserverTest.kt +++ b/app/src/test/java/org/mozilla/fenix/browser/OpenInAppOnboardingObserverTest.kt @@ -63,7 +63,8 @@ class OpenInAppOnboardingObserverTest { BrowserState( tabs = listOf( createTab(url = "https://www.mozilla.org", id = "1") - ), selectedTabId = "1" + ), + selectedTabId = "1" ) ) lifecycleOwner = MockedLifecycleOwner(Lifecycle.State.STARTED) @@ -73,16 +74,18 @@ class OpenInAppOnboardingObserverTest { container = mockk(relaxed = true) context = mockk(relaxed = true) infoBanner = mockk(relaxed = true) - openInAppOnboardingObserver = spyk(OpenInAppOnboardingObserver( - context = context, - store = store, - lifecycleOwner = lifecycleOwner, - navController = navigationController, - settings = settings, - appLinksUseCases = appLinksUseCases, - container = container, - shouldScrollWithTopToolbar = true - )) + openInAppOnboardingObserver = spyk( + OpenInAppOnboardingObserver( + context = context, + store = store, + lifecycleOwner = lifecycleOwner, + navController = navigationController, + settings = settings, + appLinksUseCases = appLinksUseCases, + container = container, + shouldScrollWithTopToolbar = true + ) + ) every { openInAppOnboardingObserver.createInfoBanner() } returns infoBanner } @@ -167,15 +170,19 @@ class OpenInAppOnboardingObserverTest { // Mockk currently doesn't support verifying constructor parameters // But we can check the values found in the constructed objects - openInAppOnboardingObserver = spyk(OpenInAppOnboardingObserver( - testContext, mockk(), mockk(), mockk(), mockk(), mockk(), mockk(), shouldScrollWithTopToolbar = true - )) + openInAppOnboardingObserver = spyk( + OpenInAppOnboardingObserver( + testContext, mockk(), mockk(), mockk(), mockk(), mockk(), mockk(), shouldScrollWithTopToolbar = true + ) + ) val banner1 = openInAppOnboardingObserver.createInfoBanner() assertTrue(banner1.shouldScrollWithTopToolbar) - openInAppOnboardingObserver = spyk(OpenInAppOnboardingObserver( - testContext, mockk(), mockk(), mockk(), mockk(), mockk(), mockk(), shouldScrollWithTopToolbar = false - )) + openInAppOnboardingObserver = spyk( + OpenInAppOnboardingObserver( + testContext, mockk(), mockk(), mockk(), mockk(), mockk(), mockk(), shouldScrollWithTopToolbar = false + ) + ) val banner2 = openInAppOnboardingObserver.createInfoBanner() assertFalse(banner2.shouldScrollWithTopToolbar) } diff --git a/app/src/test/java/org/mozilla/fenix/browser/infobanner/DynamicInfoBannerTest.kt b/app/src/test/java/org/mozilla/fenix/browser/infobanner/DynamicInfoBannerTest.kt index d894071ab..40b435d6a 100644 --- a/app/src/test/java/org/mozilla/fenix/browser/infobanner/DynamicInfoBannerTest.kt +++ b/app/src/test/java/org/mozilla/fenix/browser/infobanner/DynamicInfoBannerTest.kt @@ -17,9 +17,11 @@ import org.mozilla.fenix.helpers.FenixRobolectricTestRunner class DynamicInfoBannerTest { @Test fun `showBanner should set DynamicInfoBannerBehavior as behavior if scrollWithTopToolbar`() { - val banner = spyk(DynamicInfoBanner( - testContext, CoordinatorLayout(testContext), true, "", "" - )) + val banner = spyk( + DynamicInfoBanner( + testContext, CoordinatorLayout(testContext), true, "", "" + ) + ) banner.showBanner() @@ -28,9 +30,11 @@ class DynamicInfoBannerTest { @Test fun `showBanner should not set a behavior if not scrollWithTopToolbar`() { - val banner = spyk(DynamicInfoBanner( - testContext, CoordinatorLayout(testContext), false, "", "" - )) + val banner = spyk( + DynamicInfoBanner( + testContext, CoordinatorLayout(testContext), false, "", "" + ) + ) banner.showBanner() diff --git a/app/src/test/java/org/mozilla/fenix/collections/CollectionCreationStoreTest.kt b/app/src/test/java/org/mozilla/fenix/collections/CollectionCreationStoreTest.kt index 3415bc4ca..52bdd899e 100644 --- a/app/src/test/java/org/mozilla/fenix/collections/CollectionCreationStoreTest.kt +++ b/app/src/test/java/org/mozilla/fenix/collections/CollectionCreationStoreTest.kt @@ -103,10 +103,12 @@ class CollectionCreationStoreTest { ) ) - store.dispatch(CollectionCreationAction.StepChanged( - saveCollectionStep = SaveCollectionStep.RenameCollection, - defaultCollectionNumber = 3 - )).joinBlocking() + store.dispatch( + CollectionCreationAction.StepChanged( + saveCollectionStep = SaveCollectionStep.RenameCollection, + defaultCollectionNumber = 3 + ) + ).joinBlocking() assertEquals(SaveCollectionStep.RenameCollection, store.state.saveCollectionStep) assertEquals(3, store.state.defaultCollectionNumber) } @@ -207,11 +209,13 @@ class CollectionCreationStoreTest { fun `toTab uses active reader URL`() { val tabWithoutReaderState = createTab(url = "https://example.com", id = "1") - val tabWithInactiveReaderState = createTab(url = "https://blog.mozilla.org", id = "2", + val tabWithInactiveReaderState = createTab( + url = "https://blog.mozilla.org", id = "2", readerState = ReaderState(active = false, activeUrl = null) ) - val tabWithActiveReaderState = createTab(url = "moz-extension://123", id = "3", + val tabWithActiveReaderState = createTab( + url = "moz-extension://123", id = "3", readerState = ReaderState(active = true, activeUrl = "https://blog.mozilla.org/123") ) diff --git a/app/src/test/java/org/mozilla/fenix/collections/DefaultCollectionCreationControllerTest.kt b/app/src/test/java/org/mozilla/fenix/collections/DefaultCollectionCreationControllerTest.kt index ed80ee30e..ffd19fe0f 100644 --- a/app/src/test/java/org/mozilla/fenix/collections/DefaultCollectionCreationControllerTest.kt +++ b/app/src/test/java/org/mozilla/fenix/collections/DefaultCollectionCreationControllerTest.kt @@ -248,14 +248,16 @@ class DefaultCollectionCreationControllerTest { @Test fun `GIVEN list of collections WHEN saving tabs to collection THEN dispatch NameCollection step changed`() { - state = state.copy(tabCollections = listOf( - mockk { - every { title } returns "Collection 1" - }, - mockk { - every { title } returns "Random Collection" - } - )) + state = state.copy( + tabCollections = listOf( + mockk { + every { title } returns "Collection 1" + }, + mockk { + every { title } returns "Random Collection" + } + ) + ) controller.saveTabsToCollection(ArrayList()) diff --git a/app/src/test/java/org/mozilla/fenix/components/TrackingProtectionPolicyFactoryTest.kt b/app/src/test/java/org/mozilla/fenix/components/TrackingProtectionPolicyFactoryTest.kt index d734256ba..40619f3a9 100644 --- a/app/src/test/java/org/mozilla/fenix/components/TrackingProtectionPolicyFactoryTest.kt +++ b/app/src/test/java/org/mozilla/fenix/components/TrackingProtectionPolicyFactoryTest.kt @@ -248,7 +248,7 @@ class TrackingProtectionPolicyFactoryTest { settingsForCustom(shouldBlockCookiesInCustom = true, blockCookiesSelection = "unvisited", blockTrackingContentInCustom = "all"), settingsForCustom(shouldBlockCookiesInCustom = true, blockCookiesSelection = "third-party", blockTrackingContentInCustom = "all"), settingsForCustom(shouldBlockCookiesInCustom = true, blockCookiesSelection = "some text!", blockTrackingContentInCustom = "all") - ) + ) val privateSettings = listOf( settingsForCustom(shouldBlockCookiesInCustom = false, blockTrackingContentInCustom = "private"), @@ -257,21 +257,25 @@ class TrackingProtectionPolicyFactoryTest { settingsForCustom(shouldBlockCookiesInCustom = true, blockCookiesSelection = "unvisited", blockTrackingContentInCustom = "private"), settingsForCustom(shouldBlockCookiesInCustom = true, blockCookiesSelection = "third-party", blockTrackingContentInCustom = "private"), settingsForCustom(shouldBlockCookiesInCustom = true, blockCookiesSelection = "some text!", blockTrackingContentInCustom = "private") - ) + ) - allSettings.map { TrackingProtectionPolicyFactory(it).createTrackingProtectionPolicy( - normalMode = true, - privateMode = true - ) } + allSettings.map { + TrackingProtectionPolicyFactory(it).createTrackingProtectionPolicy( + normalMode = true, + privateMode = true + ) + } .forEach { assertTrue(it.useForRegularSessions) assertTrue(it.useForPrivateSessions) } - privateSettings.map { TrackingProtectionPolicyFactory(it).createTrackingProtectionPolicy( - normalMode = true, - privateMode = true - ) } + privateSettings.map { + TrackingProtectionPolicyFactory(it).createTrackingProtectionPolicy( + normalMode = true, + privateMode = true + ) + } .forEach { assertFalse(it.useForRegularSessions) assertTrue(it.useForPrivateSessions) diff --git a/app/src/test/java/org/mozilla/fenix/components/metrics/BreadcrumbRecorderTest.kt b/app/src/test/java/org/mozilla/fenix/components/metrics/BreadcrumbRecorderTest.kt index 756e85a4f..4e5ab2b9f 100644 --- a/app/src/test/java/org/mozilla/fenix/components/metrics/BreadcrumbRecorderTest.kt +++ b/app/src/test/java/org/mozilla/fenix/components/metrics/BreadcrumbRecorderTest.kt @@ -67,11 +67,13 @@ class BreadcrumbRecorderTest { breadCrumbRecorder.onDestinationChanged(navController, navDestination, null) verify { - reporter.recordCrashBreadcrumb(withArg { - assertEquals("test", it.message) - assertEquals("DestinationChanged", it.category) - assertEquals(Breadcrumb.Level.INFO, it.level) - }) + reporter.recordCrashBreadcrumb( + withArg { + assertEquals("test", it.message) + assertEquals("DestinationChanged", it.category) + assertEquals(Breadcrumb.Level.INFO, it.level) + } + ) } } } diff --git a/app/src/test/java/org/mozilla/fenix/components/settings/sitepermissions/ExtensionsTest.kt b/app/src/test/java/org/mozilla/fenix/components/settings/sitepermissions/ExtensionsTest.kt index a736c9dbb..57bfad949 100644 --- a/app/src/test/java/org/mozilla/fenix/components/settings/sitepermissions/ExtensionsTest.kt +++ b/app/src/test/java/org/mozilla/fenix/components/settings/sitepermissions/ExtensionsTest.kt @@ -23,7 +23,8 @@ class ExtensionsTest { @Test fun `tryReloadTabBy reloads latest tab matching origin`() { val store = BrowserStore( - BrowserState(tabs = listOf( + BrowserState( + tabs = listOf( createTab(id = "1", url = "https://www.mozilla.org/1", lastAccess = 1), createTab(id = "2", url = "https://www.mozilla.org/2", lastAccess = 2), createTab(id = "3", url = "https://www.firefox.com") diff --git a/app/src/test/java/org/mozilla/fenix/components/toolbar/DefaultBrowserToolbarMenuControllerTest.kt b/app/src/test/java/org/mozilla/fenix/components/toolbar/DefaultBrowserToolbarMenuControllerTest.kt index 8cc71d5bf..977950d6f 100644 --- a/app/src/test/java/org/mozilla/fenix/components/toolbar/DefaultBrowserToolbarMenuControllerTest.kt +++ b/app/src/test/java/org/mozilla/fenix/components/toolbar/DefaultBrowserToolbarMenuControllerTest.kt @@ -151,11 +151,14 @@ class DefaultBrowserToolbarMenuControllerTest { BrowserStore(BrowserState(tabs = listOf(regularTab), selectedTabId = regularTab.id)) var bookmarkTappedInvoked = false - val controller = createController(scope = this, store = store, bookmarkTapped = { url, title -> - assertEquals(expectedTitle, title) - assertEquals(expectedUrl, url) - bookmarkTappedInvoked = true - }) + val controller = createController( + scope = this, store = store, + bookmarkTapped = { url, title -> + assertEquals(expectedTitle, title) + assertEquals(expectedUrl, url) + bookmarkTappedInvoked = true + } + ) controller.handleToolbarItemInteraction(item) verify { metrics.track(Event.BrowserMenuItemTapped(Event.BrowserMenuItemTapped.Item.BOOKMARK)) } @@ -176,11 +179,14 @@ class DefaultBrowserToolbarMenuControllerTest { BrowserStore(BrowserState(tabs = listOf(readerTab), selectedTabId = readerTab.id)) var bookmarkTappedInvoked = false - val controller = createController(scope = this, store = browserStore, bookmarkTapped = { url, title -> - assertEquals(expectedTitle, title) - assertEquals(readerTab.readerState.activeUrl, url) - bookmarkTappedInvoked = true - }) + val controller = createController( + scope = this, store = browserStore, + bookmarkTapped = { url, title -> + assertEquals(expectedTitle, title) + assertEquals(readerTab.readerState.activeUrl, url) + bookmarkTappedInvoked = true + } + ) controller.handleToolbarItemInteraction(item) verify { metrics.track(Event.BrowserMenuItemTapped(Event.BrowserMenuItemTapped.Item.BOOKMARK)) } @@ -494,9 +500,12 @@ class DefaultBrowserToolbarMenuControllerTest { val item = ToolbarMenu.Item.FindInPage var launcherInvoked = false - val controller = createController(scope = this, store = browserStore, findInPageLauncher = { - launcherInvoked = true - }) + val controller = createController( + scope = this, store = browserStore, + findInPageLauncher = { + launcherInvoked = true + } + ) controller.handleToolbarItemInteraction(item) assertTrue(launcherInvoked) diff --git a/app/src/test/java/org/mozilla/fenix/customtabs/ExternalAppBrowserActivityTest.kt b/app/src/test/java/org/mozilla/fenix/customtabs/ExternalAppBrowserActivityTest.kt index 280f40e80..90545c701 100644 --- a/app/src/test/java/org/mozilla/fenix/customtabs/ExternalAppBrowserActivityTest.kt +++ b/app/src/test/java/org/mozilla/fenix/customtabs/ExternalAppBrowserActivityTest.kt @@ -108,14 +108,16 @@ class ExternalAppBrowserActivityTest { @Test fun `ExternalAppBrowserActivity with matching external tab`() { - val store = BrowserStore(BrowserState( - customTabs = listOf( - createCustomTab( - url = "https://www.mozilla.org", - id = "mozilla" + val store = BrowserStore( + BrowserState( + customTabs = listOf( + createCustomTab( + url = "https://www.mozilla.org", + id = "mozilla" + ) ) ) - )) + ) val intent = Intent(Intent.ACTION_VIEW).apply { putSessionId("mozilla") } @@ -149,14 +151,16 @@ class ExternalAppBrowserActivityTest { @Test fun `ExternalAppBrowserActivity with matching regular tab`() { - val store = BrowserStore(BrowserState( - tabs = listOf( - createTab( - url = "https://www.mozilla.org", - id = "mozilla" + val store = BrowserStore( + BrowserState( + tabs = listOf( + createTab( + url = "https://www.mozilla.org", + id = "mozilla" + ) ) ) - )) + ) val intent = Intent(Intent.ACTION_VIEW).apply { putSessionId("mozilla") } diff --git a/app/src/test/java/org/mozilla/fenix/downloads/DynamicDownloadDialogBehaviorTest.kt b/app/src/test/java/org/mozilla/fenix/downloads/DynamicDownloadDialogBehaviorTest.kt index 5e99904c8..e0c6581ab 100644 --- a/app/src/test/java/org/mozilla/fenix/downloads/DynamicDownloadDialogBehaviorTest.kt +++ b/app/src/test/java/org/mozilla/fenix/downloads/DynamicDownloadDialogBehaviorTest.kt @@ -65,8 +65,12 @@ class DynamicDownloadDialogBehaviorTest { @Test fun `Behavior will snap the dialog up if it is more than 50 percent visible`() { - val behavior = spyk(DynamicDownloadDialogBehavior(testContext, attrs = null, - bottomToolbarHeight = 10f)) + val behavior = spyk( + DynamicDownloadDialogBehavior( + testContext, attrs = null, + bottomToolbarHeight = 10f + ) + ) every { behavior.shouldScroll } returns true val animator: ValueAnimator = mockk(relaxed = true) @@ -106,8 +110,12 @@ class DynamicDownloadDialogBehaviorTest { @Test fun `Behavior will snap the dialog down if translationY is at least equal to half the toolbarHeight`() { - val behavior = spyk(DynamicDownloadDialogBehavior(testContext, attrs = null, - bottomToolbarHeight = 10f)) + val behavior = spyk( + DynamicDownloadDialogBehavior( + testContext, attrs = null, + bottomToolbarHeight = 10f + ) + ) every { behavior.shouldScroll } returns true val animator: ValueAnimator = mockk(relaxed = true) diff --git a/app/src/test/java/org/mozilla/fenix/ext/TabCollectionTest.kt b/app/src/test/java/org/mozilla/fenix/ext/TabCollectionTest.kt index a791b302f..09d5dd678 100644 --- a/app/src/test/java/org/mozilla/fenix/ext/TabCollectionTest.kt +++ b/app/src/test/java/org/mozilla/fenix/ext/TabCollectionTest.kt @@ -47,19 +47,25 @@ class TabCollectionTest { ) assertEquals(4, collections.getDefaultCollectionNumber()) - collections.add(mockk { - every { title } returns "Collection 5" - }) + collections.add( + mockk { + every { title } returns "Collection 5" + } + ) assertEquals(6, collections.getDefaultCollectionNumber()) - collections.add(mockk { - every { title } returns "Random name" - }) + collections.add( + mockk { + every { title } returns "Random name" + } + ) assertEquals(6, collections.getDefaultCollectionNumber()) - collections.add(mockk { - every { title } returns "Collection 10 10" - }) + collections.add( + mockk { + every { title } returns "Collection 10 10" + } + ) assertEquals(6, collections.getDefaultCollectionNumber()) } diff --git a/app/src/test/java/org/mozilla/fenix/historymetadata/HistoryMetadataMiddlewareTest.kt b/app/src/test/java/org/mozilla/fenix/historymetadata/HistoryMetadataMiddlewareTest.kt index d67a26d69..01a616a4b 100644 --- a/app/src/test/java/org/mozilla/fenix/historymetadata/HistoryMetadataMiddlewareTest.kt +++ b/app/src/test/java/org/mozilla/fenix/historymetadata/HistoryMetadataMiddlewareTest.kt @@ -398,24 +398,26 @@ class HistoryMetadataMiddlewareTest { } private fun setupGoogleSearchEngine() { - store.dispatch(SearchAction.SetSearchEnginesAction( - regionSearchEngines = listOf( - SearchEngine( - id = "google", - name = "Google", - icon = mock(), - type = SearchEngine.Type.BUNDLED, - resultUrls = listOf("https://google.com?q={searchTerms}") - ) - ), - userSelectedSearchEngineId = null, - userSelectedSearchEngineName = null, - regionDefaultSearchEngineId = "google", - customSearchEngines = emptyList(), - hiddenSearchEngines = emptyList(), - additionalAvailableSearchEngines = emptyList(), - additionalSearchEngines = emptyList(), - regionSearchEnginesOrder = listOf("google") - )).joinBlocking() + store.dispatch( + SearchAction.SetSearchEnginesAction( + regionSearchEngines = listOf( + SearchEngine( + id = "google", + name = "Google", + icon = mock(), + type = SearchEngine.Type.BUNDLED, + resultUrls = listOf("https://google.com?q={searchTerms}") + ) + ), + userSelectedSearchEngineId = null, + userSelectedSearchEngineName = null, + regionDefaultSearchEngineId = "google", + customSearchEngines = emptyList(), + hiddenSearchEngines = emptyList(), + additionalAvailableSearchEngines = emptyList(), + additionalSearchEngines = emptyList(), + regionSearchEnginesOrder = listOf("google") + ) + ).joinBlocking() } } diff --git a/app/src/test/java/org/mozilla/fenix/home/DefaultSessionControlControllerTest.kt b/app/src/test/java/org/mozilla/fenix/home/DefaultSessionControlControllerTest.kt index fc2ccbbe4..2877d9f13 100644 --- a/app/src/test/java/org/mozilla/fenix/home/DefaultSessionControlControllerTest.kt +++ b/app/src/test/java/org/mozilla/fenix/home/DefaultSessionControlControllerTest.kt @@ -145,26 +145,28 @@ class DefaultSessionControlControllerTest { val restoreUseCase: TabsUseCases.RestoreUseCase = mockk(relaxed = true) - controller = spyk(DefaultSessionControlController( - activity = activity, - store = store, - settings = settings, - engine = engine, - metrics = metrics, - tabCollectionStorage = tabCollectionStorage, - addTabUseCase = tabsUseCases.addTab, - reloadUrlUseCase = reloadUrlUseCase.reload, - selectTabUseCase = selectTabUseCase.selectTab, - restoreUseCase = restoreUseCase, - fragmentStore = fragmentStore, - navController = navController, - viewLifecycleScope = scope, - hideOnboarding = hideOnboarding, - registerCollectionStorageObserver = registerCollectionStorageObserver, - showDeleteCollectionPrompt = showDeleteCollectionPrompt, - showTabTray = showTabTray, - handleSwipedItemDeletionCancel = handleSwipedItemDeletionCancel - )) + controller = spyk( + DefaultSessionControlController( + activity = activity, + store = store, + settings = settings, + engine = engine, + metrics = metrics, + tabCollectionStorage = tabCollectionStorage, + addTabUseCase = tabsUseCases.addTab, + reloadUrlUseCase = reloadUrlUseCase.reload, + selectTabUseCase = selectTabUseCase.selectTab, + restoreUseCase = restoreUseCase, + fragmentStore = fragmentStore, + navController = navController, + viewLifecycleScope = scope, + hideOnboarding = hideOnboarding, + registerCollectionStorageObserver = registerCollectionStorageObserver, + showDeleteCollectionPrompt = showDeleteCollectionPrompt, + showTabTray = showTabTray, + handleSwipedItemDeletionCancel = handleSwipedItemDeletionCancel + ) + ) } @After @@ -361,7 +363,7 @@ class DefaultSessionControlControllerTest { verify { activity.openToBrowserAndLoad( searchTermOrURL = SupportUtils.getGenericSumoURLForTopic - (SupportUtils.SumoTopic.PRIVATE_BROWSING_MYTHS), + (SupportUtils.SumoTopic.PRIVATE_BROWSING_MYTHS), newTab = true, from = BrowserDirection.FromHome ) diff --git a/app/src/test/java/org/mozilla/fenix/home/RecentTabsListFeatureTest.kt b/app/src/test/java/org/mozilla/fenix/home/RecentTabsListFeatureTest.kt index 29054a983..21ea24543 100644 --- a/app/src/test/java/org/mozilla/fenix/home/RecentTabsListFeatureTest.kt +++ b/app/src/test/java/org/mozilla/fenix/home/RecentTabsListFeatureTest.kt @@ -122,10 +122,12 @@ class RecentTabsListFeatureTest { lastMediaAccessState = LastMediaAccessState("https://mozilla.com", 123) ) val selectedTab = createTab("https://mozilla.com", id = "43") - val browserStore = BrowserStore(BrowserState( - tabs = listOf(mediaTab, selectedTab), - selectedTabId = "43" - )) + val browserStore = BrowserStore( + BrowserState( + tabs = listOf(mediaTab, selectedTab), + selectedTabId = "43" + ) + ) val feature = RecentTabsListFeature( browserStore = browserStore, homeStore = homeStore @@ -145,10 +147,12 @@ class RecentTabsListFeatureTest { "https://mozilla.com", id = "42", lastMediaAccessState = LastMediaAccessState("https://mozilla.com", 123) ) - val browserStore = BrowserStore(BrowserState( - tabs = listOf(selectedMediaTab), - selectedTabId = "42" - )) + val browserStore = BrowserStore( + BrowserState( + tabs = listOf(selectedMediaTab), + selectedTabId = "42" + ) + ) val feature = RecentTabsListFeature( browserStore = browserStore, homeStore = homeStore @@ -237,7 +241,8 @@ class RecentTabsListFeatureTest { assertEquals("http://mozilla.org", homeStore.state.recentTabs[1].lastMediaAccessState.lastMediaUrl) // Check that the media tab is updated ignoring just the lastMediaAccess property. assertEquals( - newMediaTab, homeStore.state.recentTabs[1].copy( + newMediaTab, + homeStore.state.recentTabs[1].copy( lastMediaAccessState = LastMediaAccessState("https://mozilla.com", 100) ) ) diff --git a/app/src/test/java/org/mozilla/fenix/home/intent/FennecBookmarkShortcutsIntentProcessorTest.kt b/app/src/test/java/org/mozilla/fenix/home/intent/FennecBookmarkShortcutsIntentProcessorTest.kt index 4d7cd34da..df0cc692c 100644 --- a/app/src/test/java/org/mozilla/fenix/home/intent/FennecBookmarkShortcutsIntentProcessorTest.kt +++ b/app/src/test/java/org/mozilla/fenix/home/intent/FennecBookmarkShortcutsIntentProcessorTest.kt @@ -49,12 +49,14 @@ class FennecBookmarkShortcutsIntentProcessorTest { val testUrl = "http://mozilla.org" fennecShortcutsIntent.data = Uri.parse(testUrl) - every { addNewTabUseCase( - url = testUrl, - flags = EngineSession.LoadUrlFlags.external(), - source = SessionState.Source.HOME_SCREEN, - selectTab = true, - startLoading = true) + every { + addNewTabUseCase( + url = testUrl, + flags = EngineSession.LoadUrlFlags.external(), + source = SessionState.Source.HOME_SCREEN, + selectTab = true, + startLoading = true + ) } returns expectedSessionId val wasIntentProcessed = processor.process(fennecShortcutsIntent) diff --git a/app/src/test/java/org/mozilla/fenix/home/intent/SpeechProcessingIntentProcessorTest.kt b/app/src/test/java/org/mozilla/fenix/home/intent/SpeechProcessingIntentProcessorTest.kt index 649c3e89e..6524ffc41 100644 --- a/app/src/test/java/org/mozilla/fenix/home/intent/SpeechProcessingIntentProcessorTest.kt +++ b/app/src/test/java/org/mozilla/fenix/home/intent/SpeechProcessingIntentProcessorTest.kt @@ -44,13 +44,15 @@ class SpeechProcessingIntentProcessorTest { fun setup() { val searchEngine = searchEngine - store = BrowserStore(BrowserState( - search = SearchState( - customSearchEngines = listOf(searchEngine), - userSelectedSearchEngineId = searchEngine.id, - complete = true + store = BrowserStore( + BrowserState( + search = SearchState( + customSearchEngines = listOf(searchEngine), + userSelectedSearchEngineId = searchEngine.id, + complete = true + ) ) - )) + ) every { activity.applicationContext } returns ApplicationProvider.getApplicationContext() } diff --git a/app/src/test/java/org/mozilla/fenix/home/recentbookmarks/DefaultRecentBookmarksControllerTest.kt b/app/src/test/java/org/mozilla/fenix/home/recentbookmarks/DefaultRecentBookmarksControllerTest.kt index f2e391ac3..c1fbdb172 100644 --- a/app/src/test/java/org/mozilla/fenix/home/recentbookmarks/DefaultRecentBookmarksControllerTest.kt +++ b/app/src/test/java/org/mozilla/fenix/home/recentbookmarks/DefaultRecentBookmarksControllerTest.kt @@ -47,10 +47,12 @@ class DefaultRecentBookmarksControllerTest { every { id } returns R.id.homeFragment } - controller = spyk(DefaultRecentBookmarksController( - activity = activity, - navController = navController - )) + controller = spyk( + DefaultRecentBookmarksController( + activity = activity, + navController = navController + ) + ) } @After diff --git a/app/src/test/java/org/mozilla/fenix/home/recenttabs/controller/RecentTabControllerTest.kt b/app/src/test/java/org/mozilla/fenix/home/recenttabs/controller/RecentTabControllerTest.kt index 09b2c5080..335ab90e0 100644 --- a/app/src/test/java/org/mozilla/fenix/home/recenttabs/controller/RecentTabControllerTest.kt +++ b/app/src/test/java/org/mozilla/fenix/home/recenttabs/controller/RecentTabControllerTest.kt @@ -46,12 +46,14 @@ class RecentTabControllerTest { store = BrowserStore( BrowserState() ) - controller = spyk(DefaultRecentTabsController( - selectTabUseCase = selectTabUseCase.selectTab, - navController = navController, - metrics = metrics, - store = store - )) + controller = spyk( + DefaultRecentTabsController( + selectTabUseCase = selectTabUseCase.selectTab, + navController = navController, + metrics = metrics, + store = store + ) + ) every { navController.currentDestination } returns mockk { every { id } returns R.id.homeFragment diff --git a/app/src/test/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingAutomaticSignInViewHolderTest.kt b/app/src/test/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingAutomaticSignInViewHolderTest.kt index 80978e3f0..f737a7371 100644 --- a/app/src/test/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingAutomaticSignInViewHolderTest.kt +++ b/app/src/test/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingAutomaticSignInViewHolderTest.kt @@ -58,9 +58,11 @@ class OnboardingAutomaticSignInViewHolderTest { @Test fun `bind updates header text`() { val holder = OnboardingAutomaticSignInViewHolder(view) - holder.bind(mockk { - every { email } returns "email@example.com" - }) + holder.bind( + mockk { + every { email } returns "email@example.com" + } + ) assertEquals( "You are signed in as email@example.com on another Firefox browser on this device. Would you like to sign in with this account?", view.header_text.text diff --git a/app/src/test/java/org/mozilla/fenix/home/sessioncontrol/viewholders/topsites/TopSitesPagerAdapterTest.kt b/app/src/test/java/org/mozilla/fenix/home/sessioncontrol/viewholders/topsites/TopSitesPagerAdapterTest.kt index 40917aa85..ebd7e3b61 100644 --- a/app/src/test/java/org/mozilla/fenix/home/sessioncontrol/viewholders/topsites/TopSitesPagerAdapterTest.kt +++ b/app/src/test/java/org/mozilla/fenix/home/sessioncontrol/viewholders/topsites/TopSitesPagerAdapterTest.kt @@ -85,9 +85,11 @@ class TopSitesPagerAdapterTest { topSitesPagerAdapter.getCurrentPageChanges(payload, 1) assertEquals( - listOf(Pair(0, topSite), + listOf( + Pair(0, topSite), Pair(1, topSite2), - Pair(2, topSite3)), + Pair(2, topSite3) + ), resultPage1 ) diff --git a/app/src/test/java/org/mozilla/fenix/home/tips/ButtonTipViewHolderTest.kt b/app/src/test/java/org/mozilla/fenix/home/tips/ButtonTipViewHolderTest.kt index f4d654b21..dc7930318 100644 --- a/app/src/test/java/org/mozilla/fenix/home/tips/ButtonTipViewHolderTest.kt +++ b/app/src/test/java/org/mozilla/fenix/home/tips/ButtonTipViewHolderTest.kt @@ -47,8 +47,10 @@ class ButtonTipViewHolderTest { @Before fun setup() { MockKAnnotations.init(this) - val view = spyk(LayoutInflater.from(testContext) - .inflate(ButtonTipViewHolder.LAYOUT_ID, null)) + val view = spyk( + LayoutInflater.from(testContext) + .inflate(ButtonTipViewHolder.LAYOUT_ID, null) + ) viewHolder = ButtonTipViewHolder(view, interactor, metrics, settings) every { view.context } returns activity @@ -85,11 +87,13 @@ class ButtonTipViewHolderTest { assertTrue(viewHolder.tip_learn_more.isVisible) viewHolder.tip_learn_more.performClick() - verify { activity.openToBrowserAndLoad( - searchTermOrURL = "https://learnmore.com", - newTab = true, - from = BrowserDirection.FromHome - ) } + verify { + activity.openToBrowserAndLoad( + searchTermOrURL = "https://learnmore.com", + newTab = true, + from = BrowserDirection.FromHome + ) + } } @Test diff --git a/app/src/test/java/org/mozilla/fenix/library/bookmarks/BookmarkAdapterTest.kt b/app/src/test/java/org/mozilla/fenix/library/bookmarks/BookmarkAdapterTest.kt index bc04b618b..7c053630e 100644 --- a/app/src/test/java/org/mozilla/fenix/library/bookmarks/BookmarkAdapterTest.kt +++ b/app/src/test/java/org/mozilla/fenix/library/bookmarks/BookmarkAdapterTest.kt @@ -31,10 +31,12 @@ internal class BookmarkAdapterTest { @Test fun `update adapter from tree of bookmark nodes, null tree returns empty list`() { - val tree = testFolder("123", "root", listOf( - testBookmarkItem("someFolder", "http://mozilla.org"), - testSeparator("123"), - testBookmarkItem("123", "https://www.mozilla.org/en-US/firefox/") + val tree = testFolder( + "123", "root", + listOf( + testBookmarkItem("someFolder", "http://mozilla.org"), + testSeparator("123"), + testBookmarkItem("123", "https://www.mozilla.org/en-US/firefox/") ) ) bookmarkAdapter.updateData(tree, BookmarkFragmentState.Mode.Normal()) @@ -74,9 +76,12 @@ internal class BookmarkAdapterTest { val folder2 = testFolder("124", "123", title = "Mobile 2", children = emptyList()) val folder3 = testFolder("125", "123", title = "Mobile 3", children = listOf(item4)) val folder4 = testFolder("126", "123", title = "Mobile 3", children = emptyList()) - val folder = testFolder("123", "root", title = "Mobile", children = listOf( - folder4, item1, sep1, item2, folder2, folder3, item3 - )) + val folder = testFolder( + "123", "root", title = "Mobile", + children = listOf( + folder4, item1, sep1, item2, folder2, folder3, item3 + ) + ) bookmarkAdapter.updateData(folder, BookmarkFragmentState.Mode.Normal()) verifyOrder { bookmarkAdapter.updateData(folder, BookmarkFragmentState.Mode.Normal()) diff --git a/app/src/test/java/org/mozilla/fenix/library/bookmarks/BookmarkControllerTest.kt b/app/src/test/java/org/mozilla/fenix/library/bookmarks/BookmarkControllerTest.kt index f7d16f6bf..cdcd6dcaf 100644 --- a/app/src/test/java/org/mozilla/fenix/library/bookmarks/BookmarkControllerTest.kt +++ b/app/src/test/java/org/mozilla/fenix/library/bookmarks/BookmarkControllerTest.kt @@ -113,9 +113,11 @@ class BookmarkControllerTest { @Test fun `handleBookmarkTapped should load the bookmark in a new tab`() { var invokePendingDeletionInvoked = false - createController(invokePendingDeletion = { - invokePendingDeletionInvoked = true - }).handleBookmarkTapped(item) + createController( + invokePendingDeletion = { + invokePendingDeletionInvoked = true + } + ).handleBookmarkTapped(item) assertTrue(invokePendingDeletionInvoked) verify { @@ -142,9 +144,11 @@ class BookmarkControllerTest { @Test fun `handleBookmarkExpand clears selection and invokes pending deletions`() { var invokePendingDeletionInvoked = false - createController(invokePendingDeletion = { - invokePendingDeletionInvoked = true - }).handleBookmarkExpand(tree) + createController( + invokePendingDeletion = { + invokePendingDeletionInvoked = true + } + ).handleBookmarkExpand(tree) assertTrue(invokePendingDeletionInvoked) } @@ -152,10 +156,12 @@ class BookmarkControllerTest { @Test fun `handleBookmarkExpand should refresh and change the active bookmark node`() { var loadBookmarkNodeInvoked = false - createController(loadBookmarkNode = { - loadBookmarkNodeInvoked = true - tree - }).handleBookmarkExpand(tree) + createController( + loadBookmarkNode = { + loadBookmarkNodeInvoked = true + tree + } + ).handleBookmarkExpand(tree) assertTrue(loadBookmarkNodeInvoked) coVerify { @@ -176,9 +182,11 @@ class BookmarkControllerTest { @Test fun `handleBookmarkEdit should navigate to the 'Edit' fragment`() { var invokePendingDeletionInvoked = false - createController(invokePendingDeletion = { - invokePendingDeletionInvoked = true - }).handleBookmarkEdit(item) + createController( + invokePendingDeletion = { + invokePendingDeletionInvoked = true + } + ).handleBookmarkEdit(item) assertTrue(invokePendingDeletionInvoked) verify { @@ -205,10 +213,12 @@ class BookmarkControllerTest { val errorMessage = context.getString(R.string.bookmark_cannot_edit_root) var showSnackbarInvoked = false - createController(showSnackbar = { - assertEquals(errorMessage, it) - showSnackbarInvoked = true - }).handleBookmarkSelected(root) + createController( + showSnackbar = { + assertEquals(errorMessage, it) + showSnackbarInvoked = true + } + ).handleBookmarkSelected(root) assertTrue(showSnackbarInvoked) } @@ -236,10 +246,12 @@ class BookmarkControllerTest { val urlCopiedMessage = context.getString(R.string.url_copied) var showSnackbarInvoked = false - createController(showSnackbar = { - assertEquals(urlCopiedMessage, it) - showSnackbarInvoked = true - }).handleCopyUrl(item) + createController( + showSnackbar = { + assertEquals(urlCopiedMessage, it) + showSnackbarInvoked = true + } + ).handleCopyUrl(item) assertTrue(showSnackbarInvoked) } @@ -259,9 +271,11 @@ class BookmarkControllerTest { @Test fun `handleBookmarkTapped should open the bookmark`() { var invokePendingDeletionInvoked = false - createController(invokePendingDeletion = { - invokePendingDeletionInvoked = true - }).handleBookmarkTapped(item) + createController( + invokePendingDeletion = { + invokePendingDeletionInvoked = true + } + ).handleBookmarkTapped(item) assertTrue(invokePendingDeletionInvoked) verify { @@ -273,11 +287,13 @@ class BookmarkControllerTest { fun `handleOpeningBookmark should open the bookmark a new 'Normal' tab`() { var invokePendingDeletionInvoked = false var showTabTrayInvoked = false - createController(invokePendingDeletion = { - invokePendingDeletionInvoked = true - }, showTabTray = { - showTabTrayInvoked = true - } + createController( + invokePendingDeletion = { + invokePendingDeletionInvoked = true + }, + showTabTray = { + showTabTrayInvoked = true + } ).handleOpeningBookmark(item, BrowsingMode.Normal) assertTrue(invokePendingDeletionInvoked) @@ -292,11 +308,13 @@ class BookmarkControllerTest { fun `handleOpeningBookmark should open the bookmark a new 'Private' tab`() { var invokePendingDeletionInvoked = false var showTabTrayInvoked = false - createController(invokePendingDeletion = { - invokePendingDeletionInvoked = true - }, showTabTray = { - showTabTrayInvoked = true - } + createController( + invokePendingDeletion = { + invokePendingDeletionInvoked = true + }, + showTabTray = { + showTabTrayInvoked = true + } ).handleOpeningBookmark(item, BrowsingMode.Private) assertTrue(invokePendingDeletionInvoked) @@ -310,11 +328,13 @@ class BookmarkControllerTest { @Test fun `handleBookmarkDeletion for an item should properly call a passed in delegate`() { var deleteBookmarkNodesInvoked = false - createController(deleteBookmarkNodes = { nodes, event -> - assertEquals(setOf(item), nodes) - assertEquals(Event.RemoveBookmark, event) - deleteBookmarkNodesInvoked = true - }).handleBookmarkDeletion(setOf(item), Event.RemoveBookmark) + createController( + deleteBookmarkNodes = { nodes, event -> + assertEquals(setOf(item), nodes) + assertEquals(Event.RemoveBookmark, event) + deleteBookmarkNodesInvoked = true + } + ).handleBookmarkDeletion(setOf(item), Event.RemoveBookmark) assertTrue(deleteBookmarkNodesInvoked) } @@ -322,11 +342,13 @@ class BookmarkControllerTest { @Test fun `handleBookmarkDeletion for multiple bookmarks should properly call a passed in delegate`() { var deleteBookmarkNodesInvoked = false - createController(deleteBookmarkNodes = { nodes, event -> - assertEquals(setOf(item, subfolder), nodes) - assertEquals(Event.RemoveBookmarks, event) - deleteBookmarkNodesInvoked = true - }).handleBookmarkDeletion(setOf(item, subfolder), Event.RemoveBookmarks) + createController( + deleteBookmarkNodes = { nodes, event -> + assertEquals(setOf(item, subfolder), nodes) + assertEquals(Event.RemoveBookmarks, event) + deleteBookmarkNodesInvoked = true + } + ).handleBookmarkDeletion(setOf(item, subfolder), Event.RemoveBookmarks) assertTrue(deleteBookmarkNodesInvoked) } @@ -334,10 +356,12 @@ class BookmarkControllerTest { @Test fun `handleBookmarkDeletion for a folder should properly call the delete folder delegate`() { var deleteBookmarkFolderInvoked = false - createController(deleteBookmarkFolder = { nodes -> - assertEquals(setOf(subfolder), nodes) - deleteBookmarkFolderInvoked = true - }).handleBookmarkFolderDeletion(setOf(subfolder)) + createController( + deleteBookmarkFolder = { nodes -> + assertEquals(setOf(subfolder), nodes) + deleteBookmarkFolderInvoked = true + } + ).handleBookmarkFolderDeletion(setOf(subfolder)) assertTrue(deleteBookmarkFolderInvoked) } @@ -361,9 +385,11 @@ class BookmarkControllerTest { every { bookmarkStore.state.tree } returns tree var invokePendingDeletionInvoked = false - createController(invokePendingDeletion = { - invokePendingDeletionInvoked = true - }).handleBackPressed() + createController( + invokePendingDeletion = { + invokePendingDeletionInvoked = true + } + ).handleBackPressed() assertTrue(invokePendingDeletionInvoked) diff --git a/app/src/test/java/org/mozilla/fenix/library/bookmarks/UtilsKtTest.kt b/app/src/test/java/org/mozilla/fenix/library/bookmarks/UtilsKtTest.kt index aa5f368db..9db1341b2 100644 --- a/app/src/test/java/org/mozilla/fenix/library/bookmarks/UtilsKtTest.kt +++ b/app/src/test/java/org/mozilla/fenix/library/bookmarks/UtilsKtTest.kt @@ -68,14 +68,16 @@ class UtilsKtTest { BookmarkNodeWithDepth(1, folder, "root"), BookmarkNodeWithDepth(1, folder2, "root"), BookmarkNodeWithDepth(2, folder3, "folder2") - ), rootWithChildren.flatNodeList(null) + ), + rootWithChildren.flatNodeList(null) ) assertEquals( listOf( BookmarkNodeWithDepth(0, rootWithChildren, null), BookmarkNodeWithDepth(1, folder, "root") - ), rootWithChildren.flatNodeList(excludeSubtreeRoot = "folder2") + ), + rootWithChildren.flatNodeList(excludeSubtreeRoot = "folder2") ) } } diff --git a/app/src/test/java/org/mozilla/fenix/library/history/HistoryControllerTest.kt b/app/src/test/java/org/mozilla/fenix/library/history/HistoryControllerTest.kt index a1f062fb5..dd192fcfa 100644 --- a/app/src/test/java/org/mozilla/fenix/library/history/HistoryControllerTest.kt +++ b/app/src/test/java/org/mozilla/fenix/library/history/HistoryControllerTest.kt @@ -56,9 +56,11 @@ class HistoryControllerTest { @Test fun onPressHistoryItemInNormalMode() { var actualHistoryItem: HistoryItem? = null - val controller = createController(openInBrowser = { - actualHistoryItem = it - }) + val controller = createController( + openInBrowser = { + actualHistoryItem = it + } + ) controller.handleOpen(historyItem) assertEquals(historyItem, actualHistoryItem) } @@ -67,10 +69,12 @@ class HistoryControllerTest { fun onOpenItemInNormalMode() { var actualHistoryItem: HistoryItem? = null var actualBrowsingMode: BrowsingMode? = null - val controller = createController(openAndShowTray = { historyItem, browsingMode -> - actualHistoryItem = historyItem - actualBrowsingMode = browsingMode - }) + val controller = createController( + openAndShowTray = { historyItem, browsingMode -> + actualHistoryItem = historyItem + actualBrowsingMode = browsingMode + } + ) controller.handleOpenInNewTab(historyItem, BrowsingMode.Normal) assertEquals(historyItem, actualHistoryItem) assertEquals(BrowsingMode.Normal, actualBrowsingMode) @@ -80,10 +84,12 @@ class HistoryControllerTest { fun onOpenItemInPrivateMode() { var actualHistoryItem: HistoryItem? = null var actualBrowsingMode: BrowsingMode? = null - val controller = createController(openAndShowTray = { historyItem, browsingMode -> - actualHistoryItem = historyItem - actualBrowsingMode = browsingMode - }) + val controller = createController( + openAndShowTray = { historyItem, browsingMode -> + actualHistoryItem = historyItem + actualBrowsingMode = browsingMode + } + ) controller.handleOpenInNewTab(historyItem, BrowsingMode.Private) assertEquals(historyItem, actualHistoryItem) assertEquals(BrowsingMode.Private, actualBrowsingMode) @@ -142,9 +148,11 @@ class HistoryControllerTest { @Test fun onModeSwitched() { var invalidateOptionsMenuInvoked = false - val controller = createController(invalidateOptionsMenu = { - invalidateOptionsMenuInvoked = true - }) + val controller = createController( + invalidateOptionsMenu = { + invalidateOptionsMenuInvoked = true + } + ) controller.handleModeSwitched() assertTrue(invalidateOptionsMenuInvoked) @@ -153,9 +161,11 @@ class HistoryControllerTest { @Test fun onDeleteAll() { var displayDeleteAllInvoked = false - val controller = createController(displayDeleteAll = { - displayDeleteAllInvoked = true - }) + val controller = createController( + displayDeleteAll = { + displayDeleteAllInvoked = true + } + ) controller.handleDeleteAll() assertTrue(displayDeleteAllInvoked) @@ -165,9 +175,11 @@ class HistoryControllerTest { fun onDeleteSome() { val itemsToDelete = setOf(historyItem) var actualItems: Set? = null - val controller = createController(deleteHistoryItems = { items -> - actualItems = items - }) + val controller = createController( + deleteHistoryItems = { items -> + actualItems = items + } + ) controller.handleDeleteSome(itemsToDelete) assertEquals(itemsToDelete, actualItems) @@ -194,20 +206,24 @@ class HistoryControllerTest { createController().handleShare(historyItem) verify { - navController.navigate(directionsEq( - HistoryFragmentDirections.actionGlobalShareFragment( - data = arrayOf(ShareData(url = historyItem.url, title = historyItem.title)) + navController.navigate( + directionsEq( + HistoryFragmentDirections.actionGlobalShareFragment( + data = arrayOf(ShareData(url = historyItem.url, title = historyItem.title)) + ) ) - )) + ) } } @Test fun onRequestSync() { var syncHistoryInvoked = false - createController(syncHistory = { - syncHistoryInvoked = true - }).handleRequestSync() + createController( + syncHistory = { + syncHistoryInvoked = true + } + ).handleRequestSync() coVerifyOrder { store.dispatch(HistoryFragmentAction.StartSync) diff --git a/app/src/test/java/org/mozilla/fenix/migration/MigrationStatusAdapterTest.kt b/app/src/test/java/org/mozilla/fenix/migration/MigrationStatusAdapterTest.kt index f0012ff31..ca56d9dd8 100644 --- a/app/src/test/java/org/mozilla/fenix/migration/MigrationStatusAdapterTest.kt +++ b/app/src/test/java/org/mozilla/fenix/migration/MigrationStatusAdapterTest.kt @@ -30,19 +30,23 @@ class MigrationStatusAdapterTest { fun `getItemCount should return the number of items in whitelist`() { assertEquals(0, adapter.itemCount) - adapter.updateData(mapOf( - Migration.Addons to MigrationRun(0, success = true), - Migration.Settings to MigrationRun(0, success = true), - Migration.Bookmarks to MigrationRun(0, success = false) - )) + adapter.updateData( + mapOf( + Migration.Addons to MigrationRun(0, success = true), + Migration.Settings to MigrationRun(0, success = true), + Migration.Bookmarks to MigrationRun(0, success = false) + ) + ) assertEquals(4, adapter.itemCount) } @Test fun `creates and binds viewholder`() { - adapter.updateData(mapOf( - Migration.History to MigrationRun(0, success = true) - )) + adapter.updateData( + mapOf( + Migration.History to MigrationRun(0, success = true) + ) + ) val holder1 = adapter.createViewHolder(FrameLayout(testContext), 0) val holder2 = adapter.createViewHolder(FrameLayout(testContext), 0) diff --git a/app/src/test/java/org/mozilla/fenix/perf/PerformanceInflaterTest.kt b/app/src/test/java/org/mozilla/fenix/perf/PerformanceInflaterTest.kt index dc09d1fba..4c65e0c7d 100644 --- a/app/src/test/java/org/mozilla/fenix/perf/PerformanceInflaterTest.kt +++ b/app/src/test/java/org/mozilla/fenix/perf/PerformanceInflaterTest.kt @@ -50,10 +50,10 @@ class PerformanceInflaterTest { for (file in fileList!!) { val layoutName = file.name.split(".")[0] val layoutId = testContext.resources.getIdentifier( - layoutName, - "layout", - testContext.packageName - ) + layoutName, + "layout", + testContext.packageName + ) assertNotEquals(-1, layoutId) if (!layoutsNotToTest.contains(layoutName)) { diff --git a/app/src/test/java/org/mozilla/fenix/perf/StartupStateProviderTest.kt b/app/src/test/java/org/mozilla/fenix/perf/StartupStateProviderTest.kt index dda840ac5..762abb3df 100644 --- a/app/src/test/java/org/mozilla/fenix/perf/StartupStateProviderTest.kt +++ b/app/src/test/java/org/mozilla/fenix/perf/StartupStateProviderTest.kt @@ -107,45 +107,51 @@ class StartupStateProviderTest { @Test fun `GIVEN the app started for an activity WHEN we launched HA through a drawing IntentRA THEN start up is not cold`() { // These entries mimic observed behavior for local code changes. - logEntries.addAll(listOf( - LogEntry.ActivityCreated(irActivityClass), - LogEntry.ActivityStarted(irActivityClass), - LogEntry.AppStarted, - LogEntry.ActivityCreated(homeActivityClass), - LogEntry.ActivityStarted(homeActivityClass), - LogEntry.ActivityStopped(irActivityClass) - )) + logEntries.addAll( + listOf( + LogEntry.ActivityCreated(irActivityClass), + LogEntry.ActivityStarted(irActivityClass), + LogEntry.AppStarted, + LogEntry.ActivityCreated(homeActivityClass), + LogEntry.ActivityStarted(homeActivityClass), + LogEntry.ActivityStopped(irActivityClass) + ) + ) assertFalse(provider.isColdStartForStartedActivity(homeActivityClass)) } @Test fun `GIVEN the app started for an activity WHEN we launched HA through a drawing IntentRA THEN start up is not warm`() { // These entries mimic observed behavior for local code changes. - logEntries.addAll(listOf( - LogEntry.AppStopped, - LogEntry.ActivityStopped(homeActivityClass), - LogEntry.ActivityCreated(irActivityClass), - LogEntry.ActivityStarted(irActivityClass), - LogEntry.AppStarted, - LogEntry.ActivityCreated(homeActivityClass), - LogEntry.ActivityStarted(homeActivityClass), - LogEntry.ActivityStopped(irActivityClass) - )) + logEntries.addAll( + listOf( + LogEntry.AppStopped, + LogEntry.ActivityStopped(homeActivityClass), + LogEntry.ActivityCreated(irActivityClass), + LogEntry.ActivityStarted(irActivityClass), + LogEntry.AppStarted, + LogEntry.ActivityCreated(homeActivityClass), + LogEntry.ActivityStarted(homeActivityClass), + LogEntry.ActivityStopped(irActivityClass) + ) + ) assertFalse(provider.isWarmStartForStartedActivity(homeActivityClass)) } @Test fun `GIVEN the app started for an activity WHEN we launched HA through a drawing IntentRA THEN start up is not hot`() { // These entries mimic observed behavior for local code changes. - logEntries.addAll(listOf( - LogEntry.AppStopped, - LogEntry.ActivityStopped(homeActivityClass), - LogEntry.ActivityCreated(irActivityClass), - LogEntry.ActivityStarted(irActivityClass), - LogEntry.AppStarted, - LogEntry.ActivityStarted(homeActivityClass), - LogEntry.ActivityStopped(irActivityClass) - )) + logEntries.addAll( + listOf( + LogEntry.AppStopped, + LogEntry.ActivityStopped(homeActivityClass), + LogEntry.ActivityCreated(irActivityClass), + LogEntry.ActivityStarted(irActivityClass), + LogEntry.AppStarted, + LogEntry.ActivityStarted(homeActivityClass), + LogEntry.ActivityStopped(irActivityClass) + ) + ) assertFalse(provider.isHotStartForStartedActivity(homeActivityClass)) } @@ -153,14 +159,16 @@ class StartupStateProviderTest { fun `GIVEN the app started for an activity WHEN two HomeActivities are created THEN start up is not cold`() { // We're making an assumption about how this would work based on previous observed patterns. // AIUI, we should never have more than one HomeActivity. - logEntries.addAll(listOf( - LogEntry.ActivityCreated(homeActivityClass), - LogEntry.ActivityStarted(homeActivityClass), - LogEntry.AppStarted, - LogEntry.ActivityCreated(homeActivityClass), - LogEntry.ActivityStarted(homeActivityClass), - LogEntry.ActivityStopped(homeActivityClass) - )) + logEntries.addAll( + listOf( + LogEntry.ActivityCreated(homeActivityClass), + LogEntry.ActivityStarted(homeActivityClass), + LogEntry.AppStarted, + LogEntry.ActivityCreated(homeActivityClass), + LogEntry.ActivityStarted(homeActivityClass), + LogEntry.ActivityStopped(homeActivityClass) + ) + ) assertFalse(provider.isColdStartForStartedActivity(homeActivityClass)) } @@ -171,9 +179,11 @@ class StartupStateProviderTest { @Test fun `GIVEN the app started for an activity WHEN an activity hasn't started yet THEN start up is not cold`() { - logEntries.addAll(listOf( - LogEntry.ActivityCreated(homeActivityClass) - )) + logEntries.addAll( + listOf( + LogEntry.ActivityCreated(homeActivityClass) + ) + ) assertFalse(provider.isColdStartForStartedActivity(homeActivityClass)) } @@ -212,10 +222,12 @@ class StartupStateProviderTest { @Test fun `GIVEN the app has been stopped WHEN an activity has not been started THEN it's not a warm start`() { - logEntries.addAll(listOf( - LogEntry.AppStopped, - LogEntry.ActivityCreated(homeActivityClass) - )) + logEntries.addAll( + listOf( + LogEntry.AppStopped, + LogEntry.ActivityCreated(homeActivityClass) + ) + ) assertFalse(provider.isWarmStartForStartedActivity(homeActivityClass)) } @@ -232,10 +244,12 @@ class StartupStateProviderTest { @Test fun `GIVEN the app has been stopped WHEN an activity has not been started THEN it's not a hot start`() { - logEntries.addAll(listOf( - LogEntry.AppStopped, - LogEntry.ActivityCreated(homeActivityClass) - )) + logEntries.addAll( + listOf( + LogEntry.AppStopped, + LogEntry.ActivityCreated(homeActivityClass) + ) + ) assertFalse(provider.isHotStartForStartedActivity(homeActivityClass)) } @@ -262,14 +276,16 @@ class StartupStateProviderTest { @Test fun `WHEN two activities are started THEN get startup state is unknown`() { - logEntries.addAll(listOf( - LogEntry.ActivityCreated(irActivityClass), - LogEntry.ActivityStarted(irActivityClass), - LogEntry.AppStarted, - LogEntry.ActivityCreated(homeActivityClass), - LogEntry.ActivityStarted(homeActivityClass), - LogEntry.ActivityStopped(irActivityClass) - )) + logEntries.addAll( + listOf( + LogEntry.ActivityCreated(irActivityClass), + LogEntry.ActivityStarted(irActivityClass), + LogEntry.AppStarted, + LogEntry.ActivityCreated(homeActivityClass), + LogEntry.ActivityStarted(homeActivityClass), + LogEntry.ActivityStopped(irActivityClass) + ) + ) assertEquals(StartupState.UNKNOWN, provider.getStartupStateForStartedActivity(homeActivityClass)) } @@ -278,18 +294,21 @@ class StartupStateProviderTest { // These entries mimic observed behavior. // // MAIN: open HomeActivity directly. - val coldStartEntries = listOf(listOf( - LogEntry.ActivityCreated(homeActivityClass), - LogEntry.ActivityStarted(homeActivityClass), - LogEntry.AppStarted - - // VIEW: open non-drawing IntentReceiverActivity, then HomeActivity. - ), listOf( - LogEntry.ActivityCreated(irActivityClass), - LogEntry.ActivityCreated(homeActivityClass), - LogEntry.ActivityStarted(homeActivityClass), - LogEntry.AppStarted - )) + val coldStartEntries = listOf( + listOf( + LogEntry.ActivityCreated(homeActivityClass), + LogEntry.ActivityStarted(homeActivityClass), + LogEntry.AppStarted + + // VIEW: open non-drawing IntentReceiverActivity, then HomeActivity. + ), + listOf( + LogEntry.ActivityCreated(irActivityClass), + LogEntry.ActivityCreated(homeActivityClass), + LogEntry.ActivityStarted(homeActivityClass), + LogEntry.AppStarted + ) + ) forEachStartEntry(coldStartEntries, block) } @@ -300,46 +319,51 @@ class StartupStateProviderTest { // such an optimization). // // truncated MAIN: open HomeActivity directly. - val warmStartEntries = listOf(listOf( - LogEntry.AppStopped, - LogEntry.ActivityStopped(homeActivityClass), - LogEntry.ActivityCreated(homeActivityClass), - LogEntry.ActivityStarted(homeActivityClass), - LogEntry.AppStarted - - // untruncated MAIN: open HomeActivity directly. - ), listOf( - LogEntry.ActivityCreated(homeActivityClass), - LogEntry.ActivityStarted(homeActivityClass), - LogEntry.AppStarted, - LogEntry.AppStopped, - LogEntry.ActivityStopped(homeActivityClass), - LogEntry.ActivityCreated(homeActivityClass), - LogEntry.ActivityStarted(homeActivityClass), - LogEntry.AppStarted - - // truncated VIEW: open non-drawing IntentReceiverActivity, then HomeActivity. - ), listOf( - LogEntry.AppStopped, - LogEntry.ActivityStopped(homeActivityClass), - LogEntry.ActivityCreated(irActivityClass), - LogEntry.ActivityCreated(homeActivityClass), - LogEntry.ActivityStarted(homeActivityClass), - LogEntry.AppStarted - - // untruncated VIEW: open non-drawing IntentReceiverActivity, then HomeActivity. - ), listOf( - LogEntry.ActivityCreated(irActivityClass), - LogEntry.ActivityCreated(homeActivityClass), - LogEntry.ActivityStarted(homeActivityClass), - LogEntry.AppStarted, - LogEntry.AppStopped, - LogEntry.ActivityStopped(homeActivityClass), - LogEntry.ActivityCreated(irActivityClass), - LogEntry.ActivityCreated(homeActivityClass), - LogEntry.ActivityStarted(homeActivityClass), - LogEntry.AppStarted - )) + val warmStartEntries = listOf( + listOf( + LogEntry.AppStopped, + LogEntry.ActivityStopped(homeActivityClass), + LogEntry.ActivityCreated(homeActivityClass), + LogEntry.ActivityStarted(homeActivityClass), + LogEntry.AppStarted + + // untruncated MAIN: open HomeActivity directly. + ), + listOf( + LogEntry.ActivityCreated(homeActivityClass), + LogEntry.ActivityStarted(homeActivityClass), + LogEntry.AppStarted, + LogEntry.AppStopped, + LogEntry.ActivityStopped(homeActivityClass), + LogEntry.ActivityCreated(homeActivityClass), + LogEntry.ActivityStarted(homeActivityClass), + LogEntry.AppStarted + + // truncated VIEW: open non-drawing IntentReceiverActivity, then HomeActivity. + ), + listOf( + LogEntry.AppStopped, + LogEntry.ActivityStopped(homeActivityClass), + LogEntry.ActivityCreated(irActivityClass), + LogEntry.ActivityCreated(homeActivityClass), + LogEntry.ActivityStarted(homeActivityClass), + LogEntry.AppStarted + + // untruncated VIEW: open non-drawing IntentReceiverActivity, then HomeActivity. + ), + listOf( + LogEntry.ActivityCreated(irActivityClass), + LogEntry.ActivityCreated(homeActivityClass), + LogEntry.ActivityStarted(homeActivityClass), + LogEntry.AppStarted, + LogEntry.AppStopped, + LogEntry.ActivityStopped(homeActivityClass), + LogEntry.ActivityCreated(irActivityClass), + LogEntry.ActivityCreated(homeActivityClass), + LogEntry.ActivityStarted(homeActivityClass), + LogEntry.AppStarted + ) + ) forEachStartEntry(warmStartEntries, block) } @@ -350,42 +374,47 @@ class StartupStateProviderTest { // such an optimization). // // truncated MAIN: open HomeActivity directly. - val hotStartEntries = listOf(listOf( - LogEntry.AppStopped, - LogEntry.ActivityStopped(homeActivityClass), - LogEntry.ActivityStarted(homeActivityClass), - LogEntry.AppStarted - - // untruncated MAIN: open HomeActivity directly. - ), listOf( - LogEntry.ActivityCreated(homeActivityClass), - LogEntry.ActivityStarted(homeActivityClass), - LogEntry.AppStarted, - LogEntry.AppStopped, - LogEntry.ActivityStopped(homeActivityClass), - LogEntry.ActivityStarted(homeActivityClass), - LogEntry.AppStarted - - // truncated VIEW: open non-drawing IntentReceiverActivity, then HomeActivity. - ), listOf( - LogEntry.AppStopped, - LogEntry.ActivityStopped(homeActivityClass), - LogEntry.ActivityCreated(irActivityClass), - LogEntry.ActivityStarted(homeActivityClass), - LogEntry.AppStarted - - // untruncated VIEW: open non-drawing IntentReceiverActivity, then HomeActivity. - ), listOf( - LogEntry.ActivityCreated(irActivityClass), - LogEntry.ActivityCreated(homeActivityClass), - LogEntry.ActivityStarted(homeActivityClass), - LogEntry.AppStarted, - LogEntry.AppStopped, - LogEntry.ActivityStopped(homeActivityClass), - LogEntry.ActivityCreated(irActivityClass), - LogEntry.ActivityStarted(homeActivityClass), - LogEntry.AppStarted - )) + val hotStartEntries = listOf( + listOf( + LogEntry.AppStopped, + LogEntry.ActivityStopped(homeActivityClass), + LogEntry.ActivityStarted(homeActivityClass), + LogEntry.AppStarted + + // untruncated MAIN: open HomeActivity directly. + ), + listOf( + LogEntry.ActivityCreated(homeActivityClass), + LogEntry.ActivityStarted(homeActivityClass), + LogEntry.AppStarted, + LogEntry.AppStopped, + LogEntry.ActivityStopped(homeActivityClass), + LogEntry.ActivityStarted(homeActivityClass), + LogEntry.AppStarted + + // truncated VIEW: open non-drawing IntentReceiverActivity, then HomeActivity. + ), + listOf( + LogEntry.AppStopped, + LogEntry.ActivityStopped(homeActivityClass), + LogEntry.ActivityCreated(irActivityClass), + LogEntry.ActivityStarted(homeActivityClass), + LogEntry.AppStarted + + // untruncated VIEW: open non-drawing IntentReceiverActivity, then HomeActivity. + ), + listOf( + LogEntry.ActivityCreated(irActivityClass), + LogEntry.ActivityCreated(homeActivityClass), + LogEntry.ActivityStarted(homeActivityClass), + LogEntry.AppStarted, + LogEntry.AppStopped, + LogEntry.ActivityStopped(homeActivityClass), + LogEntry.ActivityCreated(irActivityClass), + LogEntry.ActivityStarted(homeActivityClass), + LogEntry.AppStarted + ) + ) forEachStartEntry(hotStartEntries, block) } diff --git a/app/src/test/java/org/mozilla/fenix/push/WebPushEngineIntegrationTest.kt b/app/src/test/java/org/mozilla/fenix/push/WebPushEngineIntegrationTest.kt index 4ed2af5b3..999ceda59 100644 --- a/app/src/test/java/org/mozilla/fenix/push/WebPushEngineIntegrationTest.kt +++ b/app/src/test/java/org/mozilla/fenix/push/WebPushEngineIntegrationTest.kt @@ -98,20 +98,25 @@ class WebPushEngineIntegrationTest { } var actualSubscription: WebPushSubscription? = null - delegate.captured.onGetSubscription("scope", onSubscription = { - actualSubscription = it - }) + delegate.captured.onGetSubscription( + "scope", + onSubscription = { + actualSubscription = it + } + ) assertNull(actualSubscription) assertNotNull(subscribeFn) - subscribeFn!!(AutoPushSubscription( - scope = "scope", - publicKey = "abc", - endpoint = "def", - authKey = "xyz", - appServerKey = null - )) + subscribeFn!!( + AutoPushSubscription( + scope = "scope", + publicKey = "abc", + endpoint = "def", + authKey = "xyz", + appServerKey = null + ) + ) val expectedSubscription = WebPushSubscription( scope = "scope", @@ -155,13 +160,15 @@ class WebPushEngineIntegrationTest { assertNull(actualSubscription) assertNotNull(onSubscribeFn) - onSubscribeFn!!(AutoPushSubscription( - scope = "scope", - publicKey = "abc", - endpoint = "def", - authKey = "xyz", - appServerKey = null - )) + onSubscribeFn!!( + AutoPushSubscription( + scope = "scope", + publicKey = "abc", + endpoint = "def", + authKey = "xyz", + appServerKey = null + ) + ) val expectedSubscription = WebPushSubscription( scope = "scope", diff --git a/app/src/test/java/org/mozilla/fenix/search/SearchDialogControllerTest.kt b/app/src/test/java/org/mozilla/fenix/search/SearchDialogControllerTest.kt index 688509f98..32743ca8a 100644 --- a/app/src/test/java/org/mozilla/fenix/search/SearchDialogControllerTest.kt +++ b/app/src/test/java/org/mozilla/fenix/search/SearchDialogControllerTest.kt @@ -97,9 +97,11 @@ class SearchDialogControllerTest { val url = "" var dismissDialogInvoked = false - createController(dismissDialog = { - dismissDialogInvoked = true - }).handleUrlCommitted(url) + createController( + dismissDialog = { + dismissDialogInvoked = true + } + ).handleUrlCommitted(url) assertTrue(dismissDialogInvoked) } @@ -162,9 +164,11 @@ class SearchDialogControllerTest { @Test fun handleEditingCancelled() = runBlockingTest { var clearToolbarFocusInvoked = false - createController(clearToolbarFocus = { - clearToolbarFocusInvoked = true - }).handleEditingCancelled() + createController( + clearToolbarFocus = { + clearToolbarFocusInvoked = true + } + ).handleEditingCancelled() assertTrue(clearToolbarFocusInvoked) } @@ -277,9 +281,11 @@ class SearchDialogControllerTest { val searchEngine: SearchEngine = mockk(relaxed = true) var focusToolbarInvoked = false - createController(focusToolbar = { - focusToolbarInvoked = true - }).handleSearchShortcutEngineSelected(searchEngine) + createController( + focusToolbar = { + focusToolbarInvoked = true + } + ).handleSearchShortcutEngineSelected(searchEngine) assertTrue(focusToolbarInvoked) verify { store.dispatch(SearchFragmentAction.SearchShortcutEngineSelected(searchEngine)) } diff --git a/app/src/test/java/org/mozilla/fenix/search/SearchFragmentStoreTest.kt b/app/src/test/java/org/mozilla/fenix/search/SearchFragmentStoreTest.kt index af3324002..43245dafa 100644 --- a/app/src/test/java/org/mozilla/fenix/search/SearchFragmentStoreTest.kt +++ b/app/src/test/java/org/mozilla/fenix/search/SearchFragmentStoreTest.kt @@ -201,12 +201,14 @@ class SearchFragmentStoreTest { @Test fun `Updating SearchFragmentState from SearchState`() = runBlocking { - val store = SearchFragmentStore(emptyDefaultState( - searchEngineSource = SearchEngineSource.None, - areShortcutsAvailable = false, - defaultEngine = null, - showSearchShortcutsSetting = true - )) + val store = SearchFragmentStore( + emptyDefaultState( + searchEngineSource = SearchEngineSource.None, + areShortcutsAvailable = false, + defaultEngine = null, + showSearchShortcutsSetting = true + ) + ) assertNull(store.state.defaultEngine) assertFalse(store.state.areShortcutsAvailable) @@ -256,12 +258,14 @@ class SearchFragmentStoreTest { @Test fun `Updating SearchFragmentState from SearchState - shortcuts disabled`() = runBlocking { - val store = SearchFragmentStore(emptyDefaultState( - searchEngineSource = SearchEngineSource.None, - areShortcutsAvailable = false, - defaultEngine = null, - showSearchShortcutsSetting = false - )) + val store = SearchFragmentStore( + emptyDefaultState( + searchEngineSource = SearchEngineSource.None, + areShortcutsAvailable = false, + defaultEngine = null, + showSearchShortcutsSetting = false + ) + ) assertNull(store.state.defaultEngine) assertFalse(store.state.areShortcutsAvailable) diff --git a/app/src/test/java/org/mozilla/fenix/search/awesomebar/ShortcutsSuggestionProviderTest.kt b/app/src/test/java/org/mozilla/fenix/search/awesomebar/ShortcutsSuggestionProviderTest.kt index 655c8cc1a..5d0f1e43a 100644 --- a/app/src/test/java/org/mozilla/fenix/search/awesomebar/ShortcutsSuggestionProviderTest.kt +++ b/app/src/test/java/org/mozilla/fenix/search/awesomebar/ShortcutsSuggestionProviderTest.kt @@ -62,11 +62,13 @@ class ShortcutsSuggestionProviderTest { every { name } returns "EngineTwo" every { icon } returns mockk() } - val store = BrowserStore(BrowserState( - search = SearchState( - regionSearchEngines = listOf(engineOne, engineTwo) + val store = BrowserStore( + BrowserState( + search = SearchState( + regionSearchEngines = listOf(engineOne, engineTwo) + ) ) - )) + ) val provider = ShortcutsSuggestionProvider(store, context, mockk(), mockk()) val suggestions = provider.onInputChanged("") @@ -90,11 +92,13 @@ class ShortcutsSuggestionProviderTest { @Test fun `callbacks are triggered when suggestions are clicked`() = runBlockingTest { val engineOne = mockk(relaxed = true) - val store = BrowserStore(BrowserState( - search = SearchState( - regionSearchEngines = listOf(engineOne) + val store = BrowserStore( + BrowserState( + search = SearchState( + regionSearchEngines = listOf(engineOne) + ) ) - )) + ) val selectShortcutEngine = mockk<(SearchEngine) -> Unit>(relaxed = true) val selectShortcutEngineSettings = mockk<() -> Unit>(relaxed = true) diff --git a/app/src/test/java/org/mozilla/fenix/search/toolbar/ToolbarViewTest.kt b/app/src/test/java/org/mozilla/fenix/search/toolbar/ToolbarViewTest.kt index 1ea3e3788..3058d3f81 100644 --- a/app/src/test/java/org/mozilla/fenix/search/toolbar/ToolbarViewTest.kt +++ b/app/src/test/java/org/mozilla/fenix/search/toolbar/ToolbarViewTest.kt @@ -44,10 +44,12 @@ class ToolbarViewTest { url = "", searchTerms = "", query = "", - searchEngineSource = SearchEngineSource.Default(mockk { - every { name } returns "Search Engine" - every { icon } returns testContext.getDrawable(R.drawable.ic_search)!!.toBitmap() - }), + searchEngineSource = SearchEngineSource.Default( + mockk { + every { name } returns "Search Engine" + every { icon } returns testContext.getDrawable(R.drawable.ic_search)!!.toBitmap() + } + ), defaultEngine = null, showSearchShortcutsSetting = false, showSearchSuggestionsHint = false, diff --git a/app/src/test/java/org/mozilla/fenix/settings/ExtensionsTest.kt b/app/src/test/java/org/mozilla/fenix/settings/ExtensionsTest.kt index 3df70af7f..653dd5e2f 100644 --- a/app/src/test/java/org/mozilla/fenix/settings/ExtensionsTest.kt +++ b/app/src/test/java/org/mozilla/fenix/settings/ExtensionsTest.kt @@ -52,9 +52,13 @@ class ExtensionsTest { fun `test radiobutton setStartCheckedIndicator`() { radioButton.setStartCheckedIndicator() - verify { radioButton.putCompoundDrawablesRelative(start = withArg { - assertEquals(Rect(0, 0, it.intrinsicWidth, it.intrinsicHeight), it.bounds) - }) } + verify { + radioButton.putCompoundDrawablesRelative( + start = withArg { + assertEquals(Rect(0, 0, it.intrinsicWidth, it.intrinsicHeight), it.bounds) + } + ) + } } @Test diff --git a/app/src/test/java/org/mozilla/fenix/settings/about/AboutPageAdapterTest.kt b/app/src/test/java/org/mozilla/fenix/settings/about/AboutPageAdapterTest.kt index 87ccc63af..9e1bbe3e8 100644 --- a/app/src/test/java/org/mozilla/fenix/settings/about/AboutPageAdapterTest.kt +++ b/app/src/test/java/org/mozilla/fenix/settings/about/AboutPageAdapterTest.kt @@ -28,7 +28,8 @@ class AboutPageAdapterTest { AboutItem.ExternalLink( AboutItemType.WHATS_NEW, "https://mozilla.org" - ), "Libraries" + ), + "Libraries" ), AboutPageItem(AboutItem.Libraries, "Libraries"), AboutPageItem(AboutItem.Crashes, "Crashes") diff --git a/app/src/test/java/org/mozilla/fenix/settings/about/SecretDebugMenuTriggerTest.kt b/app/src/test/java/org/mozilla/fenix/settings/about/SecretDebugMenuTriggerTest.kt index 5440ddba8..ddb5dc87e 100644 --- a/app/src/test/java/org/mozilla/fenix/settings/about/SecretDebugMenuTriggerTest.kt +++ b/app/src/test/java/org/mozilla/fenix/settings/about/SecretDebugMenuTriggerTest.kt @@ -95,11 +95,13 @@ class SecretDebugMenuTriggerTest { clickListener.captured.onClick(logoView) clickListener.captured.onClick(logoView) - verify { Toast.makeText( - context, - R.string.about_debug_menu_toast_done, - Toast.LENGTH_LONG - ) } + verify { + Toast.makeText( + context, + R.string.about_debug_menu_toast_done, + Toast.LENGTH_LONG + ) + } verify { toast.show() } verify { settings.showSecretDebugMenuThisSession = true } } diff --git a/app/src/test/java/org/mozilla/fenix/settings/creditcards/CreditCardsManagementViewTest.kt b/app/src/test/java/org/mozilla/fenix/settings/creditcards/CreditCardsManagementViewTest.kt index 4c1e381d3..b326d3f67 100644 --- a/app/src/test/java/org/mozilla/fenix/settings/creditcards/CreditCardsManagementViewTest.kt +++ b/app/src/test/java/org/mozilla/fenix/settings/creditcards/CreditCardsManagementViewTest.kt @@ -47,10 +47,12 @@ class CreditCardsManagementViewTest { assertFalse(componentCreditCardsBinding.creditCardsList.isVisible) val creditCards: List = listOf(mockk(), mockk()) - creditCardsView.update(CreditCardsListState( - creditCards = creditCards, - isLoading = false - )) + creditCardsView.update( + CreditCardsListState( + creditCards = creditCards, + isLoading = false + ) + ) assertFalse(componentCreditCardsBinding.progressBar.isVisible) assertTrue(componentCreditCardsBinding.creditCardsList.isVisible) diff --git a/app/src/test/java/org/mozilla/fenix/settings/logins/LoginsFragmentStoreTest.kt b/app/src/test/java/org/mozilla/fenix/settings/logins/LoginsFragmentStoreTest.kt index 3fe11eeb2..99156f390 100644 --- a/app/src/test/java/org/mozilla/fenix/settings/logins/LoginsFragmentStoreTest.kt +++ b/app/src/test/java/org/mozilla/fenix/settings/logins/LoginsFragmentStoreTest.kt @@ -86,11 +86,13 @@ class LoginsFragmentStoreTest { @Test fun `FilterLogins action`() { - val store = LoginsFragmentStore(baseState.copy( - isLoading = true, - searchedForText = "firefox", - loginList = loginList - )) + val store = LoginsFragmentStore( + baseState.copy( + isLoading = true, + searchedForText = "firefox", + loginList = loginList + ) + ) store.dispatch(LoginsAction.FilterLogins(null)).joinBlocking() @@ -111,13 +113,15 @@ class LoginsFragmentStoreTest { @Test fun `SortLogins action`() { val lastUsed = SortingStrategy.LastUsed - val store = LoginsFragmentStore(baseState.copy( - isLoading = true, - searchedForText = null, - sortingStrategy = SortingStrategy.Alphabetically(mockk()), - highlightedItem = SavedLoginsSortingStrategyMenu.Item.AlphabeticallySort, - loginList = loginList - )) + val store = LoginsFragmentStore( + baseState.copy( + isLoading = true, + searchedForText = null, + sortingStrategy = SortingStrategy.Alphabetically(mockk()), + highlightedItem = SavedLoginsSortingStrategyMenu.Item.AlphabeticallySort, + loginList = loginList + ) + ) store.dispatch(LoginsAction.SortLogins(lastUsed)).joinBlocking() @@ -131,13 +135,15 @@ class LoginsFragmentStoreTest { @Test fun `SortLogins action with search text`() { val lastUsed = SortingStrategy.LastUsed - val store = LoginsFragmentStore(baseState.copy( - isLoading = true, - searchedForText = "example", - sortingStrategy = SortingStrategy.Alphabetically(mockk()), - highlightedItem = SavedLoginsSortingStrategyMenu.Item.AlphabeticallySort, - loginList = loginList - )) + val store = LoginsFragmentStore( + baseState.copy( + isLoading = true, + searchedForText = "example", + sortingStrategy = SortingStrategy.Alphabetically(mockk()), + highlightedItem = SavedLoginsSortingStrategyMenu.Item.AlphabeticallySort, + loginList = loginList + ) + ) store.dispatch(LoginsAction.SortLogins(lastUsed)).joinBlocking() @@ -150,11 +156,13 @@ class LoginsFragmentStoreTest { @Test fun `LoginSelected action`() { - val store = LoginsFragmentStore(baseState.copy( + val store = LoginsFragmentStore( + baseState.copy( isLoading = false, loginList = listOf(mockk()), filteredItems = listOf(mockk()) - )) + ) + ) store.dispatch(LoginsAction.LoginSelected(mockk())).joinBlocking() diff --git a/app/src/test/java/org/mozilla/fenix/settings/quicksettings/DefaultQuickSettingsControllerTest.kt b/app/src/test/java/org/mozilla/fenix/settings/quicksettings/DefaultQuickSettingsControllerTest.kt index 296ef71cf..2e728366b 100644 --- a/app/src/test/java/org/mozilla/fenix/settings/quicksettings/DefaultQuickSettingsControllerTest.kt +++ b/app/src/test/java/org/mozilla/fenix/settings/quicksettings/DefaultQuickSettingsControllerTest.kt @@ -94,9 +94,11 @@ class DefaultQuickSettingsControllerTest { @Test fun `handlePermissionsShown should delegate to an injected parameter`() { var displayPermissionsInvoked = false - createController(displayPermissions = { - displayPermissionsInvoked = true - }).handlePermissionsShown() + createController( + displayPermissions = { + displayPermissionsInvoked = true + } + ).handlePermissionsShown() assertTrue(displayPermissionsInvoked) } @@ -131,9 +133,11 @@ class DefaultQuickSettingsControllerTest { } // We should also modify View's state. Not necessarily as the last operation. verify { - store.dispatch(match { action -> - PhoneFeature.CAMERA == (action as WebsitePermissionAction.TogglePermission).updatedFeature - }) + store.dispatch( + match { action -> + PhoneFeature.CAMERA == (action as WebsitePermissionAction.TogglePermission).updatedFeature + } + ) } } @@ -163,9 +167,11 @@ class DefaultQuickSettingsControllerTest { invalidSitePermissionsController.handlePermissionToggled(websitePermission) verify { - navController.navigate(directionsEq( - QuickSettingsSheetDialogFragmentDirections.actionGlobalSitePermissionsManagePhoneFeature(PhoneFeature.CAMERA) - )) + navController.navigate( + directionsEq( + QuickSettingsSheetDialogFragmentDirections.actionGlobalSitePermissionsManagePhoneFeature(PhoneFeature.CAMERA) + ) + ) } } @@ -212,12 +218,14 @@ class DefaultQuickSettingsControllerTest { controller.handleAndroidPermissionGranted(featureGranted) verify { - store.dispatch(withArg { action -> - action as WebsitePermissionAction.TogglePermission - assertEquals(featureGranted, action.updatedFeature) - assertEquals(permissionStatus, action.updatedStatus) - assertEquals(permissionEnabled, action.updatedEnabledStatus) - }) + store.dispatch( + withArg { action -> + action as WebsitePermissionAction.TogglePermission + assertEquals(featureGranted, action.updatedFeature) + assertEquals(permissionStatus, action.updatedStatus) + assertEquals(permissionEnabled, action.updatedEnabledStatus) + } + ) } } @@ -226,7 +234,8 @@ class DefaultQuickSettingsControllerTest { val testPermissions = arrayOf("TestPermission") var requestRuntimePermissionsInvoked = false - createController(requestPermissions = { + createController( + requestPermissions = { assertArrayEquals(testPermissions, it) requestRuntimePermissionsInvoked = true } diff --git a/app/src/test/java/org/mozilla/fenix/settings/quicksettings/WebsiteInfoViewTest.kt b/app/src/test/java/org/mozilla/fenix/settings/quicksettings/WebsiteInfoViewTest.kt index f393464f0..7fe563a3b 100644 --- a/app/src/test/java/org/mozilla/fenix/settings/quicksettings/WebsiteInfoViewTest.kt +++ b/app/src/test/java/org/mozilla/fenix/settings/quicksettings/WebsiteInfoViewTest.kt @@ -30,12 +30,14 @@ class WebsiteInfoViewTest { @Test fun bindUrlAndTitle() { - view.update(WebsiteInfoState( - websiteUrl = "https://mozilla.org", - websiteTitle = "Mozilla", - websiteSecurityUiValues = WebsiteSecurityUiValues.SECURE, - certificateName = "" - )) + view.update( + WebsiteInfoState( + websiteUrl = "https://mozilla.org", + websiteTitle = "Mozilla", + websiteSecurityUiValues = WebsiteSecurityUiValues.SECURE, + certificateName = "" + ) + ) assertEquals("https://mozilla.org", binding.url.text) assertEquals("Mozilla", binding.title.text) @@ -45,12 +47,14 @@ class WebsiteInfoViewTest { @Test fun bindCert() { - view.update(WebsiteInfoState( - websiteUrl = "https://mozilla.org", - websiteTitle = "Mozilla", - websiteSecurityUiValues = WebsiteSecurityUiValues.INSECURE, - certificateName = "Certificate" - )) + view.update( + WebsiteInfoState( + websiteUrl = "https://mozilla.org", + websiteTitle = "Mozilla", + websiteSecurityUiValues = WebsiteSecurityUiValues.INSECURE, + certificateName = "Certificate" + ) + ) assertEquals("Insecure Connection", binding.securityInfo.text) assertEquals("Verified By: Certificate", binding.certificateInfo.text) diff --git a/app/src/test/java/org/mozilla/fenix/share/ShareViewModelTest.kt b/app/src/test/java/org/mozilla/fenix/share/ShareViewModelTest.kt index 8d3efd212..96bb24ed2 100644 --- a/app/src/test/java/org/mozilla/fenix/share/ShareViewModelTest.kt +++ b/app/src/test/java/org/mozilla/fenix/share/ShareViewModelTest.kt @@ -69,9 +69,11 @@ class ShareViewModelTest { every { application.getSystemService() } returns connectivityManager every { application.components.backgroundServices.accountManager } returns fxaAccountManager - viewModel = spyk(ShareViewModel(application).apply { - this.ioDispatcher = testIoDispatcher - }) + viewModel = spyk( + ShareViewModel(application).apply { + this.ioDispatcher = testIoDispatcher + } + ) } @After diff --git a/app/src/test/java/org/mozilla/fenix/shortcut/PwaOnboardingObserverTest.kt b/app/src/test/java/org/mozilla/fenix/shortcut/PwaOnboardingObserverTest.kt index 0141a9d54..c1152835a 100644 --- a/app/src/test/java/org/mozilla/fenix/shortcut/PwaOnboardingObserverTest.kt +++ b/app/src/test/java/org/mozilla/fenix/shortcut/PwaOnboardingObserverTest.kt @@ -50,7 +50,8 @@ class PwaOnboardingObserverTest { BrowserState( tabs = listOf( createTab(url = "https://firefox.com", id = "1") - ), selectedTabId = "1" + ), + selectedTabId = "1" ) ) lifecycleOwner = MockedLifecycleOwner(Lifecycle.State.STARTED) diff --git a/app/src/test/java/org/mozilla/fenix/sync/SyncedTabsAdapterTest.kt b/app/src/test/java/org/mozilla/fenix/sync/SyncedTabsAdapterTest.kt index f1f7f3fea..0a245e14c 100644 --- a/app/src/test/java/org/mozilla/fenix/sync/SyncedTabsAdapterTest.kt +++ b/app/src/test/java/org/mozilla/fenix/sync/SyncedTabsAdapterTest.kt @@ -30,15 +30,19 @@ class SyncedTabsAdapterTest { every { displayName } returns "Charcoal" every { deviceType } returns DeviceType.DESKTOP }, - tabs = listOf(Tab( - history = listOf(TabEntry( - title = "Mozilla", - url = "https://mozilla.org", - iconUrl = null - )), - active = 0, - lastUsed = 0L - )) + tabs = listOf( + Tab( + history = listOf( + TabEntry( + title = "Mozilla", + url = "https://mozilla.org", + iconUrl = null + ) + ), + active = 0, + lastUsed = 0L + ) + ) ) private val threeTabDevice = SyncedDeviceTabs( @@ -48,20 +52,24 @@ class SyncedTabsAdapterTest { }, tabs = listOf( Tab( - history = listOf(TabEntry( - title = "Mozilla", - url = "https://mozilla.org", - iconUrl = null - )), + history = listOf( + TabEntry( + title = "Mozilla", + url = "https://mozilla.org", + iconUrl = null + ) + ), active = 0, lastUsed = 0L ), Tab( - history = listOf(TabEntry( - title = "Firefox", - url = "https://firefox.com", - iconUrl = null - )), + history = listOf( + TabEntry( + title = "Firefox", + url = "https://firefox.com", + iconUrl = null + ) + ), active = 0, lastUsed = 0L ) diff --git a/app/src/test/java/org/mozilla/fenix/sync/ext/SyncedTabsAdapterKtTest.kt b/app/src/test/java/org/mozilla/fenix/sync/ext/SyncedTabsAdapterKtTest.kt index aa568acdd..905e5bafe 100644 --- a/app/src/test/java/org/mozilla/fenix/sync/ext/SyncedTabsAdapterKtTest.kt +++ b/app/src/test/java/org/mozilla/fenix/sync/ext/SyncedTabsAdapterKtTest.kt @@ -29,15 +29,19 @@ class SyncedTabsAdapterKtTest { every { displayName } returns "Charcoal" every { deviceType } returns DeviceType.DESKTOP }, - tabs = listOf(Tab( - history = listOf(TabEntry( - title = "Mozilla", - url = "https://mozilla.org", - iconUrl = null - )), - active = 0, - lastUsed = 0L - )) + tabs = listOf( + Tab( + history = listOf( + TabEntry( + title = "Mozilla", + url = "https://mozilla.org", + iconUrl = null + ) + ), + active = 0, + lastUsed = 0L + ) + ) ) private val twoTabDevice = SyncedDeviceTabs( @@ -47,21 +51,23 @@ class SyncedTabsAdapterKtTest { }, tabs = listOf( Tab( - history = listOf(TabEntry( - title = "Mozilla", - url = "https://mozilla.org", - iconUrl = null - )), + history = listOf( + TabEntry( + title = "Mozilla", + url = "https://mozilla.org", + iconUrl = null + ) + ), active = 0, lastUsed = 0L ), Tab( history = listOf( TabEntry( - title = "Firefox", - url = "https://firefox.com", - iconUrl = null - ) + title = "Firefox", + url = "https://firefox.com", + iconUrl = null + ) ), active = 0, lastUsed = 0L diff --git a/app/src/test/java/org/mozilla/fenix/tabhistory/TabHistoryAdapterTest.kt b/app/src/test/java/org/mozilla/fenix/tabhistory/TabHistoryAdapterTest.kt index a96a5d716..867c68830 100644 --- a/app/src/test/java/org/mozilla/fenix/tabhistory/TabHistoryAdapterTest.kt +++ b/app/src/test/java/org/mozilla/fenix/tabhistory/TabHistoryAdapterTest.kt @@ -65,33 +65,45 @@ class TabHistoryAdapterTest { @Test fun `items are the same if they have matching URLs`() { - assertTrue(TabHistoryAdapter.DiffCallback.areItemsTheSame( - selectedItem, - selectedItem - )) - assertTrue(TabHistoryAdapter.DiffCallback.areItemsTheSame( - unselectedItem, - unselectedItem.copy(title = "Waterbug", index = 2, isSelected = true) - )) - assertFalse(TabHistoryAdapter.DiffCallback.areItemsTheSame( - unselectedItem, - unselectedItem.copy(url = "https://firefox.com/subpage") - )) + assertTrue( + TabHistoryAdapter.DiffCallback.areItemsTheSame( + selectedItem, + selectedItem + ) + ) + assertTrue( + TabHistoryAdapter.DiffCallback.areItemsTheSame( + unselectedItem, + unselectedItem.copy(title = "Waterbug", index = 2, isSelected = true) + ) + ) + assertFalse( + TabHistoryAdapter.DiffCallback.areItemsTheSame( + unselectedItem, + unselectedItem.copy(url = "https://firefox.com/subpage") + ) + ) } @Test fun `equal items have the same contents`() { - assertTrue(TabHistoryAdapter.DiffCallback.areContentsTheSame( - selectedItem, - selectedItem - )) - assertFalse(TabHistoryAdapter.DiffCallback.areContentsTheSame( - selectedItem, - selectedItem.copy(title = "Waterbug", index = 2, isSelected = false) - )) - assertFalse(TabHistoryAdapter.DiffCallback.areContentsTheSame( - unselectedItem, - selectedItem - )) + assertTrue( + TabHistoryAdapter.DiffCallback.areContentsTheSame( + selectedItem, + selectedItem + ) + ) + assertFalse( + TabHistoryAdapter.DiffCallback.areContentsTheSame( + selectedItem, + selectedItem.copy(title = "Waterbug", index = 2, isSelected = false) + ) + ) + assertFalse( + TabHistoryAdapter.DiffCallback.areContentsTheSame( + unselectedItem, + selectedItem + ) + ) } } diff --git a/app/src/test/java/org/mozilla/fenix/tabstray/DefaultTabsTrayControllerTest.kt b/app/src/test/java/org/mozilla/fenix/tabstray/DefaultTabsTrayControllerTest.kt index f1875b9ec..354981f1a 100644 --- a/app/src/test/java/org/mozilla/fenix/tabstray/DefaultTabsTrayControllerTest.kt +++ b/app/src/test/java/org/mozilla/fenix/tabstray/DefaultTabsTrayControllerTest.kt @@ -127,11 +127,13 @@ class DefaultTabsTrayControllerTest { @Test fun `WHEN handleTrayScrollingToPosition is called with smoothScroll=true THEN it scrolls to that position with smoothScroll`() { var selectTabPositionInvoked = false - createController(selectTabPosition = { position, smoothScroll -> - assertEquals(3, position) - assertTrue(smoothScroll) - selectTabPositionInvoked = true - }).handleTrayScrollingToPosition(3, true) + createController( + selectTabPosition = { position, smoothScroll -> + assertEquals(3, position) + assertTrue(smoothScroll) + selectTabPositionInvoked = true + } + ).handleTrayScrollingToPosition(3, true) assertTrue(selectTabPositionInvoked) } @@ -218,10 +220,12 @@ class DefaultTabsTrayControllerTest { every { browserStore.state.getNormalOrPrivateTabs(any()) } returns listOf(tab, mockk()) var showUndoSnackbarForTabInvoked = false - createController(showUndoSnackbarForTab = { - assertTrue(it) - showUndoSnackbarForTabInvoked = true - }).handleTabDeletion("22") + createController( + showUndoSnackbarForTab = { + assertTrue(it) + showUndoSnackbarForTabInvoked = true + } + ).handleTabDeletion("22") verify { tabsUseCases.removeTab("22") } assertTrue(showUndoSnackbarForTabInvoked) @@ -258,10 +262,14 @@ class DefaultTabsTrayControllerTest { @Test fun `WHEN handleMultipleTabsDeletion is called to close all private tabs THEN that it navigates to home where that tabs will be removed and shows undo snackbar`() { var showUndoSnackbarForTabInvoked = false - val controller = spyk(createController(showUndoSnackbarForTab = { - assertTrue(it) - showUndoSnackbarForTabInvoked = true - })) + val controller = spyk( + createController( + showUndoSnackbarForTab = { + assertTrue(it) + showUndoSnackbarForTabInvoked = true + } + ) + ) val privateTab: Tab = mockk { every { private } returns true @@ -285,10 +293,14 @@ class DefaultTabsTrayControllerTest { @Test fun `WHEN handleMultipleTabsDeletion is called to close all normal tabs THEN that it navigates to home where that tabs will be removed and shows undo snackbar`() { var showUndoSnackbarForTabInvoked = false - val controller = spyk(createController(showUndoSnackbarForTab = { - assertFalse(it) - showUndoSnackbarForTabInvoked = true - })) + val controller = spyk( + createController( + showUndoSnackbarForTab = { + assertFalse(it) + showUndoSnackbarForTabInvoked = true + } + ) + ) val normalTab: Tab = mockk { every { private } returns false } @@ -373,12 +385,14 @@ class DefaultTabsTrayControllerTest { fun `WHEN dismissTabsTrayAndNavigateHome is called with a spefic tab id THEN tray is dismissed and navigates home is opened to delete that tab`() { var dismissTrayInvoked = false var navigateToHomeAndDeleteSessionInvoked = false - createController(dismissTray = { - dismissTrayInvoked = true - }, navigateToHomeAndDeleteSession = { - assertEquals("randomId", it) - navigateToHomeAndDeleteSessionInvoked = true - } + createController( + dismissTray = { + dismissTrayInvoked = true + }, + navigateToHomeAndDeleteSession = { + assertEquals("randomId", it) + navigateToHomeAndDeleteSessionInvoked = true + } ).dismissTabsTrayAndNavigateHome("randomId") assertTrue(dismissTrayInvoked) diff --git a/app/src/test/java/org/mozilla/fenix/tabstray/NavigationInteractorTest.kt b/app/src/test/java/org/mozilla/fenix/tabstray/NavigationInteractorTest.kt index 6da409bc9..904fcc27c 100644 --- a/app/src/test/java/org/mozilla/fenix/tabstray/NavigationInteractorTest.kt +++ b/app/src/test/java/org/mozilla/fenix/tabstray/NavigationInteractorTest.kt @@ -66,9 +66,11 @@ class NavigationInteractorTest { @Test fun `onTabTrayDismissed calls dismissTabTray on DefaultNavigationInteractor`() { var dismissTabTrayInvoked = false - createInteractor(dismissTabTray = { - dismissTabTrayInvoked = true - }).onTabTrayDismissed() + createInteractor( + dismissTabTray = { + dismissTabTrayInvoked = true + } + ).onTabTrayDismissed() assertTrue(dismissTabTrayInvoked) verify { @@ -109,9 +111,11 @@ class NavigationInteractorTest { @Test fun `onCloseAllTabsClicked calls navigation on DefaultNavigationInteractor`() { var dismissTabTrayAndNavigateHomeInvoked = false - createInteractor(dismissTabTrayAndNavigateHome = { - dismissTabTrayAndNavigateHomeInvoked = true - }).onCloseAllTabsClicked(false) + createInteractor( + dismissTabTrayAndNavigateHome = { + dismissTabTrayAndNavigateHomeInvoked = true + } + ).onCloseAllTabsClicked(false) assertTrue(dismissTabTrayAndNavigateHomeInvoked) } @@ -142,9 +146,11 @@ class NavigationInteractorTest { @Test fun `onBookmarkTabs calls navigation on DefaultNavigationInteractor`() = runBlockingTest { var showBookmarkSnackbarInvoked = false - createInteractor(showBookmarkSnackbar = { - showBookmarkSnackbarInvoked = true - }).onSaveToBookmarks(listOf(createTrayTab())) + createInteractor( + showBookmarkSnackbar = { + showBookmarkSnackbarInvoked = true + } + ).onSaveToBookmarks(listOf(createTrayTab())) coVerify(exactly = 1) { bookmarksUseCase.addBookmark(any(), any(), any()) } assertTrue(showBookmarkSnackbarInvoked) @@ -159,9 +165,11 @@ class NavigationInteractorTest { every { entry.url }.answers { "https://mozilla.org" } var dismissTabTrayInvoked = false - createInteractor(dismissTabTray = { - dismissTabTrayInvoked = true - }).onSyncedTabClicked(tab) + createInteractor( + dismissTabTray = { + dismissTabTrayInvoked = true + } + ).onSyncedTabClicked(tab) assertTrue(dismissTabTrayInvoked) verifyOrder { diff --git a/app/src/test/java/org/mozilla/fenix/tabstray/TabsTrayFragmentTest.kt b/app/src/test/java/org/mozilla/fenix/tabstray/TabsTrayFragmentTest.kt index ef86d923c..02483a0ab 100644 --- a/app/src/test/java/org/mozilla/fenix/tabstray/TabsTrayFragmentTest.kt +++ b/app/src/test/java/org/mozilla/fenix/tabstray/TabsTrayFragmentTest.kt @@ -87,16 +87,18 @@ class TabsTrayFragmentTest { fragment.showUndoSnackbarForTab(true) - verify { lifecycleScope.allowUndo( - fragment.view!!, - testContext.getString(R.string.snackbar_private_tab_closed), - testContext.getString(R.string.snackbar_deleted_undo), - any(), - any(), - newTabButton, - TabsTrayFragment.ELEVATION, - false - ) } + verify { + lifecycleScope.allowUndo( + fragment.view!!, + testContext.getString(R.string.snackbar_private_tab_closed), + testContext.getString(R.string.snackbar_deleted_undo), + any(), + any(), + newTabButton, + TabsTrayFragment.ELEVATION, + false + ) + } } finally { unmockkStatic("org.mozilla.fenix.utils.UndoKt") unmockkStatic("androidx.lifecycle.LifecycleOwnerKt") @@ -119,16 +121,18 @@ class TabsTrayFragmentTest { fragment.showUndoSnackbarForTab(true) - verify { lifecycleScope.allowUndo( - fragment.view!!, - testContext.getString(R.string.snackbar_private_tab_closed), - testContext.getString(R.string.snackbar_deleted_undo), - any(), - any(), - null, - TabsTrayFragment.ELEVATION, - false - ) } + verify { + lifecycleScope.allowUndo( + fragment.view!!, + testContext.getString(R.string.snackbar_private_tab_closed), + testContext.getString(R.string.snackbar_deleted_undo), + any(), + any(), + null, + TabsTrayFragment.ELEVATION, + false + ) + } } finally { unmockkStatic("org.mozilla.fenix.utils.UndoKt") unmockkStatic("androidx.lifecycle.LifecycleOwnerKt") @@ -151,16 +155,18 @@ class TabsTrayFragmentTest { fragment.showUndoSnackbarForTab(false) - verify { lifecycleScope.allowUndo( - fragment.view!!, - testContext.getString(R.string.snackbar_tab_closed), - testContext.getString(R.string.snackbar_deleted_undo), - any(), - any(), - newTabButton, - TabsTrayFragment.ELEVATION, - false - ) } + verify { + lifecycleScope.allowUndo( + fragment.view!!, + testContext.getString(R.string.snackbar_tab_closed), + testContext.getString(R.string.snackbar_deleted_undo), + any(), + any(), + newTabButton, + TabsTrayFragment.ELEVATION, + false + ) + } } finally { unmockkStatic("org.mozilla.fenix.utils.UndoKt") unmockkStatic("androidx.lifecycle.LifecycleOwnerKt") @@ -183,16 +189,18 @@ class TabsTrayFragmentTest { fragment.showUndoSnackbarForTab(false) - verify { lifecycleScope.allowUndo( - fragment.view!!, - testContext.getString(R.string.snackbar_tab_closed), - testContext.getString(R.string.snackbar_deleted_undo), - any(), - any(), - null, - TabsTrayFragment.ELEVATION, - false - ) } + verify { + lifecycleScope.allowUndo( + fragment.view!!, + testContext.getString(R.string.snackbar_tab_closed), + testContext.getString(R.string.snackbar_deleted_undo), + any(), + any(), + null, + TabsTrayFragment.ELEVATION, + false + ) + } } finally { unmockkStatic("org.mozilla.fenix.utils.UndoKt") unmockkStatic("androidx.lifecycle.LifecycleOwnerKt") diff --git a/app/src/test/java/org/mozilla/fenix/tabstray/browser/BrowserTabsAdapterTest.kt b/app/src/test/java/org/mozilla/fenix/tabstray/browser/BrowserTabsAdapterTest.kt index 04d5b8d65..9a8b3f72a 100644 --- a/app/src/test/java/org/mozilla/fenix/tabstray/browser/BrowserTabsAdapterTest.kt +++ b/app/src/test/java/org/mozilla/fenix/tabstray/browser/BrowserTabsAdapterTest.kt @@ -30,12 +30,14 @@ class BrowserTabsAdapterTest { val adapter = BrowserTabsAdapter(context, interactor, store) val holder = mockk(relaxed = true) - adapter.updateTabs(Tabs( - list = listOf( - createTab("tab1") - ), - selectedIndex = 0 - )) + adapter.updateTabs( + Tabs( + list = listOf( + createTab("tab1") + ), + selectedIndex = 0 + ) + ) adapter.onBindViewHolder(holder, 0, listOf(PAYLOAD_HIGHLIGHT_SELECTED_ITEM)) @@ -56,12 +58,14 @@ class BrowserTabsAdapterTest { testSelectionHolder.internalState.add(tab) adapter.selectionHolder = testSelectionHolder - adapter.updateTabs(Tabs( - list = listOf( - tab - ), - selectedIndex = 0 - )) + adapter.updateTabs( + Tabs( + list = listOf( + tab + ), + selectedIndex = 0 + ) + ) adapter.onBindViewHolder(holder, 0, listOf(PAYLOAD_DONT_HIGHLIGHT_SELECTED_ITEM)) diff --git a/app/src/test/java/org/mozilla/fenix/telemetry/TelemetryMiddlewareTest.kt b/app/src/test/java/org/mozilla/fenix/telemetry/TelemetryMiddlewareTest.kt index fe9c8b597..1c801a364 100644 --- a/app/src/test/java/org/mozilla/fenix/telemetry/TelemetryMiddlewareTest.kt +++ b/app/src/test/java/org/mozilla/fenix/telemetry/TelemetryMiddlewareTest.kt @@ -98,9 +98,11 @@ class TelemetryMiddlewareTest { fun `WHEN multiple tabs are added THEN the open tab count is updated`() { assertEquals(0, settings.openTabsCount) store.dispatch( - TabListAction.AddMultipleTabsAction(listOf( - createTab("https://mozilla.org"), - createTab("https://firefox.com")) + TabListAction.AddMultipleTabsAction( + listOf( + createTab("https://mozilla.org"), + createTab("https://firefox.com") + ) ) ).joinBlocking() @@ -111,9 +113,11 @@ class TelemetryMiddlewareTest { @Test fun `WHEN a tab is removed THEN the open tab count is updated`() { store.dispatch( - TabListAction.AddMultipleTabsAction(listOf( - createTab(id = "1", url = "https://mozilla.org"), - createTab(id = "2", url = "https://firefox.com")) + TabListAction.AddMultipleTabsAction( + listOf( + createTab(id = "1", url = "https://mozilla.org"), + createTab(id = "2", url = "https://firefox.com") + ) ) ).joinBlocking() assertEquals(2, settings.openTabsCount) @@ -127,9 +131,11 @@ class TelemetryMiddlewareTest { @Test fun `WHEN all tabs are removed THEN the open tab count is updated`() { store.dispatch( - TabListAction.AddMultipleTabsAction(listOf( - createTab("https://mozilla.org"), - createTab("https://firefox.com")) + TabListAction.AddMultipleTabsAction( + listOf( + createTab("https://mozilla.org"), + createTab("https://firefox.com") + ) ) ).joinBlocking() assertEquals(2, settings.openTabsCount) @@ -143,10 +149,12 @@ class TelemetryMiddlewareTest { @Test fun `WHEN all normal tabs are removed THEN the open tab count is updated`() { store.dispatch( - TabListAction.AddMultipleTabsAction(listOf( - createTab("https://mozilla.org"), - createTab("https://firefox.com"), - createTab("https://getpocket.com", private = true)) + TabListAction.AddMultipleTabsAction( + listOf( + createTab("https://mozilla.org"), + createTab("https://firefox.com"), + createTab("https://getpocket.com", private = true) + ) ) ).joinBlocking() assertEquals(2, settings.openTabsCount) @@ -205,14 +213,16 @@ class TelemetryMiddlewareTest { @Test fun `WHEN foreground tab getting killed THEN middleware counts it`() { - store.dispatch(TabListAction.RestoreAction( - listOf( - createTab("https://www.mozilla.org", id = "foreground"), - createTab("https://getpocket.com", id = "background_pocket"), - createTab("https://theverge.com", id = "background_verge") - ), - selectedTabId = "foreground" - )).joinBlocking() + store.dispatch( + TabListAction.RestoreAction( + listOf( + createTab("https://www.mozilla.org", id = "foreground"), + createTab("https://getpocket.com", id = "background_pocket"), + createTab("https://theverge.com", id = "background_verge") + ), + selectedTabId = "foreground" + ) + ).joinBlocking() assertFalse(EngineMetrics.kills["foreground"].testHasValue()) assertFalse(EngineMetrics.kills["background"].testHasValue()) @@ -226,14 +236,16 @@ class TelemetryMiddlewareTest { @Test fun `WHEN background tabs getting killed THEN middleware counts it`() { - store.dispatch(TabListAction.RestoreAction( - listOf( - createTab("https://www.mozilla.org", id = "foreground"), - createTab("https://getpocket.com", id = "background_pocket"), - createTab("https://theverge.com", id = "background_verge") - ), - selectedTabId = "foreground" - )).joinBlocking() + store.dispatch( + TabListAction.RestoreAction( + listOf( + createTab("https://www.mozilla.org", id = "foreground"), + createTab("https://getpocket.com", id = "background_pocket"), + createTab("https://theverge.com", id = "background_verge") + ), + selectedTabId = "foreground" + ) + ).joinBlocking() assertFalse(EngineMetrics.kills["foreground"].testHasValue()) assertFalse(EngineMetrics.kills["background"].testHasValue()) @@ -257,21 +269,25 @@ class TelemetryMiddlewareTest { @Test fun `WHEN foreground tab gets killed THEN middleware records foreground age`() { - store.dispatch(TabListAction.RestoreAction( - listOf( - createTab("https://www.mozilla.org", id = "foreground"), - createTab("https://getpocket.com", id = "background_pocket"), - createTab("https://theverge.com", id = "background_verge") - ), - selectedTabId = "foreground" - )).joinBlocking() + store.dispatch( + TabListAction.RestoreAction( + listOf( + createTab("https://www.mozilla.org", id = "foreground"), + createTab("https://getpocket.com", id = "background_pocket"), + createTab("https://theverge.com", id = "background_verge") + ), + selectedTabId = "foreground" + ) + ).joinBlocking() clock.elapsedTime = 100 - store.dispatch(EngineAction.LinkEngineSessionAction( - tabId = "foreground", - engineSession = mock() - )).joinBlocking() + store.dispatch( + EngineAction.LinkEngineSessionAction( + tabId = "foreground", + engineSession = mock() + ) + ).joinBlocking() assertFalse(EngineMetrics.killForegroundAge.testHasValue()) assertFalse(EngineMetrics.killBackgroundAge.testHasValue()) @@ -289,21 +305,25 @@ class TelemetryMiddlewareTest { @Test fun `WHEN background tab gets killed THEN middleware records background age`() { - store.dispatch(TabListAction.RestoreAction( - listOf( - createTab("https://www.mozilla.org", id = "foreground"), - createTab("https://getpocket.com", id = "background_pocket"), - createTab("https://theverge.com", id = "background_verge") - ), - selectedTabId = "foreground" - )).joinBlocking() + store.dispatch( + TabListAction.RestoreAction( + listOf( + createTab("https://www.mozilla.org", id = "foreground"), + createTab("https://getpocket.com", id = "background_pocket"), + createTab("https://theverge.com", id = "background_verge") + ), + selectedTabId = "foreground" + ) + ).joinBlocking() clock.elapsedTime = 100 - store.dispatch(EngineAction.LinkEngineSessionAction( - tabId = "background_pocket", - engineSession = mock() - )).joinBlocking() + store.dispatch( + EngineAction.LinkEngineSessionAction( + tabId = "background_pocket", + engineSession = mock() + ) + ).joinBlocking() clock.elapsedTime = 700 diff --git a/app/src/test/java/org/mozilla/fenix/toolbar/DefaultToolbarMenuTest.kt b/app/src/test/java/org/mozilla/fenix/toolbar/DefaultToolbarMenuTest.kt index f199f6dba..2a42b741f 100644 --- a/app/src/test/java/org/mozilla/fenix/toolbar/DefaultToolbarMenuTest.kt +++ b/app/src/test/java/org/mozilla/fenix/toolbar/DefaultToolbarMenuTest.kt @@ -59,7 +59,8 @@ class DefaultToolbarMenuTest { tabs = listOf( createTab(url = "https://firefox.com", id = "1"), createTab(url = "https://getpocket.com", id = "2") - ), selectedTabId = "1" + ), + selectedTabId = "1" ) ) } @@ -70,15 +71,17 @@ class DefaultToolbarMenuTest { } private fun createMenu() { - toolbarMenu = spyk(DefaultToolbarMenu( - context = context, - store = store, - hasAccountProblem = false, - onItemTapped = { }, - lifecycleOwner = lifecycleOwner, - bookmarksStorage = bookmarksStorage, - isPinningSupported = false - )) + toolbarMenu = spyk( + DefaultToolbarMenu( + context = context, + store = store, + hasAccountProblem = false, + onItemTapped = { }, + lifecycleOwner = lifecycleOwner, + bookmarksStorage = bookmarksStorage, + isPinningSupported = false + ) + ) every { toolbarMenu.updateCurrentUrlIsBookmarked(any()) } returns mockk() every { toolbarMenu.shouldShowOpenInApp() } returns mockk() diff --git a/app/src/test/java/org/mozilla/fenix/trackingprotection/TrackerBucketsTest.kt b/app/src/test/java/org/mozilla/fenix/trackingprotection/TrackerBucketsTest.kt index bbef778dd..a834f3552 100644 --- a/app/src/test/java/org/mozilla/fenix/trackingprotection/TrackerBucketsTest.kt +++ b/app/src/test/java/org/mozilla/fenix/trackingprotection/TrackerBucketsTest.kt @@ -64,13 +64,15 @@ class TrackerBucketsTest { assertEquals( mapOf( FenixTrackingProtectionCategory.SOCIAL_MEDIA_TRACKERS to listOf("facebook.com") - ), buckets.buckets.loadedBucketMap + ), + buckets.buckets.loadedBucketMap ) assertEquals( mapOf( FINGERPRINTERS to listOf("google.com") - ), buckets.buckets.blockedBucketMap + ), + buckets.buckets.blockedBucketMap ) } diff --git a/app/src/test/java/org/mozilla/fenix/trackingprotection/TrackingProtectionOverlayTest.kt b/app/src/test/java/org/mozilla/fenix/trackingprotection/TrackingProtectionOverlayTest.kt index 98da76499..9a3337e7f 100644 --- a/app/src/test/java/org/mozilla/fenix/trackingprotection/TrackingProtectionOverlayTest.kt +++ b/app/src/test/java/org/mozilla/fenix/trackingprotection/TrackingProtectionOverlayTest.kt @@ -69,7 +69,8 @@ class TrackingProtectionOverlayTest { metrics, store, lifecycleOwner - ) { toolbar }) + ) { toolbar } + ) every { toolbar.findViewById(R.id.mozac_browser_toolbar_tracking_protection_indicator) } returns icon } diff --git a/app/src/test/java/org/mozilla/fenix/trackingprotection/TrackingProtectionPanelViewTest.kt b/app/src/test/java/org/mozilla/fenix/trackingprotection/TrackingProtectionPanelViewTest.kt index 884a26529..d89aa6e16 100644 --- a/app/src/test/java/org/mozilla/fenix/trackingprotection/TrackingProtectionPanelViewTest.kt +++ b/app/src/test/java/org/mozilla/fenix/trackingprotection/TrackingProtectionPanelViewTest.kt @@ -56,12 +56,14 @@ class TrackingProtectionPanelViewTest { @Test fun testPrivateModeUi() { - view.update(baseState.copy( - mode = TrackingProtectionState.Mode.Details( - selectedCategory = TrackingProtectionCategory.TRACKING_CONTENT, - categoryBlocked = false + view.update( + baseState.copy( + mode = TrackingProtectionState.Mode.Details( + selectedCategory = TrackingProtectionCategory.TRACKING_CONTENT, + categoryBlocked = false + ) ) - )) + ) assertTrue(view.details_mode.isVisible) assertFalse(view.normal_mode.isVisible) assertEquals( diff --git a/app/src/test/java/org/mozilla/fenix/widget/VoiceSearchActivityTest.kt b/app/src/test/java/org/mozilla/fenix/widget/VoiceSearchActivityTest.kt index 504c5fbe1..21f9cd7d1 100644 --- a/app/src/test/java/org/mozilla/fenix/widget/VoiceSearchActivityTest.kt +++ b/app/src/test/java/org/mozilla/fenix/widget/VoiceSearchActivityTest.kt @@ -60,7 +60,8 @@ class VoiceSearchActivityTest { shadowPackageManager.addActivityIfNotPresent(component) shadowPackageManager.addIntentFilterForActivity( component, - IntentFilter(ACTION_RECOGNIZE_SPEECH).apply { addCategory(Intent.CATEGORY_DEFAULT) }) + IntentFilter(ACTION_RECOGNIZE_SPEECH).apply { addCategory(Intent.CATEGORY_DEFAULT) } + ) } @Test