From 65bb9233b2a0d8734c1d13e8f3a01bee0f6c3b17 Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Tue, 5 Mar 2019 21:06:24 -0500
Subject: Convert fbcookies to room entities

---
 app/src/main/kotlin/com/pitchedapps/frost/utils/Downloader.kt |  7 ++++---
 app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt      | 10 +++++-----
 2 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'app/src/main/kotlin/com/pitchedapps/frost/utils')

diff --git a/app/src/main/kotlin/com/pitchedapps/frost/utils/Downloader.kt b/app/src/main/kotlin/com/pitchedapps/frost/utils/Downloader.kt
index 254297a6..64094d1e 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/utils/Downloader.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/utils/Downloader.kt
@@ -29,7 +29,7 @@ import ca.allanwang.kau.utils.showAppInfo
 import ca.allanwang.kau.utils.string
 import ca.allanwang.kau.utils.toast
 import com.pitchedapps.frost.R
-import com.pitchedapps.frost.db.loadFbCookie
+import com.pitchedapps.frost.db.CookieEntity
 import com.pitchedapps.frost.facebook.USER_AGENT_BASIC
 
 /**
@@ -38,6 +38,7 @@ import com.pitchedapps.frost.facebook.USER_AGENT_BASIC
  * With reference to <a href="https://stackoverflow.com/questions/33434532/android-webview-download-files-like-browsers-do">Stack Overflow</a>
  */
 fun Context.frostDownload(
+    cookie: CookieEntity,
     url: String?,
     userAgent: String = USER_AGENT_BASIC,
     contentDisposition: String? = null,
@@ -45,10 +46,11 @@ fun Context.frostDownload(
     contentLength: Long = 0L
 ) {
     url ?: return
-    frostDownload(Uri.parse(url), userAgent, contentDisposition, mimeType, contentLength)
+    frostDownload(cookie, Uri.parse(url), userAgent, contentDisposition, mimeType, contentLength)
 }
 
 fun Context.frostDownload(
+    cookie: CookieEntity,
     uri: Uri?,
     userAgent: String = USER_AGENT_BASIC,
     contentDisposition: String? = null,
@@ -75,7 +77,6 @@ fun Context.frostDownload(
         if (!granted) return@kauRequestPermissions
         val request = DownloadManager.Request(uri)
         request.setMimeType(mimeType)
-        val cookie = loadFbCookie(Prefs.userId) ?: return@kauRequestPermissions
         val title = URLUtil.guessFileName(uri.toString(), contentDisposition, mimeType)
         request.addRequestHeader("Cookie", cookie.cookie)
         request.addRequestHeader("User-Agent", userAgent)
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt b/app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt
index 1222e93b..5a104458 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt
@@ -62,7 +62,7 @@ import com.pitchedapps.frost.activities.TabCustomizerActivity
 import com.pitchedapps.frost.activities.WebOverlayActivity
 import com.pitchedapps.frost.activities.WebOverlayActivityBase
 import com.pitchedapps.frost.activities.WebOverlayBasicActivity
-import com.pitchedapps.frost.db.CookieModel
+import com.pitchedapps.frost.db.CookieEntity
 import com.pitchedapps.frost.facebook.FACEBOOK_COM
 import com.pitchedapps.frost.facebook.FBCDN_NET
 import com.pitchedapps.frost.facebook.FbCookie
@@ -103,7 +103,7 @@ internal inline val Context.ctxCoroutine: CoroutineScope
     get() = this as? CoroutineScope ?: GlobalScope
 
 inline fun <reified T : Activity> Context.launchNewTask(
-    cookieList: ArrayList<CookieModel> = arrayListOf(),
+    cookieList: ArrayList<CookieEntity> = arrayListOf(),
     clearStack: Boolean = false
 ) {
     startActivity<T>(clearStack, intentBuilder = {
@@ -111,13 +111,13 @@ inline fun <reified T : Activity> Context.launchNewTask(
     })
 }
 
-fun Context.launchLogin(cookieList: ArrayList<CookieModel>, clearStack: Boolean = true) {
+fun Context.launchLogin(cookieList: ArrayList<CookieEntity>, clearStack: Boolean = true) {
     if (cookieList.isNotEmpty()) launchNewTask<SelectorActivity>(cookieList, clearStack)
     else launchNewTask<LoginActivity>(clearStack = clearStack)
 }
 
-fun Activity.cookies(): ArrayList<CookieModel> {
-    return intent?.getParcelableArrayListExtra<CookieModel>(EXTRA_COOKIES) ?: arrayListOf()
+fun Activity.cookies(): ArrayList<CookieEntity> {
+    return intent?.getParcelableArrayListExtra<CookieEntity>(EXTRA_COOKIES) ?: arrayListOf()
 }
 
 /**
-- 
cgit v1.2.3