commit 3563d70aaf22c5ed15917da4302414bbc41de734 parent 2117132a29040d8429cdcad22bd6b9ad0a6b77f9 Author: Ryan VanderMeulen <rvandermeulen@mozilla.com> Date: Sat, 6 Dec 2025 16:45:08 +0000 Bug 2003775 - Fix argument-list-wrapping errors. r=android-reviewers,mcarare Differential Revision: https://phabricator.services.mozilla.com/D274970 Diffstat:
34 files changed, 262 insertions(+), 77 deletions(-)
diff --git a/mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/preferences/GeckoPreferencesUtils.kt b/mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/preferences/GeckoPreferencesUtils.kt @@ -55,21 +55,24 @@ object GeckoPreferencesUtils { is String -> { SetGeckoPreference.setStringPref( this.pref, - this.value as String, this.branch.intoGeckoBranch(), + this.value as String, + this.branch.intoGeckoBranch(), ) } is Int -> { SetGeckoPreference.setIntPref( this.pref, - this.value as Int, this.branch.intoGeckoBranch(), + this.value as Int, + this.branch.intoGeckoBranch(), ) } is Boolean -> { SetGeckoPreference.setBoolPref( this.pref, - this.value as Boolean, this.branch.intoGeckoBranch(), + this.value as Boolean, + this.branch.intoGeckoBranch(), ) } else -> { diff --git a/mobile/android/android-components/components/browser/state/src/test/java/mozilla/components/browser/state/action/SearchActionTest.kt b/mobile/android/android-components/components/browser/state/src/test/java/mozilla/components/browser/state/action/SearchActionTest.kt @@ -147,7 +147,8 @@ class SearchActionTest { // Add a custom search engine state = BrowserStateReducer.reduce( - state, SearchAction.UpdateCustomSearchEngineAction(customSearchEngine), + state, + SearchAction.UpdateCustomSearchEngineAction(customSearchEngine), ) state.search.customSearchEngines.let { searchEngines -> @@ -165,7 +166,8 @@ class SearchActionTest { // Add another search engine state = BrowserStateReducer.reduce( - state, SearchAction.UpdateCustomSearchEngineAction(customSearchEngine2), + state, + SearchAction.UpdateCustomSearchEngineAction(customSearchEngine2), ) state.search.customSearchEngines.let { searchEngines -> @@ -180,7 +182,8 @@ class SearchActionTest { name = "My awesome search engine", ) state = BrowserStateReducer.reduce( - state, SearchAction.UpdateCustomSearchEngineAction(updated), + state, + SearchAction.UpdateCustomSearchEngineAction(updated), ) state.search.customSearchEngines.let { searchEngines -> @@ -210,13 +213,15 @@ class SearchActionTest { assertEquals(1, state.search.customSearchEngines.size) state = BrowserStateReducer.reduce( - state, SearchAction.RemoveCustomSearchEngineAction("unrecognized_id"), + state, + SearchAction.RemoveCustomSearchEngineAction("unrecognized_id"), ) assertEquals(1, state.search.customSearchEngines.size) state = BrowserStateReducer.reduce( - state, SearchAction.RemoveCustomSearchEngineAction(customSearchEngine.id), + state, + SearchAction.RemoveCustomSearchEngineAction(customSearchEngine.id), ) assertTrue(state.search.customSearchEngines.isEmpty()) @@ -240,14 +245,16 @@ class SearchActionTest { assertNull(state.search.userSelectedSearchEngineId) state = BrowserStateReducer.reduce( - state, SearchAction.SelectSearchEngineAction(searchEngine.id, null), + state, + SearchAction.SelectSearchEngineAction(searchEngine.id, null), ) assertEquals(searchEngine.id, state.search.userSelectedSearchEngineId) assertEquals(searchEngine.id, state.search.userSelectedSearchEngineId) state = BrowserStateReducer.reduce( - state, SearchAction.SelectSearchEngineAction("unrecognized_id", null), + state, + SearchAction.SelectSearchEngineAction("unrecognized_id", null), ) // We allow setting an ID of a search engine that is not in the state since loading happens @@ -261,7 +268,8 @@ class SearchActionTest { assertNull(state.search.region) state = BrowserStateReducer.reduce( - state, SearchAction.SetRegionAction(RegionState("DE", "FR")), + state, + SearchAction.SetRegionAction(RegionState("DE", "FR")), ) assertNotNull(state.search.region) diff --git a/mobile/android/android-components/components/browser/storage-sync/src/main/java/mozilla/components/browser/storage/sync/PlacesHistoryStorage.kt b/mobile/android/android-components/components/browser/storage-sync/src/main/java/mozilla/components/browser/storage/sync/PlacesHistoryStorage.kt @@ -397,8 +397,19 @@ open class PlacesHistoryStorage( } val schemasToIgnore = listOf( - "", "about", "imap", "news", "mailbox", "moz-anno", "moz-extension", - "view-source", "chrome", "resource", "data", "javascript", "blob", + "", + "about", + "imap", + "news", + "mailbox", + "moz-anno", + "moz-extension", + "view-source", + "chrome", + "resource", + "data", + "javascript", + "blob", ) return !schemasToIgnore.contains(scheme) diff --git a/mobile/android/android-components/components/browser/storage-sync/src/test/java/mozilla/components/browser/storage/sync/PlacesHistoryStorageTest.kt b/mobile/android/android-components/components/browser/storage-sync/src/test/java/mozilla/components/browser/storage/sync/PlacesHistoryStorageTest.kt @@ -110,9 +110,15 @@ class PlacesHistoryStorageTest { // Can use WebView-style getVisited API. assertEquals( listOf( - "http://www.firefox.com/1", "http://www.firefox.com/2", "http://www.firefox.com/3", - "http://www.firefox.com/4", "http://www.firefox.com/5", "http://www.firefox.com/6", - "http://www.firefox.com/7", "http://www.firefox.com/8", "http://www.firefox.com/9", + "http://www.firefox.com/1", + "http://www.firefox.com/2", + "http://www.firefox.com/3", + "http://www.firefox.com/4", + "http://www.firefox.com/5", + "http://www.firefox.com/6", + "http://www.firefox.com/7", + "http://www.firefox.com/8", + "http://www.firefox.com/9", ), history.getVisited(), ) @@ -123,10 +129,16 @@ class PlacesHistoryStorageTest { history.getVisited( listOf( "http://www.mozilla.com", - "http://www.firefox.com/1", "http://www.firefox.com/2", "http://www.firefox.com/3", - "http://www.firefox.com/4", "http://www.firefox.com/5", "http://www.firefox.com/6", + "http://www.firefox.com/1", + "http://www.firefox.com/2", + "http://www.firefox.com/3", + "http://www.firefox.com/4", + "http://www.firefox.com/5", + "http://www.firefox.com/6", "http://www.firefox.com/oops", - "http://www.firefox.com/7", "http://www.firefox.com/8", "http://www.firefox.com/9", + "http://www.firefox.com/7", + "http://www.firefox.com/8", + "http://www.firefox.com/9", ), ), ) diff --git a/mobile/android/android-components/components/compose/browser-toolbar/src/main/java/mozilla/components/compose/browser/toolbar/ui/HighlightedDomainUrl.kt b/mobile/android/android-components/components/compose/browser-toolbar/src/main/java/mozilla/components/compose/browser/toolbar/ui/HighlightedDomainUrl.kt @@ -121,7 +121,10 @@ fun HighlightedDomainUrl( maxLines = 1, modifier = modifier .focusTextIndexRange( - annotatedUrl.text, fadedTextStyle, registrableDomainIndexRange, fadeLength, + annotatedUrl.text, + fadedTextStyle, + registrableDomainIndexRange, + fadeLength, ), ) } diff --git a/mobile/android/android-components/components/feature/app-links/src/main/java/mozilla/components/feature/app/links/AppLinksFeature.kt b/mobile/android/android-components/components/feature/app-links/src/main/java/mozilla/components/feature/app/links/AppLinksFeature.kt @@ -31,8 +31,13 @@ import mozilla.components.support.ktx.android.content.appName internal const val MAX_SUCCESSIVE_DIALOG_MILLIS_LIMIT: Int = 500 // 0.5 seconds internal val WALLET_SCHEMES: Array<String> = arrayOf( - "openid4vp", "mdoc", "mdoc-openid4vp", "haip", - "eudi-wallet", "eudi-openid4vp", "openid-credential-offer", + "openid4vp", + "mdoc", + "mdoc-openid4vp", + "haip", + "eudi-wallet", + "eudi-openid4vp", + "openid-credential-offer", ) /** diff --git a/mobile/android/android-components/components/feature/app-links/src/main/java/mozilla/components/feature/app/links/AppLinksUseCases.kt b/mobile/android/android-components/components/feature/app-links/src/main/java/mozilla/components/feature/app/links/AppLinksUseCases.kt @@ -333,8 +333,19 @@ class AppLinksUseCases( // list of scheme from https://searchfox.org/mozilla-central/source/netwerk/build/components.conf internal val ENGINE_SUPPORTED_SCHEMES: Set<String> = setOf( - "about", "data", "file", "ftp", "http", - "https", "moz-extension", "moz-safe-about", "resource", "view-source", "ws", "wss", "blob", + "about", + "data", + "file", + "ftp", + "http", + "https", + "moz-extension", + "moz-safe-about", + "resource", + "view-source", + "ws", + "wss", + "blob", ) internal val ALWAYS_DENY_SCHEMES: Set<String> = diff --git a/mobile/android/android-components/components/feature/awesomebar/src/test/java/mozilla/components/feature/awesomebar/provider/SessionSuggestionProviderTest.kt b/mobile/android/android-components/components/feature/awesomebar/src/test/java/mozilla/components/feature/awesomebar/provider/SessionSuggestionProviderTest.kt @@ -249,7 +249,9 @@ class SessionSuggestionProviderTest { val useCase: TabsUseCases.SelectTabUseCase = mock() val provider = SessionSuggestionProvider( - store, useCase, excludeSelectedSession = true, + store, + useCase, + excludeSelectedSession = true, switchToTabDescription = "Switch to tab", ) val suggestions = provider.onInputChanged("org") diff --git a/mobile/android/android-components/components/feature/downloads/src/test/java/mozilla/components/feature/downloads/AbstractFetchDownloadServiceTest.kt b/mobile/android/android-components/components/feature/downloads/src/test/java/mozilla/components/feature/downloads/AbstractFetchDownloadServiceTest.kt @@ -1788,8 +1788,15 @@ class AbstractFetchDownloadServiceTest { doAnswer { throw IllegalArgumentException() }.`when`(downloadManager) .addCompletedDownload( - anyString(), anyString(), anyBoolean(), anyString(), - anyString(), anyLong(), anyBoolean(), isNull(), any(), + anyString(), + anyString(), + anyBoolean(), + anyString(), + anyString(), + anyLong(), + anyBoolean(), + isNull(), + any(), ) try { @@ -1852,8 +1859,15 @@ class AbstractFetchDownloadServiceTest { testsDispatcher.scheduler.advanceUntilIdle() verify(downloadManager).addCompletedDownload( - anyString(), anyString(), anyBoolean(), eq(defaultMimeType), - anyString(), anyLong(), anyBoolean(), isNull(), any(), + anyString(), + anyString(), + anyBoolean(), + eq(defaultMimeType), + anyString(), + anyLong(), + anyBoolean(), + isNull(), + any(), ) downloadManager = mock() @@ -1862,8 +1876,15 @@ class AbstractFetchDownloadServiceTest { testsDispatcher.scheduler.advanceUntilIdle() verify(downloadManager).addCompletedDownload( - anyString(), anyString(), anyBoolean(), eq(defaultMimeType), - anyString(), anyLong(), anyBoolean(), isNull(), any(), + anyString(), + anyString(), + anyBoolean(), + eq(defaultMimeType), + anyString(), + anyLong(), + anyBoolean(), + isNull(), + any(), ) } @@ -1885,16 +1906,30 @@ class AbstractFetchDownloadServiceTest { service.addToDownloadSystemDatabaseCompat(downloadWithNullMimeType, this) verify(downloadManager, never()).addCompletedDownload( - anyString(), anyString(), anyBoolean(), eq(defaultMimeType), - anyString(), anyLong(), anyBoolean(), isNull(), any(), + anyString(), + anyString(), + anyBoolean(), + eq(defaultMimeType), + anyString(), + anyLong(), + anyBoolean(), + isNull(), + any(), ) downloadManager = mock() doReturn(downloadManager).`when`(spyContext).getSystemService<DownloadManager>() service.addToDownloadSystemDatabaseCompat(downloadWithEmptyMimeType, this) verify(downloadManager, never()).addCompletedDownload( - anyString(), anyString(), anyBoolean(), eq(defaultMimeType), - anyString(), anyLong(), anyBoolean(), isNull(), any(), + anyString(), + anyString(), + anyBoolean(), + eq(defaultMimeType), + anyString(), + anyLong(), + anyBoolean(), + isNull(), + any(), ) } diff --git a/mobile/android/android-components/components/feature/webnotifications/src/test/java/mozilla/components/feature/webnotifications/NativeNotificationBridgeTest.kt b/mobile/android/android-components/components/feature/webnotifications/src/test/java/mozilla/components/feature/webnotifications/NativeNotificationBridgeTest.kt @@ -40,8 +40,17 @@ private const val TEST_CHANNEL = "testChannel" @RunWith(AndroidJUnit4::class) class NativeNotificationBridgeTest { private val blankNotification = WebNotification( - TEST_TITLE, TEST_TAG, TEST_TEXT, TEST_URL, null, null, - null, true, mock(), 0, privateBrowsing = false, + TEST_TITLE, + TEST_TAG, + TEST_TEXT, + TEST_URL, + null, + null, + null, + true, + mock(), + 0, + privateBrowsing = false, ) private lateinit var icons: BrowserIcons diff --git a/mobile/android/android-components/components/lib/crash/src/main/java/mozilla/components/lib/crash/service/MozillaSocorroService.kt b/mobile/android/android-components/components/lib/crash/src/main/java/mozilla/components/lib/crash/service/MozillaSocorroService.kt @@ -191,8 +191,16 @@ class MozillaSocorroService( conn.setRequestProperty("Content-Encoding", "gzip") sendCrashData( - conn.outputStream, boundary, crash.timestamp, throwable, miniDumpFilePath, extrasFilePath, - isNativeCodeCrash, isFatalCrash, breadcrumbsJson.toString(), crashVersionName, + conn.outputStream, + boundary, + crash.timestamp, + throwable, + miniDumpFilePath, + extrasFilePath, + isNativeCodeCrash, + isFatalCrash, + breadcrumbsJson.toString(), + crashVersionName, ) BufferedReader(InputStreamReader(conn.inputStream)).use { reader -> diff --git a/mobile/android/android-components/components/service/firefox-relay/src/main/java/mozilla/components/service/fxrelay/FxRelay.kt b/mobile/android/android-components/components/service/firefox-relay/src/main/java/mozilla/components/service/fxrelay/FxRelay.kt @@ -108,7 +108,8 @@ class FxRelay( */ suspend fun fetchAllAddresses(): List<RelayAddress> = withContext(Dispatchers.IO) { handleRelayExceptions( - RelayOperation.FETCH_ALL_ADDRESSES, { emptyList() }, + RelayOperation.FETCH_ALL_ADDRESSES, + { emptyList() }, ) { client.fetchAddresses().map { it.into() } } diff --git a/mobile/android/android-components/components/support/ktx/src/main/java/mozilla/components/support/ktx/android/view/Window.kt b/mobile/android/android-components/components/support/ktx/src/main/java/mozilla/components/support/ktx/android/view/Window.kt @@ -176,12 +176,20 @@ fun Window.setSystemBarsBackground( ViewCompat.getRootWindowInsets(decorView)?.let { decorView.setWindowInsetsBackgroundColors( - it, statusBarColor, navigationBarColor, navigationBarDividerColor, horizontalInsetsColor, + it, + statusBarColor, + navigationBarColor, + navigationBarDividerColor, + horizontalInsetsColor, ) } ViewCompat.setOnApplyWindowInsetsListener(decorView) { _, windowInsets -> decorView.setWindowInsetsBackgroundColors( - windowInsets, statusBarColor, navigationBarColor, navigationBarDividerColor, horizontalInsetsColor, + windowInsets, + statusBarColor, + navigationBarColor, + navigationBarDividerColor, + horizontalInsetsColor, ) windowInsets // return the insets to allow other listeners to use them as well } @@ -227,7 +235,11 @@ private fun View.setWindowInsetsBackgroundColors( horizontalInsetsColor.toPaint()?.let { canvas.drawRect(0f, 0f, insets.left().toFloat(), screenHeight.toFloat(), it) canvas.drawRect( - screenWidth - insets.right().toFloat(), 0f, screenWidth.toFloat(), screenHeight.toFloat(), it, + screenWidth - insets.right().toFloat(), + 0f, + screenWidth.toFloat(), + screenHeight.toFloat(), + it, ) } diff --git a/mobile/android/android-components/components/support/utils/src/test/java/mozilla/components/support/utils/DomainMatcherTest.kt b/mobile/android/android-components/components/support/utils/src/test/java/mozilla/components/support/utils/DomainMatcherTest.kt @@ -18,13 +18,18 @@ class DomainMatcherTest { assertNull(segmentAwareDomainMatch("moz", listOf())) val urls = listOf( - "http://www.mozilla.org", "http://Firefox.com", - "https://mobile.twitter.com", "https://m.youtube.com", + "http://www.mozilla.org", + "http://Firefox.com", + "https://mobile.twitter.com", + "https://m.youtube.com", "https://en.Wikipedia.org/Wiki/Mozilla", "https://www.github.com/mozilla-mobile/fenix", - "http://192.168.254.254:8000", "http://192.168.254.254:8000/admin", + "http://192.168.254.254:8000", + "http://192.168.254.254:8000/admin", "http://иННая.локаль", // TODO add more test data for non-english locales - "about:config", "about:crashes", "http://localhost:8080/index.html", + "about:config", + "about:crashes", + "http://localhost:8080/index.html", "https://www.reddit.com/r/vancouver/comments/quu9lt/hwy_1_just_north_of_lytton_is_gone/", ) // Full url matching. diff --git a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/NavigationToolbarTestCompose.kt b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/NavigationToolbarTestCompose.kt @@ -925,7 +925,10 @@ class NavigationToolbarTestCompose : TestSetup() { composeTestRule = composeTestRule, *generalEnginesList.toTypedArray(), *topicEnginesList.toTypedArray(), - "Bookmarks", "Tabs", "History", "Search settings", + "Bookmarks", + "Tabs", + "History", + "Search settings", ) } } diff --git a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/SearchTest.kt b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/SearchTest.kt @@ -135,7 +135,10 @@ class SearchTest : TestSetup() { verifySearchShortcutListContains( *generalEnginesList.toTypedArray(), *topicEnginesList.toTypedArray(), - "Bookmarks", "Tabs", "History", "Search settings", + "Bookmarks", + "Tabs", + "History", + "Search settings", ) } } diff --git a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BookmarksRobot.kt b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BookmarksRobot.kt @@ -74,7 +74,8 @@ class BookmarksRobot(private val composeTestRule: ComposeTestRule) { fun verifyBookmarkTitle(title: String) { Log.i(TAG, "verifyBookmarkTitle: Waiting for $waitingTime for bookmark with title: $title to exist.") composeTestRule.waitUntilExactlyOneExists( - hasText(title), waitingTime, + hasText(title), + waitingTime, ) Log.i(TAG, "verifyBookmarkTitle: Waited for $waitingTime for bookmark with title: $title to exist.") Log.i(TAG, "verifyBookmarkTitle: Waited for bookmarks header to exist.") diff --git a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BrowserRobot.kt b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BrowserRobot.kt @@ -1238,7 +1238,8 @@ class BrowserRobot { Log.i(TAG, "verifyWebCompatReporterViewItems: Verified that the \"Describe the problem (optional)\" field is displayed") if (appContext.components.core.engine.version.releaseChannel !== EngineReleaseChannel.RELEASE) { Log.i( - TAG, "Release channel is ${appContext.components.core.engine.version.releaseChannel}", + TAG, + "Release channel is ${appContext.components.core.engine.version.releaseChannel}", ) Log.i( TAG, diff --git a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAddonsManagerRobot.kt b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAddonsManagerRobot.kt @@ -301,7 +301,8 @@ class SettingsSubMenuAddonsManagerRobot { verifyTheRecommendedAddons(composeTestRule) Log.i(TAG, "verifyRecommendedAddonsViewFromRedesignedMainMenu: Trying to verify that that the \"Discover more extensions\" button is displayed") composeTestRule.onNode( - hasText(getStringResource(R.string.browser_menu_discover_more_extensions)), useUnmergedTree = true, + hasText(getStringResource(R.string.browser_menu_discover_more_extensions)), + useUnmergedTree = true, ).assertIsDisplayed() Log.i(TAG, "verifyRecommendedAddonsViewFromRedesignedMainMenu: Verified that that the \"Discover more extensions\" button is displayed") } diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/menu/compose/LibraryMenuItem.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/menu/compose/LibraryMenuItem.kt @@ -140,13 +140,17 @@ private fun LibraryMenuItemPreview( val outerRounding = 28.dp val leftShape = RoundedCornerShape( - topStart = outerRounding, topEnd = innerRounding, - bottomStart = outerRounding, bottomEnd = innerRounding, + topStart = outerRounding, + topEnd = innerRounding, + bottomStart = outerRounding, + bottomEnd = innerRounding, ) val middleShape = RoundedCornerShape(innerRounding) val rightShape = RoundedCornerShape( topStart = innerRounding, - topEnd = outerRounding, bottomStart = innerRounding, bottomEnd = outerRounding, + topEnd = outerRounding, + bottomStart = innerRounding, + bottomEnd = outerRounding, ) FirefoxTheme { diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/menu/compose/MainMenu.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/menu/compose/MainMenu.kt @@ -488,6 +488,7 @@ private fun MoreMenuButtonGroup( } @Composable +@Suppress("LongMethod") private fun LibraryMenuGroup( isDownloadHighlighted: Boolean = false, onBookmarksMenuClick: () -> Unit, @@ -500,13 +501,17 @@ private fun LibraryMenuGroup( val outerRounding = 28.dp val leftShape = RoundedCornerShape( - topStart = outerRounding, topEnd = innerRounding, - bottomStart = outerRounding, bottomEnd = innerRounding, + topStart = outerRounding, + topEnd = innerRounding, + bottomStart = outerRounding, + bottomEnd = innerRounding, ) val middleShape = RoundedCornerShape(innerRounding) val rightShape = RoundedCornerShape( topStart = innerRounding, - topEnd = outerRounding, bottomStart = innerRounding, bottomEnd = outerRounding, + topEnd = outerRounding, + bottomStart = innerRounding, + bottomEnd = outerRounding, ) Row( diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/CustomTabBrowserToolbarMiddleware.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/CustomTabBrowserToolbarMiddleware.kt @@ -396,7 +396,8 @@ class CustomTabBrowserToolbarMiddleware( ActionButton( drawable = when (customIconBitmap) { null -> AppCompatResources.getDrawable( - uiContext, iconsR.drawable.mozac_ic_cross_24, + uiContext, + iconsR.drawable.mozac_ic_cross_24, ) else -> customIconBitmap.toDrawable(uiContext.resources) diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/perf/ProfilerUtils.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/perf/ProfilerUtils.kt @@ -93,8 +93,15 @@ private val networking_features = arrayOf( ) private val networking_threads = arrayOf( - "Compositor", "DNS Resolver", "DOM Worker", "GeckoMain", - "Renderer", "Socket Thread", "StreamTrans", "SwComposite", "TRR Background", + "Compositor", + "DNS Resolver", + "DOM Worker", + "GeckoMain", + "Renderer", + "Socket Thread", + "StreamTrans", + "SwComposite", + "TRR Background", ) private val debug_features = arrayOf( diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/search/BrowserToolbarSearchMiddleware.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/search/BrowserToolbarSearchMiddleware.kt @@ -368,7 +368,9 @@ class BrowserToolbarSearchMiddleware( searchEngineShortcuts: List<SearchEngine>, ) { val searchSelector = buildSearchSelector( - selectedSearchEngine, searchEngineShortcuts, uiContext.resources, + selectedSearchEngine, + searchEngineShortcuts, + uiContext.resources, ) context.dispatch( SearchActionsStartUpdated( diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/logins/ui/BiometricAuthenticationUtils.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/logins/ui/BiometricAuthenticationUtils.kt @@ -94,7 +94,8 @@ object DefaultBiometricUtils : BiometricAuthenticationUtils { val executor = ContextCompat.getMainExecutor(activity) val biometricPrompt = BiometricPrompt( - activity, executor, + activity, + executor, object : BiometricPrompt.AuthenticationCallback() { override fun onAuthenticationError(errorCode: Int, errString: CharSequence) { super.onAuthenticationError(errorCode, errString) diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/settingssearch/DefaultFenixSettingsIndexer.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/settingssearch/DefaultFenixSettingsIndexer.kt @@ -261,7 +261,9 @@ class DefaultFenixSettingsIndexer(private val context: Context) : SettingsIndexe private fun getStringResource(resourceName: String): String { return try { val resourceId = context.resources.getIdentifier( - resourceName, "string", context.packageName, + resourceName, + "string", + context.packageName, ) if (resourceId == 0) { return "" diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/trustpanel/ui/ProtectionPanel.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/trustpanel/ui/ProtectionPanel.kt @@ -67,7 +67,10 @@ import org.mozilla.fenix.theme.FirefoxTheme import mozilla.components.ui.icons.R as iconsR private val BANNER_ROUNDED_CORNER_SHAPE = RoundedCornerShape( - topStart = 28.dp, topEnd = 28.dp, bottomStart = 4.dp, bottomEnd = 4.dp, + topStart = 28.dp, + topEnd = 28.dp, + bottomStart = 4.dp, + bottomEnd = 4.dp, ) private const val DROPDOWN_TEXT_WIDTH_FRACTION = 0.5f diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayFab.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayFab.kt @@ -50,7 +50,10 @@ fun TabsTrayFab( ) { state -> state.mode == TabsTrayState.Mode.Normal } val shouldDisplayFloatingActionButton = shouldDisplayFloatingActionButton( - isPbmLocked, currentPage, isInNormalMode, isSignedIn, + isPbmLocked, + currentPage, + isInNormalMode, + isSignedIn, ) val icon: Painter diff --git a/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/components/toolbar/BrowserToolbarMiddlewareTest.kt b/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/components/toolbar/BrowserToolbarMiddlewareTest.kt @@ -802,7 +802,8 @@ class BrowserToolbarMiddlewareTest { ) } assertEquals( - "false", Events.enteredUrl.testGetValue()?.last()?.extra?.get("autocomplete"), + "false", + Events.enteredUrl.testGetValue()?.last()?.extra?.get("autocomplete"), ) } diff --git a/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/downloads/listscreen/store/DownloadUIStoreTest.kt b/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/downloads/listscreen/store/DownloadUIStoreTest.kt @@ -135,7 +135,12 @@ class DownloadUIStoreTest { val initialState = DownloadUIState( items = listOf( - fileItem1, fileItem2, inProgressFileItem, pausedFileItem, failedFileItem, initiatedFileItem, + fileItem1, + fileItem2, + inProgressFileItem, + pausedFileItem, + failedFileItem, + initiatedFileItem, ), mode = DownloadUIState.Mode.Normal, pendingDeletionIds = emptySet(), @@ -148,7 +153,12 @@ class DownloadUIStoreTest { val expected = DownloadUIState( items = listOf( - fileItem1, fileItem2, inProgressFileItem, pausedFileItem, failedFileItem, initiatedFileItem, + fileItem1, + fileItem2, + inProgressFileItem, + pausedFileItem, + failedFileItem, + initiatedFileItem, ), mode = DownloadUIState.Mode.Editing(selectedItems = setOf(fileItem1, fileItem2)), pendingDeletionIds = emptySet(), diff --git a/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/search/FenixSearchMiddlewareTest.kt b/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/search/FenixSearchMiddlewareTest.kt @@ -295,7 +295,10 @@ class FenixSearchMiddlewareTest { @Test fun `WHEN a new search engine is selected THEN update it in search state and record telemetry`() { val newSearchEngineSelection = SearchEngine( - "engine-f", "Engine F", mockk(), type = SearchEngine.Type.BUNDLED_ADDITIONAL, + "engine-f", + "Engine F", + mockk(), + type = SearchEngine.Type.BUNDLED_ADDITIONAL, ) val appStore = AppStore( AppState( diff --git a/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/settings/address/store/AddressStoreTest.kt b/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/settings/address/store/AddressStoreTest.kt @@ -146,9 +146,14 @@ class AddressStoreTest { assertEquals(store.state.address, emptyUpdatableAddress) listOf( - FormChange.Name("Work"), FormChange.StreetAddress("Mozilla Lane"), FormChange.AddressLevel2("Level 2"), - FormChange.AddressLevel1("This Should Change"), FormChange.PostalCode("31337"), FormChange.Country("CA"), - FormChange.Tel("555-555-5555"), FormChange.Email("mo@zilla.com"), + FormChange.Name("Work"), + FormChange.StreetAddress("Mozilla Lane"), + FormChange.AddressLevel2("Level 2"), + FormChange.AddressLevel1("This Should Change"), + FormChange.PostalCode("31337"), + FormChange.Country("CA"), + FormChange.Tel("555-555-5555"), + FormChange.Email("mo@zilla.com"), ).forEach(store::dispatch) val expected = UpdatableAddressFields( diff --git a/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/webcompat/middleware/WebCompatReporterSubmissionMiddlewareTest.kt b/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/webcompat/middleware/WebCompatReporterSubmissionMiddlewareTest.kt @@ -642,7 +642,8 @@ class WebCompatReporterSubmissionMiddlewareTest { createMiddleware( browserStore = BrowserStore( BrowserState( - tabs = listOf(createTab("https://www.mozilla.org", id = "t1")), selectedTabId = "t1", + tabs = listOf(createTab("https://www.mozilla.org", id = "t1")), + selectedTabId = "t1", ), ), service = FakeWebCompatReporterRetrievalService(), diff --git a/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/PanZoomControllerTest.kt b/mobile/android/geckoview/src/androidTest/java/org/mozilla/geckoview/test/PanZoomControllerTest.kt @@ -822,7 +822,8 @@ class PanZoomControllerTest : BaseSessionTest() { ) assertThat( "we waited a frame", - promise.value as Boolean, equalTo(true), + promise.value as Boolean, + equalTo(true), ) mainSession.promiseAllPaintsDone() mainSession.flushApzRepaints() @@ -843,7 +844,8 @@ class PanZoomControllerTest : BaseSessionTest() { wasNotified = true assertThat( "notified scrollY is correct", - scrollY, equalTo(50.0f), + scrollY, + equalTo(50.0f), ) } }, @@ -855,7 +857,8 @@ class PanZoomControllerTest : BaseSessionTest() { assertThat( "delegate was notified on registration", - wasNotified, equalTo(true), + wasNotified, + equalTo(true), ) // Clean up