From dfe9a0d0514115377668288d6262d2d8d0bbc7a8 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Wed, 22 Jun 2022 23:32:14 +0200
Subject: [PATCH] updating some casual things

---
 app/build.gradle                                         | 2 +-
 app/src/fdroid/res/values/bools.xml                      | 2 ++
 .../camera/activities/SettingsActivity.kt                | 9 ++++++---
 build.gradle                                             | 2 +-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 4042216e..a66fcaaf 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -62,7 +62,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.github.SimpleMobileTools:Simple-Commons:d5e1100f27'
+    implementation 'com.github.SimpleMobileTools:Simple-Commons:d1d5402388'
     implementation 'androidx.documentfile:documentfile:1.0.1'
     implementation "androidx.exifinterface:exifinterface:1.3.3"
 }
diff --git a/app/src/fdroid/res/values/bools.xml b/app/src/fdroid/res/values/bools.xml
index e966e656..ac02880e 100644
--- a/app/src/fdroid/res/values/bools.xml
+++ b/app/src/fdroid/res/values/bools.xml
@@ -1,4 +1,6 @@
 <?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>
 </resources>
diff --git a/app/src/main/kotlin/com/simplemobiletools/camera/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/camera/activities/SettingsActivity.kt
index 56f9c1da..9989b0fa 100644
--- a/app/src/main/kotlin/com/simplemobiletools/camera/activities/SettingsActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/camera/activities/SettingsActivity.kt
@@ -110,11 +110,14 @@ class SettingsActivity : SimpleActivity() {
         val licenses = LICENSE_GLIDE
 
         val faqItems = arrayListOf(
-            FAQItem(R.string.faq_1_title, R.string.faq_1_text),
-            FAQItem(R.string.faq_2_title_commons, R.string.faq_2_text_commons),
-            FAQItem(R.string.faq_6_title_commons, R.string.faq_6_text_commons)
+            FAQItem(R.string.faq_1_title, R.string.faq_1_text)
         )
 
+        if (!resources.getBoolean(R.bool.hide_google_relations)) {
+            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))
+        }
+
         startAboutActivity(R.string.app_name, licenses, BuildConfig.VERSION_NAME, faqItems, true)
     }
 
diff --git a/build.gradle b/build.gradle
index cf4af380..a13b99ff 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.6.20'
+    ext.kotlin_version = '1.6.21'
 
     repositories {
         google()