diff options
author | Allan Wang <me@allanwang.ca> | 2017-08-03 22:21:51 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-03 22:21:51 -0700 |
commit | 7746e63373c905faa6d7e45e45fffc48d3ffff85 (patch) | |
tree | 5d1bd4338a722619bb892abb308b369abc61f396 /app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClients.kt | |
parent | 5583f519dd7c4843f045029b0e48fd882dd79c71 (diff) | |
download | frost-7746e63373c905faa6d7e45e45fffc48d3ffff85.tar.gz frost-7746e63373c905faa6d7e45e45fffc48d3ffff85.tar.bz2 frost-7746e63373c905faa6d7e45e45fffc48d3ffff85.zip |
Add IM notifications, FAQ, video uploading, and geolocations (#107)
* Test canary
* Update activities to use kau base
* Update dependencies
* Cherry pick faq
* Update kau and add faq
* Add readme badges
* Add im notifications and video uploading
* Update theme
* Update and fix unit tests
* Add geolocation
* Prepare alpha test
* Remove explicit nonnull request
Diffstat (limited to 'app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClients.kt')
-rw-r--r-- | app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClients.kt | 6 |
1 files changed, 3 insertions, 3 deletions
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 cb5125c4..9f7dd916 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClients.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostWebViewClients.kt @@ -1,6 +1,5 @@ package com.pitchedapps.frost.web -import android.content.ActivityNotFoundException import android.content.Context import android.content.Intent import android.graphics.Bitmap @@ -17,6 +16,7 @@ import com.pitchedapps.frost.facebook.FB_URL_BASE import com.pitchedapps.frost.facebook.FbCookie import com.pitchedapps.frost.injectors.* import com.pitchedapps.frost.utils.* +import com.pitchedapps.frost.utils.iab.IS_FROST_PRO import io.reactivex.subjects.Subject /** @@ -71,8 +71,8 @@ open class FrostWebViewClient(val webCore: FrostWebViewCore) : BaseWebViewClient } view.jsInject( CssAssets.ROUND_ICONS.maybe(Prefs.showRoundedIcons), - CssHider.PEOPLE_YOU_MAY_KNOW.maybe(!Prefs.showSuggestedFriends && Prefs.pro), - CssHider.ADS.maybe(!Prefs.showFacebookAds && Prefs.pro) + CssHider.PEOPLE_YOU_MAY_KNOW.maybe(!Prefs.showSuggestedFriends && IS_FROST_PRO), + CssHider.ADS.maybe(!Prefs.showFacebookAds && IS_FROST_PRO) ) onPageFinishedActions(url) } |