Convert fbcookies to room entities

1 files changed, 8 insertions, 7 deletions

diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/LoginActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/LoginActivity.kt
index 7ff22a5a..5649cc73 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/activities/LoginActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/LoginActivity.kt
@@ -32,9 +32,8 @@ import com.bumptech.glide.load.engine.GlideException
 import com.bumptech.glide.request.RequestListener
 import com.bumptech.glide.request.target.Target
 import com.pitchedapps.frost.R
-import com.pitchedapps.frost.db.CookieModel
-import com.pitchedapps.frost.db.loadFbCookiesSuspend
-import com.pitchedapps.frost.db.saveFbCookie
+import com.pitchedapps.frost.db.CookieDao
+import com.pitchedapps.frost.db.CookieEntity
 import com.pitchedapps.frost.facebook.FbCookie
 import com.pitchedapps.frost.facebook.FbItem
 import com.pitchedapps.frost.facebook.profilePictureUrl
@@ -58,6 +57,7 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.suspendCancellableCoroutine
 import kotlinx.coroutines.withContext
 import kotlinx.coroutines.withTimeout
+import org.koin.android.ext.android.inject
 import java.net.UnknownHostException
 import kotlin.coroutines.resume
 
@@ -71,6 +71,7 @@ class LoginActivity : BaseActivity() {
     private val swipeRefresh: SwipeRefreshLayout by bindView(R.id.swipe_refresh)
     private val textview: AppCompatTextView by bindView(R.id.textview)
     private val profile: ImageView by bindView(R.id.profile)
+    private val cookieDao: CookieDao by inject()
 
     private lateinit var profileLoader: RequestManager
     private val refreshChannel = Channel<Boolean>(10)
@@ -109,7 +110,7 @@ class LoginActivity : BaseActivity() {
         refreshChannel.offer(refreshing)
     }
 
-    private suspend fun loadInfo(cookie: CookieModel): Unit = withMainContext {
+    private suspend fun loadInfo(cookie: CookieEntity): Unit = withMainContext {
         refresh(true)
 
         val imageDeferred = async { loadProfile(cookie.id) }
@@ -134,7 +135,7 @@ class LoginActivity : BaseActivity() {
          * The user may have logged into an account that is already in the database
          * We will let the db handle duplicates and load it now after the new account has been saved
          */
-        val cookies = ArrayList(loadFbCookiesSuspend())
+        val cookies = ArrayList(cookieDao.selectAll())
         delay(1000)
         if (Showcase.intro)
             launchNewTask<IntroActivity>(cookies, true)
@@ -171,7 +172,7 @@ class LoginActivity : BaseActivity() {
         }
     }
 
-    private suspend fun loadUsername(cookie: CookieModel): String = withContext(Dispatchers.IO) {
+    private suspend fun loadUsername(cookie: CookieEntity): String = withContext(Dispatchers.IO) {
         val result: String = try {
             withTimeout(5000) {
                 frostJsoup(cookie.cookie, FbItem.PROFILE.url).title()
@@ -184,7 +185,7 @@ class LoginActivity : BaseActivity() {
 
         if (cookie.name?.isNotBlank() == false && result != cookie.name) {
             cookie.name = result
-            saveFbCookie(cookie)
+            cookieDao.insertCookie(cookie)
         }
 
         cookie.name ?: ""