From 1d01c5d7b48c14a4d04a8968f485a9d21018640f Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Fri, 20 Mar 2020 17:00:11 -0500
Subject: [PATCH] Add preference for linkifying task edit screen

---
 app/src/main/java/com/todoroo/astrid/service/Upgrader.java  | 2 ++
 .../java/com/todoroo/astrid/ui/EditTitleControlSet.java     | 6 +++++-
 app/src/main/java/org/tasks/ui/DescriptionControlSet.java   | 6 +++++-
 app/src/main/res/values/keys.xml                            | 1 +
 app/src/main/res/xml/preferences_look_and_feel.xml          | 6 ++++++
 5 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/todoroo/astrid/service/Upgrader.java b/app/src/main/java/com/todoroo/astrid/service/Upgrader.java
index f3cca9412..8ecb6eb4b 100644
--- a/app/src/main/java/com/todoroo/astrid/service/Upgrader.java
+++ b/app/src/main/java/com/todoroo/astrid/service/Upgrader.java
@@ -61,6 +61,7 @@ public class Upgrader {
   private static final int V7_0 = 617;
   public static final int V8_2 = 675;
   private static final int V8_5 = 700;
+  private static final int V8_8 = 715;
   private final Context context;
   private final Preferences preferences;
   private final Tracker tracker;
@@ -122,6 +123,7 @@ public class Upgrader {
       run(from, V7_0, this::applyCaldavSubtasks);
       run(from, V8_2, this::migrateColors);
       run(from, V8_5, this::applyCaldavGeo);
+      run(from, V8_8, () -> preferences.setBoolean(R.string.p_linkify_task_edit, true));
     }
     preferences.setCurrentVersion(to);
   }
diff --git a/app/src/main/java/com/todoroo/astrid/ui/EditTitleControlSet.java b/app/src/main/java/com/todoroo/astrid/ui/EditTitleControlSet.java
index 1efeda9b5..8a937e17a 100644
--- a/app/src/main/java/com/todoroo/astrid/ui/EditTitleControlSet.java
+++ b/app/src/main/java/com/todoroo/astrid/ui/EditTitleControlSet.java
@@ -30,6 +30,7 @@ import org.tasks.R;
 import org.tasks.dialogs.Linkify;
 import org.tasks.injection.ForApplication;
 import org.tasks.injection.FragmentComponent;
+import org.tasks.preferences.Preferences;
 import org.tasks.ui.CheckBoxProvider;
 import org.tasks.ui.TaskEditControlFragment;
 
@@ -51,6 +52,7 @@ public class EditTitleControlSet extends TaskEditControlFragment {
   @Inject TaskCompleter taskCompleter;
   @Inject Linkify linkify;
   @Inject CheckBoxProvider checkBoxProvider;
+  @Inject Preferences preferences;
 
   @BindView(R.id.title)
   EditText editText;
@@ -93,7 +95,9 @@ public class EditTitleControlSet extends TaskEditControlFragment {
     editText.setLines(1);
     editText.setMaxLines(Integer.MAX_VALUE);
 
-    linkify.linkify(editText);
+    if (preferences.getBoolean(R.string.p_linkify_task_edit, false)) {
+      linkify.linkify(editText);
+    }
 
     updateCompleteBox();
     return view;
diff --git a/app/src/main/java/org/tasks/ui/DescriptionControlSet.java b/app/src/main/java/org/tasks/ui/DescriptionControlSet.java
index 44ed265e7..747346298 100644
--- a/app/src/main/java/org/tasks/ui/DescriptionControlSet.java
+++ b/app/src/main/java/org/tasks/ui/DescriptionControlSet.java
@@ -15,6 +15,7 @@ import javax.inject.Inject;
 import org.tasks.R;
 import org.tasks.dialogs.Linkify;
 import org.tasks.injection.FragmentComponent;
+import org.tasks.preferences.Preferences;
 
 public class DescriptionControlSet extends TaskEditControlFragment {
 
@@ -22,6 +23,7 @@ public class DescriptionControlSet extends TaskEditControlFragment {
   private static final String EXTRA_DESCRIPTION = "extra_description";
 
   @Inject Linkify linkify;
+  @Inject Preferences preferences;
 
   @BindView(R.id.notes)
   EditText editText;
@@ -46,7 +48,9 @@ public class DescriptionControlSet extends TaskEditControlFragment {
       editText.setTextKeepState(description);
     }
 
-    linkify.linkify(editText);
+    if (preferences.getBoolean(R.string.p_linkify_task_edit, false)) {
+      linkify.linkify(editText);
+    }
 
     return view;
   }
diff --git a/app/src/main/res/values/keys.xml b/app/src/main/res/values/keys.xml
index e379e7d19..61bbe6fa6 100644
--- a/app/src/main/res/values/keys.xml
+++ b/app/src/main/res/values/keys.xml
@@ -280,6 +280,7 @@
   <string name="p_show_description">show_description</string>
   <string name="p_show_full_description">show_full_description</string>
   <string name="p_linkify_task_list">linkify_task_list</string>
+  <string name="p_linkify_task_edit">linkify_task_edit</string>
   <string name="p_show_list_indicators">show_list_indicators</string>
   <string name="map_provider_mapbox">Mapbox</string>
   <string name="map_provider_google">Google</string>
diff --git a/app/src/main/res/xml/preferences_look_and_feel.xml b/app/src/main/res/xml/preferences_look_and_feel.xml
index a23a63b1f..5a09d220f 100644
--- a/app/src/main/res/xml/preferences_look_and_feel.xml
+++ b/app/src/main/res/xml/preferences_look_and_feel.xml
@@ -124,6 +124,12 @@
         android:targetPackage="@string/app_package" />
     </Preference>
 
+    <SwitchPreferenceCompat
+      android:defaultValue="false"
+      android:key="@string/p_linkify_task_edit"
+      android:summary="@string/linkify_description"
+      android:title="@string/linkify" />
+
     <SwitchPreferenceCompat
       android:defaultValue="false"
       android:key="@string/p_back_button_saves_task"