diff options
| author | Allan Wang <me@allanwang.ca> | 2021-10-09 17:50:31 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-09 17:50:31 -0700 |
| commit | 6914873473951e2e129a8cd5906805f00d3b4068 (patch) | |
| tree | 58b8a0c11f2c9ac13d6c8b9d85e03cf859d900d7 /app/src/main/kotlin/com/pitchedapps | |
| parent | 3b6de26ee105959a5ea7ee5a782509c48f1f358d (diff) | |
| parent | d3a35cbd786b3f0df9e3f0f9f6287f44286174a1 (diff) | |
| download | frost-6914873473951e2e129a8cd5906805f00d3b4068.tar.gz frost-6914873473951e2e129a8cd5906805f00d3b4068.tar.bz2 frost-6914873473951e2e129a8cd5906805f00d3b4068.zip | |
Merge pull request #1834 from AllanWang/default-app-messenger-url
Diffstat (limited to 'app/src/main/kotlin/com/pitchedapps')
| -rw-r--r-- | app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt | 4 | ||||
| -rw-r--r-- | app/src/main/kotlin/com/pitchedapps/frost/web/FrostUrlOverlayValidator.kt | 3 |
2 files changed, 4 insertions, 3 deletions
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..33d1d9d1 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt @@ -307,11 +307,11 @@ fun Context.createPrivateMediaFile(extension: String) = createPrivateMediaFile(" /** * Tries to send the uri to the proper activity via an intent * returns [true] if activity is resolved, [false] otherwise - * For safety, any uri that [isFacebookUrl] without [isExplicitIntent] will return [false] + * For safety, any uri that ([isFacebookUrl] or [isMessengerUrl]) without [isExplicitIntent] will return [false] */ fun Context.startActivityForUri(uri: Uri): Boolean { val url = uri.toString() - if (url.isFacebookUrl && !url.isExplicitIntent) { + if ((url.isFacebookUrl || url.isMessengerUrl) && !url.isExplicitIntent) { return false } val intent = Intent( 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" } |