commit 9bba7bd46b4d05e17036ffe016365dc6de88e660 parent 8898eb88313e8bdde1e2e7f7230c3dd12ea5e511 Author: Ryan VanderMeulen <rvandermeulen@mozilla.com> Date: Sat, 6 Dec 2025 16:45:09 +0000 Bug 2003775 - Fix no-blank-line-in-list errors. r=android-reviewers,mcarare Differential Revision: https://phabricator.services.mozilla.com/D274972 Diffstat:
61 files changed, 1 insertion(+), 259 deletions(-)
diff --git a/mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/util/SpeculativeSessionFactory.kt b/mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/util/SpeculativeSessionFactory.kt @@ -142,7 +142,6 @@ internal class SpeculativeEngineSession constructor( */ internal class SpeculativeSessionObserver( private val factory: SpeculativeSessionFactory, - ) : EngineSession.Observer { override fun onCrash() { factory.clear() diff --git a/mobile/android/android-components/components/browser/engine-gecko/src/test/java/mozilla/components/browser/engine/gecko/GeckoEngineSessionTest.kt b/mobile/android/android-components/components/browser/engine-gecko/src/test/java/mozilla/components/browser/engine/gecko/GeckoEngineSessionTest.kt @@ -1841,7 +1841,6 @@ class GeckoEngineSessionTest { assertEquals( GeckoCookieBehavior.ACCEPT_FIRST_PARTY, CookiePolicy.ACCEPT_ONLY_FIRST_PARTY.id, - ) assertEquals(GeckoCookieBehavior.ACCEPT_VISITED, CookiePolicy.ACCEPT_VISITED.id) } diff --git a/mobile/android/android-components/components/browser/engine-gecko/src/test/java/mozilla/components/browser/engine/gecko/GeckoEngineTest.kt b/mobile/android/android-components/components/browser/engine-gecko/src/test/java/mozilla/components/browser/engine/gecko/GeckoEngineTest.kt @@ -4469,7 +4469,6 @@ class GeckoEngineTest { @OptIn(ExperimentalAndroidComponentsApi::class) engine.clearBrowserUserPref( "test.test.test", - onSuccess = { onSuccessCalled = true }, diff --git a/mobile/android/android-components/components/browser/engine-gecko/src/test/java/mozilla/components/browser/engine/gecko/GeckoWebContentIsolationMapperTest.kt b/mobile/android/android-components/components/browser/engine-gecko/src/test/java/mozilla/components/browser/engine/gecko/GeckoWebContentIsolationMapperTest.kt @@ -33,7 +33,6 @@ class GeckoWebContentIsolationMapperTest { assertEquals( WebContentIsolationStrategy.ISOLATE_HIGH_VALUE, 8.intoWebContentIsolationStrategy(), - ) } diff --git a/mobile/android/android-components/components/browser/icons/src/test/java/mozilla/components/browser/icons/BrowserIconsTest.kt b/mobile/android/android-components/components/browser/icons/src/test/java/mozilla/components/browser/icons/BrowserIconsTest.kt @@ -83,7 +83,6 @@ class BrowserIconsTest { server.enqueue( MockResponse().setBody( - javaClass.getResourceAsStream("/png/mozac.png")!!.source().buffer().buffer, ), ) diff --git a/mobile/android/android-components/components/browser/menu/src/main/java/mozilla/components/browser/menu/BrowserMenuPositioning.kt b/mobile/android/android-components/components/browser/menu/src/main/java/mozilla/components/browser/menu/BrowserMenuPositioning.kt @@ -20,32 +20,26 @@ internal data class MenuPositioningData( * Where and how should the menu be placed in relation to the [BrowserMenuPlacement.anchor]. */ val inferredMenuPlacement: BrowserMenuPlacement? = null, - /** * The orientation asked by users of this class when initializing it. */ val askedOrientation: BrowserMenu.Orientation = BrowserMenu.Orientation.DOWN, - /** * Whether the menu fits in the space between [display top, anchor] in a top - down layout. */ val fitsUp: Boolean = false, - /** * Whether the menu fits in the space between [anchor, display top] in a top - down layout. */ val fitsDown: Boolean = false, - /** * Distance between [display top, anchor top margin]. Used for better positioning the menu. */ @param:Px val availableHeightToTop: Int = 0, - /** * Distance between [display bottom, anchor bottom margin]. Used for better positioning the menu. */ @param:Px val availableHeightToBottom: Int = 0, - /** * [View#measuredHeight] of the menu. May be bigger than the available screen height. */ diff --git a/mobile/android/android-components/components/browser/menu2/src/main/java/mozilla/components/browser/menu2/ext/BrowserMenuPositioning.kt b/mobile/android/android-components/components/browser/menu2/src/main/java/mozilla/components/browser/menu2/ext/BrowserMenuPositioning.kt @@ -238,22 +238,18 @@ data class MenuPositioningData( * Android View that the PopupWindow should be anchored to. */ val anchor: View, - /** * [WindowManager#LayoutParams#x] of params the menu will be added with. */ @param:Px val x: Int = 0, - /** * [WindowManager#LayoutParams#y] of params the menu will be added with. */ @param:Px val y: Int = 0, - /** * [View#measuredHeight] of the menu. */ @param:Px val containerHeight: Int = 0, - /** * [PopupWindow#animationStyle] of the menu. */ diff --git a/mobile/android/android-components/components/browser/state/src/main/java/mozilla/components/browser/state/engine/middleware/TranslationsMiddleware.kt b/mobile/android/android-components/components/browser/state/src/main/java/mozilla/components/browser/state/engine/middleware/TranslationsMiddleware.kt @@ -273,7 +273,6 @@ class TranslationsMiddleware( logger.info("Success requesting engine support. isEngineSupported: $isEngineSupported") continuation.resume(isEngineSupported) }, - onError = { error -> context.store.dispatch( TranslationsAction.EngineExceptionAction( @@ -384,7 +383,6 @@ class TranslationsMiddleware( ) logger.info("Success requesting language models.") }, - onError = { error -> context.store.dispatch( TranslationsAction.EngineExceptionAction( @@ -429,7 +427,6 @@ class TranslationsMiddleware( ) logger.info("Success requesting never translate sites.") }, - onError = { context.store.dispatch( TranslationsAction.EngineExceptionAction( @@ -578,12 +575,10 @@ class TranslationsMiddleware( return suspendCoroutine { continuation -> engine.getLanguageSetting( languageCode = pageLanguage, - onSuccess = { setting -> logger.info("Success requesting language settings.") continuation.resume(setting) }, - onError = { logger.error("Could not retrieve language settings: $it") continuation.resume(null) @@ -615,7 +610,6 @@ class TranslationsMiddleware( tabId: String? = null, ) { engine.getLanguageSettings( - onSuccess = { settings -> context.store.dispatch( TranslationsAction.SetLanguageSettingsAction( @@ -624,7 +618,6 @@ class TranslationsMiddleware( ) logger.info("Success requesting language settings.") }, - onError = { context.store.dispatch( TranslationsAction.EngineExceptionAction( @@ -688,7 +681,6 @@ class TranslationsMiddleware( engine.getTranslationsPairDownloadSize( fromLanguage = fromLanguage.code, toLanguage = toLanguage.code, - onSuccess = { size -> context.store.dispatch( TranslationsAction.SetTranslationDownloadSizeAction( @@ -703,7 +695,6 @@ class TranslationsMiddleware( ) logger.info("Success requesting download size.") }, - onError = { error -> context.store.dispatch( TranslationsAction.SetTranslationDownloadSizeAction( @@ -823,7 +814,6 @@ class TranslationsMiddleware( engine.setLanguageSetting( languageCode = languageCode, languageSetting = setting, - onSuccess = { // Value was proactively updated in [TranslationsStateReducer] for // [TranslationsBrowserState.languageSettings] @@ -840,7 +830,6 @@ class TranslationsMiddleware( logger.info("Successfully updated the language preference.") }, - onError = { logger.error("Could not update the language preference.", it) // The browser store [TranslationsBrowserState.languageSettings] is out of sync, @@ -1004,7 +993,6 @@ class TranslationsMiddleware( requestLanguageModels(context) } }, - onError = { error -> logger.error("Could not update the language model(s).", error) // Value was set to a wait state in [TranslationsStateReducer] for diff --git a/mobile/android/android-components/components/compose/base/src/main/java/mozilla/components/compose/base/menu/DropdownMenu.kt b/mobile/android/android-components/components/compose/base/src/main/java/mozilla/components/compose/base/menu/DropdownMenu.kt @@ -394,7 +394,6 @@ private fun DropdownMenuPreview() { Column( modifier = Modifier.background(color = MaterialTheme.colorScheme.surfaceContainerLowest), - ) { val menuItems: List<MenuItem> by remember { mutableStateOf(menuPreviewParameters.map { it.menuItems.first() }) @@ -411,7 +410,6 @@ private fun DropdownMenuPreview() { Column( modifier = Modifier.background(color = MaterialTheme.colorScheme.surfaceContainerLowest), - ) { val menuItems: List<MenuItem> = remember { val dividerList = mutableListOf<MenuItem>() diff --git a/mobile/android/android-components/components/compose/base/src/main/java/mozilla/components/compose/base/menu/MenuItem.kt b/mobile/android/android-components/components/compose/base/src/main/java/mozilla/components/compose/base/menu/MenuItem.kt @@ -71,7 +71,6 @@ sealed interface MenuItem { override val supportingText: Text? = null, override val enabled: Boolean = true, override val onClick: () -> Unit, - ) : FixedItem( text = text, level = level, diff --git a/mobile/android/android-components/components/compose/base/src/main/java/mozilla/components/compose/base/text/FadedText.kt b/mobile/android/android-components/components/compose/base/src/main/java/mozilla/components/compose/base/text/FadedText.kt @@ -98,7 +98,6 @@ private fun Modifier.fadeText( ), ) { textLayoutState?.didOverflowWidth == true } }, - inspectorInfo = { name = "fade text" properties["key"] = text diff --git a/mobile/android/android-components/components/compose/base/src/main/java/mozilla/components/compose/base/theme/AcornTypography.kt b/mobile/android/android-components/components/compose/base/src/main/java/mozilla/components/compose/base/theme/AcornTypography.kt @@ -88,70 +88,60 @@ val defaultTypography = AcornTypography( letterSpacing = 0.18.sp, lineHeight = 32.sp, ), - headline6 = DefaultTextStyle.copy( fontSize = 20.sp, fontWeight = FontWeight.W500, letterSpacing = 0.15.sp, lineHeight = 24.sp, ), - headline7 = DefaultTextStyle.copy( fontSize = 16.sp, fontWeight = FontWeight.W500, letterSpacing = 0.15.sp, lineHeight = 24.sp, ), - headline8 = DefaultTextStyle.copy( fontSize = 14.sp, fontWeight = FontWeight.W500, letterSpacing = 0.4.sp, lineHeight = 20.sp, ), - subtitle1 = DefaultTextStyle.copy( fontSize = 16.sp, fontWeight = FontWeight.W400, letterSpacing = 0.15.sp, lineHeight = 24.sp, ), - subtitle2 = DefaultTextStyle.copy( fontSize = 14.sp, fontWeight = FontWeight.W500, letterSpacing = 0.1.sp, lineHeight = 24.sp, ), - body1 = DefaultTextStyle.copy( fontSize = 16.sp, fontWeight = FontWeight.W400, letterSpacing = 0.5.sp, lineHeight = 24.sp, ), - body2 = DefaultTextStyle.copy( fontSize = 14.sp, fontWeight = FontWeight.W400, letterSpacing = 0.25.sp, lineHeight = 20.sp, ), - button = DefaultTextStyle.copy( fontSize = 14.sp, fontWeight = FontWeight.W500, letterSpacing = 0.25.sp, lineHeight = 14.sp, ), - caption = DefaultTextStyle.copy( fontSize = 12.sp, fontWeight = FontWeight.W400, letterSpacing = 0.4.sp, lineHeight = 16.sp, ), - overline = DefaultTextStyle.copy( fontSize = 10.sp, fontWeight = FontWeight.W400, diff --git a/mobile/android/android-components/components/concept/base/src/main/java/mozilla/components/concept/base/crash/Breadcrumb.kt b/mobile/android/android-components/components/concept/base/src/main/java/mozilla/components/concept/base/crash/Breadcrumb.kt @@ -23,27 +23,22 @@ data class Breadcrumb( * Message of the crash breadcrumb. */ val message: String = "", - /** * Data related to the crash breadcrumb. */ val data: Map<String, String> = emptyMap(), - /** * Category of the crash breadcrumb. */ val category: String = "", - /** * Level of the crash breadcrumb. */ val level: Level = Level.DEBUG, - /** * Type of the crash breadcrumb. */ val type: Type = Type.DEFAULT, - /** * Date of the crash breadcrumb. */ diff --git a/mobile/android/android-components/components/concept/engine/src/main/java/mozilla/components/concept/engine/webextension/WebExtension.kt b/mobile/android/android-components/components/concept/engine/src/main/java/mozilla/components/concept/engine/webextension/WebExtension.kt @@ -351,165 +351,136 @@ data class Metadata( * https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/manifest.json/version */ val version: String, - /** * Required API permissions: * https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/manifest.json/permissions#API_permissions */ val requiredPermissions: List<String>, - /** * Required origin permissions: * https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/manifest.json/permissions#Host_permissions */ val requiredOrigins: List<String>, - /** * Required data collection permissions. */ val requiredDataCollectionPermissions: List<String>, - /** * Optional API permissions for this extension: * https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/manifest.json/optional_permissions */ val optionalPermissions: List<String>, - /** * Optional API permissions granted to this extension: * https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/manifest.json/optional_permissions */ val grantedOptionalPermissions: List<String>, - /** * Optional origin permissions for this extension: * https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/manifest.json/optional_permissions */ val optionalOrigins: List<String>, - /** * Optional origin permissions granted to this extension: * https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/manifest.json/optional_permissions */ val grantedOptionalOrigins: List<String>, - /** * Optional data collection permissions. */ val optionalDataCollectionPermissions: List<String>, - /** * Optional data collection granted to this extension. */ val grantedOptionalDataCollectionPermissions: List<String>, - /** * Name of the extension: * https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/manifest.json/name */ val name: String?, - /** * Description of the extension: * https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/manifest.json/description */ val description: String?, - /** * Name of the extension developer: * https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/manifest.json/developer */ val developerName: String?, - /** * Url of the developer: * https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/manifest.json/developer */ val developerUrl: String?, - /** * Url of extension's homepage: * https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/manifest.json/homepage_url */ val homepageUrl: String?, - /** * Options page: * https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/manifest.json/options_ui */ val optionsPageUrl: String?, - /** * Whether or not the options page should be opened in a new tab: * https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/manifest.json/options_ui#syntax */ val openOptionsPageInTab: Boolean, - /** * Describes the reason (or reasons) why an extension is disabled. */ val disabledFlags: DisabledFlags, - /** * Base URL for pages of this extension. Can be used to determine if a page * is from / belongs to this extension. */ val baseUrl: String, - /** * The full description of this extension. */ val fullDescription: String?, - /** * The URL used to install this extension. */ val downloadUrl: String?, - /** * The string representation of the date that this extension was most recently updated * (simplified ISO 8601 format). */ val updateDate: String?, - /** * The average rating of this extension. */ val averageRating: Float, - /** * The link to the review page for this extension. */ val reviewUrl: String?, - /** * The average rating of this extension. */ val reviewCount: Int, - /** * The creator name of this extension. * https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/manifest.json/developer */ val creatorName: String?, - /** * The creator url of this extension. * https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/manifest.json/developer */ val creatorUrl: String?, - /** * Whether or not this extension is temporary i.e. installed using a debug tool * such as web-ext, and won't be retained when the application exits. */ val temporary: Boolean = false, - /** * The URL to the detail page of this extension. */ val detailUrl: String?, - /** * Indicates how this extension works with private browsing windows. * https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/manifest.json/incognito diff --git a/mobile/android/android-components/components/concept/engine/src/test/java/mozilla/components/concept/engine/EngineSessionTest.kt b/mobile/android/android-components/components/concept/engine/src/test/java/mozilla/components/concept/engine/EngineSessionTest.kt @@ -777,7 +777,6 @@ class EngineSessionTest { val all = TrackingProtectionPolicy.strict() val selected = TrackingProtectionPolicy.select( trackingCategories = arrayOf(TrackingCategory.AD), - ) // Tracking protection policies should be applied to all sessions by default diff --git a/mobile/android/android-components/components/feature/addons/src/main/java/mozilla/components/feature/addons/update/db/UpdateAttemptEntity.kt b/mobile/android/android-components/components/feature/addons/src/main/java/mozilla/components/feature/addons/update/db/UpdateAttemptEntity.kt @@ -26,16 +26,12 @@ internal data class UpdateAttemptEntity( @PrimaryKey @ColumnInfo(name = "addon_id") var addonId: String, - @ColumnInfo(name = "date") var date: Long, - @ColumnInfo(name = "status") var status: Int, - @ColumnInfo(name = "error_message") var errorMessage: String = "", - @ColumnInfo(name = "error_trace") var errorTrace: String = "", ) { diff --git a/mobile/android/android-components/components/feature/containers/src/main/java/mozilla/components/feature/containers/db/ContainerEntity.kt b/mobile/android/android-components/components/feature/containers/src/main/java/mozilla/components/feature/containers/db/ContainerEntity.kt @@ -19,13 +19,10 @@ internal data class ContainerEntity( @PrimaryKey @ColumnInfo(name = "context_id") var contextId: String, - @ColumnInfo(name = "name") var name: String, - @ColumnInfo(name = "color") var color: Color, - @ColumnInfo(name = "icon") var icon: Icon, ) { diff --git a/mobile/android/android-components/components/feature/downloads/src/main/java/mozilla/components/feature/downloads/db/DownloadEntity.kt b/mobile/android/android-components/components/feature/downloads/src/main/java/mozilla/components/feature/downloads/db/DownloadEntity.kt @@ -17,28 +17,20 @@ internal data class DownloadEntity( @PrimaryKey @ColumnInfo(name = "id") var id: String, - @ColumnInfo(name = "url") var url: String, - @ColumnInfo(name = "file_name") var fileName: String?, - @ColumnInfo(name = "content_type") var contentType: String?, - @ColumnInfo(name = "content_length") var contentLength: Long?, - @ColumnInfo(name = "status") var status: DownloadState.Status, - @ColumnInfo(name = "destination_directory") var destinationDirectory: String, - @ColumnInfo(name = "created_at") var createdAt: Long, - @ColumnInfo(name = "etag") val etag: String?, ) { diff --git a/mobile/android/android-components/components/feature/downloads/src/test/java/mozilla/components/feature/downloads/DownloadMiddlewareTest.kt b/mobile/android/android-components/components/feature/downloads/src/test/java/mozilla/components/feature/downloads/DownloadMiddlewareTest.kt @@ -699,7 +699,6 @@ class DownloadMiddlewareTest { coroutineContext = dispatcher, downloadStorage = downloadStorage, deleteFileFromStorage = { false }, - ) val store = BrowserStore( initialState = BrowserState(), diff --git a/mobile/android/android-components/components/feature/logins/src/main/java/mozilla/components/feature/logins/exceptions/db/LoginExceptionEntity.kt b/mobile/android/android-components/components/feature/logins/src/main/java/mozilla/components/feature/logins/exceptions/db/LoginExceptionEntity.kt @@ -16,7 +16,6 @@ internal data class LoginExceptionEntity( @PrimaryKey(autoGenerate = true) @ColumnInfo(name = "id") var id: Long? = null, - @ColumnInfo(name = "origin") var origin: String, ) diff --git a/mobile/android/android-components/components/feature/prompts/src/main/java/mozilla/components/feature/prompts/login/LoginPickerView.kt b/mobile/android/android-components/components/feature/prompts/src/main/java/mozilla/components/feature/prompts/login/LoginPickerView.kt @@ -174,7 +174,6 @@ private fun LoginPickerHeader( painter = painterResource(id = chevronResourceId), contentDescription = null, tint = loginPickerColors.header, - ) } } diff --git a/mobile/android/android-components/components/feature/prompts/src/test/java/mozilla/components/feature/prompts/PromptFeatureTest.kt b/mobile/android/android-components/components/feature/prompts/src/test/java/mozilla/components/feature/prompts/PromptFeatureTest.kt @@ -285,7 +285,6 @@ class PromptFeatureTest { tabsUseCases = mock(), fileUploadsDirCleaner = mock(), onNeedToRequestPermissions = { }, - ) feature.start() @@ -315,7 +314,6 @@ class PromptFeatureTest { tabsUseCases = mock(), fileUploadsDirCleaner = mock(), onNeedToRequestPermissions = { }, - ) feature.start() @@ -334,7 +332,6 @@ class PromptFeatureTest { tabsUseCases = mock(), fileUploadsDirCleaner = mock(), onNeedToRequestPermissions = { }, - ), ) @@ -359,7 +356,6 @@ class PromptFeatureTest { }, fileUploadsDirCleaner = mock(), onNeedToRequestPermissions = { }, - ), ) val selectLoginPrompt = mock<PromptRequest.SelectLoginPrompt>() @@ -529,7 +525,6 @@ class PromptFeatureTest { isSaveLoginEnabled = { true }, fileUploadsDirCleaner = mock(), onNeedToRequestPermissions = {}, - ), ) val session = tab()!! @@ -592,7 +587,6 @@ class PromptFeatureTest { }, fileUploadsDirCleaner = mock(), onNeedToRequestPermissions = { }, - ), ) val selectLoginPrompt = mock<PromptRequest.SelectLoginPrompt>() @@ -624,7 +618,6 @@ class PromptFeatureTest { }, fileUploadsDirCleaner = mock(), onNeedToRequestPermissions = { }, - ), ) val selectLoginPrompt = mock<PromptRequest.SelectLoginPrompt>() @@ -655,7 +648,6 @@ class PromptFeatureTest { }, fileUploadsDirCleaner = mock(), onNeedToRequestPermissions = { }, - ), ) val selectLoginPrompt = mock<PromptRequest.SelectLoginPrompt>() @@ -688,7 +680,6 @@ class PromptFeatureTest { }, fileUploadsDirCleaner = mock(), onNeedToRequestPermissions = { }, - ), ) val selectCreditCardRequest = mock<PromptRequest.SelectCreditCard>() @@ -720,7 +711,6 @@ class PromptFeatureTest { }, fileUploadsDirCleaner = mock(), onNeedToRequestPermissions = { }, - ), ) val selectCreditCardRequest = mock<PromptRequest.SelectCreditCard>() @@ -751,7 +741,6 @@ class PromptFeatureTest { }, fileUploadsDirCleaner = mock(), onNeedToRequestPermissions = { }, - ), ) val selectCreditCardRequest = mock<PromptRequest.SelectCreditCard>() @@ -783,7 +772,6 @@ class PromptFeatureTest { }, fileUploadsDirCleaner = mock(), onNeedToRequestPermissions = { }, - ), ) feature.creditCardPicker = creditCardPicker @@ -815,7 +803,6 @@ class PromptFeatureTest { addressDelegate = addressDelegate, fileUploadsDirCleaner = mock(), onNeedToRequestPermissions = { }, - ), ) feature.addressPicker = addressPicker @@ -850,7 +837,6 @@ class PromptFeatureTest { addressDelegate = addressDelegate, fileUploadsDirCleaner = mock(), onNeedToRequestPermissions = { }, - ), ) val selectAddressRequest = mock<PromptRequest.SelectAddress>() @@ -876,7 +862,6 @@ class PromptFeatureTest { tabsUseCases = mock(), fileUploadsDirCleaner = mock(), onNeedToRequestPermissions = { }, - ) val singleChoiceRequest = SingleChoice(arrayOf(), {}, {}) @@ -900,7 +885,6 @@ class PromptFeatureTest { exitFullscreenUsecase = mock(), fileUploadsDirCleaner = mock(), onNeedToRequestPermissions = { }, - ) feature.start() @@ -925,7 +909,6 @@ class PromptFeatureTest { exitFullscreenUsecase = mock(), fileUploadsDirCleaner = mock(), onNeedToRequestPermissions = { }, - ) feature.start() @@ -950,7 +933,6 @@ class PromptFeatureTest { exitFullscreenUsecase = mock(), fileUploadsDirCleaner = mock(), onNeedToRequestPermissions = { }, - ) feature.start() @@ -975,7 +957,6 @@ class PromptFeatureTest { exitFullscreenUsecase = mock(), fileUploadsDirCleaner = mock(), onNeedToRequestPermissions = { }, - ) var onShowNoMoreAlertsWasCalled = false @@ -1012,7 +993,6 @@ class PromptFeatureTest { exitFullscreenUsecase = mock(), fileUploadsDirCleaner = mock(), onNeedToRequestPermissions = { }, - ) var onDismissWasCalled = false val promptRequest = Alert("title", "message", false, {}, { onDismissWasCalled = true }) @@ -1036,7 +1016,6 @@ class PromptFeatureTest { exitFullscreenUsecase = mock(), fileUploadsDirCleaner = mock(), onNeedToRequestPermissions = { }, - ) var onConfirmWasCalled = false var onDismissWasCalled = false @@ -1074,7 +1053,6 @@ class PromptFeatureTest { exitFullscreenUsecase = mock(), fileUploadsDirCleaner = mock(), onNeedToRequestPermissions = { }, - ) var onDismissWasCalled = false @@ -1114,7 +1092,6 @@ class PromptFeatureTest { exitFullscreenUsecase = mock(), fileUploadsDirCleaner = mock(), onNeedToRequestPermissions = { }, - ) var onClearWasCalled = false var selectedDate: Date? = null @@ -1156,7 +1133,6 @@ class PromptFeatureTest { tabsUseCases = mock(), fileUploadsDirCleaner = mock(), onNeedToRequestPermissions = { }, - ) feature.handleDialogsRequest(mock<PromptRequest.File>(), mock()) } @@ -1182,7 +1158,6 @@ class PromptFeatureTest { tabsUseCases = mock(), fileUploadsDirCleaner = mock(), onNeedToRequestPermissions = { }, - ) val intent = Intent() @@ -1215,7 +1190,6 @@ class PromptFeatureTest { tabsUseCases = mock(), fileUploadsDirCleaner = mock(), onNeedToRequestPermissions = { }, - ) val intent = Intent() @@ -1253,7 +1227,6 @@ class PromptFeatureTest { tabsUseCases = mock(), fileUploadsDirCleaner = mock(), onNeedToRequestPermissions = { }, - ) val intent = Intent() @@ -1281,7 +1254,6 @@ class PromptFeatureTest { }, fileUploadsDirCleaner = mock(), onNeedToRequestPermissions = { }, - ) feature.creditCardPicker = creditCardPicker val intent = Intent() @@ -1308,7 +1280,6 @@ class PromptFeatureTest { }, fileUploadsDirCleaner = mock(), onNeedToRequestPermissions = { }, - ) feature.creditCardPicker = creditCardPicker val intent = Intent() @@ -1335,7 +1306,6 @@ class PromptFeatureTest { }, fileUploadsDirCleaner = mock(), onNeedToRequestPermissions = { }, - ) feature.creditCardPicker = creditCardPicker @@ -1361,7 +1331,6 @@ class PromptFeatureTest { }, fileUploadsDirCleaner = mock(), onNeedToRequestPermissions = { }, - ) feature.creditCardPicker = creditCardPicker @@ -1448,7 +1417,6 @@ class PromptFeatureTest { exitFullscreenUsecase = mock(), fileUploadsDirCleaner = mock(), onNeedToRequestPermissions = { }, - ) var onConfirmWasCalled = false @@ -1536,7 +1504,6 @@ class PromptFeatureTest { exitFullscreenUsecase = mock(), fileUploadsDirCleaner = mock(), onNeedToRequestPermissions = { }, - ) var onDismissWasCalled = false diff --git a/mobile/android/android-components/components/feature/pwa/src/main/java/mozilla/components/feature/pwa/db/ManifestEntity.kt b/mobile/android/android-components/components/feature/pwa/src/main/java/mozilla/components/feature/pwa/db/ManifestEntity.kt @@ -15,23 +15,17 @@ import mozilla.components.concept.engine.manifest.WebAppManifest @Entity(tableName = "manifests") internal data class ManifestEntity( val manifest: WebAppManifest, - @PrimaryKey @ColumnInfo(name = "start_url") val startUrl: String, - @ColumnInfo(name = "scope", index = true) val scope: String?, - @ColumnInfo(name = "has_share_targets", index = true) val hasShareTargets: Int, - @ColumnInfo(name = "created_at") val createdAt: Long, - @ColumnInfo(name = "updated_at") val updatedAt: Long, - @ColumnInfo(name = "used_at") val usedAt: Long, ) { diff --git a/mobile/android/android-components/components/feature/pwa/src/test/java/mozilla/components/feature/pwa/intent/WebAppIntentProcessorTest.kt b/mobile/android/android-components/components/feature/pwa/src/test/java/mozilla/components/feature/pwa/intent/WebAppIntentProcessorTest.kt @@ -77,7 +77,6 @@ class WebAppIntentProcessorTest { enableUrlbarHiding = true, showCloseButton = false, showShareMenuItem = true, - ), webAppManifest = manifest, ), @@ -118,7 +117,6 @@ class WebAppIntentProcessorTest { enableUrlbarHiding = true, showCloseButton = false, showShareMenuItem = true, - ), webAppManifest = manifest, ) diff --git a/mobile/android/android-components/components/feature/recentlyclosed/src/main/java/mozilla/components/feature/recentlyclosed/db/RecentlyClosedTabEntity.kt b/mobile/android/android-components/components/feature/recentlyclosed/src/main/java/mozilla/components/feature/recentlyclosed/db/RecentlyClosedTabEntity.kt @@ -22,13 +22,10 @@ internal data class RecentlyClosedTabEntity( @PrimaryKey @ColumnInfo(name = "uuid") var uuid: String, - @ColumnInfo(name = "title") var title: String, - @ColumnInfo(name = "url") var url: String, - @ColumnInfo(name = "created_at") var createdAt: Long, ) { diff --git a/mobile/android/android-components/components/feature/search/src/main/java/mozilla/components/feature/search/telemetry/SearchProviderModel.kt b/mobile/android/android-components/components/feature/search/src/main/java/mozilla/components/feature/search/telemetry/SearchProviderModel.kt @@ -36,7 +36,6 @@ data class SearchProviderModel( val followOnParamNames: List<String>?, val extraAdServersRegexps: List<Regex>, val expectedOrganicCodes: List<String>?, - ) { constructor( @@ -52,7 +51,6 @@ data class SearchProviderModel( followOnParamNames: List<String>? = emptyList(), extraAdServersRegexps: List<String> = emptyList(), expectedOrganicCodes: List<String>? = emptyList(), - ) : this( schema = schema, taggedCodes = taggedCodes, @@ -66,7 +64,6 @@ data class SearchProviderModel( followOnParamNames = followOnParamNames, extraAdServersRegexps = extraAdServersRegexps.map { it.toRegex() }, expectedOrganicCodes = expectedOrganicCodes, - ) /** diff --git a/mobile/android/android-components/components/feature/share/src/main/java/mozilla/components/feature/share/db/RecentAppEntity.kt b/mobile/android/android-components/components/feature/share/src/main/java/mozilla/components/feature/share/db/RecentAppEntity.kt @@ -12,11 +12,9 @@ import mozilla.components.feature.share.db.RecentAppsDatabase.Companion.RECENT_A @Entity(tableName = RECENT_APPS_TABLE) internal data class RecentAppEntity( - @PrimaryKey @ColumnInfo(name = "activityName") override var activityName: String, - @ColumnInfo(name = "score") override var score: Double = 0.0, ) : RecentApp diff --git a/mobile/android/android-components/components/feature/sitepermissions/src/main/java/mozilla/components/feature/sitepermissions/db/SitePermissionsEntity.kt b/mobile/android/android-components/components/feature/sitepermissions/src/main/java/mozilla/components/feature/sitepermissions/db/SitePermissionsEntity.kt @@ -14,47 +14,33 @@ import mozilla.components.concept.engine.permission.SitePermissions */ @Entity(tableName = "site_permissions") internal data class SitePermissionsEntity( - @PrimaryKey @ColumnInfo(name = "origin") var origin: String, - @ColumnInfo(name = "location") var location: SitePermissions.Status, - @ColumnInfo(name = "notification") var notification: SitePermissions.Status, - @ColumnInfo(name = "microphone") var microphone: SitePermissions.Status, - @ColumnInfo(name = "camera") var camera: SitePermissions.Status, - @ColumnInfo(name = "bluetooth") var bluetooth: SitePermissions.Status, - @ColumnInfo(name = "local_storage") var localStorage: SitePermissions.Status, - @ColumnInfo(name = "autoplay_audible") var autoplayAudible: SitePermissions.AutoplayStatus, - @ColumnInfo(name = "autoplay_inaudible") var autoplayInaudible: SitePermissions.AutoplayStatus, - @ColumnInfo(name = "media_key_system_access") var mediaKeySystemAccess: SitePermissions.Status, - @ColumnInfo(name = "cross_origin_storage_access") var crossOriginStorageAccess: SitePermissions.Status, - @ColumnInfo(name = "local_device_access") var localDeviceAccess: SitePermissions.Status, - @ColumnInfo(name = "local_network_access") var localNetworkAccess: SitePermissions.Status, - @ColumnInfo(name = "saved_at") var savedAt: Long, ) { diff --git a/mobile/android/android-components/components/feature/tab-collections/src/main/java/mozilla/components/feature/tab/collections/db/TabCollectionEntity.kt b/mobile/android/android-components/components/feature/tab-collections/src/main/java/mozilla/components/feature/tab/collections/db/TabCollectionEntity.kt @@ -16,13 +16,10 @@ internal data class TabCollectionEntity( @PrimaryKey(autoGenerate = true) @ColumnInfo(name = "id") var id: Long? = null, - @ColumnInfo(name = "title") var title: String, - @ColumnInfo(name = "updated_at") var updatedAt: Long = System.currentTimeMillis(), - @ColumnInfo(name = "created_at") var createdAt: Long = System.currentTimeMillis(), ) diff --git a/mobile/android/android-components/components/feature/tab-collections/src/main/java/mozilla/components/feature/tab/collections/db/TabEntity.kt b/mobile/android/android-components/components/feature/tab-collections/src/main/java/mozilla/components/feature/tab/collections/db/TabEntity.kt @@ -33,19 +33,14 @@ internal data class TabEntity( @PrimaryKey(autoGenerate = true) @ColumnInfo(name = "id") var id: Long? = null, - @ColumnInfo(name = "title") var title: String, - @ColumnInfo(name = "url") var url: String, - @ColumnInfo(name = "stat_file") var stateFile: String, - @ColumnInfo(name = "tab_collection_id") var tabCollectionId: Long, - @ColumnInfo(name = "created_at") var createdAt: Long, ) { diff --git a/mobile/android/android-components/components/feature/top-sites/src/main/java/mozilla/components/feature/top/sites/db/PinnedSiteEntity.kt b/mobile/android/android-components/components/feature/top-sites/src/main/java/mozilla/components/feature/top/sites/db/PinnedSiteEntity.kt @@ -17,16 +17,12 @@ internal data class PinnedSiteEntity( @PrimaryKey(autoGenerate = true) @ColumnInfo(name = "id") var id: Long? = null, - @ColumnInfo(name = "title") var title: String, - @ColumnInfo(name = "url") var url: String, - @ColumnInfo(name = "is_default") var isDefault: Boolean = false, - @ColumnInfo(name = "created_at") var createdAt: Long = System.currentTimeMillis(), ) { diff --git a/mobile/android/android-components/components/lib/crash/src/main/java/mozilla/components/lib/crash/db/Breadcrumb.kt b/mobile/android/android-components/components/lib/crash/src/main/java/mozilla/components/lib/crash/db/Breadcrumb.kt @@ -22,27 +22,22 @@ internal data class Breadcrumb( * Date of the crash breadcrumb. */ val timestamp: String = "", - /** * Message of the crash breadcrumb. */ val message: String = "", - /** * Category of the crash breadcrumb. */ val category: String = "", - /** * Level of the crash breadcrumb. */ val level: String = Level.DEBUG.value, - /** * Type of the crash breadcrumb. */ val type: String = Type.DEFAULT.value, - /** * Data related to the crash breadcrumb. */ diff --git a/mobile/android/android-components/components/lib/crash/src/main/java/mozilla/components/lib/crash/db/CrashEntity.kt b/mobile/android/android-components/components/lib/crash/src/main/java/mozilla/components/lib/crash/db/CrashEntity.kt @@ -31,74 +31,61 @@ data class CrashReporterUnableToRestoreException(override var message: String) : ) internal data class CrashEntity( // shared fields- both uncaught exception and native crashes - /** * Type of crash- either UNCAUGHT or NATIVE */ @ColumnInfo(name = "crashType", defaultValue = "UNCAUGHT") var crashType: CrashType, - /** * Generated UUID for this crash. */ @PrimaryKey @ColumnInfo(name = "uuid") var uuid: String, - /** * Runtime tags that should be attached to any report associated with this crash. */ @ColumnInfo(name = "runtime_tags", defaultValue = "{}") var runtimeTags: Map<String, String>, - /** * List of breadcrumbs to send with the crash report. */ @ColumnInfo(name = "breadcrumbs", defaultValue = "null") var breadcrumbs: List<String>? = emptyList(), - /** * Timestamp (in milliseconds) of when the crash happened. */ @ColumnInfo(name = "created_at") var createdAt: Long, - // Uncaught exception crash fields - /** * The stacktrace of the crash (if this crash was caused by an exception/throwable): otherwise * a string describing the type of crash. */ @ColumnInfo(name = "stacktrace") var stacktrace: String, - /** * The serialized [Throwable] tht caused the crash. */ @ColumnInfo(name = "throwable") val throwableData: ByteArray?, - // Native crash fields - /** * Path to a Breakpad minidump file containing information about the crash. */ @ColumnInfo(name = "minidumpPath", defaultValue = "null") var minidumpPath: String?, - /** * The type of process the crash occurred in. Affects whether or not the crash is fatal * or whether the application can recover from it. */ @ColumnInfo(name = "processVisibility", defaultValue = "null") var processVisibility: String?, - /** * The process type name reported by the crashing process. */ @ColumnInfo(name = "processType", defaultValue = "null") var processType: String?, - /** * Path to a file containing extra metadata about the crash. The file contains key-value pairs * in the form `Key=Value`. Be aware, it may contain sensitive data such as the URI that was @@ -106,7 +93,6 @@ internal data class CrashEntity( */ @ColumnInfo(name = "extrasPath", defaultValue = "null") var extrasPath: String?, - /** * The type of child process (when available). */ diff --git a/mobile/android/android-components/components/lib/crash/src/main/java/mozilla/components/lib/crash/db/CrashWithReports.kt b/mobile/android/android-components/components/lib/crash/src/main/java/mozilla/components/lib/crash/db/CrashWithReports.kt @@ -13,7 +13,6 @@ import androidx.room.Relation internal data class CrashWithReports( @Embedded val crash: CrashEntity, - @Relation( parentColumn = "uuid", entityColumn = "crash_uuid", diff --git a/mobile/android/android-components/components/lib/crash/src/main/java/mozilla/components/lib/crash/db/ReportEntity.kt b/mobile/android/android-components/components/lib/crash/src/main/java/mozilla/components/lib/crash/db/ReportEntity.kt @@ -23,19 +23,16 @@ internal data class ReportEntity( @PrimaryKey(autoGenerate = true) @ColumnInfo(name = "id") var id: Long? = null, - /** * UUID of the crash that was reported. */ @ColumnInfo(name = "crash_uuid") var crashUuid: String, - /** * Id of the service the crash was reported to (matching [CrashReporterService.id]. */ @ColumnInfo(name = "service_id") var serviceId: String, - /** * The id of the crash report as returned by [CrashReporterService.report]. */ diff --git a/mobile/android/android-components/components/lib/jexl/src/main/java/mozilla/components/lib/jexl/parser/Parser.kt b/mobile/android/android-components/components/lib/jexl/src/main/java/mozilla/components/lib/jexl/parser/Parser.kt @@ -189,7 +189,6 @@ internal val handlers: Map<Token.Type, (Parser, Token) -> Unit> = mapOf( Literal(token.value), ) }, - Token.Type.BINARY_OP to { parser, token -> val precedence = parser.grammar.elements[token.value]?.precedence ?: 0 var parent = parser.cursor!!.parent @@ -213,7 +212,6 @@ internal val handlers: Map<Token.Type, (Parser, Token) -> Unit> = mapOf( parser.cursor = parent parser.placeAtCursor(node) }, - Token.Type.IDENTIFIER to { parser, token -> val node = Identifier(token.value) @@ -228,14 +226,12 @@ internal val handlers: Map<Token.Type, (Parser, Token) -> Unit> = mapOf( parser.placeAtCursor(node) } }, - Token.Type.UNARY_OP to { parser, token -> val node = UnaryExpression( operator = token.value.toString(), ) parser.placeAtCursor(node) }, - Token.Type.DOT to { parser, _ -> val cursor = parser.cursor diff --git a/mobile/android/android-components/components/service/nimbus/src/test/java/mozilla/components/service/nimbus/messaging/NimbusMessagingStorageTest.kt b/mobile/android/android-components/components/service/nimbus/src/test/java/mozilla/components/service/nimbus/messaging/NimbusMessagingStorageTest.kt @@ -795,13 +795,11 @@ class NimbusMessagingStorageTest { action = "OPEN_URL", actionParams = mapOf("url" to "https://mozilla.org"), ), - // with uuid in the param value "open-url-with-uuid" to createMessageData( action = "OPEN_URL", actionParams = mapOf("url" to "https://mozilla.org?uuid={uuid}"), ), - // with ? in the action "install-focus" to createMessageData( action = "INSTALL_FOCUS", diff --git a/mobile/android/android-components/components/tooling/lint/src/main/java/mozilla/components/tooling/lint/ConstraintLayoutPerfDetector.kt b/mobile/android/android-components/components/tooling/lint/src/main/java/mozilla/components/tooling/lint/ConstraintLayoutPerfDetector.kt @@ -17,7 +17,6 @@ import org.w3c.dom.Element private val FRAMEWORK_ELEMENTS = setOf( "androidx.constraintlayout.widget.ConstraintLayout", - // Android framework views that extend ConstraintLayout "androidx.constraintlayout.motion.widget.MotionLayout", ) @@ -38,7 +37,6 @@ private val CUSTOM_VIEW_ELEMENTS = setOf( "$FENIX_PREFIX.settings.deletebrowsingdata.DeleteBrowsingDataItem", "$FENIX_PREFIX.trackingprotection.SwitchWithDescription", "$FENIX_PREFIX.trackingprotection.TrackingProtectionCategoryItem", - "$AC_PREFIX.feature.readerview.view.ReaderViewControlsBar", "$AC_PREFIX.feature.findinpage.view.FindInPageBar", "$AC_PREFIX.feature.prompts.login.LoginSelectBar", diff --git a/mobile/android/android-components/components/ui/widgets/src/main/java/mozilla/components/ui/widgets/behavior/BrowserGestureDetector.kt b/mobile/android/android-components/components/ui/widgets/src/main/java/mozilla/components/ui/widgets/behavior/BrowserGestureDetector.kt @@ -118,32 +118,27 @@ internal class BrowserGestureDetector( * The distance in x and y is also supplied for convenience. */ val onScroll: ((distanceX: Float, distanceY: Float) -> Unit)? = { _, _ -> run {} }, - /** * Responds to an in progress scroll occuring more on the vertical axis. * The scroll distance is also supplied for convenience. */ val onVerticalScroll: ((distance: Float) -> Unit)? = {}, - /** * Responds to an in progress scroll occurring more on the horizontal axis. * The scroll distance is also supplied for convenience. */ val onHorizontalScroll: ((distance: Float) -> Unit)? = {}, - /** * Responds to the the beginning of a new scale gesture. * Reported by new pointers going down. */ val onScaleBegin: ((scaleFactor: Float) -> Unit)? = {}, - /** * Responds to scaling events for a gesture in progress. * The scaling factor is also supplied for convenience. * This value is represents the difference from the previous scale event to the current event. */ val onScale: ((scaleFactor: Float) -> Unit)? = {}, - /** * Responds to the end of a scale gesture. * Reported by existing pointers going up. diff --git a/mobile/android/android-components/samples/browser/src/main/java/org/mozilla/samples/browser/DefaultComponents.kt b/mobile/android/android-components/samples/browser/src/main/java/org/mozilla/samples/browser/DefaultComponents.kt @@ -329,7 +329,6 @@ open class DefaultComponents(private val applicationContext: Context) { SimpleBrowserMenuItem("Save to PDF") { sessionUseCases.saveToPdf.invoke() }, - SimpleBrowserMenuItem("Translate (auto)") { var detectedFrom = store.state.selectedTab?.translationsState?.translationEngineState diff --git a/mobile/android/android-components/samples/compose-browser/src/main/java/org/mozilla/samples/compose/browser/browser/BrowserToolbarMiddleware.kt b/mobile/android/android-components/samples/compose-browser/src/main/java/org/mozilla/samples/compose/browser/browser/BrowserToolbarMiddleware.kt @@ -117,7 +117,6 @@ internal class BrowserToolbarMiddleware( showPrivacyMask = false, onClick = TabCounterClicked, ), - ActionButtonRes( drawableResId = iconsR.drawable.mozac_ic_ellipsis_vertical_24, contentDescription = R.string.menu_button_description, diff --git a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/MainMenuTestCompose.kt b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/MainMenuTestCompose.kt @@ -1326,7 +1326,6 @@ class MainMenuTestCompose : TestSetup() { createCustomTabIntent( customTabPage.url.toString(), customMenuItem, - ), ) @@ -1350,7 +1349,6 @@ class MainMenuTestCompose : TestSetup() { createCustomTabIntent( customTabPage.url.toString(), customMenuItem, - ), ) @@ -1371,7 +1369,6 @@ class MainMenuTestCompose : TestSetup() { createCustomTabIntent( customTabPDF.url.toString(), customMenuItem, - ), ) diff --git a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/LibrarySubMenusMultipleSelectionToolbarRobot.kt b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/LibrarySubMenusMultipleSelectionToolbarRobot.kt @@ -60,7 +60,6 @@ class LibrarySubMenusMultipleSelectionToolbarRobot { ), ), ), - // This is used as part of the `multiSelectionToolbarItemsTest` test. Somehow, in the view hierarchy, // the match above is finding two checkmark views - one visible, one hidden, which is throwing off // the matcher. This 'isDisplayed' check is a hacky workaround for this, we're explicitly ignoring diff --git a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAutofillRobot.kt b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAutofillRobot.kt @@ -92,7 +92,6 @@ class SettingsSubMenuAutofillRobot(private val composeTestRule: ComposeTestRule) saveAndAutofillCreditCardsOption(), saveAndAutofillCreditCardsSummary(), syncCreditCardsAcrossDevicesButton(), - ) if (userHasSavedCreditCard) { diff --git a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ThreeDotMenuMainRobot.kt b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ThreeDotMenuMainRobot.kt @@ -178,7 +178,6 @@ class ThreeDotMenuMainRobot { desktopSiteButton(), reportSiteIssueButton(), desktopSiteToggle(isRequestDesktopSiteEnabled), - ) // Swipe to second part of menu expandMenu() diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/BackgroundServices.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/BackgroundServices.kt @@ -102,7 +102,6 @@ class BackgroundServices( private val deviceConfig = DeviceConfig( name = defaultDeviceName(context), type = DeviceType.MOBILE, - // NB: flipping this flag back and worth is currently not well supported and may need hand-holding. // Consult with the android-components peers before changing. // See https://github.com/mozilla/application-services/issues/1308 @@ -110,7 +109,6 @@ class BackgroundServices( add(DeviceCapability.SEND_TAB) add(DeviceCapability.CLOSE_TABS) }, - // Enable encryption for account state on supported API levels (23+). // Just on Nightly and local builds for now. // Enabling this for all channels is tracked in https://github.com/mozilla-mobile/fenix/issues/6704 diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/appstate/VoiceSearchState.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/appstate/VoiceSearchState.kt @@ -12,7 +12,6 @@ data class VoiceSearchState( * Whether the app is currently requesting voice input from the user. */ val isRequestingVoiceInput: Boolean = false, - /** * The search terms received from voice input, if any. */ diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarMiddleware.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarMiddleware.kt @@ -821,7 +821,6 @@ class BrowserToolbarMiddleware( contentDescription = StringResContentDescription(tabcounterR.string.mozac_browser_menu_new_tab), onClick = AddNewTab(source), ), - BrowserToolbarMenuButton( icon = DrawableResIcon(iconsR.drawable.mozac_ic_private_mode_24), text = StringResText(tabcounterR.string.mozac_browser_menu_new_private_tab), @@ -829,9 +828,7 @@ class BrowserToolbarMiddleware( StringResContentDescription(tabcounterR.string.mozac_browser_menu_new_private_tab), onClick = AddNewPrivateTab(source), ), - BrowserToolbarMenuDivider, - BrowserToolbarMenuButton( icon = DrawableResIcon(iconsR.drawable.mozac_ic_cross_24), text = StringResText(tabcounterR.string.mozac_close_tab), diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/collections/Collections.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/collections/Collections.kt @@ -119,7 +119,6 @@ private fun getMenuItems( ) { onRenameCollectionTapped(collection) }, - if (showAddTabs) { MenuItem( title = stringResource(R.string.add_tab), @@ -130,7 +129,6 @@ private fun getMenuItems( } else { null }, - MenuItem( title = stringResource(R.string.collection_delete), color = MaterialTheme.colorScheme.error, diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/toolbar/BrowserSimpleToolbar.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/toolbar/BrowserSimpleToolbar.kt @@ -132,7 +132,6 @@ private fun initialActions(): List<Action> { showPrivacyMask = false, onClick = object : BrowserToolbarEvent {}, ), - ActionButtonRes( drawableResId = iconsR.drawable.mozac_ic_ellipsis_vertical_24, contentDescription = android.R.string.untitled, diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/messaging/CustomAttributeProvider.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/messaging/CustomAttributeProvider.kt @@ -84,27 +84,20 @@ object CustomAttributeProvider : JexlAttributeProvider { "is_default_browser" to BrowsersCache.all(context).isDefaultBrowser, "date_string" to formatter.format(now.time), "number_of_app_launches" to settings.numberOfAppLaunches, - "adjust_campaign" to settings.adjustCampaignId, "adjust_network" to settings.adjustNetwork, "adjust_ad_group" to settings.adjustAdGroup, "adjust_creative" to settings.adjustCreative, - UTM_SOURCE to settings.utmSource, UTM_MEDIUM to settings.utmMedium, UTM_CAMPAIGN to settings.utmCampaign, UTM_TERM to settings.utmTerm, UTM_CONTENT to settings.utmContent, - "are_notifications_enabled" to NotificationManagerCompat.from(context) .areNotificationsEnabledSafe(), - "search_widget_is_installed" to settings.searchWidgetInstalled, - "android_version" to android.os.Build.VERSION.SDK_INT, - "is_fxa_signed_in" to settings.signedInFxaAccount, - "fxa_connected_devices" to ( context.components.backgroundServices.syncStore.state .constellationState?.otherDevices?.size ?: 0 diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayFragment.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayFragment.kt @@ -592,7 +592,6 @@ class TabsTrayFragment : AppCompatDialogFragment() { ), positiveButtonRadius = pixelSizeFor(R.dimen.tab_corner_radius).toFloat(), ), - onPositiveButtonClicked = ::onCancelDownloadWarningAccepted, ) dialog.show(parentFragmentManager, DOWNLOAD_CANCEL_DIALOG_FRAGMENT_TAG) diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tabstray/ui/TabManagementFragment.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tabstray/ui/TabManagementFragment.kt @@ -339,7 +339,6 @@ class TabManagementFragment : DialogFragment() { onSaveToCollectionClick = tabManagerInteractor::onAddSelectedTabsToCollectionClicked, onShareSelectedTabsClick = tabManagerInteractor::onShareSelectedTabs, - onTabSettingsClick = tabManagerController::onTabSettingsClicked, onRecentlyClosedClick = tabManagerController::onOpenRecentlyClosedClicked, onAccountSettingsClick = tabManagerController::onAccountSettingsClicked, @@ -360,7 +359,6 @@ class TabManagementFragment : DialogFragment() { tabManagerInteractor::onBookmarkSelectedTabsClicked, onForceSelectedTabsAsInactiveClick = tabManagerInteractor::onForceSelectedTabsAsInactiveClicked, - onTabsTrayPbmLockedClick = ::onTabsTrayPbmLockedClick, onTabsTrayPbmLockedDismiss = { requireContext().settings().shouldShowLockPbmBanner = false @@ -555,7 +553,6 @@ class TabManagementFragment : DialogFragment() { ), positiveButtonRadius = pixelSizeFor(R.dimen.tab_corner_radius).toFloat(), ), - onPositiveButtonClicked = ::onCancelDownloadWarningAccepted, ) dialog.show(parentFragmentManager, DOWNLOAD_CANCEL_DIALOG_FRAGMENT_TAG) diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/webcompat/ui/WebCompatReporter.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/webcompat/ui/WebCompatReporter.kt @@ -262,7 +262,6 @@ fun WebCompatReporter( modifier = Modifier, color = FirefoxTheme.colors.textPrimary, style = FirefoxTheme.typography.subtitle2, - ) Icon( painter = painterResource(R.drawable.ic_arrowhead_right), diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/webcompat/ui/WebCompatReporterPreviewSheet.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/webcompat/ui/WebCompatReporterPreviewSheet.kt @@ -81,9 +81,7 @@ private fun PreviewSheetContent( .fillMaxSize() .padding(horizontal = FirefoxTheme.layout.space.dynamic200), horizontalAlignment = Alignment.CenterHorizontally, - ) { - Spacer(modifier = Modifier.height(FirefoxTheme.layout.space.static150)) - + ) { Text( text = stringResource(id = R.string.webcompat_reporter_preview_bottom_sheet_header), style = FirefoxTheme.typography.headline7, 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 @@ -3151,16 +3151,13 @@ class BrowserToolbarMiddlewareTest { contentDescription = StringResContentDescription(tabcounterR.string.mozac_browser_menu_new_tab), onClick = AddNewTab(source), ), - BrowserToolbarMenuButton( icon = DrawableResIcon(iconsR.drawable.mozac_ic_private_mode_24), text = StringResText(tabcounterR.string.mozac_browser_menu_new_private_tab), contentDescription = StringResContentDescription(tabcounterR.string.mozac_browser_menu_new_private_tab), onClick = AddNewPrivateTab(source), ), - BrowserToolbarMenuDivider, - BrowserToolbarMenuButton( icon = DrawableResIcon(iconsR.drawable.mozac_ic_cross_24), text = StringResText(tabcounterR.string.mozac_close_tab), diff --git a/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/library/history/HistoryDataSourceTest.kt b/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/library/history/HistoryDataSourceTest.kt @@ -12,7 +12,6 @@ import org.mozilla.fenix.components.history.HistoryDB class HistoryDataSourceTest { private val testCases = listOf( listOf<Int>() to listOf(), - listOf(1) to listOf( TestHistory.Regular("http://www.mozilla.com"), ), diff --git a/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/perf/StartupStateProviderTest.kt b/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/perf/StartupStateProviderTest.kt @@ -301,7 +301,6 @@ class StartupStateProviderTest { LogEntry.ActivityCreated(homeActivityClass), LogEntry.ActivityStarted(homeActivityClass), LogEntry.AppStarted, - // VIEW: open non-drawing IntentReceiverActivity, then HomeActivity. ), listOf( @@ -328,7 +327,6 @@ class StartupStateProviderTest { LogEntry.ActivityCreated(homeActivityClass), LogEntry.ActivityStarted(homeActivityClass), LogEntry.AppStarted, - // untruncated MAIN: open HomeActivity directly. ), listOf( @@ -340,7 +338,6 @@ class StartupStateProviderTest { LogEntry.ActivityCreated(homeActivityClass), LogEntry.ActivityStarted(homeActivityClass), LogEntry.AppStarted, - // truncated VIEW: open non-drawing IntentReceiverActivity, then HomeActivity. ), listOf( @@ -350,7 +347,6 @@ class StartupStateProviderTest { LogEntry.ActivityCreated(homeActivityClass), LogEntry.ActivityStarted(homeActivityClass), LogEntry.AppStarted, - // untruncated VIEW: open non-drawing IntentReceiverActivity, then HomeActivity. ), listOf( @@ -382,7 +378,6 @@ class StartupStateProviderTest { LogEntry.ActivityStopped(homeActivityClass), LogEntry.ActivityStarted(homeActivityClass), LogEntry.AppStarted, - // untruncated MAIN: open HomeActivity directly. ), listOf( @@ -393,7 +388,6 @@ class StartupStateProviderTest { LogEntry.ActivityStopped(homeActivityClass), LogEntry.ActivityStarted(homeActivityClass), LogEntry.AppStarted, - // truncated VIEW: open non-drawing IntentReceiverActivity, then HomeActivity. ), listOf( @@ -402,7 +396,6 @@ class StartupStateProviderTest { LogEntry.ActivityCreated(irActivityClass), LogEntry.ActivityStarted(homeActivityClass), LogEntry.AppStarted, - // untruncated VIEW: open non-drawing IntentReceiverActivity, then HomeActivity. ), listOf( diff --git a/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/tabstray/ui/fab/TabManagerFloatingToolbarTest.kt b/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/tabstray/ui/fab/TabManagerFloatingToolbarTest.kt @@ -44,7 +44,6 @@ class TabManagerFloatingToolbarTest { createTab(url = "https://www.google.com", id = "a"), createTab(url = "https://www.duckduckgo.com", id = "b"), ), - ) composeTestRule.setContent { FirefoxTheme(theme = Theme.Light) { @@ -79,7 +78,6 @@ class TabManagerFloatingToolbarTest { createTab(url = "https://www.google.com", id = "a"), createTab(url = "https://www.duckduckgo.com", id = "b"), ), - ) composeTestRule.setContent { FirefoxTheme(theme = Theme.Private) { @@ -114,7 +112,6 @@ class TabManagerFloatingToolbarTest { createTab(url = "https://www.google.com", id = "a"), createTab(url = "https://www.duckduckgo.com", id = "b"), ), - ) composeTestRule.setContent { FirefoxTheme(theme = Theme.Dark) { diff --git a/mobile/android/focus-android/app/src/main/java/org/mozilla/focus/activity/MainActivity.kt b/mobile/android/focus-android/app/src/main/java/org/mozilla/focus/activity/MainActivity.kt @@ -86,7 +86,6 @@ open class MainActivity : EdgeToEdgeActivity() { onEraseAction = ::reactToEraseAction, ), scope = lifecycleScope, - ) } diff --git a/mobile/android/focus-android/app/src/test/java/org/mozilla/focus/telemetry/StartupStateProviderTest.kt b/mobile/android/focus-android/app/src/test/java/org/mozilla/focus/telemetry/StartupStateProviderTest.kt @@ -287,7 +287,6 @@ class StartupStateProviderTest { LogEntry.ActivityCreated(mainActivityClass), LogEntry.ActivityStarted(mainActivityClass), LogEntry.AppStarted, - // VIEW: open non-drawing IntentReceiverActivity, then HomeActivity. ), listOf( @@ -314,7 +313,6 @@ class StartupStateProviderTest { LogEntry.ActivityCreated(mainActivityClass), LogEntry.ActivityStarted(mainActivityClass), LogEntry.AppStarted, - // untruncated MAIN: open MainActivity directly. ), listOf( @@ -326,7 +324,6 @@ class StartupStateProviderTest { LogEntry.ActivityCreated(mainActivityClass), LogEntry.ActivityStarted(mainActivityClass), LogEntry.AppStarted, - // truncated VIEW: open non-drawing IntentReceiverActivity, then MainActivity. ), listOf( @@ -336,7 +333,6 @@ class StartupStateProviderTest { LogEntry.ActivityCreated(mainActivityClass), LogEntry.ActivityStarted(mainActivityClass), LogEntry.AppStarted, - // untruncated VIEW: open non-drawing IntentReceiverActivity, then MainActivity. ), listOf( @@ -368,7 +364,6 @@ class StartupStateProviderTest { LogEntry.ActivityStopped(mainActivityClass), LogEntry.ActivityStarted(mainActivityClass), LogEntry.AppStarted, - // untruncated MAIN: open HomeActivity directly. ), listOf( @@ -379,7 +374,6 @@ class StartupStateProviderTest { LogEntry.ActivityStopped(mainActivityClass), LogEntry.ActivityStarted(mainActivityClass), LogEntry.AppStarted, - // truncated VIEW: open non-drawing IntentReceiverActivity, then HomeActivity. ), listOf( @@ -388,7 +382,6 @@ class StartupStateProviderTest { LogEntry.ActivityCreated(irActivityClass), LogEntry.ActivityStarted(mainActivityClass), LogEntry.AppStarted, - // untruncated VIEW: open non-drawing IntentReceiverActivity, then HomeActivity. ), listOf(