diff options
author | Allan Wang <me@allanwang.ca> | 2020-02-29 23:35:07 -0800 |
---|---|---|
committer | Allan Wang <me@allanwang.ca> | 2020-02-29 23:35:07 -0800 |
commit | 118635f6630487e93a519e9a63151d95b31ee8b1 (patch) | |
tree | 354c8b0a52866ad62e1b20860517bc5287401cb4 /app/src/main/kotlin/com/pitchedapps/frost/views/FrostWebView.kt | |
parent | 34e5eebbc2dfdd9e71ba200c044f3637ba89aaa2 (diff) | |
parent | e732e30d97babca49ba5f7d97aea1620ba14024b (diff) | |
download | frost-118635f6630487e93a519e9a63151d95b31ee8b1.tar.gz frost-118635f6630487e93a519e9a63151d95b31ee8b1.tar.bz2 frost-118635f6630487e93a519e9a63151d95b31ee8b1.zip |
Merge remote-tracking branch 'origin/dev' into save-image
Diffstat (limited to 'app/src/main/kotlin/com/pitchedapps/frost/views/FrostWebView.kt')
-rw-r--r-- | app/src/main/kotlin/com/pitchedapps/frost/views/FrostWebView.kt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/views/FrostWebView.kt b/app/src/main/kotlin/com/pitchedapps/frost/views/FrostWebView.kt index dd31d303..9ca622a3 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/views/FrostWebView.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/views/FrostWebView.kt @@ -28,6 +28,7 @@ import ca.allanwang.kau.utils.launchMain import com.pitchedapps.frost.contracts.FrostContentContainer import com.pitchedapps.frost.contracts.FrostContentCore import com.pitchedapps.frost.contracts.FrostContentParent +import com.pitchedapps.frost.db.CookieDao import com.pitchedapps.frost.db.FrostDatabase import com.pitchedapps.frost.db.currentCookie import com.pitchedapps.frost.facebook.FB_HOME_URL @@ -62,6 +63,7 @@ class FrostWebView @JvmOverloads constructor( val fbCookie: FbCookie by inject() val prefs: Prefs by inject() + val cookieDao: CookieDao by inject() override fun reload(animate: Boolean) { if (parent.registerTransition(false, animate)) @@ -92,10 +94,9 @@ class FrostWebView @JvmOverloads constructor( webChromeClient = FrostChromeClient(this) addJavascriptInterface(FrostJSI(this), "Frost") setBackgroundColor(Color.TRANSPARENT) - val db = FrostDatabase.get() setDownloadListener { url, userAgent, contentDisposition, mimetype, contentLength -> context.ctxCoroutine.launchMain { - val cookie = db.cookieDao().currentCookie() ?: return@launchMain + val cookie = cookieDao.currentCookie(prefs) ?: return@launchMain context.frostDownload( cookie, url, |