Subject: [PATCH] 0001-before first build
---
Index: app/build.gradle
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/app/build.gradle b/app/build.gradle
--- a/app/build.gradle	(revision f4eedc368a2aa500a3aa81930f57e1f21f514d8b)
+++ b/app/build.gradle	(revision f8dd2d76ea6e231bb0750372cc730123a60f213b)
@@ -330,8 +330,8 @@
         // same version code. Therefore we need to have different version codes for our ARM and x86
         // builds.
 
-        def versionName = variant.buildType.name == 'nightly' ? Config.nightlyVersionName() : Config.releaseVersionName(project)
-        println("versionName override: $versionName")
+//        def versionName = variant.buildType.name == 'nightly' ? Config.nightlyVersionName() : Config.releaseVersionName(project)
+//        println("versionName override: $versionName")
 
         variant.outputs.each { output ->
             def isMozillaOnline = project.hasProperty("mozillaOnline") || gradle.hasProperty("localProperties.mozillaOnline")
@@ -934,4 +934,4 @@
 }
 
 // Enable expiration by major version.
-ext.gleanExpireByVersion = Config.majorVersion()
+ext.gleanExpireByVersion = 26
Index: app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt b/app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt
--- a/app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt	(revision f4eedc368a2aa500a3aa81930f57e1f21f514d8b)
+++ b/app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt	(revision f8dd2d76ea6e231bb0750372cc730123a60f213b)
@@ -143,10 +143,6 @@
                             showAlertDialog()
                             true
                         }
-                        R.id.addons_sideload -> {
-                            installFromFile()
-                            true
-                        }
                         R.id.search -> {
                             true
                         }
Index: app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
--- a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt	(revision f4eedc368a2aa500a3aa81930f57e1f21f514d8b)
+++ b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt	(revision f8dd2d76ea6e231bb0750372cc730123a60f213b)
@@ -593,7 +593,6 @@
                     }
                 },
             ),
-            showTopRecentSites = settings.showTopRecentSites,
         )
     }