From ea7c105d91b3ee781a2db04f5cdf1057b0686755 Mon Sep 17 00:00:00 2001 From: Ryan VanderMeulen Date: Thu, 29 Oct 2026 11:51:04 -0400 Subject: [PATCH 1/2] Update ktfmt to version 0.65 and Spotless to version 8.10.4 ktfmt 0.65 moved to org.jetbrains.kotlinx:ktfmt, which Spotless resolves starting with 8.10.4. --- gradle/libs.versions.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 3227bea15..4fd361a5a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -41,8 +41,8 @@ androidx-test-uiautomator = "2.4.0" dependency-analysis = "3.19.2" detekt = "1.23.8" jspecify = "1.0.0" -ktfmt = "0.64" -spotless = "8.10.2" +ktfmt = "0.65" +spotless = "8.10.4" # Third Party Testing hamcrest = "1.3" From 57ad3b997fb02691f9436eff63d3261039476b37 Mon Sep 17 00:00:00 2001 From: Ryan VanderMeulen Date: Thu, 29 Oct 2026 11:51:04 -0400 Subject: [PATCH 2/2] Reformat Kotlin sources with ktfmt 0.65 --- .../reference/browser/ui/CustomTabsTest.kt | 2 +- .../browser/ui/robots/AddonsManagerRobot.kt | 20 +++++++++-------- .../browser/ui/robots/AwesomeBarRobot.kt | 4 ++-- .../browser/ui/robots/BrowserRobot.kt | 8 +++---- .../browser/ui/robots/CustomTabRobot.kt | 2 +- .../browser/ui/robots/ExternalAppsRobot.kt | 2 +- .../browser/ui/robots/ReaderViewRobot.kt | 22 +++++++++---------- .../browser/ui/robots/SettingsViewRobot.kt | 12 +++++----- .../browser/ui/robots/SyncedTabsRobot.kt | 4 ++-- .../browser/ui/robots/ThreeDotMenuRobot.kt | 6 ++--- .../reference/browser/BrowserActivity.kt | 2 +- .../reference/browser/BrowserApplication.kt | 2 +- .../reference/browser/NotificationManager.kt | 2 +- .../browser/addons/AddonSettingsActivity.kt | 2 +- .../browser/browser/BaseBrowserFragment.kt | 2 +- .../browser/browser/BrowserFragment.kt | 2 +- .../browser/components/BackgroundServices.kt | 2 +- .../reference/browser/components/Core.kt | 2 +- .../settings/PrivacySettingsFragment.kt | 2 +- .../reference/browser/tabs/TabsTouchHelper.kt | 2 +- 20 files changed, 52 insertions(+), 50 deletions(-) diff --git a/app/src/androidTest/java/org/mozilla/reference/browser/ui/CustomTabsTest.kt b/app/src/androidTest/java/org/mozilla/reference/browser/ui/CustomTabsTest.kt index 200ae9aec..6872d307a 100644 --- a/app/src/androidTest/java/org/mozilla/reference/browser/ui/CustomTabsTest.kt +++ b/app/src/androidTest/java/org/mozilla/reference/browser/ui/CustomTabsTest.kt @@ -38,7 +38,7 @@ class CustomTabsTest { InstrumentationRegistry.getInstrumentation().targetContext, IntentReceiverActivity::class.java, ) - } + }, ) @Before diff --git a/app/src/androidTest/java/org/mozilla/reference/browser/ui/robots/AddonsManagerRobot.kt b/app/src/androidTest/java/org/mozilla/reference/browser/ui/robots/AddonsManagerRobot.kt index 09c563843..2633ac1d5 100644 --- a/app/src/androidTest/java/org/mozilla/reference/browser/ui/robots/AddonsManagerRobot.kt +++ b/app/src/androidTest/java/org/mozilla/reference/browser/ui/robots/AddonsManagerRobot.kt @@ -80,13 +80,15 @@ class AddonsManagerRobot { .waitForExists(waitingTime) mDevice.waitAndInteract( Until.findObject( - By.text(getStringResource(addonsR.string.mozac_feature_addons_installed_dialog_okay_button_2)) - ) + By.text(getStringResource(addonsR.string.mozac_feature_addons_installed_dialog_okay_button_2)), + ), ) {} mDevice .findObject( UiSelector() - .textContains(getStringResource(addonsR.string.mozac_feature_addons_installed_dialog_okay_button_2)) + .textContains( + getStringResource(addonsR.string.mozac_feature_addons_installed_dialog_okay_button_2), + ), ) .click() } @@ -109,7 +111,7 @@ class AddonsManagerRobot { withContentDescription("Install $addonName"), isDescendantOfA(withId(R.id.add_on_item)), hasSibling(hasDescendant(withText(addonName))), - ) + ), ) private fun removeAddonButton() = onView(withId(R.id.remove_add_on)) @@ -131,7 +133,7 @@ class AddonsManagerRobot { allOf( withId(addonsR.id.optional_or_required_text), withText(containsString("Required permissions:")), - ) + ), ) .check(matches(isCompletelyDisplayed())) @@ -139,7 +141,7 @@ class AddonsManagerRobot { allOf( withId(addonsR.id.allow_button), withText(addonsR.string.mozac_feature_addons_permissions_dialog_add), - ) + ), ) .check(matches(isCompletelyDisplayed())) @@ -147,7 +149,7 @@ class AddonsManagerRobot { allOf( withId(addonsR.id.deny_button), withText(addonsR.string.mozac_feature_addons_permissions_dialog_cancel), - ) + ), ) .check(matches(isCompletelyDisplayed())) } @@ -157,7 +159,7 @@ class AddonsManagerRobot { allOf( withId(addonsR.id.deny_button), withText(addonsR.string.mozac_feature_addons_permissions_dialog_cancel), - ) + ), ) .check(matches(isCompletelyDisplayed())) .perform(click()) @@ -197,7 +199,7 @@ class AddonsManagerRobot { hasSibling(withId(R.id.details)), hasSibling(withId(R.id.permissions)), hasSibling(withId(R.id.allow_in_private_browsing_switch)), - ) + ), ) .check(matches(withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE))) } diff --git a/app/src/androidTest/java/org/mozilla/reference/browser/ui/robots/AwesomeBarRobot.kt b/app/src/androidTest/java/org/mozilla/reference/browser/ui/robots/AwesomeBarRobot.kt index 5a7ced788..56b26d6df 100644 --- a/app/src/androidTest/java/org/mozilla/reference/browser/ui/robots/AwesomeBarRobot.kt +++ b/app/src/androidTest/java/org/mozilla/reference/browser/ui/robots/AwesomeBarRobot.kt @@ -92,7 +92,7 @@ private fun awesomeBar() = allOf( withId(toolbarR.id.mozac_browser_toolbar_edit_url_view), isDescendantOfA(withId(toolbarR.id.mozac_browser_toolbar_container)), - ) + ), ) private fun clearToolbarButton() = @@ -121,7 +121,7 @@ private fun assertPastedToolbarText(expectedText: String) { allOf( withSubstring(expectedText), withId(toolbarR.id.mozac_browser_toolbar_edit_url_view), - ) + ), ) .check(matches(withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE))) } diff --git a/app/src/androidTest/java/org/mozilla/reference/browser/ui/robots/BrowserRobot.kt b/app/src/androidTest/java/org/mozilla/reference/browser/ui/robots/BrowserRobot.kt index 2cbc50ab2..826f0e7fb 100644 --- a/app/src/androidTest/java/org/mozilla/reference/browser/ui/robots/BrowserRobot.kt +++ b/app/src/androidTest/java/org/mozilla/reference/browser/ui/robots/BrowserRobot.kt @@ -50,17 +50,17 @@ class BrowserRobot { withSubstring(expectedUrl), withId(toolbarR.id.mozac_browser_toolbar_url_view), isDescendantOfA(withId(toolbarR.id.mozac_browser_toolbar_origin_view)), - ) + ), ) .check(matches(withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE))) } fun verifyAboutBrowser() { assertTrue( - mDevice.findObject(UiSelector().resourceId("$packageName:id/about_content")).waitForExists(waitingTime) + mDevice.findObject(UiSelector().resourceId("$packageName:id/about_content")).waitForExists(waitingTime), ) assertTrue( - mDevice.findObject(UiSelector().resourceId("$packageName:id/version_info")).waitForExists(waitingTime) + mDevice.findObject(UiSelector().resourceId("$packageName:id/version_info")).waitForExists(waitingTime), ) } @@ -180,7 +180,7 @@ class BrowserRobot { fun waitUntilCopyLinkSnackbarIsGone() = mDevice .findObject( - UiSelector().resourceId("$packageName:id/snackbar_text").textContains("Link copied to clipboard") + UiSelector().resourceId("$packageName:id/snackbar_text").textContains("Link copied to clipboard"), ) .waitUntilGone(waitingTime) diff --git a/app/src/androidTest/java/org/mozilla/reference/browser/ui/robots/CustomTabRobot.kt b/app/src/androidTest/java/org/mozilla/reference/browser/ui/robots/CustomTabRobot.kt index 007bc8cfe..655385f6a 100644 --- a/app/src/androidTest/java/org/mozilla/reference/browser/ui/robots/CustomTabRobot.kt +++ b/app/src/androidTest/java/org/mozilla/reference/browser/ui/robots/CustomTabRobot.kt @@ -72,7 +72,7 @@ class CustomTabRobot { assertTrue( mDevice .findObject(UiSelector().resourceId("$packageName:id/mozac_browser_menu_recyclerView")) - .waitUntilGone(waitingTime) + .waitUntilGone(waitingTime), ) } catch (e: AssertionError) { println("Failed to click request desktop toggle") diff --git a/app/src/androidTest/java/org/mozilla/reference/browser/ui/robots/ExternalAppsRobot.kt b/app/src/androidTest/java/org/mozilla/reference/browser/ui/robots/ExternalAppsRobot.kt index 8530ac788..c44a8aeba 100644 --- a/app/src/androidTest/java/org/mozilla/reference/browser/ui/robots/ExternalAppsRobot.kt +++ b/app/src/androidTest/java/org/mozilla/reference/browser/ui/robots/ExternalAppsRobot.kt @@ -52,7 +52,7 @@ private fun assertYouTubeApp() { println("The native youtube app opens but needs to be updated") // In case the app isn't up to date on the emulator an update message will be displayed assertTrue( - mDevice.findObject(UiSelector().text("Update for a faster, better YouTube")).waitForExists(waitingTime) + mDevice.findObject(UiSelector().text("Update for a faster, better YouTube")).waitForExists(waitingTime), ) } } diff --git a/app/src/androidTest/java/org/mozilla/reference/browser/ui/robots/ReaderViewRobot.kt b/app/src/androidTest/java/org/mozilla/reference/browser/ui/robots/ReaderViewRobot.kt index f1354568c..6a6efb41b 100644 --- a/app/src/androidTest/java/org/mozilla/reference/browser/ui/robots/ReaderViewRobot.kt +++ b/app/src/androidTest/java/org/mozilla/reference/browser/ui/robots/ReaderViewRobot.kt @@ -115,7 +115,7 @@ private fun appearanceButton() = allOf( withId(R.id.readerViewAppearanceButton), hasSibling(withId(R.id.toolbar)), - ) + ), ) private fun appearanceMenu() = @@ -123,7 +123,7 @@ private fun appearanceMenu() = allOf( withId(R.id.readerViewAppearanceButton), hasSibling(withId(R.id.swipeRefresh)), - ) + ), ) private fun fontGroupButtons() = @@ -131,7 +131,7 @@ private fun fontGroupButtons() = allOf( withId(readerviewR.id.mozac_feature_readerview_font_group), withParent(withId(R.id.readerViewBar)), - ) + ), ) private fun sansSerifButton() = @@ -139,7 +139,7 @@ private fun sansSerifButton() = allOf( withId(readerviewR.id.mozac_feature_readerview_font_sans_serif), withParent(withId(readerviewR.id.mozac_feature_readerview_font_group)), - ) + ), ) private fun serifButton() = @@ -147,7 +147,7 @@ private fun serifButton() = allOf( withId(readerviewR.id.mozac_feature_readerview_font_serif), withParent(withId(readerviewR.id.mozac_feature_readerview_font_group)), - ) + ), ) private fun increaseFontSizeButton() = @@ -155,7 +155,7 @@ private fun increaseFontSizeButton() = allOf( withText("+"), withParent(withId(R.id.readerViewBar)), - ) + ), ) private fun decreaseFontSizeButton() = @@ -163,7 +163,7 @@ private fun decreaseFontSizeButton() = allOf( withText("−"), withParent(withId(R.id.readerViewBar)), - ) + ), ) private fun colorSchemeGroupButtons() = @@ -171,7 +171,7 @@ private fun colorSchemeGroupButtons() = allOf( withId(readerviewR.id.mozac_feature_readerview_color_scheme_group), withParent(withId(R.id.readerViewBar)), - ) + ), ) private fun lightColorButton() = @@ -179,7 +179,7 @@ private fun lightColorButton() = allOf( withText("Light"), withParent(withId(readerviewR.id.mozac_feature_readerview_color_scheme_group)), - ) + ), ) private fun sepiaColorButton() = @@ -187,7 +187,7 @@ private fun sepiaColorButton() = allOf( withText("Sepia"), withParent(withId(readerviewR.id.mozac_feature_readerview_color_scheme_group)), - ) + ), ) private fun darkColorButton() = @@ -195,7 +195,7 @@ private fun darkColorButton() = allOf( withText("Dark"), withParent(withId(readerviewR.id.mozac_feature_readerview_color_scheme_group)), - ) + ), ) private fun assertAppearanceButtonExists() { diff --git a/app/src/androidTest/java/org/mozilla/reference/browser/ui/robots/SettingsViewRobot.kt b/app/src/androidTest/java/org/mozilla/reference/browser/ui/robots/SettingsViewRobot.kt index 4cac32379..6c6bafe8a 100644 --- a/app/src/androidTest/java/org/mozilla/reference/browser/ui/robots/SettingsViewRobot.kt +++ b/app/src/androidTest/java/org/mozilla/reference/browser/ui/robots/SettingsViewRobot.kt @@ -92,7 +92,7 @@ class SettingsViewRobot { class Transition { fun openSettingsViewPrivacy( - interact: SettingsViewPrivacyRobot.() -> Unit + interact: SettingsViewPrivacyRobot.() -> Unit, ): SettingsViewPrivacyRobot.Transition { privacyButton().click() SettingsViewPrivacyRobot().interact() @@ -150,9 +150,9 @@ private fun assertSettingsView() { .findObject( UiSelector() .resourceId("$packageName:id/action_bar") - .childSelector(UiSelector().textContains(getStringResource(R.string.settings))) + .childSelector(UiSelector().textContains(getStringResource(R.string.settings))), ) - .waitForExists(waitingTime) + .waitForExists(waitingTime), ) } @@ -173,7 +173,7 @@ private fun openLinksInAppsToggle() = allOf( withId(androidx.preference.R.id.switchWidget), hasCousin(withText(R.string.open_links_in_apps)), - ) + ), ) private fun makeDefaultBrowserButton() = Espresso.onView(withText(R.string.preferences_make_default_browser)) @@ -191,7 +191,7 @@ private fun remoteDebuggingToggle() = allOf( withId(androidx.preference.R.id.switchWidget), hasCousin(withText(R.string.preferences_remote_debugging)), - ) + ), ) private fun customAddonCollectionButton() = onView(withText("Custom Add-on collection")) @@ -261,7 +261,7 @@ private fun assertCustomAddonCollectionPanel() { withId(androidx.appcompat.R.id.alertTitle), withId(android.R.id.title), ), - ) + ), ) .inRoot(isDialog()) .check(matches(isCompletelyDisplayed())) diff --git a/app/src/androidTest/java/org/mozilla/reference/browser/ui/robots/SyncedTabsRobot.kt b/app/src/androidTest/java/org/mozilla/reference/browser/ui/robots/SyncedTabsRobot.kt index 40fbe7fbb..dabe7cbf9 100644 --- a/app/src/androidTest/java/org/mozilla/reference/browser/ui/robots/SyncedTabsRobot.kt +++ b/app/src/androidTest/java/org/mozilla/reference/browser/ui/robots/SyncedTabsRobot.kt @@ -28,9 +28,9 @@ class SyncedTabsRobot { .findObject( UiSelector() .resourceId("$packageName:id/synced_tabs_status") - .textContains(getStringResource(R.string.synced_tabs_connect_to_sync_account)) + .textContains(getStringResource(R.string.synced_tabs_connect_to_sync_account)), ) - .waitForExists(waitingTime) + .waitForExists(waitingTime), ) } } diff --git a/app/src/androidTest/java/org/mozilla/reference/browser/ui/robots/ThreeDotMenuRobot.kt b/app/src/androidTest/java/org/mozilla/reference/browser/ui/robots/ThreeDotMenuRobot.kt index ec279852e..52fcd2042 100644 --- a/app/src/androidTest/java/org/mozilla/reference/browser/ui/robots/ThreeDotMenuRobot.kt +++ b/app/src/androidTest/java/org/mozilla/reference/browser/ui/robots/ThreeDotMenuRobot.kt @@ -96,7 +96,7 @@ class ThreeDotMenuRobot { } fun switchRequestDesktopSiteToggle( - interact: NavigationToolbarRobot.() -> Unit + interact: NavigationToolbarRobot.() -> Unit, ): NavigationToolbarRobot.Transition { try { mDevice.findObject(UiSelector().textContains("Request desktop site")).waitForExists(waitingTime) @@ -105,7 +105,7 @@ class ThreeDotMenuRobot { assertTrue( mDevice .findObject(UiSelector().resourceId("$packageName:id/mozac_browser_menu_recyclerView")) - .waitUntilGone(waitingTime) + .waitUntilGone(waitingTime), ) } catch (e: AssertionFailedError) { println("Failed to click request desktop toggle") @@ -119,7 +119,7 @@ class ThreeDotMenuRobot { assertTrue( mDevice .findObject(UiSelector().resourceId("$packageName:id/mozac_browser_menu_recyclerView")) - .waitUntilGone(waitingTime) + .waitUntilGone(waitingTime), ) } NavigationToolbarRobot().interact() diff --git a/app/src/main/java/org/mozilla/reference/browser/BrowserActivity.kt b/app/src/main/java/org/mozilla/reference/browser/BrowserActivity.kt index 322b6556b..061a3b05f 100644 --- a/app/src/main/java/org/mozilla/reference/browser/BrowserActivity.kt +++ b/app/src/main/java/org/mozilla/reference/browser/BrowserActivity.kt @@ -88,7 +88,7 @@ open class BrowserActivity : AppCompatActivity() { override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { Logger.info( "Activity onActivityResult received with " + - "requestCode: $requestCode, resultCode: $resultCode, data: $data" + "requestCode: $requestCode, resultCode: $resultCode, data: $data", ) supportFragmentManager.fragments.forEach { diff --git a/app/src/main/java/org/mozilla/reference/browser/BrowserApplication.kt b/app/src/main/java/org/mozilla/reference/browser/BrowserApplication.kt index 9af27bf79..3ee9f3c0e 100644 --- a/app/src/main/java/org/mozilla/reference/browser/BrowserApplication.kt +++ b/app/src/main/java/org/mozilla/reference/browser/BrowserApplication.kt @@ -42,7 +42,7 @@ open class BrowserApplication : Application() { Dispatchers.Main + CoroutineExceptionHandler { _, throwable -> Logger.error("ApplicationScope: Unhandled error: ${throwable.message}", throwable) - } + }, ) val components by lazy { Components(this, applicationScope) } diff --git a/app/src/main/java/org/mozilla/reference/browser/NotificationManager.kt b/app/src/main/java/org/mozilla/reference/browser/NotificationManager.kt index 3f36959e6..4f0eecc14 100644 --- a/app/src/main/java/org/mozilla/reference/browser/NotificationManager.kt +++ b/app/src/main/java/org/mozilla/reference/browser/NotificationManager.kt @@ -232,7 +232,7 @@ object NotificationManager { context.getString( R.string.fxa_tab_received_from_notification_name, it.displayName, - ) + ), ) return this } diff --git a/app/src/main/java/org/mozilla/reference/browser/addons/AddonSettingsActivity.kt b/app/src/main/java/org/mozilla/reference/browser/addons/AddonSettingsActivity.kt index eb9c27d7c..82aa19e76 100644 --- a/app/src/main/java/org/mozilla/reference/browser/addons/AddonSettingsActivity.kt +++ b/app/src/main/java/org/mozilla/reference/browser/addons/AddonSettingsActivity.kt @@ -77,7 +77,7 @@ class AddonSettingsActivity : AppCompatActivity() { Addon::class.java, ) ?.installedState - ?.optionsPageUrl + ?.optionsPageUrl, ) engineSession = requireContext().components.core.engine.createSession() diff --git a/app/src/main/java/org/mozilla/reference/browser/browser/BaseBrowserFragment.kt b/app/src/main/java/org/mozilla/reference/browser/browser/BaseBrowserFragment.kt index 2ce9fe7d4..2de01f823 100644 --- a/app/src/main/java/org/mozilla/reference/browser/browser/BaseBrowserFragment.kt +++ b/app/src/main/java/org/mozilla/reference/browser/browser/BaseBrowserFragment.kt @@ -494,7 +494,7 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Activit ): Boolean { Logger.info( "Fragment onActivityResult received with " + - "requestCode: $requestCode, resultCode: $resultCode, data: $data" + "requestCode: $requestCode, resultCode: $resultCode, data: $data", ) return activityResultHandler.any { it.onActivityResult(requestCode, data, resultCode) } diff --git a/app/src/main/java/org/mozilla/reference/browser/browser/BrowserFragment.kt b/app/src/main/java/org/mozilla/reference/browser/browser/BrowserFragment.kt index 5c2184cc3..8b761acf5 100644 --- a/app/src/main/java/org/mozilla/reference/browser/browser/BrowserFragment.kt +++ b/app/src/main/java/org/mozilla/reference/browser/browser/BrowserFragment.kt @@ -144,7 +144,7 @@ class BrowserFragment : BaseBrowserFragment(), UserInteractionHandler { requireComponents.backgroundServices.syncedTabsStorage, requireComponents.useCases.tabsUseCases.addTab, requireComponents.core.icons, - ) + ), ) awesomeBar.setOnRemoveSuggestionButtonClicked { awesomeBar.addHiddenSuggestion(it) diff --git a/app/src/main/java/org/mozilla/reference/browser/components/BackgroundServices.kt b/app/src/main/java/org/mozilla/reference/browser/components/BackgroundServices.kt index 88ec088cb..a8dc629e3 100644 --- a/app/src/main/java/org/mozilla/reference/browser/components/BackgroundServices.kt +++ b/app/src/main/java/org/mozilla/reference/browser/components/BackgroundServices.kt @@ -121,7 +121,7 @@ class BackgroundServices( // If the queue is empty when the worker runs, that's OK; the worker // won't do anything, and won't run again until the next call to `onAdded`. override fun onRemoved() = Unit - } + }, ) } } diff --git a/app/src/main/java/org/mozilla/reference/browser/components/Core.kt b/app/src/main/java/org/mozilla/reference/browser/components/Core.kt index 91be146ec..e0dd29ecc 100644 --- a/app/src/main/java/org/mozilla/reference/browser/components/Core.kt +++ b/app/src/main/java/org/mozilla/reference/browser/components/Core.kt @@ -120,7 +120,7 @@ class Core( ), SearchMiddleware(context), RecordingDevicesMiddleware(context, context.components.notificationsDelegate), - ) + EngineMiddleware.create(engine) + ) + EngineMiddleware.create(engine), ) .apply { icons.install(engine, this) diff --git a/app/src/main/java/org/mozilla/reference/browser/settings/PrivacySettingsFragment.kt b/app/src/main/java/org/mozilla/reference/browser/settings/PrivacySettingsFragment.kt index e88b5e6ca..95b7663da 100644 --- a/app/src/main/java/org/mozilla/reference/browser/settings/PrivacySettingsFragment.kt +++ b/app/src/main/java/org/mozilla/reference/browser/settings/PrivacySettingsFragment.kt @@ -44,7 +44,7 @@ class PrivacySettingsFragment : PreferenceFragmentCompat() { } private fun getChangeListenerForTrackingProtection( - createTrackingProtectionPolicy: (Boolean) -> TrackingProtectionPolicy + createTrackingProtectionPolicy: (Boolean) -> TrackingProtectionPolicy, ): OnPreferenceChangeListener = OnPreferenceChangeListener { _, value -> val policy = createTrackingProtectionPolicy(value as Boolean) requireComponents.useCases.settingsUseCases.updateTrackingProtection.invoke(policy) diff --git a/app/src/main/java/org/mozilla/reference/browser/tabs/TabsTouchHelper.kt b/app/src/main/java/org/mozilla/reference/browser/tabs/TabsTouchHelper.kt index 34e901c27..b1b19d77e 100644 --- a/app/src/main/java/org/mozilla/reference/browser/tabs/TabsTouchHelper.kt +++ b/app/src/main/java/org/mozilla/reference/browser/tabs/TabsTouchHelper.kt @@ -17,5 +17,5 @@ class TabsTouchHelper(observable: (TabSessionState) -> Unit) : dX: Float, distanceToAlphaMin: Int, ): Float = 1f - 2f * abs(dX) / distanceToAlphaMin - } + }, )