From e0f39c5584759749812bedb3a5be7571ff8b7cf1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Deniz=20D=C3=BCzg=C3=B6ren?= <k.duezgoeren@gmail.com>
Date: Wed, 14 Aug 2019 18:53:56 +0200
Subject: [PATCH] Now using Repository instead of ViewModel in DataFetcher as a
 fix for the database not persisting once updated from Firebase notification
 responder

---
 app/build.gradle                              |  4 ++--
 .../denizd/substitutionplan/DataFetcher.kt    | 22 ++++++++++---------
 .../substitutionplan/FBNotificationService.kt |  2 +-
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 1d414cc..48a4856 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "com.denizd.substitutionplan"
         minSdkVersion 21
         targetSdkVersion 28
-        versionCode 24
-        versionName "2.2.1"
+        versionCode 25
+        versionName "2.2.2"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
diff --git a/app/src/main/java/com/denizd/substitutionplan/DataFetcher.kt b/app/src/main/java/com/denizd/substitutionplan/DataFetcher.kt
index d681657..3b2bf3a 100644
--- a/app/src/main/java/com/denizd/substitutionplan/DataFetcher.kt
+++ b/app/src/main/java/com/denizd/substitutionplan/DataFetcher.kt
@@ -54,11 +54,11 @@ class DataFetcher(isplan: Boolean, ismenu: Boolean, isjobservice: Boolean, conte
                 val docFood = Jsoup.connect(foodUrl).get()
                 currentFoodTime = docFood.select("h1")[0].text()
                 if (currentFoodTime != prefs.getString("timeFood", "")) {
-                    val foodViewModel = FoodViewModel(mApplication)
+                    val foodRepository = FoodRepository(mApplication)
                     val foodElements = docFood.select("th")
                     var foodInt = 0
                     var priority = 0
-                    foodViewModel.deleteAll()
+                    foodRepository.deleteAll()
                     while (foodInt in 0 until foodElements.size) {
                         try { // what a mess this is!
                             with(foodElements[foodInt].text()) {
@@ -68,29 +68,29 @@ class DataFetcher(isplan: Boolean, ismenu: Boolean, isjobservice: Boolean, conte
                                     val two = foodElements[foodInt + 2].text()
                                     if (three.contains("Montag") || three.contains("Dienstag") || three.contains("Mittwoch") ||
                                             three.contains("Donnerstag") || three.contains("Freitag") || three.contains("von")) {
-                                        foodViewModel.insert(Food(foodElements[foodInt].text() + "\n"
+                                        foodRepository.insert(Food(foodElements[foodInt].text() + "\n"
                                                 + foodElements[foodInt + 1].text() + "\n"
                                                 + foodElements[foodInt + 2].text(), priority))
                                         foodInt += 2
                                     } else if (two.contains("Montag") || two.contains("Dienstag") || two.contains("Mittwoch") ||
                                             two.contains("Donnerstag") || two.contains("Freitag") || two.contains("von")) {
-                                        foodViewModel.insert(Food(foodElements[foodInt].text() + "\n"
+                                        foodRepository.insert(Food(foodElements[foodInt].text() + "\n"
                                                 + foodElements[foodInt + 1].text(), priority))
                                         foodInt += 1
                                     }
                                 } else {
-                                    foodViewModel.insert(Food(foodElements[foodInt].text(), priority))
+                                    foodRepository.insert(Food(foodElements[foodInt].text(), priority))
                                 }
                             }
 
                         } catch (e: IndexOutOfBoundsException) {
                             try {
-                                foodViewModel.insert(Food(foodElements[foodInt].text() + "\n"
+                                foodRepository.insert(Food(foodElements[foodInt].text() + "\n"
                                         + foodElements[foodInt + 1].text() + "\n"
                                         + foodElements[foodInt + 2].text(), priority))
                                 break
                             } catch (e1: IndexOutOfBoundsException) {
-                                foodViewModel.insert(Food(foodElements[foodInt].text() + "\n"
+                                foodRepository.insert(Food(foodElements[foodInt].text() + "\n"
                                         + foodElements[foodInt + 1].text(), priority))
                                 break
                             }
@@ -106,7 +106,7 @@ class DataFetcher(isplan: Boolean, ismenu: Boolean, isjobservice: Boolean, conte
                 val doc = Jsoup.connect(substUrl).get()
                 currentTime = doc.select("h1")[0].text()
                 if (currentTime != prefs.getString("time", "")) {
-                    val substViewModel = SubstViewModel(mApplication)
+                    val substRepo = SubstRepository(mApplication)
                     val rows = doc.select("tr")
                     val paragraphs = doc.select("p")
 
@@ -126,7 +126,8 @@ class DataFetcher(isplan: Boolean, ismenu: Boolean, isjobservice: Boolean, conte
                     }
                     edit.putString("informational", informational).apply()
 
-                    substViewModel.deleteAllSubst()
+//                    substViewModel.deleteAllSubst()
+                    substRepo.deleteAllSubst()
 
                     for (i in 0 until rows.size) {
                         val row = rows[i]
@@ -143,7 +144,8 @@ class DataFetcher(isplan: Boolean, ismenu: Boolean, isjobservice: Boolean, conte
                         val subst = Subst(drawable, groupS[i], dateS[i], timeS[i], courseS[i],
                                 roomS[i], additionalS[i], priority)
                         priority--
-                        substViewModel.insertSubst(subst)
+//                        substViewModel.insertSubst(subst)
+                        substRepo.insert(subst)
 
                         if (jobservice && prefs.getBoolean("notif", true)) {
                             if ((prefs.getString("courses", "")
diff --git a/app/src/main/java/com/denizd/substitutionplan/FBNotificationService.kt b/app/src/main/java/com/denizd/substitutionplan/FBNotificationService.kt
index 01e895a..8007ab2 100644
--- a/app/src/main/java/com/denizd/substitutionplan/FBNotificationService.kt
+++ b/app/src/main/java/com/denizd/substitutionplan/FBNotificationService.kt
@@ -6,6 +6,6 @@ import com.google.firebase.messaging.RemoteMessage
 class FBNotificationService : FirebaseMessagingService() {
 
     override fun onMessageReceived(p0: RemoteMessage?) {
-        DataFetcher(true, true, true, this, application, null).execute()
+        DataFetcher(true, true, true, applicationContext, application, null).execute()
     }
 }
\ No newline at end of file