From e1f091d3087a5904af38fcc384b2ff6fda9db0fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Deniz=20D=C3=BCzg=C3=B6ren?= <k.duezgoeren@gmail.com>
Date: Fri, 23 Aug 2019 13:13:52 +0200
Subject: [PATCH] Ping service now subscribes to Firebase topics every 15
 minutes to keep the app alive, courses and rooms are now struck through if
 the course is cancelled

---
 .../main/java/com/denizd/substitutionplan/CardAdapter.kt | 2 +-
 .../java/com/denizd/substitutionplan/FBPingService.kt    | 6 ++++++
 .../java/com/denizd/substitutionplan/SettingsFragment.kt | 9 +++++++++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/denizd/substitutionplan/CardAdapter.kt b/app/src/main/java/com/denizd/substitutionplan/CardAdapter.kt
index ae6c15a..15369b1 100644
--- a/app/src/main/java/com/denizd/substitutionplan/CardAdapter.kt
+++ b/app/src/main/java/com/denizd/substitutionplan/CardAdapter.kt
@@ -64,7 +64,7 @@ class CardAdapter(private var mSubst: List<Subst>) : RecyclerView.Adapter<CardAd
             }
         }
         with (currentItem.additional.toLowerCase(Locale.ROOT)) {
-            if (contains("eigenverantwortliches arbeiten") || contains("entfall")) {
+            if (contains("eigenverantwortliches arbeiten") || contains("entfall") || contains("fällt aus")) {
                 strings[2].setSpan(StrikethroughSpan(), 0, strings[2].length, 0)
                 strings[3].setSpan(StrikethroughSpan(), 0, strings[3].length, 0)
             }
diff --git a/app/src/main/java/com/denizd/substitutionplan/FBPingService.kt b/app/src/main/java/com/denizd/substitutionplan/FBPingService.kt
index 10d369e..df43dd6 100644
--- a/app/src/main/java/com/denizd/substitutionplan/FBPingService.kt
+++ b/app/src/main/java/com/denizd/substitutionplan/FBPingService.kt
@@ -38,6 +38,12 @@ class FBPingService : JobService() {
             FirebaseMessaging.getInstance().unsubscribeFromTopic("substitutions-debug")
         }
 
+        if (prefs.getBoolean("subscribedToiOSChannel", false)) {
+            FirebaseMessaging.getInstance().subscribeToTopic("substitutions-ios")
+        } else {
+            FirebaseMessaging.getInstance().unsubscribeFromTopic("substitutions-ios")
+        }
+
         FirebaseMessaging.getInstance().subscribeToTopic("substitutions-broadcast")
         prefs.edit().putInt("pingFB", prefs.getInt("pingFB", 0) + 1).apply()
 
diff --git a/app/src/main/java/com/denizd/substitutionplan/SettingsFragment.kt b/app/src/main/java/com/denizd/substitutionplan/SettingsFragment.kt
index 5f7a29e..e968a59 100644
--- a/app/src/main/java/com/denizd/substitutionplan/SettingsFragment.kt
+++ b/app/src/main/java/com/denizd/substitutionplan/SettingsFragment.kt
@@ -407,6 +407,15 @@ class SettingsFragment : Fragment(R.layout.content_settings), View.OnClickListen
                     edit.putBoolean("subscribedToFBDebugChannel", !prefs.getBoolean("subscribedToFBDebugChannel", false)).apply()
                     Toast.makeText(mContext, "$subbed Firebase development channel", Toast.LENGTH_LONG).show()
                 }
+                "_IOSCHANNEL" -> {
+                    val subbed = if (prefs.getBoolean("subscribedToiOSChannel", false)) {
+                        "Unsubscribed from"
+                    } else {
+                        "Subscribed to"
+                    }
+                    edit.putBoolean("subscribedToiOSChannel", !prefs.getBoolean("subscribedToiOSChannel", false)).apply()
+                    Toast.makeText(mContext, "$subbed iOS channel", Toast.LENGTH_LONG).show()
+                }
                 else -> Toast.makeText(mContext, getString(R.string.invalidCode), Toast.LENGTH_LONG).show()
             }
         }