Merge branch 'fork-maintainers:iceraven' into iceraven

Author: Burhanverse

.buildconfig.yml

@@ -99,6 +99,8 @@ variants:
     fileName: app-fenix-arm64-v8a-debug.apk
   - abi: armeabi-v7a
     fileName: app-fenix-armeabi-v7a-debug.apk
+  - abi: universal
+    fileName: app-fenix-universal-debug.apk
   - abi: x86
     fileName: app-fenix-x86-debug.apk
   - abi: x86_64
@@ -110,6 +112,8 @@ variants:
     fileName: app-fenix-arm64-v8a-release-unsigned.apk
   - abi: armeabi-v7a
     fileName: app-fenix-armeabi-v7a-release-unsigned.apk
+  - abi: universal
+    fileName: app-fenix-universal-release-unsigned.apk
   - abi: x86
     fileName: app-fenix-x86-release-unsigned.apk
   - abi: x86_64
@@ -121,6 +125,8 @@ variants:
     fileName: app-fenix-arm64-v8a-nightly-unsigned.apk
   - abi: armeabi-v7a
     fileName: app-fenix-armeabi-v7a-nightly-unsigned.apk
+  - abi: universal
+    fileName: app-fenix-universal-nightly-unsigned.apk
   - abi: x86
     fileName: app-fenix-x86-nightly-unsigned.apk
   - abi: x86_64
@@ -132,6 +138,8 @@ variants:
     fileName: app-fenix-arm64-v8a-beta-unsigned.apk
   - abi: armeabi-v7a
     fileName: app-fenix-armeabi-v7a-beta-unsigned.apk
+  - abi: universal
+    fileName: app-fenix-universal-beta-unsigned.apk
   - abi: x86
     fileName: app-fenix-x86-beta-unsigned.apk
   - abi: x86_64
@@ -143,6 +151,8 @@ variants:
     fileName: app-fenix-arm64-v8a-benchmark.apk
   - abi: armeabi-v7a
     fileName: app-fenix-armeabi-v7a-benchmark.apk
+  - abi: universal
+    fileName: app-fenix-universal-benchmark.apk
   - abi: x86
     fileName: app-fenix-x86-benchmark.apk
   - abi: x86_64

android-components

@@ -42,6 +42,11 @@ import static org.gradle.api.tasks.testing.TestResult.ResultType
 
 apply from: 'benchmark.gradle'
 
+ext.getAbi = { output ->
+    // Assume that if the ABI isn't set, it's an app bundle or universal APK
+    output.getFilter(FilterConfiguration.FilterType.ABI.name()) ?: "universal"
+}
+
 def isAppBundle = gradle.startParameter.taskNames.any { it.toLowerCase().contains("bundle") }
 
 // Mimic Python: open(os.path.join(buildconfig.topobjdir, 'buildid.h')).readline().split()[2]
@@ -281,6 +286,9 @@ android {
                 include "arm64-v8a"
             } else {
                 include "x86", "armeabi-v7a", "arm64-v8a", "x86_64"
+                if (gradle.mozconfig.substs.MOZILLA_OFFICIAL) {
+                    universalApk true
+                }
             }
         }
     }
@@ -359,13 +367,10 @@ android.applicationVariants.configureEach { variant ->
         project.logger.debug("versionName override: $versionName")
 
         variant.outputs.each { output ->
-            def abi = output.getFilter(FilterConfiguration.FilterType.ABI.name())
-            if (isAppBundle) {
-                abi = "AAB"
-            }
             // We use the same version code generator, that we inherited from Fennec, across all channels - even on
             // channels that never shipped a Fennec build.
-            def versionCodeOverride = Config.generateFennecVersionCode(abi, isAppBundle )
+            def abi = getAbi(output)
+            def versionCodeOverride = Config.generateFennecVersionCode(abi)
 
             project.logger.debug("versionCode for $abi = $versionCodeOverride")
 
@@ -857,7 +862,7 @@ tasks.register('printVariants') {
     def variants = project.provider {
         android.applicationVariants.collect { variant -> [
             apks: variant.outputs.collect { output -> [
-                    abi: output.getFilter(FilterConfiguration.FilterType.ABI.name()),
+                    abi: getAbi(output),
                     fileName: output.outputFile.name
             ]},
             build_type: variant.buildType.name,

app/build.gradle

@@ -496,7 +496,7 @@ class TabbedBrowsingTest : TestSetup() {
 
     @Ignore("Temporarily disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1972361")
     @Test
-    fun privateModeDoNotPersistAfterRestartTest() {
+    fun privateModeStaysAsDefaultAfterRestartTest() {
         val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
 
         navigationToolbar {
@@ -508,6 +508,7 @@ class TabbedBrowsingTest : TestSetup() {
         restartApp(composeTestRule.activityRule)
 
         homeScreen {
+            verifyPrivateBrowsingHomeScreenItems()
         }.openTabDrawer(composeTestRule) {
         }.toggleToNormalTabs {
             verifyExistingOpenTabs(defaultWebPage.title)
@@ -533,6 +534,7 @@ class TabbedBrowsingTest : TestSetup() {
         closeApp(composeTestRule.activityRule)
         restartApp(composeTestRule.activityRule)
         homeScreen {
+            verifyPrivateBrowsingHomeScreenItems()
         }.openTabDrawer(composeTestRule) {
             verifyNoOpenTabsInPrivateBrowsing()
         }

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

@@ -1273,7 +1273,6 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity {
     private fun createBrowsingModeManager(intent: Intent?): BrowsingModeManager {
         return DefaultBrowsingModeManager(
             intent = intent,
-            store = components.core.store,
             settings = components.settings,
             onModeChange = { newMode ->
                 updateSecureWindowFlags(newMode)

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

@@ -5,8 +5,6 @@
 package org.mozilla.fenix.browser.browsingmode
 
 import android.content.Intent
-import mozilla.components.browser.state.selector.getNormalOrPrivateTabs
-import mozilla.components.browser.state.store.BrowserStore
 import mozilla.components.support.utils.toSafeIntent
 import org.mozilla.fenix.HomeActivity.Companion.PRIVATE_BROWSING_MODE
 import org.mozilla.fenix.components.AppStore
@@ -49,13 +47,11 @@ interface BrowsingModeManager {
  * persists it to [Settings], and synchronizes it with [AppStore].
  *
  * @param intent The [Intent] that started the activity.
- * @param store The [BrowserStore] to observe the private tabs state from.
  * @param settings [Settings] used to persist the current browsing mode in storage.
  * @param onModeChange Callback invoked when the browsing mode changes.
  */
 class DefaultBrowsingModeManager(
     intent: Intent?,
-    private val store: BrowserStore,
     private val settings: Settings,
     private val onModeChange: (BrowsingMode) -> Unit,
 ) : BrowsingModeManager {
@@ -78,9 +74,7 @@ class DefaultBrowsingModeManager(
     }
 
     /**
-     * Returns the [BrowsingMode] set by the [intent] or the last known browsing mode based on
-     * whether or not the user was in private mode and has any private tabs, otherwise fallback to
-     * [BrowsingMode.Normal].
+     * Returns the [BrowsingMode] set by the [intent] or the last known [BrowsingMode].
      */
     private fun getModeFromIntentOrLastKnown(intent: Intent?): BrowsingMode {
         intent?.toSafeIntent()?.let {
@@ -90,10 +84,6 @@ class DefaultBrowsingModeManager(
             }
         }
 
-        if (settings.lastKnownMode.isPrivate && store.state.getNormalOrPrivateTabs(private = true).isNotEmpty()) {
-            return BrowsingMode.Private
-        }
-
-        return BrowsingMode.Normal
+        return settings.lastKnownMode
     }
 }

app/src/main/java/org/mozilla/fenix/browser/browsingmode/BrowsingModeManager.kt

@@ -88,7 +88,7 @@
       "channel": "beta",
       "userFacingName": "Setup checklist (all users)",
       "userFacingDescription": "Android Setup Checklist",
-      "isEnrollmentPaused": false,
+      "isEnrollmentPaused": true,
       "isRollout": false,
       "bucketConfig": {
         "randomizationUnit": "nimbus_id",
@@ -168,7 +168,7 @@
       ],
       "targeting": "((android_sdk_version|versionCompare('26') >= 0)) && (app_version|versionCompare('139.!') >= 0)",
       "startDate": "2025-07-24",
-      "enrollmentEndDate": null,
+      "enrollmentEndDate": "2025-08-18",
       "endDate": null,
       "proposedDuration": 28,
       "proposedEnrollment": 7,

app/src/main/res/raw/initial_experiments.json

@@ -11,9 +11,6 @@ import io.mockk.every
 import io.mockk.impl.annotations.MockK
 import io.mockk.just
 import io.mockk.verify
-import mozilla.components.browser.state.state.BrowserState
-import mozilla.components.browser.state.state.createTab
-import mozilla.components.browser.state.store.BrowserStore
 import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Rule
@@ -85,17 +82,10 @@ class DefaultBrowsingModeManagerTest {
     }
 
     @Test
-    fun `GIVEN browsing mode is not set by intent and private mode with a tab persisted WHEN browsing mode manager is initialized THEN set browsing mode to private`() {
+    fun `GIVEN last known mode is private mode WHEN browsing mode manager is initialized THEN set browsing mode to private`() {
         every { settings.lastKnownMode } returns BrowsingMode.Private
 
-        val browserStore = BrowserStore(
-            BrowserState(
-                tabs = listOf(
-                    createTab(url = "https://mozilla.org", private = true),
-                ),
-            ),
-        )
-        val manager = buildBrowsingModeManager(store = browserStore)
+        val manager = buildBrowsingModeManager()
 
         assertEquals(BrowsingMode.Private, manager.mode)
 
@@ -105,20 +95,6 @@ class DefaultBrowsingModeManagerTest {
         }
     }
 
-    @Test
-    fun `GIVEN last known mode is private mode and no tabs persisted WHEN browsing mode manager is initialized THEN set browsing mode to normal`() {
-        every { settings.lastKnownMode } returns BrowsingMode.Private
-
-        val manager = buildBrowsingModeManager()
-
-        assertEquals(BrowsingMode.Normal, manager.mode)
-
-        verify {
-            onModeChange.invoke(BrowsingMode.Normal)
-            settings.lastKnownMode = BrowsingMode.Normal
-        }
-    }
-
     @Test
     fun `GIVEN last known mode is normal mode WHEN browsing mode manager is initialized THEN set browsing mode to normal`() {
         every { settings.lastKnownMode } returns BrowsingMode.Normal
@@ -163,36 +139,16 @@ class DefaultBrowsingModeManagerTest {
     }
 
     @Test
-    fun `GIVEN browsing mode is not set by intent and private mode with a tab persisted WHEN update mode is called THEN set browsing mode to private`() {
-        val browserStore = BrowserStore(
-            BrowserState(
-                tabs = listOf(
-                    createTab(url = "https://mozilla.org", private = true),
-                ),
-            ),
-        )
-        val manager = buildBrowsingModeManager(store = browserStore)
-
-        assertEquals(BrowsingMode.Normal, manager.mode)
-
-        every { settings.lastKnownMode } returns BrowsingMode.Private
-
-        manager.updateMode()
-
-        assertEquals(BrowsingMode.Private, manager.mode)
-    }
-
-    @Test
-    fun `GIVEN browsing mode is not set by intent and private mode and no tabs persisted WHEN update mode is called THEN set browsing mode to normal`() {
+    fun `GIVEN browsing mode is not set by intent and last known mode is private mode WHEN update mode is called THEN set browsing mode to private`() {
         every { settings.lastKnownMode } returns BrowsingMode.Private
 
         val manager = buildBrowsingModeManager()
 
-        assertEquals(BrowsingMode.Normal, manager.mode)
+        assertEquals(BrowsingMode.Private, manager.mode)
 
         manager.updateMode()
 
-        assertEquals(BrowsingMode.Normal, manager.mode)
+        assertEquals(BrowsingMode.Private, manager.mode)
     }
 
     @Test
@@ -210,11 +166,9 @@ class DefaultBrowsingModeManagerTest {
 
     private fun buildBrowsingModeManager(
         intent: Intent? = null,
-        store: BrowserStore = BrowserStore(),
     ): BrowsingModeManager {
         return DefaultBrowsingModeManager(
             intent = intent,
-            store = store,
             settings = settings,
             onModeChange = onModeChange,
         )

app/src/test/java/org/mozilla/fenix/browser/browsingmode/DefaultBrowsingModeManagerTest.kt

@@ -61,7 +61,6 @@ class TabCounterViewTest {
 
         browsingModeManager = DefaultBrowsingModeManager(
             intent = null,
-            store = BrowserStore(),
             settings = settings,
             onModeChange = onModeChange,
         )

app/src/test/java/org/mozilla/fenix/home/toolbar/TabCounterViewTest.kt

@@ -1082,7 +1082,6 @@ class DefaultTabsTrayControllerTest {
         var appStateModeUpdate: BrowsingMode? = null
         browsingModeManager = DefaultBrowsingModeManager(
             intent = null,
-            store = browserStore,
             settings = settings,
             onModeChange = { updatedMode ->
                 appStateModeUpdate = updatedMode