diff options
author | Allan Wang <me@allanwang.ca> | 2018-03-21 01:28:31 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-21 01:28:31 -0400 |
commit | d36dfe98a52ced46c5106b28304ae5d245180a7f (patch) | |
tree | a20261ea953b7e29e8754cf641e9ed743511079d /app/src/main/kotlin/com/pitchedapps/frost/web | |
parent | 6b85bc72a864e65d99ae65802ce03f977a98c906 (diff) | |
download | frost-d36dfe98a52ced46c5106b28304ae5d245180a7f.tar.gz frost-d36dfe98a52ced46c5106b28304ae5d245180a7f.tar.bz2 frost-d36dfe98a52ced46c5106b28304ae5d245180a7f.zip |
Feature/bugsnag (#807)
* Add bugsnag
* Remove crashlytics
* Remove pro features and iab
* Make analytics opt in
* Clean settings activity
* Clean settings activity 2
Diffstat (limited to 'app/src/main/kotlin/com/pitchedapps/frost/web')
-rw-r--r-- | app/src/main/kotlin/com/pitchedapps/frost/web/DebugWebView.kt | 5 | ||||
-rw-r--r-- | app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClients.kt | 7 |
2 files changed, 5 insertions, 7 deletions
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/web/DebugWebView.kt b/app/src/main/kotlin/com/pitchedapps/frost/web/DebugWebView.kt index 4ac9e600..4c4e5525 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/web/DebugWebView.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/web/DebugWebView.kt @@ -15,7 +15,6 @@ import com.pitchedapps.frost.injectors.jsInject import com.pitchedapps.frost.utils.L import com.pitchedapps.frost.utils.Prefs import com.pitchedapps.frost.utils.createFreshFile -import com.pitchedapps.frost.utils.iab.IS_FROST_PRO import com.pitchedapps.frost.utils.isFacebookUrl import org.jetbrains.anko.withAlpha import java.io.File @@ -85,8 +84,8 @@ class DebugWebView @JvmOverloads constructor( CssAssets.ROUND_ICONS.maybe(Prefs.showRoundedIcons), CssHider.CORE, CssHider.COMPOSER.maybe(!Prefs.showComposer), - CssHider.PEOPLE_YOU_MAY_KNOW.maybe(!Prefs.showSuggestedFriends && IS_FROST_PRO), - CssHider.SUGGESTED_GROUPS.maybe(!Prefs.showSuggestedGroups && IS_FROST_PRO), + CssHider.PEOPLE_YOU_MAY_KNOW.maybe(!Prefs.showSuggestedFriends), + CssHider.SUGGESTED_GROUPS.maybe(!Prefs.showSuggestedGroups), Prefs.themeInjector, CssHider.NON_RECENT.maybe((url?.contains("?sk=h_chr") ?: false) && Prefs.aggressiveRecents)) 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 d4e1c103..f1d03f35 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClients.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClients.kt @@ -10,7 +10,6 @@ import com.pitchedapps.frost.facebook.FB_URL_BASE import com.pitchedapps.frost.facebook.FbItem import com.pitchedapps.frost.injectors.* import com.pitchedapps.frost.utils.* -import com.pitchedapps.frost.utils.iab.IS_FROST_PRO import com.pitchedapps.frost.views.FrostWebView import io.reactivex.subjects.Subject import org.jetbrains.anko.withAlpha @@ -67,14 +66,14 @@ open class FrostWebViewClient(val web: FrostWebView) : BaseWebViewClient() { CssAssets.ROUND_ICONS.maybe(Prefs.showRoundedIcons), CssHider.CORE, CssHider.COMPOSER.maybe(!Prefs.showComposer), - CssHider.PEOPLE_YOU_MAY_KNOW.maybe(!Prefs.showSuggestedFriends && IS_FROST_PRO), - CssHider.SUGGESTED_GROUPS.maybe(!Prefs.showSuggestedGroups && IS_FROST_PRO), + CssHider.PEOPLE_YOU_MAY_KNOW.maybe(!Prefs.showSuggestedFriends), + CssHider.SUGGESTED_GROUPS.maybe(!Prefs.showSuggestedGroups), Prefs.themeInjector, CssHider.NON_RECENT.maybe((web.url?.contains("?sk=h_chr") ?: false) && Prefs.aggressiveRecents), JsAssets.DOCUMENT_WATCHER, JsAssets.CLICK_A, - CssHider.ADS.maybe(!Prefs.showFacebookAds && IS_FROST_PRO), + CssHider.ADS.maybe(!Prefs.showFacebookAds), JsAssets.CONTEXT_A, JsAssets.HEADER_HIDER, JsAssets.MEDIA) |