Add a condition to 'if' statement for new option

Domi04151309 · May 17, 2024 · 06df97f · 06df97f
1 parent cebd834
commit 06df97f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/app/src/main/java/io/github/domi04151309/alwayson/helpers/Rules.kt b/app/src/main/java/io/github/domi04151309/alwayson/helpers/Rules.kt
@@ -113,6 +113,12 @@ class Rules(context: Context) {
                 false,
             )
 
+        fun hideWhenNoNotifications(context: Context): Boolean =
+            P.getPreferences(context).getBoolean(
+                "rules_hide_no_notifications",
+                false
+            )
+
         fun matchesBatteryPercentage(context: Context): Boolean =
             (
                 getBatteryStatus(context)?.getIntExtra(

diff --git a/app/src/main/java/io/github/domi04151309/alwayson/services/NotificationService.kt b/app/src/main/java/io/github/domi04151309/alwayson/services/NotificationService.kt
@@ -57,6 +57,7 @@ class NotificationService : NotificationListenerService() {
         if (
             CombinedServiceReceiver.isAlwaysOnRunning &&
             Rules.isAmbientMode(this) &&
+            Rules.hideWhenNoNotifications(this) &&
             count < 1
         ) {
             AlwaysOn.finish()

diff --git a/app/src/main/res/xml/pref_laf_rules.xml b/app/src/main/res/xml/pref_laf_rules.xml
@@ -17,7 +17,7 @@
     <SwitchPreference
         android:defaultValue="false"
         android:icon="@drawable/ic_notification"
-        android:key="pref_hide_no_notifications"
+        android:key="rules_hide_no_notifications"
         android:summary="@string/pref_look_and_feel_hide_no_notifications_summary"
         android:title="@string/pref_look_and_feel_hide_no_notifications"
         android:dependency="rules_ambient_mode" />