add more cookie handling

3 files changed, 34 insertions, 7 deletions

diff --git a/app/src/main/kotlin/com/pitchedapps/frost/dbflow/CookiesDb.kt b/app/src/main/kotlin/com/pitchedapps/frost/dbflow/CookiesDb.kt
index d8f349a0..12443cf1 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/dbflow/CookiesDb.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/dbflow/CookiesDb.kt
@@ -1,6 +1,5 @@
 package com.pitchedapps.frost.dbflow
 
-import com.pitchedapps.frost.facebook.FbCookie
 import com.pitchedapps.frost.utils.L
 import com.pitchedapps.frost.utils.Prefs
 import com.raizlabs.android.dbflow.annotation.ConflictAction
@@ -23,10 +22,16 @@ object CookiesDb {
 @Table(database = CookiesDb::class, allFields = true, primaryKeyConflict = ConflictAction.REPLACE)
 data class CookieModel(@PrimaryKey var id: Long = Prefs.userIdDefault, var cookie: String? = null) : BaseModel()
 
-fun loadFbCookie(): CookieModel? = (select from CookieModel::class where (CookieModel_Table.id eq Prefs.userId)).querySingle()
+fun loadFbCookie(id: Long): CookieModel? = (select from CookieModel::class where (CookieModel_Table.id eq id)).querySingle()
 
-fun saveFbCookie() {
-    CookieModel(FbCookie.userId, FbCookie.webCookie).async save {
+fun saveFbCookie(id: Long, cookie: String?) {
+    CookieModel(id, cookie).async save {
         L.d("Fb cookie saved")
     }
+}
+
+fun removeCookie(id: Long) {
+    loadFbCookie(id)?.async?.delete({
+        L.d("Fb cookie deleted")
+    })
 }
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/dbflow/DbUtils.kt b/app/src/main/kotlin/com/pitchedapps/frost/dbflow/DbUtils.kt
new file mode 100644
index 00000000..bb2627a5
--- /dev/null
+++ b/app/src/main/kotlin/com/pitchedapps/frost/dbflow/DbUtils.kt
@@ -0,0 +1,24 @@
+package com.pitchedapps.frost.dbflow
+
+import android.content.Context
+import com.pitchedapps.frost.utils.L
+import com.raizlabs.android.dbflow.config.FlowManager
+import com.raizlabs.android.dbflow.structure.database.transaction.FastStoreModelTransaction
+
+/**
+ * Created by Allan Wang on 2017-05-30.
+ */
+
+object DbUtils {
+
+    fun db(name: String) = FlowManager.getDatabase(name)
+    fun dbName(name: String) = "$name.db"
+    fun deleteDatabase(c: Context, name: String) = c.deleteDatabase(dbName(name))
+
+}
+
+inline fun <reified T : Any> List<T>.replace(context: Context, dbName: String) {
+    L.d("Replacing $dbName.db")
+    DbUtils.db(dbName).reset(context)
+    FastStoreModelTransaction.saveBuilder(FlowManager.getModelAdapter(T::class.java)).addAll(this).build()
+}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/dbflow/FbTabsDb.kt b/app/src/main/kotlin/com/pitchedapps/frost/dbflow/FbTabsDb.kt
index 067a07bf..bfd0b0fe 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/dbflow/FbTabsDb.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/dbflow/FbTabsDb.kt
@@ -7,9 +7,7 @@ import com.mikepenz.google_material_typeface_library.GoogleMaterial
 import com.mikepenz.iconics.typeface.IIcon
 import com.mikepenz.material_design_iconic_typeface_library.MaterialDesignIconic
 import com.pitchedapps.frost.R
-import com.pitchedapps.frost.facebook.FB_KEY
 import com.pitchedapps.frost.utils.L
-import com.pitchedapps.frost.utils.replace
 import com.raizlabs.android.dbflow.annotation.Database
 import com.raizlabs.android.dbflow.annotation.ForeignKey
 import com.raizlabs.android.dbflow.annotation.PrimaryKey
@@ -66,7 +64,7 @@ enum class FbUrl(@StringRes val titleId: Int, val icon: IIcon, relativeUrl: Stri
     PROFILE(R.string.profile, CommunityMaterial.Icon.cmd_account, "me"),
     EVENTS(R.string.events, GoogleMaterial.Icon.gmd_event, "events/upcoming"),
     FRIENDS(R.string.friends, GoogleMaterial.Icon.gmd_people, "friends/center/requests"),
-    MESSAGES(R.string.messages, MaterialDesignIconic.Icon.gmi_comments, "messages"),
+    MESSAGES(R.string.messages, MaterialDesignIconic.Icon.gmi_comments, "messages?disable_interstitial=1"),
     NOTIFICATIONS(R.string.notifications, MaterialDesignIconic.Icon.gmi_globe, "notifications");
 
     val url = "$FB_URL_BASE$relativeUrl"