aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/kotlin/com/pitchedapps/frost/web/FrostUrlOverlayValidator.kt
diff options
context:
space:
mode:
authorAllan Wang <me@allanwang.ca>2017-08-29 13:49:54 -0400
committerGitHub <noreply@github.com>2017-08-29 13:49:54 -0400
commita6243384bc87548fd91fef5593f569c53750563b (patch)
treed45729ec2e835e954cfec000b716cd24482f8f14 /app/src/main/kotlin/com/pitchedapps/frost/web/FrostUrlOverlayValidator.kt
parent93bc40dbe9f2d3e2a126956caefc1bacbafa7be6 (diff)
downloadfrost-a6243384bc87548fd91fef5593f569c53750563b.tar.gz
frost-a6243384bc87548fd91fef5593f569c53750563b.tar.bz2
frost-a6243384bc87548fd91fef5593f569c53750563b.zip
Miscellaneous fixes (#223)
* Disable js dialogs for headless webviews * Update logging * Fix sharing theme * Add buddylist to drawer and theme update * Blacklist sharer.php from launching in overlay * Add whitelist for message related links
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.kt8
1 files changed, 7 insertions, 1 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 0a1878b3..29d2e991 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostUrlOverlayValidator.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostUrlOverlayValidator.kt
@@ -1,6 +1,7 @@
package com.pitchedapps.frost.web
import android.content.Context
+import com.pitchedapps.frost.facebook.FbItem
import com.pitchedapps.frost.facebook.formattedFbUrl
import com.pitchedapps.frost.utils.L
import com.pitchedapps.frost.utils.isFacebookUrl
@@ -43,6 +44,11 @@ fun Context.requestWebOverlay(url: String): Boolean {
}
/**
+ * If the url contains any one of the whitelist segments, switch to the chat overlay
+ */
+val messageWhitelist = setOf(FbItem.MESSAGES.url, FbItem.CHAT.url)
+
+/**
* The following components should never be launched in a new overlay
*/
-val overlayBlacklist = setOf("messages/?pageNum", "photoset_token") \ No newline at end of file
+val overlayBlacklist = setOf("messages/?pageNum", "photoset_token", "sharer.php") \ No newline at end of file