From 268a774b0a0e1236f60e8ad69b2c34a70ec77b5b Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Wed, 20 Feb 2019 12:04:05 -0600 Subject: [PATCH] Handle error when task not found --- .../com/todoroo/astrid/activity/MainActivity.java | 5 ++++- app/src/main/java/org/tasks/ui/Toaster.java | 11 +++++++++-- app/src/main/res/values/strings.xml | 1 + 3 files changed, 14 insertions(+), 3 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 665d4e34c..0a89c59de 100644 --- a/app/src/main/java/com/todoroo/astrid/activity/MainActivity.java +++ b/app/src/main/java/com/todoroo/astrid/activity/MainActivity.java @@ -79,6 +79,7 @@ import org.tasks.ui.EmptyTaskEditFragment; import org.tasks.ui.NavigationDrawerFragment; import org.tasks.ui.PriorityControlSet; import org.tasks.ui.TaskListViewModel; +import org.tasks.ui.Toaster; public class MainActivity extends InjectingAppCompatActivity implements OnFilterItemClickedListener, @@ -115,6 +116,7 @@ public class MainActivity extends InjectingAppCompatActivity @Inject LocalBroadcastManager localBroadcastManager; @Inject TaskCreator taskCreator; @Inject PlayServices playServices; + @Inject Toaster toaster; @BindView(R.id.drawer_layout) DrawerLayout drawerLayout; @@ -245,7 +247,8 @@ public class MainActivity extends InjectingAppCompatActivity task -> { getSupportFragmentManager().executePendingTransactions(); 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); diff --git a/app/src/main/java/org/tasks/ui/Toaster.java b/app/src/main/java/org/tasks/ui/Toaster.java index 62ba9f3e7..03bb2d893 100644 --- a/app/src/main/java/org/tasks/ui/Toaster.java +++ b/app/src/main/java/org/tasks/ui/Toaster.java @@ -20,9 +20,16 @@ public class Toaster { this.locale = locale; } + public void longToast(@StringRes int resId) { + longToast(context.getString(resId)); + } + public void longToast(@StringRes int resId, int number) { - Toast.makeText(context, context.getString(resId, locale.formatNumber(number)), LENGTH_LONG) - .show(); + longToast(context.getString(resId, locale.formatNumber(number))); + } + + private void longToast(String text) { + Toast.makeText(context, text, LENGTH_LONG).show(); } @SuppressWarnings("DeprecatedIsStillUsed") diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 84e62962a..820c5b21f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -878,4 +878,5 @@ File %1$s contained %2$s.\n\n Arrived at %s Departed %s Generating notifications + Task not found