Merge branch 'main' into 1805070-update-detekt-in-ac

.cron.yml

@@ -19,6 +19,7 @@ jobs:
           target-tasks-method: nightly-test
       when:
         - {hour: 5, minute: 0}
+        - {hour: 16, minute: 0}
     - name: screenshots
       job:
           type: decision-task

.github/workflows/pull-request-labeler.yml

@@ -0,0 +1,26 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/
+
+name: Pull Request Labeler
+
+on:
+  pull_request_target:
+    types: [opened, reopened, synchronize, converted_to_draft, ready_for_review, review_requested]
+    branches:
+      - main
+  pull_request_review:
+    types: [submitted]
+    branches:
+      - main
+
+jobs:
+  pull_request_labeler:
+    runs-on: ubuntu-latest
+    if: github.actor != 'github-actions[bot]' && github.actor != 'dependabot[bot]' && github.actor != 'MickeyMoz'
+    steps:
+      - name: Pull Request Labeler
+        uses: gabrielluong/pull-request-labeler@1.0.3
+        if: github.repository == 'mozilla-mobile/firefox-android'
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}

android-components/components/feature/addons/src/main/res/values-fa/strings.xml

@@ -35,9 +35,9 @@
     <!-- Description for browser_data permission. -->
     <string name="mozac_feature_addons_permissions_browser_data_description">پاک کردن تاریخچهٔ مرور اخیر،‌ کلوچک‌ها و اطلاعات مرتبط</string>
     <!-- Description for clipboard_read permission. -->
-    <string name="mozac_feature_addons_permissions_clipboard_read_description">دریافت اطلاعات از تخته نسخه برداری</string>
+    <string name="mozac_feature_addons_permissions_clipboard_read_description">دریافت داده از تخته‌گیره</string>
     <!-- Description for clipboard_write permission. -->
-    <string name="mozac_feature_addons_permissions_clipboard_write_description">ورود اطلاعات به تخته نسخه برداری</string>
+    <string name="mozac_feature_addons_permissions_clipboard_write_description">ورود داده به تخته‌گیره</string>
     <!-- Description for declarativeNetRequest permission. -->
     <string name="mozac_feature_addons_permissions_declarative_net_request_description">محتوا را در هر صفحه‌ای مسدود کن</string>
     <!-- Description for declarativeNetRequestFeedback permission. -->

android-components/components/service/nimbus/src/test/java/mozilla/components/service/nimbus/messaging/NimbusMessagingStorageTest.kt

@@ -678,7 +678,7 @@ class NimbusMessagingStorageTest {
         )
 
         // We should not be using the feature holder until getMessages is called.
-        verify(messagingFeature, never()).value(any())
+        verify(messagingFeature, never()).value()
     }
 
     @Test

android-components/plugins/dependencies/src/main/java/ApplicationServices.kt

@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 // These lines are generated by android-components/automation/application-services-nightly-bump.py
-val VERSION = "115.20230517050358"
+val VERSION = "115.20230518050343"
 val CHANNEL = ApplicationServicesChannel.NIGHTLY
 
 object ApplicationServicesConfig {

android-components/plugins/dependencies/src/main/java/DependenciesPlugin.kt

@@ -40,7 +40,7 @@ object Versions {
     const val zxing = "3.3.3"
 
     const val disklrucache = "2.0.2"
-    const val leakcanary = "2.10"
+    const val leakcanary = "2.11"
 
     // DO NOT MODIFY MANUALLY. This is auto-updated along with GeckoView.
     const val mozilla_glean = "52.7.0"
@@ -78,7 +78,7 @@ object Versions {
         const val palette = "1.0.0"
         const val preferences = "1.1.1"
         const val lifecycle = "2.6.1"
-        const val media = "1.2.0"
+        const val media = "1.6.0"
         const val navigation = "2.5.3"
         const val work = "2.7.1"
         const val arch = "2.2.0"

android-components/plugins/dependencies/src/main/java/Gecko.kt

@@ -9,7 +9,7 @@ object Gecko {
     /**
      * GeckoView Version.
      */
-    const val version = "115.0.20230517094542"
+    const val version = "115.0.20230518092544"
 
     /**
      * GeckoView channel

fenix/app/build.gradle

@@ -851,20 +851,6 @@ if (gradle.hasProperty('localProperties.dependencySubstitutions.geckoviewTopsrcd
     apply from: "${topsrcdir}/substitute-local-geckoview.gradle"
 }
 
-def appServicesSrcDir = null
-if (gradle.hasProperty('localProperties.autoPublish.application-services.dir')) {
-  appServicesSrcDir = gradle.getProperty('localProperties.autoPublish.application-services.dir')
-} else if (gradle.hasProperty('localProperties.branchBuild.application-services.dir')) {
-  appServicesSrcDir = gradle.getProperty('localProperties.branchBuild.application-services.dir')
-}
-if (appServicesSrcDir) {
-    if (appServicesSrcDir.startsWith("/")) {
-        apply from: "${appServicesSrcDir}/build-scripts/substitute-local-appservices.gradle"
-    } else {
-        apply from: "../${appServicesSrcDir}/build-scripts/substitute-local-appservices.gradle"
-    }
-}
-
 if (gradle.hasProperty('localProperties.autoPublish.glean.dir')) {
     ext.gleanSrcDir = gradle."localProperties.autoPublish.glean.dir"
     apply from: "../${gleanSrcDir}/build-scripts/substitute-local-glean.gradle"

fenix/app/src/androidTest/java/org/mozilla/fenix/ui/BrowsingErrorPagesTest.kt

@@ -6,6 +6,7 @@ package org.mozilla.fenix.ui
 
 import androidx.core.net.toUri
 import org.junit.After
+import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 import org.mozilla.fenix.R
@@ -86,6 +87,7 @@ class BrowsingErrorPagesTest {
         }
     }
 
+    @Ignore("Failing, see: https://bugzilla.mozilla.org/show_bug.cgi?id=1833874")
     @Test
     fun connectionFailureErrorMessageTest() {
         val url = "example.com"

fenix/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt

@@ -57,11 +57,6 @@ object FeatureFlags {
      */
     const val composeTabsTray = false
 
-    /**
-     * Enables the wallpaper v2 enhancements.
-     */
-    const val wallpaperV2Enabled = true
-
     /**
      * Enables the save to PDF feature.
      */

fenix/app/src/main/java/org/mozilla/fenix/settings/wallpaper/WallpaperSettingsFragment.kt

@@ -18,7 +18,6 @@ import kotlinx.coroutines.launch
 import mozilla.components.lib.state.ext.observeAsComposableState
 import mozilla.components.service.glean.private.NoExtras
 import org.mozilla.fenix.BrowserDirection
-import org.mozilla.fenix.FeatureFlags
 import org.mozilla.fenix.GleanMetrics.Wallpapers
 import org.mozilla.fenix.HomeActivity
 import org.mozilla.fenix.R
@@ -57,11 +56,7 @@ class WallpaperSettingsFragment : Fragment() {
                     val coroutineScope = rememberCoroutineScope()
 
                     WallpaperSettings(
-                        wallpaperGroups = if (FeatureFlags.wallpaperV2Enabled) {
-                            wallpapers.groupByDisplayableCollection()
-                        } else {
-                            mapOf(Wallpaper.ClassicFirefoxCollection to wallpapers)
-                        },
+                        wallpaperGroups = wallpapers.groupByDisplayableCollection(),
                         defaultWallpaper = Wallpaper.Default,
                         selectedWallpaper = currentWallpaper,
                         loadWallpaperResource = {