diff options
author | Allan Wang <me@allanwang.ca> | 2017-08-20 14:09:41 -0700 |
---|---|---|
committer | Allan Wang <me@allanwang.ca> | 2017-08-20 14:09:41 -0700 |
commit | 238c263376d2db2ef7bff765155832fa95309cf1 (patch) | |
tree | 202959e8969f0202fbe6c3a7e1f0a9e821e2609a /app/src/main/kotlin/com/pitchedapps/frost/web | |
parent | 62e10aa1295bdcd99e307b22b4747bb5353cd5d7 (diff) | |
download | frost-238c263376d2db2ef7bff765155832fa95309cf1.tar.gz frost-238c263376d2db2ef7bff765155832fa95309cf1.tar.bz2 frost-238c263376d2db2ef7bff765155832fa95309cf1.zip |
Update login logic
Diffstat (limited to 'app/src/main/kotlin/com/pitchedapps/frost/web')
3 files changed, 3 insertions, 11 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 2abc9b25..c7232fe3 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostJSI.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostJSI.kt @@ -5,6 +5,7 @@ import android.support.v4.widget.SwipeRefreshLayout import android.webkit.JavascriptInterface import com.pitchedapps.frost.activities.MainActivity import com.pitchedapps.frost.dbflow.CookieModel +import com.pitchedapps.frost.facebook.FbCookie import com.pitchedapps.frost.utils.* import io.reactivex.subjects.Subject @@ -68,7 +69,7 @@ class FrostJSI(val webView: FrostWebViewCore) { @JavascriptInterface fun loadLogin() { - context.launchLogin(cookies, true) + FbCookie.logout(context) } /** diff --git a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClients.kt b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClients.kt index 53745602..8335be7f 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClients.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClients.kt @@ -11,7 +11,6 @@ import com.pitchedapps.frost.activities.LoginActivity import com.pitchedapps.frost.activities.MainActivity import com.pitchedapps.frost.activities.SelectorActivity import com.pitchedapps.frost.activities.WebOverlayActivity -import com.pitchedapps.frost.dbflow.removeCookie import com.pitchedapps.frost.facebook.FB_URL_BASE import com.pitchedapps.frost.facebook.FbCookie import com.pitchedapps.frost.facebook.FbItem @@ -51,12 +50,6 @@ open class FrostWebViewClient(val webCore: FrostWebViewCore) : BaseWebViewClient if (url == null) return L.d("FWV Loading", url) refreshObservable.onNext(true) - if (!url.isFacebookUrl) return - if (url.contains("logout.php")) FbCookie.logout(Prefs.userId, { launchLogin(view.context) }) - else if (url.contains("login.php")) { - removeCookie(Prefs.userId) // cookie is invalid - FbCookie.reset({ launchLogin(view.context) }) - } } diff --git a/app/src/main/kotlin/com/pitchedapps/frost/web/LoginWebView.kt b/app/src/main/kotlin/com/pitchedapps/frost/web/LoginWebView.kt index 6bf04ae1..51dc2e99 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/web/LoginWebView.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/web/LoginWebView.kt @@ -2,7 +2,6 @@ package com.pitchedapps.frost.web import android.annotation.SuppressLint import android.content.Context -import android.graphics.Color import android.util.AttributeSet import android.view.View import android.webkit.* @@ -18,7 +17,6 @@ import com.pitchedapps.frost.utils.Prefs import com.pitchedapps.frost.utils.isFacebookUrl import org.jetbrains.anko.doAsync import org.jetbrains.anko.uiThread -import org.jetbrains.anko.withAlpha /** * Created by Allan Wang on 2017-05-29. @@ -78,7 +76,7 @@ class LoginWebView @JvmOverloads constructor( override fun onPageCommitVisible(view: WebView, url: String?) { super.onPageCommitVisible(view, url) - view.setBackgroundColor(Color.TRANSPARENT) + view.setBackgroundColor(Prefs.bgColor) } override fun shouldOverrideUrlLoading(view: WebView, request: WebResourceRequest): Boolean { |