diff --git a/src/main/java/com/todoroo/astrid/actfm/TagSettingsActivity.java b/src/main/java/com/todoroo/astrid/actfm/TagSettingsActivity.java index 9ada1eed4..9867ace72 100644 --- a/src/main/java/com/todoroo/astrid/actfm/TagSettingsActivity.java +++ b/src/main/java/com/todoroo/astrid/actfm/TagSettingsActivity.java @@ -49,6 +49,7 @@ public class TagSettingsActivity extends InjectingAppCompatActivity { public static final String TOKEN_NEW_FILTER = "newFilter"; //$NON-NLS-1$ public static final String TOKEN_AUTOPOPULATE_NAME = "autopopulateName"; //$NON-NLS-1$ + public static final String EXTRA_TAG_DATA = "tagData"; //$NON-NLS-1$ private boolean isNewTag; private TagData tagData; @@ -70,7 +71,7 @@ public class TagSettingsActivity extends InjectingAppCompatActivity { setContentView(R.layout.tag_settings_activity); ButterKnife.bind(this); - tagData = getIntent().getParcelableExtra(TagViewFragment.EXTRA_TAG_DATA); + tagData = getIntent().getParcelableExtra(EXTRA_TAG_DATA); if (tagData == null) { isNewTag = true; tagData = new TagData(); diff --git a/src/main/java/com/todoroo/astrid/actfm/TagViewFragment.java b/src/main/java/com/todoroo/astrid/actfm/TagViewFragment.java index 7f861a3a4..a9641bb4f 100644 --- a/src/main/java/com/todoroo/astrid/actfm/TagViewFragment.java +++ b/src/main/java/com/todoroo/astrid/actfm/TagViewFragment.java @@ -5,20 +5,13 @@ */ package com.todoroo.astrid.actfm; -import android.app.Activity; -import android.content.Intent; import android.os.Bundle; import com.todoroo.andlib.utility.DateUtilities; -import com.todoroo.astrid.activity.TaskListActivity; import com.todoroo.astrid.activity.TaskListFragment; import com.todoroo.astrid.dao.TagDataDao; import com.todoroo.astrid.data.RemoteModel; import com.todoroo.astrid.data.TagData; -import com.todoroo.astrid.tags.TagFilterExposer; -import com.todoroo.astrid.utility.Flags; - -import org.tasks.ui.NavigationDrawerFragment; import javax.inject.Inject; @@ -26,17 +19,8 @@ public class TagViewFragment extends TaskListFragment { public static final String EXTRA_TAG_NAME = "tag"; //$NON-NLS-1$ - @Deprecated - private static final String EXTRA_TAG_REMOTE_ID = "remoteId"; //$NON-NLS-1$ - public static final String EXTRA_TAG_UUID = "uuid"; //$NON-NLS-1$ - public static final String EXTRA_TAG_DATA = "tagData"; //$NON-NLS-1$ - - private static final int REQUEST_CODE_SETTINGS = 0; - - public static final String TOKEN_START_ACTIVITY = "startActivity"; //$NON-NLS-1$ - protected TagData tagData; @Inject TagDataDao tagDataDao; @@ -67,9 +51,6 @@ public class TagViewFragment extends TaskListFragment { String uuid = RemoteModel.NO_UUID; if (extras.containsKey(EXTRA_TAG_UUID)) { uuid = extras.getString(EXTRA_TAG_UUID); - } else if (extras.containsKey(EXTRA_TAG_REMOTE_ID)) // For legacy support with shortcuts, widgets, etc. - { - uuid = Long.toString(extras.getLong(EXTRA_TAG_REMOTE_ID)); } @@ -89,10 +70,6 @@ public class TagViewFragment extends TaskListFragment { } super.initializeData(); - - if (extras.getBoolean(TOKEN_START_ACTIVITY, false)) { - extras.remove(TOKEN_START_ACTIVITY); - } } @Override @@ -116,38 +93,6 @@ public class TagViewFragment extends TaskListFragment { } } - protected void reloadTagData() { - tagData = tagDataDao.fetch(tagData.getId(), TagData.PROPERTIES); // refetch - if (tagData == null) { - // This can happen if a tag has been deleted as part of a sync - taskListMetadata = null; - return; - } - initializeTaskListMetadata(); - filter = TagFilterExposer.filterFromTagData(getActivity(), tagData); - getActivity().getIntent().putExtra(TOKEN_FILTER, filter); - extras.putParcelable(TOKEN_FILTER, filter); - Activity activity = getActivity(); - if (activity instanceof TaskListActivity) { - ((TaskListActivity) activity).setListsTitle(filter.listingTitle); - NavigationDrawerFragment navigationDrawer = ((TaskListActivity) activity).getNavigationDrawerFragment(); - if (navigationDrawer != null) { - navigationDrawer.clear(); - } - } - taskAdapter = null; - Flags.set(Flags.REFRESH); - } - - @Override - public void onActivityResult(int requestCode, int resultCode, Intent data) { - if (requestCode == REQUEST_CODE_SETTINGS && resultCode == Activity.RESULT_OK) { - reloadTagData(); - } else { - super.onActivityResult(requestCode, resultCode, data); - } - } - @Override protected boolean hasDraggableOption() { return tagData != null; diff --git a/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java b/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java index 099d112aa..201a49d63 100755 --- a/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java +++ b/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java @@ -13,7 +13,6 @@ import android.net.Uri; import android.os.Bundle; import android.os.Handler; import android.support.v4.view.ViewPager; -import android.text.TextUtils; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; @@ -96,6 +95,7 @@ public final class TaskEditFragment extends InjectingFragment implements EditNot */ private static final String EXTRA_TASK = "extra_task"; //$NON-NLS-1$ private static final String EXTRA_APPLY_MODEL = "extra_apply_model"; + private static final String EXTRA_IS_NEW_TASK = "extra_is_new_task"; /** * Token for saving a bitmap in the intent before it has been added with a comment @@ -170,6 +170,7 @@ public final class TaskEditFragment extends InjectingFragment implements EditNot if (savedInstanceState != null) { model = savedInstanceState.getParcelable(EXTRA_TASK); applyModel = savedInstanceState.getBoolean(EXTRA_APPLY_MODEL); + isNewTask = savedInstanceState.getBoolean(EXTRA_IS_NEW_TASK); } showEditComments = preferences.getBoolean(R.string.p_show_task_edit_comments, true); @@ -409,16 +410,9 @@ public final class TaskEditFragment extends InjectingFragment implements EditNot */ protected void discardButtonClick() { - // abandon editing in this case - if (getTitle().trim().length() == 0 || TextUtils.isEmpty(model.getTitle())) { - if (isNewTask) { - TimerPlugin.stopTimer(notificationManager, taskService, getActivity(), model); - taskDeleter.delete(model); - if (getActivity() instanceof TaskListActivity) { - TaskListActivity tla = (TaskListActivity) getActivity(); - tla.refreshTaskList(); - } - } + if (isNewTask) { + TimerPlugin.stopTimer(notificationManager, taskService, getActivity(), model); + taskDeleter.delete(model); } removeExtrasFromIntent(getActivity().getIntent()); @@ -513,6 +507,7 @@ public final class TaskEditFragment extends InjectingFragment implements EditNot outState.putParcelable(EXTRA_TASK, model); outState.putBoolean(EXTRA_APPLY_MODEL, applyModel); + outState.putBoolean(EXTRA_IS_NEW_TASK, isNewTask); } /* diff --git a/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java b/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java index b69076675..1c5aeff41 100644 --- a/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java +++ b/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java @@ -19,7 +19,6 @@ import android.support.v4.widget.DrawerLayout; import android.support.v7.app.ActionBar; import android.support.v7.widget.SearchView; import android.support.v7.widget.Toolbar; -import android.view.KeyEvent; import android.view.Menu; import android.view.MenuItem; import android.view.View; @@ -688,7 +687,7 @@ public class TaskListActivity extends InjectingAppCompatActivity implements return true; case R.id.menu_tag_settings: startActivityForResult(new Intent(this, TagSettingsActivity.class) {{ - putExtra(TagViewFragment.EXTRA_TAG_DATA, getTaskListFragment().getActiveTagData()); + putExtra(TagSettingsActivity.EXTRA_TAG_DATA, getTaskListFragment().getActiveTagData()); }}, REQUEST_EDIT_TAG); return true; case R.id.menu_show_hidden: @@ -712,18 +711,6 @@ public class TaskListActivity extends InjectingAppCompatActivity implements } } - @Override - public boolean onKeyDown(int keyCode, KeyEvent event) { - if (keyCode == KeyEvent.KEYCODE_BACK) { - TaskEditFragment tef = getTaskEditFragment(); - if (tef != null) { - tef.onBackPressed(); - return true; - } - } - return super.onKeyDown(keyCode, event); - } - public TaskListFragment getTaskListFragment() { return (TaskListFragment) getFragmentManager() .findFragmentByTag(TaskListFragment.TAG_TASKLIST_FRAGMENT); diff --git a/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java b/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java index 2ef5dbcc8..2fc29f7d5 100644 --- a/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java +++ b/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java @@ -711,14 +711,11 @@ public class TaskListFragment extends InjectingListFragment implements SwipeRefr } protected void onTaskDelete(Task task) { - Activity a = getActivity(); - if (a instanceof TaskListActivity) { - TaskListActivity activity = (TaskListActivity) a; - TaskEditFragment tef = activity.getTaskEditFragment(); - if (tef != null) { - if (task.getId() == tef.model.getId()) { - tef.discardButtonClick(); - } + TaskListActivity activity = (TaskListActivity) getActivity(); + TaskEditFragment tef = activity.getTaskEditFragment(); + if (tef != null) { + if (task.getId() == tef.model.getId()) { + tef.discardButtonClick(); } } TimerPlugin.stopTimer(notificationManager, taskService, context, task);