diff options
author | Allan Wang <me@allanwang.ca> | 2019-08-04 23:58:18 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-08-04 23:58:18 -0700 |
commit | d5b53ee27be8c50419ef61bf33b93cd1619dfddb (patch) | |
tree | 42718fe3fe45b256e2486a3f0fe2f294480919f8 /app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt | |
parent | 2eacc8cb77b561eb1da11acb6ec8f620195fd24f (diff) | |
parent | 96241eb6dfdcbfadc57ed5800e2a2d85a060b6fc (diff) | |
download | frost-d5b53ee27be8c50419ef61bf33b93cd1619dfddb.tar.gz frost-d5b53ee27be8c50419ef61bf33b93cd1619dfddb.tar.bz2 frost-d5b53ee27be8c50419ef61bf33b93cd1619dfddb.zip |
Merge pull request #1499 from AllanWang/url-format
Format fb urls before intent
Diffstat (limited to 'app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt')
-rw-r--r-- | app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt | 14 |
1 files changed, 11 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 8544aac3..0367457e 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt @@ -65,6 +65,7 @@ import com.pitchedapps.frost.facebook.FbCookie import com.pitchedapps.frost.facebook.FbItem import com.pitchedapps.frost.facebook.FbUrlFormatter.Companion.VIDEO_REDIRECT import com.pitchedapps.frost.facebook.USER_AGENT_DESKTOP +import com.pitchedapps.frost.facebook.formattedFbUri import com.pitchedapps.frost.facebook.formattedFbUrl import com.pitchedapps.frost.injectors.CssAssets import com.pitchedapps.frost.injectors.JsAssets @@ -270,9 +271,16 @@ fun Context.createPrivateMediaFile(extension: String) = createPrivateMediaFile(" */ fun Context.resolveActivityForUri(uri: Uri): Boolean { val url = uri.toString() - if (url.isFacebookUrl && !url.isExplicitIntent) return false - val intent = Intent(Intent.ACTION_VIEW, uri) - if (intent.resolveActivity(packageManager) == null) return false + if (url.isFacebookUrl && !url.isExplicitIntent) { + return false + } + val intent = Intent( + Intent.ACTION_VIEW, + uri.formattedFbUri + ) + if (intent.resolveActivity(packageManager) == null) { + return false + } startActivity(intent) return true } |