aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/kotlin/com/pitchedapps/frost/web/FrostUrlOverlayValidator.kt
diff options
context:
space:
mode:
authorAllan Wang <me@allanwang.ca>2019-09-07 18:10:38 -0700
committerAllan Wang <me@allanwang.ca>2019-09-07 18:10:38 -0700
commite736b53094629c4250c536170e938c625f5dc03c (patch)
tree8704f9b8986a4f5c643dfe2c683bc557be3f2221 /app/src/main/kotlin/com/pitchedapps/frost/web/FrostUrlOverlayValidator.kt
parent1a0ec6fc0239d77c2aa771a23ab857f5bd7703d9 (diff)
downloadfrost-e736b53094629c4250c536170e938c625f5dc03c.tar.gz
frost-e736b53094629c4250c536170e938c625f5dc03c.tar.bz2
frost-e736b53094629c4250c536170e938c625f5dc03c.zip
Remove desktop overlay activity
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.kt19
1 files changed, 1 insertions, 18 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 4aa43b49..eec5a5dc 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostUrlOverlayValidator.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostUrlOverlayValidator.kt
@@ -22,7 +22,6 @@ import com.pitchedapps.frost.activities.WebOverlayActivityBase
import com.pitchedapps.frost.contracts.VideoViewHolder
import com.pitchedapps.frost.facebook.FbCookie
import com.pitchedapps.frost.facebook.FbItem
-import com.pitchedapps.frost.facebook.USER_AGENT_DESKTOP
import com.pitchedapps.frost.facebook.formattedFbUrl
import com.pitchedapps.frost.utils.L
import com.pitchedapps.frost.utils.Prefs
@@ -32,7 +31,6 @@ import com.pitchedapps.frost.utils.isIndirectImageUrl
import com.pitchedapps.frost.utils.isVideoUrl
import com.pitchedapps.frost.utils.launchImageActivity
import com.pitchedapps.frost.utils.launchWebOverlay
-import com.pitchedapps.frost.utils.launchWebOverlayDesktop
import com.pitchedapps.frost.views.FrostWebView
/**
@@ -74,22 +72,7 @@ fun FrostWebView.requestWebOverlay(url: String): Boolean {
return false
}
if (!Prefs.overlayEnabled) return false
- if (context is WebOverlayActivityBase) {
- val shouldUseDesktop = url.formattedFbUrl.shouldUseDesktopAgent
- //already overlay; manage user agent
- if (userAgentString != USER_AGENT_DESKTOP && shouldUseDesktop) {
- L._i { "Switch to desktop agent overlay" }
- context.launchWebOverlayDesktop(url)
- return true
- }
- if (userAgentString == USER_AGENT_DESKTOP && !shouldUseDesktop) {
- L._i { "Switch from desktop agent" }
- context.launchWebOverlay(url)
- return true
- }
- L._i { "return false switch" }
- return false
- }
+ if (context is WebOverlayActivityBase) return false
L.v { "Request web overlay passed" }
context.launchWebOverlay(url)
return true