aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/kotlin/com/pitchedapps/frost/web/FrostUrlOverlayValidator.kt
diff options
context:
space:
mode:
authorAllan Wang <me@allanwang.ca>2018-02-16 21:51:02 -0500
committerGitHub <noreply@github.com>2018-02-16 21:51:02 -0500
commitfec23276e8290d4600ef79c54b5fcb00673daa83 (patch)
treec1e7710e91b4152bf40f736294aef12a635535b2 /app/src/main/kotlin/com/pitchedapps/frost/web/FrostUrlOverlayValidator.kt
parentd68ea6d7eb8cadf687308fa3204386b79df0556b (diff)
downloadfrost-fec23276e8290d4600ef79c54b5fcb00673daa83.tar.gz
frost-fec23276e8290d4600ef79c54b5fcb00673daa83.tar.bz2
frost-fec23276e8290d4600ef79c54b5fcb00673daa83.zip
Update/misc (#728)
* Update basic agent check; fixes #714 * Disable swipe on long click * Remove duplicate code * Update dependencies * Update dependencies 2 * Add debug keystore * Update versions * Fix duplicate notification * Fix duplicate notification sound; addreesses #725 * Update changelog * Clean up
Diffstat (limited to 'app/src/main/kotlin/com/pitchedapps/frost/web/FrostUrlOverlayValidator.kt')
-rw-r--r--app/src/main/kotlin/com/pitchedapps/frost/web/FrostUrlOverlayValidator.kt11
1 files changed, 8 insertions, 3 deletions
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostUrlOverlayValidator.kt b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostUrlOverlayValidator.kt
index 8df5b065..7e5f1632 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostUrlOverlayValidator.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostUrlOverlayValidator.kt
@@ -72,6 +72,11 @@ fun FrostWebView.requestWebOverlay(url: String): Boolean {
*/
val messageWhitelist = setOf(FbItem.MESSAGES, FbItem.CHAT, FbItem.FEED_MOST_RECENT, FbItem.FEED_TOP_STORIES).map { it.url }.toSet()
-val String.shouldUseBasicAgent
- get() = !contains("story.php") //we will use basic agent for anything that isn't a comment section
-// get() = (messageWhitelist.any { contains(it) }) || this == FB_URL_BASE \ No newline at end of file
+val String.shouldUseBasicAgent: Boolean
+ get() {
+ if (contains("story.php")) // do not use basic for comment section
+ return false
+ if (contains("/events/")) // do not use for events (namely the map)
+ return false
+ return true // use for everything else
+ } \ No newline at end of file