Convert fbcookies to room entities

2 files changed, 11 insertions, 7 deletions

diff --git a/app/src/main/kotlin/com/pitchedapps/frost/services/FrostNotifications.kt b/app/src/main/kotlin/com/pitchedapps/frost/services/FrostNotifications.kt
index 994f9a18..abd871b3 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/services/FrostNotifications.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/services/FrostNotifications.kt
@@ -31,6 +31,7 @@ import ca.allanwang.kau.utils.string
 import com.pitchedapps.frost.BuildConfig
 import com.pitchedapps.frost.R
 import com.pitchedapps.frost.activities.FrostWebActivity
+import com.pitchedapps.frost.db.CookieEntity
 import com.pitchedapps.frost.db.CookieModel
 import com.pitchedapps.frost.db.NotificationModel
 import com.pitchedapps.frost.db.lastNotificationTime
@@ -116,7 +117,7 @@ enum class NotificationType(
      * Returns the number of notifications generated,
      * or -1 if an error occurred
      */
-    fun fetch(context: Context, data: CookieModel): Int {
+    fun fetch(context: Context, data: CookieEntity): Int {
         val response = try {
             parser.parse(data.cookie)
         } catch (ignored: Exception) {
@@ -161,7 +162,7 @@ enum class NotificationType(
         return notifs.size
     }
 
-    fun debugNotification(context: Context, data: CookieModel) {
+    fun debugNotification(context: Context, data: CookieEntity) {
         val content = NotificationContent(
             data,
             System.currentTimeMillis(),
@@ -247,7 +248,7 @@ enum class NotificationType(
  * Notification data holder
  */
 data class NotificationContent(
-    val data: CookieModel,
+    val data: CookieEntity,
     val id: Long,
     val href: String,
     val title: String? = null, // defaults to frost title
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/services/NotificationService.kt b/app/src/main/kotlin/com/pitchedapps/frost/services/NotificationService.kt
index a895900f..088d8e0a 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/services/NotificationService.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/services/NotificationService.kt
@@ -21,8 +21,8 @@ import androidx.core.app.NotificationManagerCompat
 import ca.allanwang.kau.utils.string
 import com.pitchedapps.frost.BuildConfig
 import com.pitchedapps.frost.R
-import com.pitchedapps.frost.db.CookieModel
-import com.pitchedapps.frost.db.loadFbCookiesSync
+import com.pitchedapps.frost.db.CookieDao
+import com.pitchedapps.frost.db.CookieEntity
 import com.pitchedapps.frost.utils.L
 import com.pitchedapps.frost.utils.Prefs
 import com.pitchedapps.frost.utils.frostEvent
@@ -31,6 +31,7 @@ import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import kotlinx.coroutines.yield
+import org.koin.android.ext.android.inject
 
 /**
  * Created by Allan Wang on 2017-06-14.
@@ -42,6 +43,8 @@ import kotlinx.coroutines.yield
  */
 class NotificationService : BaseJobService() {
 
+    val cookieDao: CookieDao by inject()
+
     override fun onStopJob(params: JobParameters?): Boolean {
         super.onStopJob(params)
         prepareFinish(true)
@@ -81,7 +84,7 @@ class NotificationService : BaseJobService() {
 
     private suspend fun sendNotifications(params: JobParameters?): Unit = withContext(Dispatchers.Default) {
         val currentId = Prefs.userId
-        val cookies = loadFbCookiesSync()
+        val cookies = cookieDao.selectAll()
         yield()
         val jobId = params?.extras?.getInt(NOTIFICATION_PARAM_ID, -1) ?: -1
         var notifCount = 0
@@ -107,7 +110,7 @@ class NotificationService : BaseJobService() {
      * Implemented fetch to also notify when an error occurs
      * Also normalized the output to return the number of notifications received
      */
-    private fun fetch(jobId: Int, type: NotificationType, cookie: CookieModel): Int {
+    private fun fetch(jobId: Int, type: NotificationType, cookie: CookieEntity): Int {
         val count = type.fetch(this, cookie)
         if (count < 0) {
             if (jobId == NOTIFICATION_JOB_NOW)