diff options
author | Allan Wang <me@allanwang.ca> | 2017-08-19 20:31:53 -0700 |
---|---|---|
committer | Allan Wang <me@allanwang.ca> | 2017-08-19 20:31:53 -0700 |
commit | bf2168ee57ded706819d1e4f49d729d4f45e1d29 (patch) | |
tree | e4bd606ab8fc90fa7f797709227b901fb0e946b4 /app/src/main/kotlin/com/pitchedapps/frost/utils | |
parent | 86630a1a6bfedfb9c9834c5e1d13c45bd37e18e7 (diff) | |
download | frost-bf2168ee57ded706819d1e4f49d729d4f45e1d29.tar.gz frost-bf2168ee57ded706819d1e4f49d729d4f45e1d29.tar.bz2 frost-bf2168ee57ded706819d1e4f49d729d4f45e1d29.zip |
Fix link issue and add option to use default browser
Diffstat (limited to 'app/src/main/kotlin/com/pitchedapps/frost/utils')
-rw-r--r-- | app/src/main/kotlin/com/pitchedapps/frost/utils/Prefs.kt | 1 | ||||
-rw-r--r-- | app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt | 7 |
2 files changed, 5 insertions, 3 deletions
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/utils/Prefs.kt b/app/src/main/kotlin/com/pitchedapps/frost/utils/Prefs.kt index 34257da8..126bd500 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/utils/Prefs.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/utils/Prefs.kt @@ -131,4 +131,5 @@ object Prefs : KPref() { var debugSettings: Boolean by kpref("debug_settings", false) + var linksInDefaultApp: Boolean by kpref("link_in_default_app", false) } 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 469a3951..92d4c109 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt @@ -65,9 +65,10 @@ fun Context.launchWebOverlay(url: String) { val argUrl = url.formattedFbUrl L.v("Launch received", url) L.i("Launch web overlay", argUrl) - startActivity(WebOverlayActivity::class.java, false, intentBuilder = { - putExtra(ARG_URL, argUrl) - }) + if (!(Prefs.linksInDefaultApp && resolveActivityForUri(Uri.parse(argUrl)))) + startActivity(WebOverlayActivity::class.java, false, intentBuilder = { + putExtra(ARG_URL, argUrl) + }) } fun Context.launchImageActivity(imageUrl: String, text: String?) { |