Merge branch 'main' into bug-1877307

.cron.yml

@@ -25,7 +25,7 @@ jobs:
           type: decision-task
           treeherder-symbol: screenshots-D
           target-tasks-method: screenshots
-      when: [{weekday: 'Monday', hour: 10, minute: 0}]
+      when: [] # unscheduled
     - name: legacy-api-ui-tests
       job:
           type: decision-task

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: We are now using Bugzilla for issue tracking!
+    url: https://bugzilla.mozilla.org/enter_bug.cgi?product=Fenix
+    about: Please file your ticket there, and select the corresponding component from the list. If the component is not in the list, select "General". In commit messages, please reference the ticket using "Bug 1234567 - " as prefix.

.mergify.yml

@@ -2,6 +2,9 @@ queue_rules:
   - name: default
     conditions:
       - status-success=complete-pr
+      - or:
+        - current-datetime<2024-03-15T00:00:00Z
+        - base!=main
     allow_checks_interruption: false
     priority_rules:
       - name: high priority

README.md

@@ -1,6 +1,8 @@
 
 This repository hosts the Firefox for Android (Fenix), Focus on Android, and Mozilla Android Components projects.
 
+⚠️ This repository will soon be migrated to Mozilla Central. See the [announcement here](https://github.com/mozilla-mobile/firefox-android/wiki#upcoming-migration-to-mozilla-central).
+
 # Firefox for Android
 
 [![Task Status](https://firefox-ci-tc.services.mozilla.com/api/github/v1/repository/mozilla-mobile/firefox-android/main/badge.svg)](https://firefox-ci-tc.services.mozilla.com/api/github/v1/repository/mozilla-mobile/firefox-android/main/latest)

android-components/.buildconfig.yml

@@ -269,6 +269,7 @@ projects:
     - ui-autocomplete
     - ui-colors
     - ui-icons
+    - ui-widgets
   compose-awesomebar:
     description: An awesomebar component showing search results matching text entered
       into the toolbar.
@@ -601,7 +602,9 @@ projects:
     path: components/feature/autofill
     publish: true
     upstream_dependencies:
+    - browser-errorpages
     - concept-base
+    - concept-engine
     - concept-fetch
     - concept-storage
     - lib-fetch-okhttp
@@ -756,6 +759,7 @@ projects:
     - ui-colors
     - ui-icons
     - ui-tabcounter
+    - ui-widgets
   feature-downloads:
     description: Feature implementation for apps that want to use Android downloads
       manager.
@@ -1029,6 +1033,7 @@ projects:
     - ui-colors
     - ui-icons
     - ui-tabcounter
+    - ui-widgets
   feature-qr:
     description: A feature that provides functionality for scanning QR codes.
     path: components/feature/qr
@@ -1863,6 +1868,7 @@ projects:
     - ui-colors
     - ui-icons
     - ui-tabcounter
+    - ui-widgets
   service-contile:
     description: A library to communicate with the Contile services API
     path: components/service/contile
@@ -2261,9 +2267,17 @@ projects:
     path: components/ui/widgets
     publish: true
     upstream_dependencies:
+    - browser-errorpages
     - concept-base
+    - concept-engine
+    - concept-fetch
+    - concept-storage
+    - lib-publicsuffixlist
     - support-base
+    - support-ktx
     - support-test
+    - support-test-fakes
+    - support-utils
     - tooling-lint
     - ui-colors
     - ui-icons

android-components/.config.yml

@@ -2,6 +2,7 @@
 componentsGroupId: "org.mozilla.components"
 
 # Synchronized build configuration for all modules
+jvmTargetCompatibility: 17
 compileSdkVersion: 34
 minSdkVersion: 21
 targetSdkVersion: 34

android-components/.editorconfig

@@ -10,9 +10,6 @@ root = True
 indent_size = 4
 indent_style = space
 
-# Matches maxLineLength in detekt.yml
-max_line_length = 120
-
 ij_kotlin_allow_trailing_comma_on_call_site=true
 ij_kotlin_allow_trailing_comma=true
 

android-components/build.gradle

@@ -202,6 +202,10 @@ subprojects {
                 lintChecks project(':tooling-lint')
             }
 
+            kotlin {
+                jvmToolchain(config.jvmTargetCompatibility)
+            }
+
             android {
                 testOptions {
                     unitTests {
@@ -224,13 +228,7 @@ subprojects {
                     ignoreAssetsPattern "manifest.template.json"
                 }
 
-                compileOptions {
-                    sourceCompatibility JavaVersion.VERSION_17
-                    targetCompatibility JavaVersion.VERSION_17
-                }
-
                 tasks.withType(KotlinCompile).configureEach {
-                    kotlinOptions.jvmTarget = "17"
                     kotlinOptions.freeCompilerArgs += ["-opt-in=kotlin.RequiresOptIn"]
                 }
             }

android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngineSession.kt

@@ -1107,6 +1107,7 @@ class GeckoEngineSession(
             session: GeckoSession,
             url: String?,
             geckoPermissions: List<ContentPermission>,
+            hasUserGesture: Boolean,
         ) {
             this@GeckoEngineSession.geckoPermissions = geckoPermissions
             if (url == null) {
@@ -1140,7 +1141,7 @@ class GeckoEngineSession(
             }
             // Reset the status of current page being product or not when user navigates away.
             notifyObservers { onProductUrlChange(false) }
-            notifyObservers { onLocationChange(url) }
+            notifyObservers { onLocationChange(url, hasUserGesture) }
         }
 
         override fun onLoadRequest(

android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/ext/Address.kt

@@ -12,9 +12,7 @@ import org.mozilla.geckoview.Autocomplete
  */
 fun Autocomplete.Address.toAddress() = Address(
     guid = guid ?: "",
-    givenName = givenName,
-    additionalName = additionalName,
-    familyName = familyName,
+    name = name,
     organization = organization,
     streetAddress = streetAddress,
     addressLevel3 = addressLevel3,
@@ -31,10 +29,7 @@ fun Autocomplete.Address.toAddress() = Address(
  */
 fun Address.toAutocompleteAddress() = Autocomplete.Address.Builder()
     .guid(guid)
-    .name(fullName)
-    .givenName(givenName)
-    .additionalName(additionalName)
-    .familyName(familyName)
+    .name(name)
     .organization(organization)
     .streetAddress(streetAddress)
     .addressLevel3(addressLevel3)

android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/webextension/GeckoWebExtension.kt

@@ -13,6 +13,7 @@ import mozilla.components.concept.engine.Settings
 import mozilla.components.concept.engine.webextension.Action
 import mozilla.components.concept.engine.webextension.ActionHandler
 import mozilla.components.concept.engine.webextension.DisabledFlags
+import mozilla.components.concept.engine.webextension.Incognito
 import mozilla.components.concept.engine.webextension.MessageHandler
 import mozilla.components.concept.engine.webextension.Metadata
 import mozilla.components.concept.engine.webextension.Port
@@ -365,6 +366,8 @@ class GeckoWebExtension(
                 reviewUrl = it.reviewUrl,
                 version = it.version,
                 permissions = it.permissions.toList(),
+                optionalPermissions = it.optionalPermissions.toList(),
+                optionalOrigins = it.optionalOrigins.toList(),
                 // Origins is marked as @NonNull but may be null: https://bugzilla.mozilla.org/show_bug.cgi?id=1629957
                 hostPermissions = it.origins.orEmpty().toList(),
                 disabledFlags = DisabledFlags.select(it.disabledFlags),
@@ -373,6 +376,7 @@ class GeckoWebExtension(
                 baseUrl = it.baseUrl,
                 temporary = it.temporary,
                 detailUrl = it.amoListingUrl,
+                incognito = Incognito.fromString(it.incognito),
             )
         }
     }

android-components/components/browser/engine-gecko/src/test/java/mozilla/components/browser/engine/gecko/GeckoEngineSessionTest.kt

@@ -298,13 +298,17 @@ class GeckoEngineSessionTest {
         val engineSession = GeckoEngineSession(runtime, geckoSessionProvider = geckoSessionProvider)
 
         var observedUrl = ""
+        var observedUserGesture = true
         var observedCanGoBack = false
         var observedCanGoForward = false
         var cookieBanner = CookieBannerHandlingStatus.HANDLED
         var displaysProduct = false
         engineSession.register(
             object : EngineSession.Observer {
-                override fun onLocationChange(url: String) { observedUrl = url }
+                override fun onLocationChange(url: String, hasUserGesture: Boolean) {
+                    observedUrl = url
+                    observedUserGesture = hasUserGesture
+                }
                 override fun onNavigationStateChange(canGoBack: Boolean?, canGoForward: Boolean?) {
                     canGoBack?.let { observedCanGoBack = canGoBack }
                     canGoForward?.let { observedCanGoForward = canGoForward }
@@ -320,8 +324,9 @@ class GeckoEngineSessionTest {
 
         captureDelegates()
 
-        navigationDelegate.value.onLocationChange(mock(), "http://mozilla.org", emptyList())
+        navigationDelegate.value.onLocationChange(mock(), "http://mozilla.org", emptyList(), false)
         assertEquals("http://mozilla.org", observedUrl)
+        assertEquals(false, observedUserGesture)
         assertEquals(CookieBannerHandlingStatus.NO_DETECTED, cookieBanner)
         // TO DO: add a positive test case after a test endpoint is implemented in desktop (Bug 1846341)
         assertEquals(false, displaysProduct)
@@ -858,22 +863,22 @@ class GeckoEngineSessionTest {
         var observedUrl = ""
         engineSession.register(
             object : EngineSession.Observer {
-                override fun onLocationChange(url: String) { observedUrl = url }
+                override fun onLocationChange(url: String, hasUserGesture: Boolean) { observedUrl = url }
             },
         )
 
         captureDelegates()
 
-        navigationDelegate.value.onLocationChange(mock(), "about:blank", emptyList())
+        navigationDelegate.value.onLocationChange(mock(), "about:blank", emptyList(), false)
         assertEquals("", observedUrl)
 
-        navigationDelegate.value.onLocationChange(mock(), "about:blank", emptyList())
+        navigationDelegate.value.onLocationChange(mock(), "about:blank", emptyList(), false)
         assertEquals("", observedUrl)
 
-        navigationDelegate.value.onLocationChange(mock(), "https://www.mozilla.org", emptyList())
+        navigationDelegate.value.onLocationChange(mock(), "https://www.mozilla.org", emptyList(), false)
         assertEquals("https://www.mozilla.org", observedUrl)
 
-        navigationDelegate.value.onLocationChange(mock(), "about:blank", emptyList())
+        navigationDelegate.value.onLocationChange(mock(), "about:blank", emptyList(), false)
         assertEquals("about:blank", observedUrl)
     }
 
@@ -883,7 +888,7 @@ class GeckoEngineSessionTest {
         captureDelegates()
         assertTrue(session.initialLoad)
 
-        navigationDelegate.value.onLocationChange(mock(), "https://mozilla.org", emptyList())
+        navigationDelegate.value.onLocationChange(mock(), "https://mozilla.org", emptyList(), false)
         assertFalse(session.initialLoad)
 
         navigationDelegate.value.onLoadRequest(mock(), mockLoadRequest("moz-extension://1234-test"))
@@ -892,16 +897,16 @@ class GeckoEngineSessionTest {
         var observedUrl = ""
         session.register(
             object : EngineSession.Observer {
-                override fun onLocationChange(url: String) { observedUrl = url }
+                override fun onLocationChange(url: String, hasUserGesture: Boolean) { observedUrl = url }
             },
         )
-        navigationDelegate.value.onLocationChange(mock(), "about:blank", emptyList())
+        navigationDelegate.value.onLocationChange(mock(), "about:blank", emptyList(), false)
         assertEquals("", observedUrl)
 
-        navigationDelegate.value.onLocationChange(mock(), "https://www.mozilla.org", emptyList())
+        navigationDelegate.value.onLocationChange(mock(), "https://www.mozilla.org", emptyList(), false)
         assertEquals("https://www.mozilla.org", observedUrl)
 
-        navigationDelegate.value.onLocationChange(mock(), "about:blank", emptyList())
+        navigationDelegate.value.onLocationChange(mock(), "about:blank", emptyList(), false)
         assertEquals("about:blank", observedUrl)
     }
 
@@ -931,10 +936,10 @@ class GeckoEngineSessionTest {
         geckoResult.complete(true)
 
         assertNull(engineSession.currentUrl)
-        navigationDelegate.value.onLocationChange(geckoSession, "https://www.mozilla.org", emptyList())
+        navigationDelegate.value.onLocationChange(geckoSession, "https://www.mozilla.org", emptyList(), false)
         assertEquals("https://www.mozilla.org", engineSession.currentUrl)
 
-        navigationDelegate.value.onLocationChange(geckoSession, "https://www.firefox.com", emptyList())
+        navigationDelegate.value.onLocationChange(geckoSession, "https://www.firefox.com", emptyList(), false)
         assertEquals("https://www.firefox.com", engineSession.currentUrl)
     }
 
@@ -944,7 +949,7 @@ class GeckoEngineSessionTest {
 
         captureDelegates()
 
-        navigationDelegate.value.onLocationChange(geckoSession, "https://www.mozilla.org", listOf(mock()))
+        navigationDelegate.value.onLocationChange(geckoSession, "https://www.mozilla.org", listOf(mock()), false)
 
         assertTrue(engineSession.geckoPermissions.isNotEmpty())
     }
@@ -955,7 +960,7 @@ class GeckoEngineSessionTest {
 
         captureDelegates()
 
-        navigationDelegate.value.onLocationChange(geckoSession, null, listOf(mock()))
+        navigationDelegate.value.onLocationChange(geckoSession, null, listOf(mock()), false)
 
         assertTrue(engineSession.geckoPermissions.isNotEmpty())
     }
@@ -981,7 +986,7 @@ class GeckoEngineSessionTest {
         verify(historyTrackingDelegate, never()).onTitleChanged(anyString(), anyString())
 
         // This sets the currentUrl.
-        navigationDelegate.value.onLocationChange(geckoSession, "https://www.mozilla.com", emptyList())
+        navigationDelegate.value.onLocationChange(geckoSession, "https://www.mozilla.com", emptyList(), false)
 
         contentDelegate.value.onTitleChange(geckoSession, "Hello World!")
         verify(historyTrackingDelegate).onTitleChanged(eq("https://www.mozilla.com"), eq("Hello World!"))
@@ -1038,7 +1043,7 @@ class GeckoEngineSessionTest {
 
         engineSession.register(
             object : EngineSession.Observer {
-                override fun onLocationChange(url: String) { observedUrl = url }
+                override fun onLocationChange(url: String, hasUserGesture: Boolean) { observedUrl = url }
                 override fun onTitleChange(title: String) { observedTitle = title }
             },
         )
@@ -1072,7 +1077,7 @@ class GeckoEngineSessionTest {
             ),
         )
 
-        navigationDelegate.value.onLocationChange(geckoSession, emptyPageUrl, emptyList())
+        navigationDelegate.value.onLocationChange(geckoSession, emptyPageUrl, emptyList(), false)
         contentDelegate.value.onTitleChange(geckoSession, emptyPageUrl)
 
         historyDelegate.value.onVisited(
@@ -1112,7 +1117,7 @@ class GeckoEngineSessionTest {
         verify(historyTrackingDelegate, never()).onPreviewImageChange(anyString(), anyString())
 
         // This sets the currentUrl.
-        navigationDelegate.value.onLocationChange(geckoSession, "https://www.mozilla.com", emptyList())
+        navigationDelegate.value.onLocationChange(geckoSession, "https://www.mozilla.com", emptyList(), false)
 
         contentDelegate.value.onPreviewImage(geckoSession, previewImageUrl)
         verify(historyTrackingDelegate).onPreviewImageChange(eq("https://www.mozilla.com"), eq(previewImageUrl))

android-components/components/browser/engine-gecko/src/test/java/mozilla/components/browser/engine/gecko/prompt/GeckoPromptDelegateTest.kt

@@ -1853,9 +1853,7 @@ class GeckoPromptDelegateTest {
 
         val address = Address(
             guid = "1",
-            givenName = "Firefox",
-            additionalName = "-",
-            familyName = "-",
+            name = "Firefox",
             organization = "-",
             streetAddress = "street",
             addressLevel3 = "address3",