From 493187e00bb5a5492c688e58596c53f63b36f2ca Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Thu, 7 Mar 2019 14:58:38 -0600
Subject: [PATCH] Rename main activity task extras

---
 .../todoroo/astrid/activity/MainActivity.java | 20 +++++++++----------
 .../astrid/activity/ShareLinkActivity.java    |  2 +-
 .../java/org/tasks/intents/TaskIntents.java   |  2 +-
 .../java/org/tasks/widget/TasksWidget.java    |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/com/todoroo/astrid/activity/MainActivity.java b/app/src/main/java/com/todoroo/astrid/activity/MainActivity.java
index 59ce24c59..9d79b2083 100644
--- a/app/src/main/java/com/todoroo/astrid/activity/MainActivity.java
+++ b/app/src/main/java/com/todoroo/astrid/activity/MainActivity.java
@@ -79,8 +79,8 @@ public class MainActivity extends InjectingAppCompatActivity
 
   public static final String OPEN_FILTER = "open_filter"; // $NON-NLS-1$
   public static final String LOAD_FILTER = "load_filter";
-  public static final String OPEN_TASK = "open_task"; // $NON-NLS-1$
-  public static final String OPEN_NEW_TASK = "open_new_task"; // $NON-NLS-1$
+  public static final String CREATE_TASK = "open_task"; // $NON-NLS-1$
+  public static final String OPEN_TASK = "open_new_task"; // $NON-NLS-1$
   private static final String FRAG_TAG_TASK_LIST = "frag_tag_task_list";
   private static final String EXTRA_FILTER = "extra_filter";
 
@@ -195,8 +195,8 @@ public class MainActivity extends InjectingAppCompatActivity
       hideDetailFragment();
     } else if (intent.hasExtra(OPEN_FILTER)
         || intent.hasExtra(LOAD_FILTER)
-        || intent.hasExtra(OPEN_TASK)
-        || intent.hasExtra(OPEN_NEW_TASK)) {
+        || intent.hasExtra(CREATE_TASK)
+        || intent.hasExtra(OPEN_TASK)) {
       taskEditFragment.save();
       removeTaskEditFragment();
     } else {
@@ -209,9 +209,9 @@ public class MainActivity extends InjectingAppCompatActivity
             .observeOn(AndroidSchedulers.mainThread())
             .doAfterSuccess(this::openTaskListFragment);
 
-    if (intent.hasExtra(OPEN_TASK)) {
-      long taskId = intent.getLongExtra(OPEN_TASK, 0);
-      intent.removeExtra(OPEN_TASK);
+    if (intent.hasExtra(CREATE_TASK)) {
+      long taskId = intent.getLongExtra(CREATE_TASK, 0);
+      intent.removeExtra(CREATE_TASK);
       disposables.add(
           single
               .observeOn(Schedulers.io())
@@ -227,9 +227,9 @@ public class MainActivity extends InjectingAppCompatActivity
                     onTaskListItemClicked(task);
                   },
                   exception -> toaster.longToast(R.string.error_task_not_found)));
-    } else if (intent.hasExtra(OPEN_NEW_TASK)) {
-      Task task = intent.getParcelableExtra(OPEN_NEW_TASK);
-      intent.removeExtra(OPEN_NEW_TASK);
+    } else if (intent.hasExtra(OPEN_TASK)) {
+      Task task = intent.getParcelableExtra(OPEN_TASK);
+      intent.removeExtra(OPEN_TASK);
       disposables.add(single.subscribe(tlf -> onTaskListItemClicked(task)));
     } else if (intent.hasExtra(TOKEN_CREATE_NEW_LIST_NAME)) {
       final String listName = intent.getStringExtra(TOKEN_CREATE_NEW_LIST_NAME);
diff --git a/app/src/main/java/com/todoroo/astrid/activity/ShareLinkActivity.java b/app/src/main/java/com/todoroo/astrid/activity/ShareLinkActivity.java
index d6bba727f..c80d932fd 100644
--- a/app/src/main/java/com/todoroo/astrid/activity/ShareLinkActivity.java
+++ b/app/src/main/java/com/todoroo/astrid/activity/ShareLinkActivity.java
@@ -71,7 +71,7 @@ public final class ShareLinkActivity extends InjectingAppCompatActivity {
 
   private static TaskStackBuilder getEditTaskStack(Context context, Task task) {
     Intent intent = getTaskListIntent(context, null);
-    intent.putExtra(MainActivity.OPEN_NEW_TASK, task);
+    intent.putExtra(MainActivity.OPEN_TASK, task);
     return TaskStackBuilder.create(context).addNextIntent(intent);
   }
 
diff --git a/app/src/main/java/org/tasks/intents/TaskIntents.java b/app/src/main/java/org/tasks/intents/TaskIntents.java
index 3b07e2f15..920bd5080 100644
--- a/app/src/main/java/org/tasks/intents/TaskIntents.java
+++ b/app/src/main/java/org/tasks/intents/TaskIntents.java
@@ -17,7 +17,7 @@ public class TaskIntents {
 
   public static Intent getEditTaskIntent(Context context, @Nullable Filter filter, Task task) {
     Intent intent = getTaskListIntent(context, filter);
-    intent.putExtra(MainActivity.OPEN_NEW_TASK, task);
+    intent.putExtra(MainActivity.OPEN_TASK, task);
     intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
     return intent;
   }
diff --git a/app/src/main/java/org/tasks/widget/TasksWidget.java b/app/src/main/java/org/tasks/widget/TasksWidget.java
index 685e37ee9..19afa1140 100644
--- a/app/src/main/java/org/tasks/widget/TasksWidget.java
+++ b/app/src/main/java/org/tasks/widget/TasksWidget.java
@@ -170,7 +170,7 @@ public class TasksWidget extends InjectingAppWidgetProvider {
 
   private PendingIntent getNewTaskIntent(Context context, Filter filter, int widgetId) {
     Intent intent = TaskIntents.getTaskListIntent(context, filter);
-    intent.putExtra(MainActivity.OPEN_TASK, 0L);
+    intent.putExtra(MainActivity.CREATE_TASK, 0L);
     intent.setFlags(flags);
     intent.setAction("new_task");
     return PendingIntent.getActivity(context, widgetId, intent, PendingIntent.FLAG_UPDATE_CURRENT);