From 39c1744786c75fb8370d6d67dcebc1545edb6a39 Mon Sep 17 00:00:00 2001
From: Alex <alex@xps>
Date: Wed, 17 Oct 2018 13:04:49 -0700
Subject: [PATCH] Added always open links with external browser option

---
 .../org/floens/chan/core/settings/ChanSettings.java  |  2 ++
 .../ui/controller/BehaviourSettingsController.java   |  3 +++
 .../java/org/floens/chan/ui/layout/ThreadLayout.java | 12 ++++++++++--
 Clover/app/src/main/res/values/strings.xml           |  1 +
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/Clover/app/src/main/java/org/floens/chan/core/settings/ChanSettings.java b/Clover/app/src/main/java/org/floens/chan/core/settings/ChanSettings.java
index 70102cd5..fe98acc0 100644
--- a/Clover/app/src/main/java/org/floens/chan/core/settings/ChanSettings.java
+++ b/Clover/app/src/main/java/org/floens/chan/core/settings/ChanSettings.java
@@ -95,6 +95,7 @@ public class ChanSettings {
     public static final StringSetting fontSize;
     public static final BooleanSetting fontCondensed;
     public static final BooleanSetting openLinkConfirmation;
+    public static final BooleanSetting openLinkBrowser;
     public static final BooleanSetting autoRefreshThread;
     //    public static final BooleanSetting imageAutoLoad;
     public static final OptionsSetting<MediaAutoLoadMode> imageAutoLoadNetwork;
@@ -170,6 +171,7 @@ public class ChanSettings {
         fontSize = new StringSetting(p, "preference_font", tablet ? "16" : "14");
         fontCondensed = new BooleanSetting(p, "preference_font_condensed", false);
         openLinkConfirmation = new BooleanSetting(p, "preference_open_link_confirmation", false);
+        openLinkBrowser = new BooleanSetting(p, "preference_open_link_browser", false);
         autoRefreshThread = new BooleanSetting(p, "preference_auto_refresh_thread", true);
 //        imageAutoLoad = new BooleanSetting(p, "preference_image_auto_load", true);
         imageAutoLoadNetwork = new OptionsSetting<>(p, "preference_image_auto_load_network", MediaAutoLoadMode.class, MediaAutoLoadMode.WIFI);
diff --git a/Clover/app/src/main/java/org/floens/chan/ui/controller/BehaviourSettingsController.java b/Clover/app/src/main/java/org/floens/chan/ui/controller/BehaviourSettingsController.java
index ece42a43..1651eab4 100644
--- a/Clover/app/src/main/java/org/floens/chan/ui/controller/BehaviourSettingsController.java
+++ b/Clover/app/src/main/java/org/floens/chan/ui/controller/BehaviourSettingsController.java
@@ -128,6 +128,9 @@ public class BehaviourSettingsController extends SettingsController {
             post.add(new BooleanSettingView(this,
                     ChanSettings.openLinkConfirmation,
                     R.string.setting_open_link_confirmation, 0));
+            post.add(new BooleanSettingView(this,
+                    ChanSettings.openLinkBrowser,
+                    R.string.setting_open_link_browser, 0));
 
             groups.add(post);
         }
diff --git a/Clover/app/src/main/java/org/floens/chan/ui/layout/ThreadLayout.java b/Clover/app/src/main/java/org/floens/chan/ui/layout/ThreadLayout.java
index 0e4e6668..b73d0263 100644
--- a/Clover/app/src/main/java/org/floens/chan/ui/layout/ThreadLayout.java
+++ b/Clover/app/src/main/java/org/floens/chan/ui/layout/ThreadLayout.java
@@ -301,14 +301,22 @@ public class ThreadLayout extends CoordinatorLayout implements
                     .setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
                         @Override
                         public void onClick(DialogInterface dialog, int which) {
-                            AndroidUtils.openLinkInBrowser((Activity) getContext(), link);
+                            if (ChanSettings.openLinkBrowser.get()) {
+                                AndroidUtils.openLink(link);
+                            } else {
+                                AndroidUtils.openLinkInBrowser((Activity) getContext(), link);
+                            }
                         }
                     })
                     .setTitle(R.string.open_link_confirmation)
                     .setMessage(link)
                     .show();
         } else {
-            AndroidUtils.openLinkInBrowser((Activity) getContext(), link);
+            if (ChanSettings.openLinkBrowser.get()) {
+                AndroidUtils.openLink(link);
+            } else {
+                AndroidUtils.openLinkInBrowser((Activity) getContext(), link);
+            }
         }
     }
 
diff --git a/Clover/app/src/main/res/values/strings.xml b/Clover/app/src/main/res/values/strings.xml
index 4a29009f..641e9703 100644
--- a/Clover/app/src/main/res/values/strings.xml
+++ b/Clover/app/src/main/res/values/strings.xml
@@ -482,6 +482,7 @@ Crash reports do not collect any personally identifiable information."
     <string name="setting_volume_key_scrolling">Volume keys scroll content</string>
     <string name="setting_tap_no_rely">Tap the post number to reply</string>
     <string name="setting_open_link_confirmation">Ask before opening links</string>
+    <string name="setting_open_link_browser">Always open links in external browser</string>
 
 
     <!-- Behavior proxy group -->