Fixes from master

Domi04151309 · May 14, 2024 · 25f4cea · 25f4cea
1 parent 98a4fb5
commit 25f4cea
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 13 deletions.
diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
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
@@ -35,12 +35,12 @@ class NotificationService : NotificationListenerService() {
         val rules = Rules(this)
         @Suppress("ComplexCondition")
         if (
-            isValidNotification(notification)
-            && !CombinedServiceReceiver.isScreenOn
-            && !CombinedServiceReceiver.isAlwaysOnRunning
+            isValidNotification(notification) &&
+            !CombinedServiceReceiver.isScreenOn &&
+            !CombinedServiceReceiver.isAlwaysOnRunning &&
             Rules.isAmbientMode(this) &&
-            rules.canShow(this)
-            && count >= 1
+            rules.canShow(this) &&
+            count >= 1
         ) {
             startActivity(
                 Intent(
@@ -51,14 +51,13 @@ class NotificationService : NotificationListenerService() {
         }
     }
 
-    override fun onNotificationRemoved(sbn: StatusBarNotification) {
+    override fun onNotificationRemoved(notification: StatusBarNotification) {
         updateValues()
 
-        val rules = Rules(this, prefs)
         if (
-            CombinedServiceReceiver.isAlwaysOnRunning
-            && rules.isAmbientMode()
-            && count < 1
+            CombinedServiceReceiver.isAlwaysOnRunning &&
+            Rules.isAmbientMode(this) &&
+            count < 1
         ) {
             AlwaysOn.finish()
         }

diff --git a/gradle.properties b/gradle.properties
@@ -20,4 +20,4 @@ kotlin.code.style=official
 # Enables namespacing of each library's R class so that its R class includes only the
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
-android.nonTransitiveRClass=true
+android.nonTransitiveRClass=true