From 605a08c2e2e8634263d7626cf7471310add3acb2 Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Tue, 6 Jun 2017 23:24:06 -0700
Subject: Preparing preferences

---
 app/src/main/kotlin/com/pitchedapps/frost/web/FrostJSI.kt | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'app/src/main/kotlin/com/pitchedapps/frost/web/FrostJSI.kt')

diff --git a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostJSI.kt b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostJSI.kt
index 045c180f..66f638af 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostJSI.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostJSI.kt
@@ -3,15 +3,21 @@ package com.pitchedapps.frost.web
 import android.content.Context
 import android.webkit.JavascriptInterface
 import com.pitchedapps.frost.LoginActivity
+import com.pitchedapps.frost.MainActivity
 import com.pitchedapps.frost.SelectorActivity
 import com.pitchedapps.frost.dbflow.CookieModel
+import com.pitchedapps.frost.utils.cookies
 import com.pitchedapps.frost.utils.launchNewTask
 import com.pitchedapps.frost.utils.launchWebOverlay
 
 /**
  * Created by Allan Wang on 2017-06-01.
  */
-class FrostJSI(val context: Context, val cookies: ArrayList<CookieModel>) {
+class FrostJSI(val context: Context) {
+
+    val cookies: ArrayList<CookieModel>
+        get() = (context as? MainActivity)?.cookies() ?: arrayListOf()
+
     @JavascriptInterface
     fun loadUrl(url: String) = context.launchWebOverlay(url)
 
@@ -20,7 +26,7 @@ class FrostJSI(val context: Context, val cookies: ArrayList<CookieModel>) {
         if (cookies.isNotEmpty())
             context.launchNewTask(SelectorActivity::class.java, cookies)
         else
-            context.launchNewTask(LoginActivity::class.java, clearStack = false)
+            context.launchNewTask(LoginActivity::class.java)
     }
 
 }
\ No newline at end of file
-- 
cgit v1.2.3