From 7c18d956dec3fa34e2ace0a7a0f0a18fcc4e6216 Mon Sep 17 00:00:00 2001
From: Philipp Heckel <pheckel@datto.com>
Date: Tue, 18 Jan 2022 22:22:00 -0500
Subject: [PATCH] Move wakelock back to advanced section

---
 app/src/main/java/io/heckel/ntfy/log/Log.kt | 6 +++---
 app/src/main/res/xml/main_preferences.xml   | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/io/heckel/ntfy/log/Log.kt b/app/src/main/java/io/heckel/ntfy/log/Log.kt
index 69c265d..396cc22 100644
--- a/app/src/main/java/io/heckel/ntfy/log/Log.kt
+++ b/app/src/main/java/io/heckel/ntfy/log/Log.kt
@@ -6,6 +6,7 @@ import io.heckel.ntfy.BuildConfig
 import io.heckel.ntfy.db.Database
 import io.heckel.ntfy.db.LogDao
 import io.heckel.ntfy.db.LogEntry
+import io.heckel.ntfy.db.Repository
 import io.heckel.ntfy.util.isIgnoringBatteryOptimizations
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
@@ -41,15 +42,14 @@ class Log(private val logsDao: LogDao) {
         return """
             This is a log of the ntfy Android app. The log shows up to 5,000 lines.
             Server URLs (aside from ntfy.sh) and topics have been replaced with fruits 🍌🥝🍋🥥🥑🍊🍎🍑.
-            
+
             Device info:
             --
             ntfy: ${BuildConfig.VERSION_NAME} (${BuildConfig.FLAVOR})
             OS: ${System.getProperty("os.version")}
             Android: ${Build.VERSION.RELEASE} (SDK ${Build.VERSION.SDK_INT})
             Model: ${Build.DEVICE}
-            Product: ${Build.PRODUCT}        
-            ---           
+            Product: ${Build.PRODUCT}
         """.trimIndent() + "\n\n$s"
     }
 
diff --git a/app/src/main/res/xml/main_preferences.xml b/app/src/main/res/xml/main_preferences.xml
index 519d17c..e8f51c0 100644
--- a/app/src/main/res/xml/main_preferences.xml
+++ b/app/src/main/res/xml/main_preferences.xml
@@ -53,6 +53,10 @@
                 app:key="@string/settings_advanced_clear_logs_key"
                 app:title="@string/settings_advanced_clear_logs_title"
                 app:summary="@string/settings_advanced_clear_logs_summary"/>
+        <SwitchPreference
+                app:key="@string/settings_advanced_wakelock_key"
+                app:title="@string/settings_advanced_wakelock_title"
+                app:enabled="true"/>
     </PreferenceCategory>
     <PreferenceCategory app:title="@string/settings_experimental_header">
         <ListPreference
@@ -61,10 +65,6 @@
                 app:entries="@array/settings_advanced_connection_protocol_entries"
                 app:entryValues="@array/settings_advanced_connection_protocol_values"
                 app:defaultValue="jsonhttp"/>
-        <SwitchPreference
-                app:key="@string/settings_advanced_wakelock_key"
-                app:title="@string/settings_advanced_wakelock_title"
-                app:enabled="true"/>
     </PreferenceCategory>
     <PreferenceCategory app:title="@string/settings_about_header">
         <Preference