From 1414cdbb3840957895d22bbb19cbcccaef21e185 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Deniz=20D=C3=BCzg=C3=B6ren?= <k.duezgoeren@gmail.com>
Date: Wed, 18 Sep 2019 16:24:12 +0200
Subject: [PATCH] Notifications can now show type when additional string is
 empty

---
 .../java/com/denizd/substitutionplan/data/DataFetcher.kt  | 2 +-
 .../com/denizd/substitutionplan/data/HelperFunctions.kt   | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/denizd/substitutionplan/data/DataFetcher.kt b/app/src/main/java/com/denizd/substitutionplan/data/DataFetcher.kt
index 3ea7bb9..3826138 100644
--- a/app/src/main/java/com/denizd/substitutionplan/data/DataFetcher.kt
+++ b/app/src/main/java/com/denizd/substitutionplan/data/DataFetcher.kt
@@ -190,7 +190,7 @@ internal class DataFetcher(isPlan: Boolean, isMenu: Boolean, isJobService: Boole
                     )
                 }.forEach { substItem ->
                     if (countOfNotificationItems < 4) {
-                        notificationText += ("${if (notificationText.isNotEmpty()) ",\n" else ""}${substItem.course}: ${if (substItem.additional.isNotEmpty()) substItem.additional else "---"}")
+                        notificationText += ("${if (notificationText.isNotEmpty()) ",\n" else ""}${substItem.course}: ${if (substItem.additional.isNotEmpty()) substItem.additional else if (substItem.type.isNotEmpty()) substItem.type else "---"}")
                         countOfNotificationItems += 1
                     } else {
                         countOfMoreNotificationItems += 1
diff --git a/app/src/main/java/com/denizd/substitutionplan/data/HelperFunctions.kt b/app/src/main/java/com/denizd/substitutionplan/data/HelperFunctions.kt
index 26518dd..9a95a13 100644
--- a/app/src/main/java/com/denizd/substitutionplan/data/HelperFunctions.kt
+++ b/app/src/main/java/com/denizd/substitutionplan/data/HelperFunctions.kt
@@ -142,17 +142,15 @@ internal object HelperFunctions {
             return true
         }
         if (coursePreference.isEmpty() && classPreference.isNotEmpty()) {
-            if (group.isNotEmpty() && group != "") {
+            if (group.isNotEmpty()) {
                 if (classPreference.contains(group) || group.contains(classPreference)) {
                     return true
                 }
             }
         } else if (classPreference.isNotEmpty() && coursePreference.isNotEmpty()) {
             if (group != "" && course != "") {
-                if (coursePreference.contains(course)) {
-                    if (classPreference.contains(group) || group.contains(classPreference)) {
-                        return true
-                    }
+                if ((classPreference.contains(group) || group.contains(classPreference)) && coursePreference.contains(course)) {
+                    return true
                 }
             }
         }