From ea4c0e12aa528e3a2e798a2c9f1e3744489ffc33 Mon Sep 17 00:00:00 2001
From: "fossifybot[bot]" <212866877+fossifybot[bot]@users.noreply.github.com>
Date: Thu, 8 Oct 2026 00:54:19 +0000
Subject: [PATCH 1/2] chore(deps): bump org.fossify.commons from 6.1.6 to 7.1.0

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index ef9f88d6..ce8f749e 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -8,7 +8,7 @@ detektCompose = "0.4.28"
 androidx-swiperefreshlayout = "1.2.0"
 androidx-documentfile = "1.1.0"
 #Fossify
-commons = "6.1.6"
+commons = "7.1.0"
 #Other
 autofittextview = "0.2.1"
 gestureviews = "2.9.0"

From 33c5d6ef51e883fdcf1714cb3cb332a51d9a3619 Mon Sep 17 00:00:00 2001
From: Naveen Singh <snaveen935@gmail.com>
Date: Thu, 8 Oct 2026 07:21:33 +0530
Subject: [PATCH 2/2] fix: migrate to commons v7.1.0

---
 app/build.gradle.kts                                          | 1 -
 app/src/foss/res/values/bools.xml                             | 3 +--
 app/src/gplay/res/values/bools.xml                            | 2 +-
 .../kotlin/org/fossify/filemanager/activities/MainActivity.kt | 4 ++--
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 57154336..56a2ae6b 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -82,7 +82,6 @@ android {
 
     flavorDimensions.add("variants")
     productFlavors {
-        register("core")
         register("foss")
         register("gplay")
     }
diff --git a/app/src/foss/res/values/bools.xml b/app/src/foss/res/values/bools.xml
index ac02880e..fcdfa946 100644
--- a/app/src/foss/res/values/bools.xml
+++ b/app/src/foss/res/values/bools.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <bool name="show_donate_in_about">true</bool>
-    <bool name="hide_google_relations">true</bool>
-    <bool name="pretend_thank_you_installed">true</bool>
+    <bool name="is_google_play_build">false</bool>
 </resources>
diff --git a/app/src/gplay/res/values/bools.xml b/app/src/gplay/res/values/bools.xml
index b0ad1f66..d89a62c6 100644
--- a/app/src/gplay/res/values/bools.xml
+++ b/app/src/gplay/res/values/bools.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <bool name="show_donate_in_about">false</bool>
-    <bool name="hide_google_relations">false</bool>
+    <bool name="is_google_play_build">true</bool>
 </resources>
diff --git a/app/src/main/kotlin/org/fossify/filemanager/activities/MainActivity.kt b/app/src/main/kotlin/org/fossify/filemanager/activities/MainActivity.kt
index 4a6e4be7..4e4d3574 100644
--- a/app/src/main/kotlin/org/fossify/filemanager/activities/MainActivity.kt
+++ b/app/src/main/kotlin/org/fossify/filemanager/activities/MainActivity.kt
@@ -211,7 +211,7 @@ class MainActivity : SimpleActivity() {
 
             findItem(R.id.column_count).isVisible = currentViewType == VIEW_TYPE_GRID && currentFragment !is StorageFragment
 
-            findItem(R.id.more_apps_from_us).isVisible = !resources.getBoolean(R.bool.hide_google_relations)
+            findItem(R.id.more_apps_from_us).isVisible = resources.getBoolean(R.bool.is_google_play_build)
             findItem(R.id.settings).isVisible = !isCreateDocumentIntent
             findItem(R.id.about).isVisible = !isCreateDocumentIntent
         }
@@ -584,7 +584,7 @@ class MainActivity : SimpleActivity() {
             FAQItem(R.string.faq_9_title_commons, R.string.faq_9_text_commons)
         )
 
-        if (!resources.getBoolean(R.bool.hide_google_relations)) {
+        if (resources.getBoolean(R.bool.is_google_play_build)) {
             faqItems.add(FAQItem(R.string.faq_2_title_commons, R.string.faq_2_text_commons))
             faqItems.add(FAQItem(R.string.faq_6_title_commons, R.string.faq_6_text_commons))
             faqItems.add(FAQItem(R.string.faq_7_title_commons, R.string.faq_7_text_commons))