Load default list after deleting tag or filter

pull/413/head
Alex Baker 10 years ago
parent 89682c0353
commit 1f789530c5

@ -92,7 +92,7 @@ public class TagViewFragment extends TaskListFragment {
} else if (AstridApiConstants.BROADCAST_EVENT_TAG_DELETED.equals(action)) { } else if (AstridApiConstants.BROADCAST_EVENT_TAG_DELETED.equals(action)) {
String activeUuid = tagData.getUuid(); String activeUuid = tagData.getUuid();
if (activeUuid.equals(uuid)) { if (activeUuid.equals(uuid)) {
activity.onFilterItemClicked(BuiltInFilterExposer.getMyTasksFilter(getResources())); activity.onFilterItemClicked(null);
activity.clearNavigationDrawer(); // Should auto refresh activity.clearNavigationDrawer(); // Should auto refresh
} }
} }

@ -228,6 +228,9 @@ public class TaskListActivity extends InjectingAppCompatActivity implements
@Override @Override
public void onFilterItemClicked(FilterListItem item) { public void onFilterItemClicked(FilterListItem item) {
if (item == null) {
item = defaultFilterProvider.getDefaultFilter();
}
TaskEditFragment tef = getTaskEditFragment(); TaskEditFragment tef = getTaskEditFragment();
if (tef != null) { if (tef != null) {
getTaskEditFragment().save(); getTaskEditFragment().save();

@ -735,7 +735,7 @@ public class TaskListFragment extends InjectingListFragment implements
CustomFilter customFilter = data.getParcelableExtra(FilterSettingsActivity.TOKEN_FILTER); CustomFilter customFilter = data.getParcelableExtra(FilterSettingsActivity.TOKEN_FILTER);
((TaskListActivity) getActivity()).onFilterItemClicked(customFilter); ((TaskListActivity) getActivity()).onFilterItemClicked(customFilter);
} else if(AstridApiConstants.BROADCAST_EVENT_FILTER_DELETED.equals(action)) { } else if(AstridApiConstants.BROADCAST_EVENT_FILTER_DELETED.equals(action)) {
((TaskListActivity) getActivity()).onFilterItemClicked(BuiltInFilterExposer.getMyTasksFilter(getResources())); ((TaskListActivity) getActivity()).onFilterItemClicked(null);
} }
((TaskListActivity) getActivity()).refreshNavigationDrawer(); ((TaskListActivity) getActivity()).refreshNavigationDrawer();

Loading…
Cancel
Save