Refactor reset to be more accurate

Signed-off-by: Tyler Nijmeh <tylernij@gmail.com>

6 files changed, 16 insertions, 30 deletions

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9424907..5e3852d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -32,7 +32,7 @@
 
         <service android:name=".services.TileResetService"
             android:icon="@drawable/ic_baseline_api_24"
-            android:label="@string/pref_profile_title_reset"
+            android:label="@string/pref_profile_title_default"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"
             android:exported="true">
             <intent-filter>
diff --git a/app/src/main/java/com/draco/buoy/fragments/MainPreferenceFragment.kt b/app/src/main/java/com/draco/buoy/fragments/MainPreferenceFragment.kt
index 554cc84..1a65293 100644
--- a/app/src/main/java/com/draco/buoy/fragments/MainPreferenceFragment.kt
+++ b/app/src/main/java/com/draco/buoy/fragments/MainPreferenceFragment.kt
@@ -106,8 +106,8 @@ class MainPreferenceFragment : PreferenceFragmentCompat(), SharedPreferences.OnS
 
     override fun onPreferenceTreeClick(preference: Preference): Boolean {
         when (preference.key) {
-            getString(R.string.pref_profile_key_reset) -> {
-                batterySaverManager.reset()
+            getString(R.string.pref_profile_key_default) -> {
+                batterySaverManager.resetToDefault()
                 refreshSettings()
             }
             getString(R.string.pref_profile_key_light) -> {
diff --git a/app/src/main/java/com/draco/buoy/services/TileResetService.kt b/app/src/main/java/com/draco/buoy/services/TileResetService.kt
index 21f22d7..14c568d 100644
--- a/app/src/main/java/com/draco/buoy/services/TileResetService.kt
+++ b/app/src/main/java/com/draco/buoy/services/TileResetService.kt
@@ -13,6 +13,6 @@ class TileResetService : TileService() {
 
     override fun onClick() {
         super.onClick()
-        batterySaverManager.reset()
+        batterySaverManager.resetToDefault()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/draco/buoy/utils/BatterySaverManager.kt b/app/src/main/java/com/draco/buoy/utils/BatterySaverManager.kt
index d9ba9be..a72aa70 100644
--- a/app/src/main/java/com/draco/buoy/utils/BatterySaverManager.kt
+++ b/app/src/main/java/com/draco/buoy/utils/BatterySaverManager.kt
@@ -7,17 +7,6 @@ import com.draco.buoy.repositories.constants.BatterySaverSecureSettings
 
 class BatterySaverManager(private val contentResolver: ContentResolver) {
     /**
-     * Reset constants to default values
-     */
-    fun resetConstants() {
-        Settings.Global.putString(
-            contentResolver,
-            BatterySaverSecureSettings.BATTERY_SAVER_CONSTANTS,
-            null
-        )
-    }
-
-    /**
      * Enable or disable low power mode
      */
     fun setLowPower(state: Boolean) {
@@ -56,7 +45,7 @@ class BatterySaverManager(private val contentResolver: ContentResolver) {
     /**
      * Set the raw battery saver constants secure setting
      */
-    fun setConstantsString(constants: String) {
+    fun setConstantsString(constants: String?) {
         Settings.Global.putString(
             contentResolver,
             BatterySaverSecureSettings.BATTERY_SAVER_CONSTANTS,
@@ -84,9 +73,9 @@ class BatterySaverManager(private val contentResolver: ContentResolver) {
     /**
      * Quick way to apply either type of config
      */
-    fun apply(config: Any) {
+    fun apply(config: Any?) {
         when (config) {
-            is String -> setConstantsString(config)
+            is String? -> setConstantsString(config)
             is BatterySaverConstantsConfig -> setConstantsConfig(config)
         }
 
@@ -96,12 +85,9 @@ class BatterySaverManager(private val contentResolver: ContentResolver) {
     }
 
     /**
-     * Quick way to reset everything
+     * Reset constants to default values
      */
-    fun reset() {
-        resetConstants()
-        setLowPower(false)
-        setLowPowerSticky(false)
-        setLowPowerStickyAutoDisableEnabled(true)
+    fun resetToDefault() {
+        apply(null)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2cc3954..f737890 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -25,9 +25,9 @@
     <string name="category_about">About</string>
     <string name="category_config">Configuration</string>
 
-    <string name="pref_profile_key_reset">reset</string>
-    <string name="pref_profile_title_reset">Reset</string>
-    <string name="pref_profile_summary_reset">Undo all changes done by the app</string>
+    <string name="pref_profile_key_default">default</string>
+    <string name="pref_profile_title_default">Default</string>
+    <string name="pref_profile_summary_default">Use the device\'s default battery saver settings</string>
 
     <string name="pref_profile_key_light">light</string>
     <string name="pref_profile_title_light">Light</string>
diff --git a/app/src/main/res/xml/main.xml b/app/src/main/res/xml/main.xml
index 3e77be0..26859ba 100644
--- a/app/src/main/res/xml/main.xml
+++ b/app/src/main/res/xml/main.xml
@@ -3,9 +3,9 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <PreferenceCategory android:title="@string/category_profiles">
         <Preference
-            android:title="@string/pref_profile_title_reset"
-            android:summary="@string/pref_profile_summary_reset"
-            android:key="@string/pref_profile_key_reset"
+            android:title="@string/pref_profile_title_default"
+            android:summary="@string/pref_profile_summary_default"
+            android:key="@string/pref_profile_key_default"
             android:icon="@drawable/ic_baseline_undo_24" />
         <Preference
             android:title="@string/pref_profile_title_light"