From 4a07d2ed10741e08895c9e9f03738656ddfc33f9 Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Sun, 2 Jul 2017 17:24:17 -0700 Subject: Adding auto uploads --- .../kotlin/com/pitchedapps/frost/web/FrostWebViewClient.kt | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClient.kt') diff --git a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClient.kt b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClient.kt index f12212ed..709ab7ac 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClient.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClient.kt @@ -2,9 +2,7 @@ package com.pitchedapps.frost.web import android.content.Context import android.graphics.Bitmap -import android.view.KeyEvent import android.webkit.WebResourceRequest -import android.webkit.WebResourceResponse import android.webkit.WebView import android.webkit.WebViewClient import com.pitchedapps.frost.LoginActivity @@ -52,8 +50,8 @@ open class FrostWebViewClient(val webCore: FrostWebViewCore) : WebViewClient() { } view.jsInject(JsActions.LOGIN_CHECK, CssAssets.ROUND_ICONS.maybe(Prefs.showRoundedIcons), - CssHider.PEOPLE_YOU_MAY_KNOW.maybe(!Prefs.showSuggestedFriends), - CssHider.ADS.maybe(!Prefs.showFacebookAds), + CssHider.PEOPLE_YOU_MAY_KNOW.maybe(!Prefs.showSuggestedFriends && Prefs.pro), + CssHider.ADS.maybe(!Prefs.showFacebookAds && Prefs.pro), JsAssets.HEADER_BADGES.maybe(webCore.baseEnum != null)) onPageFinishedActions(url) } @@ -67,9 +65,7 @@ open class FrostWebViewClient(val webCore: FrostWebViewCore) : WebViewClient() { webCore.jsInject(CssHider.HEADER, Prefs.themeInjector, JsAssets.CLICK_A.maybe(webCore.baseEnum != null), - callback = { - refreshObservable.onNext(false) - }) + callback = { refreshObservable.onNext(false) }) } open fun handleHtml(html: String) { -- cgit v1.2.3