Remove dbflow

4 files changed, 3 insertions, 118 deletions

diff --git a/app/src/main/kotlin/com/pitchedapps/frost/db/CookiesDb.kt b/app/src/main/kotlin/com/pitchedapps/frost/db/CookiesDb.kt
index 82548396..d90ff3de 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/db/CookiesDb.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/db/CookiesDb.kt
@@ -24,11 +24,6 @@ import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
 import com.pitchedapps.frost.utils.Prefs
-import com.raizlabs.android.dbflow.annotation.ConflictAction
-import com.raizlabs.android.dbflow.annotation.Database
-import com.raizlabs.android.dbflow.annotation.PrimaryKey
-import com.raizlabs.android.dbflow.annotation.Table
-import com.raizlabs.android.dbflow.structure.BaseModel
 import kotlinx.android.parcel.Parcelize
 
 /**
@@ -74,21 +69,3 @@ suspend fun CookieDao.save(cookie: CookieEntity) = dao { _save(cookie) }
 suspend fun CookieDao.save(cookies: List<CookieEntity>) = dao { _save(cookies) }
 suspend fun CookieDao.deleteById(id: Long) = dao { _deleteById(id) }
 suspend fun CookieDao.currentCookie() = selectById(Prefs.userId)
-
-@Database(version = CookiesDb.VERSION)
-object CookiesDb {
-    const val NAME = "Cookies"
-    const val VERSION = 2
-}
-
-@Parcelize
-@Table(database = CookiesDb::class, allFields = true, primaryKeyConflict = ConflictAction.REPLACE)
-data class CookieModel(
-    @PrimaryKey var id: Long = -1L,
-    var name: String? = null,
-    var cookie: String? = null
-) :
-    BaseModel(), Parcelable {
-
-    override fun toString(): String = "CookieModel(${hashCode()})"
-}
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/db/FbTabsDb.kt b/app/src/main/kotlin/com/pitchedapps/frost/db/FbTabsDb.kt
deleted file mode 100644
index 475d134f..00000000
--- a/app/src/main/kotlin/com/pitchedapps/frost/db/FbTabsDb.kt
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright 2018 Allan Wang
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package com.pitchedapps.frost.db
-
-import com.pitchedapps.frost.facebook.FbItem
-import com.raizlabs.android.dbflow.annotation.Database
-import com.raizlabs.android.dbflow.annotation.PrimaryKey
-import com.raizlabs.android.dbflow.annotation.Table
-import com.raizlabs.android.dbflow.structure.BaseModel
-
-/**
- * Created by Allan Wang on 2017-05-30.
- */
-
-const val TAB_COUNT = 4
-
-@Database(version = FbTabsDb.VERSION)
-object FbTabsDb {
-    const val NAME = "FrostTabs"
-    const val VERSION = 1
-}
-
-@Table(database = FbTabsDb::class, allFields = true)
-data class FbTabModel(@PrimaryKey var position: Int = -1, var tab: FbItem = FbItem.FEED) :
-    BaseModel()
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/db/GenericDb.kt b/app/src/main/kotlin/com/pitchedapps/frost/db/GenericDb.kt
index f36c8af9..b7274c33 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/db/GenericDb.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/db/GenericDb.kt
@@ -56,6 +56,8 @@ interface GenericDao {
     }
 }
 
+const val TAB_COUNT = 4
+
 suspend fun GenericDao.saveTabs(tabs: List<FbItem>) = dao {
     val content = tabs.joinToString(",") { it.name }
     _save(GenericEntity(GenericDao.TYPE_TABS, content))
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/db/NotificationDb.kt b/app/src/main/kotlin/com/pitchedapps/frost/db/NotificationDb.kt
index e89bf46d..93df01dc 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/db/NotificationDb.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/db/NotificationDb.kt
@@ -26,22 +26,8 @@ import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
 import androidx.room.Transaction
-import com.pitchedapps.frost.services.NOTIF_CHANNEL_GENERAL
-import com.pitchedapps.frost.services.NOTIF_CHANNEL_MESSAGES
 import com.pitchedapps.frost.services.NotificationContent
 import com.pitchedapps.frost.utils.L
-import com.raizlabs.android.dbflow.annotation.ConflictAction
-import com.raizlabs.android.dbflow.annotation.Database
-import com.raizlabs.android.dbflow.annotation.Migration
-import com.raizlabs.android.dbflow.annotation.PrimaryKey
-import com.raizlabs.android.dbflow.annotation.Table
-import com.raizlabs.android.dbflow.kotlinextensions.eq
-import com.raizlabs.android.dbflow.kotlinextensions.from
-import com.raizlabs.android.dbflow.kotlinextensions.select
-import com.raizlabs.android.dbflow.kotlinextensions.where
-import com.raizlabs.android.dbflow.sql.SQLiteType
-import com.raizlabs.android.dbflow.sql.migration.AlterTableMigration
-import com.raizlabs.android.dbflow.structure.BaseModel
 
 @Entity(
     tableName = "notifications",
@@ -164,46 +150,5 @@ suspend fun NotificationDao.saveNotifications(
 }
 
 suspend fun NotificationDao.latestEpoch(userId: Long, type: String): Long = dao {
-    _selectEpoch(userId, type) ?: lastNotificationTime(userId).let {
-        when (type) {
-            NOTIF_CHANNEL_GENERAL -> it.epoch
-            NOTIF_CHANNEL_MESSAGES -> it.epochIm
-            else -> -1L
-        }
-    }
-}
-
-/**
- * Created by Allan Wang on 2017-05-30.
- */
-
-@Database(version = NotificationDb.VERSION)
-object NotificationDb {
-    const val NAME = "Notifications"
-    const val VERSION = 2
+    _selectEpoch(userId, type) ?: -1L
 }
-
-@Migration(version = 2, database = NotificationDb::class)
-class NotificationMigration2(modelClass: Class<NotificationModel>) :
-    AlterTableMigration<NotificationModel>(modelClass) {
-    override fun onPreMigrate() {
-        super.onPreMigrate()
-        addColumn(SQLiteType.INTEGER, "epochIm")
-        L.d { "Added column" }
-    }
-}
-
-@Table(
-    database = NotificationDb::class,
-    allFields = true,
-    primaryKeyConflict = ConflictAction.REPLACE
-)
-data class NotificationModel(
-    @PrimaryKey var id: Long = -1L,
-    var epoch: Long = -1L,
-    var epochIm: Long = -1L
-) : BaseModel()
-
-internal fun lastNotificationTime(id: Long): NotificationModel =
-    (select from NotificationModel::class where (NotificationModel_Table.id eq id)).querySingle()
-        ?: NotificationModel(id = id)