diff options
| author | Allan Wang <me@allanwang.ca> | 2017-06-22 23:31:18 -0700 |
|---|---|---|
| committer | Allan Wang <me@allanwang.ca> | 2017-06-22 23:31:18 -0700 |
| commit | 1d2f1d902569c5db2b928e152dda1ff322bb7fa1 (patch) | |
| tree | 53a95b9ffc905dea0f9717c311c34f937eee04ea /app/src/main/kotlin/com/pitchedapps/frost/web/FrostJSI.kt | |
| parent | da5967f87b8a0e9863fb6b82fc5807bae9e62a00 (diff) | |
| download | frost-1d2f1d902569c5db2b928e152dda1ff322bb7fa1.tar.gz frost-1d2f1d902569c5db2b928e152dda1ff322bb7fa1.tar.bz2 frost-1d2f1d902569c5db2b928e152dda1ff322bb7fa1.zip | |
Add workaround for depth 2 links
Diffstat (limited to 'app/src/main/kotlin/com/pitchedapps/frost/web/FrostJSI.kt')
| -rw-r--r-- | app/src/main/kotlin/com/pitchedapps/frost/web/FrostJSI.kt | 9 |
1 files changed, 2 insertions, 7 deletions
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 532b9f82..89f7d20b 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostJSI.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostJSI.kt @@ -2,13 +2,11 @@ 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.L import com.pitchedapps.frost.utils.cookies -import com.pitchedapps.frost.utils.launchNewTask +import com.pitchedapps.frost.utils.launchLogin import com.pitchedapps.frost.utils.launchWebOverlay import io.reactivex.subjects.Subject @@ -39,10 +37,7 @@ class FrostJSI(val context: Context, val webView: FrostWebViewCore) { @JavascriptInterface fun loadLogin() { - if (cookies.isNotEmpty()) - context.launchNewTask(SelectorActivity::class.java, cookies) - else - context.launchNewTask(LoginActivity::class.java) + context.launchLogin(cookies, true) } @JavascriptInterface |