From 30c45b61204cafdbfe8c71505ae9b47ebbc7763e Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Sat, 9 Oct 2021 17:31:55 -0700
Subject: Support messenger usage when default apps are enabled

---
 app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt               | 3 +++
 .../main/kotlin/com/pitchedapps/frost/web/FrostUrlOverlayValidator.kt  | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'app/src/main/kotlin/com')

diff --git a/app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt b/app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt
index 896dd6aa..d655c458 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt
@@ -314,6 +314,9 @@ fun Context.startActivityForUri(uri: Uri): Boolean {
     if (url.isFacebookUrl && !url.isExplicitIntent) {
         return false
     }
+    if (url.isMessengerUrl) {
+        return false
+    }
     val intent = Intent(
         Intent.ACTION_VIEW,
         uri.formattedFbUri
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 d08f80a6..94300348 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/web/FrostUrlOverlayValidator.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/web/FrostUrlOverlayValidator.kt
@@ -28,6 +28,7 @@ import com.pitchedapps.frost.utils.isFacebookUrl
 import com.pitchedapps.frost.utils.isImageUrl
 import com.pitchedapps.frost.utils.isIndependent
 import com.pitchedapps.frost.utils.isIndirectImageUrl
+import com.pitchedapps.frost.utils.isMessengerUrl
 import com.pitchedapps.frost.utils.isVideoUrl
 import com.pitchedapps.frost.utils.launchImageActivity
 import com.pitchedapps.frost.utils.launchWebOverlay
@@ -76,7 +77,7 @@ fun FrostWebView.requestWebOverlay(url: String): Boolean {
     }
     if (!prefs.overlayEnabled) return false
     if (context is WebOverlayActivityBase) {
-        val shouldUseDesktop = url.isFacebookUrl
+        val shouldUseDesktop = url.isFacebookUrl || url.isMessengerUrl
         // already overlay; manage user agent
         if (userAgentString != USER_AGENT_DESKTOP_CONST && shouldUseDesktop) {
             L._i { "Switch to desktop agent overlay" }
-- 
cgit v1.2.3