From e7e5ae2b772a4bbb2a5eea754fb56b56fdd03343 Mon Sep 17 00:00:00 2001
From: Adolfo Santiago <epoch@nixnetmail.com>
Date: Sat, 15 Jan 2022 18:56:55 +0100
Subject: [PATCH] Load default ACRA enable preference

---
 husky/app/src/husky/res/values/strings.xml    |  4 ++++
 .../com/keylesspalace/tusky/MainActivity.kt   |  7 ++++++
 .../keylesspalace/tusky/TuskyApplication.kt   |  1 +
 .../preference/PreferencesFragment.kt         | 24 ++++++-------------
 .../tusky/settings/SettingsConstants.kt       |  2 --
 .../app/src/main/res/xml/app_preferences.xml  | 13 ++++++++++
 6 files changed, 32 insertions(+), 19 deletions(-)
 create mode 100644 husky/app/src/main/res/xml/app_preferences.xml

diff --git a/husky/app/src/husky/res/values/strings.xml b/husky/app/src/husky/res/values/strings.xml
index 580ffb9..6edfea0 100644
--- a/husky/app/src/husky/res/values/strings.xml
+++ b/husky/app/src/husky/res/values/strings.xml
@@ -47,6 +47,10 @@
     <string name="pref_title_composing">Composing</string>
     <string name="pref_title_composing_title">Composing using zero-width space characters in emojis</string>
 
+    <string name="pref_acra_category">ACRA Settings</string>
+    <string name="pref_acra_body">Enable ACRA reporting</string>
+    <string name="key_enable_acra">acra.enable</string>
+
     <string name="pref_title_anonymize_upload_filenames">Anonymize uploaded file names</string>
     <string name="pref_title_live_notifications">Live notifications</string>
     <string name="pref_summary_live_notifications">May slightly increase power consumption</string>
diff --git a/husky/app/src/main/java/com/keylesspalace/tusky/MainActivity.kt b/husky/app/src/main/java/com/keylesspalace/tusky/MainActivity.kt
index 5da1fe7..b2a00b3 100644
--- a/husky/app/src/main/java/com/keylesspalace/tusky/MainActivity.kt
+++ b/husky/app/src/main/java/com/keylesspalace/tusky/MainActivity.kt
@@ -250,6 +250,13 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidInje
             // Flush old media that was cached for sharing
             deleteStaleCachedMedia(applicationContext.getExternalFilesDir("Husky"))
         }
+
+        // Load the default settings for the app but does not overwrite changed values
+        PreferenceManager.setDefaultValues(
+            this,
+            R.xml.app_preferences,
+            true
+        )
     }
 
     private fun initPullNotifications() {
diff --git a/husky/app/src/main/java/com/keylesspalace/tusky/TuskyApplication.kt b/husky/app/src/main/java/com/keylesspalace/tusky/TuskyApplication.kt
index 90ab82c..2702ae5 100644
--- a/husky/app/src/main/java/com/keylesspalace/tusky/TuskyApplication.kt
+++ b/husky/app/src/main/java/com/keylesspalace/tusky/TuskyApplication.kt
@@ -22,6 +22,7 @@ package com.keylesspalace.tusky
 
 import android.app.Application
 import android.content.Context
+import android.content.SharedPreferences
 import android.content.res.Configuration
 import android.graphics.Bitmap
 import androidx.core.app.NotificationManagerCompat
diff --git a/husky/app/src/main/java/com/keylesspalace/tusky/components/preference/PreferencesFragment.kt b/husky/app/src/main/java/com/keylesspalace/tusky/components/preference/PreferencesFragment.kt
index 6d3eb16..a8a2124 100644
--- a/husky/app/src/main/java/com/keylesspalace/tusky/components/preference/PreferencesFragment.kt
+++ b/husky/app/src/main/java/com/keylesspalace/tusky/components/preference/PreferencesFragment.kt
@@ -45,6 +45,7 @@ import com.mikepenz.iconics.utils.colorInt
 import com.mikepenz.iconics.utils.sizePx
 import javax.inject.Inject
 import okhttp3.OkHttpClient
+import org.acra.ACRA.PREF_ENABLE_ACRA
 
 class PreferencesFragment : PreferenceFragmentCompat(), Injectable {
 
@@ -336,23 +337,12 @@ class PreferencesFragment : PreferenceFragmentCompat(), Injectable {
                 }
             }
 
-            preferenceCategory(R.string.pref_title_proxy_settings) {
-                httpProxyPref = preference {
-                    setTitle(R.string.pref_title_http_proxy_settings)
-                    setOnPreferenceClickListener {
-                        activity?.let { activity ->
-                            val intent = PreferencesActivity.newIntent(
-                                activity,
-                                PreferencesActivity.PROXY_PREFERENCES
-                            )
-                            activity.startActivity(intent)
-                            activity.overridePendingTransition(
-                                R.anim.slide_from_right,
-                                R.anim.slide_to_left
-                            )
-                        }
-                        true
-                    }
+            preferenceCategory(R.string.pref_acra_category) {
+                switchPreference {
+                    setDefaultValue(false)
+                    key = PREF_ENABLE_ACRA
+                    setTitle(R.string.pref_acra_body)
+                    isSingleLineTitle = false
                 }
             }
         }
diff --git a/husky/app/src/main/java/com/keylesspalace/tusky/settings/SettingsConstants.kt b/husky/app/src/main/java/com/keylesspalace/tusky/settings/SettingsConstants.kt
index 4943c6d..db8bc25 100644
--- a/husky/app/src/main/java/com/keylesspalace/tusky/settings/SettingsConstants.kt
+++ b/husky/app/src/main/java/com/keylesspalace/tusky/settings/SettingsConstants.kt
@@ -92,6 +92,4 @@ object PrefKeys {
 
     const val TAB_FILTER_HOME_REPLIES = "tabFilterHomeReplies"
     const val TAB_FILTER_HOME_BOOSTS = "tabFilterHomeBoosts"
-
-    const val ACRA_ENABLE_REPORT = "acraEnable"
 }
diff --git a/husky/app/src/main/res/xml/app_preferences.xml b/husky/app/src/main/res/xml/app_preferences.xml
new file mode 100644
index 0000000..efa8766
--- /dev/null
+++ b/husky/app/src/main/res/xml/app_preferences.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <PreferenceCategory android:title="@string/pref_acra_category">
+
+        <CheckBoxPreference
+            android:defaultValue="false"
+            android:key="@string/key_enable_acra"
+            android:title="@string/pref_acra_body" />
+
+    </PreferenceCategory>
+
+</PreferenceScreen>