From ff53e7d08f3ba69a8bd9f47b0b6c93fd44ed00c6 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Wed, 12 Jun 2019 12:57:19 -0500 Subject: [PATCH] Open new tasks immediately --- .../todoroo/astrid/activity/MainActivity.java | 36 ++++++++++--------- 1 file changed, 19 insertions(+), 17 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 8d9837f01..b5b31f78d 100644 --- a/app/src/main/java/com/todoroo/astrid/activity/MainActivity.java +++ b/app/src/main/java/com/todoroo/astrid/activity/MainActivity.java @@ -366,23 +366,25 @@ public class MainActivity extends InjectingAppCompatActivity clearUi(); - disposables.add( - Single.fromCallable(() -> task.isNew() ? task : taskDao.fetch(task.getId())) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe( - t -> { - getSupportFragmentManager() - .beginTransaction() - .replace( - R.id.detail, - newTaskEditFragment(t), - TaskEditFragment.TAG_TASKEDIT_FRAGMENT) - .addToBackStack(TaskEditFragment.TAG_TASKEDIT_FRAGMENT) - .commit(); - - showDetailFragment(); - })); + if (task.isNew()) { + openTask(task); + } else { + disposables.add( + Single.fromCallable(() -> taskDao.fetch(task.getId())) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(this::openTask)); + } + } + + private void openTask(Task task) { + getSupportFragmentManager() + .beginTransaction() + .replace(R.id.detail, newTaskEditFragment(task), TaskEditFragment.TAG_TASKEDIT_FRAGMENT) + .addToBackStack(TaskEditFragment.TAG_TASKEDIT_FRAGMENT) + .commit(); + + showDetailFragment(); } @Override