|
|
@ -24,6 +24,7 @@ import com.todoroo.astrid.api.Filter;
|
|
|
|
import com.todoroo.astrid.api.FilterListItem;
|
|
|
|
import com.todoroo.astrid.api.FilterListItem;
|
|
|
|
import com.todoroo.astrid.service.ThemeService;
|
|
|
|
import com.todoroo.astrid.service.ThemeService;
|
|
|
|
import com.todoroo.astrid.ui.FragmentPopover;
|
|
|
|
import com.todoroo.astrid.ui.FragmentPopover;
|
|
|
|
|
|
|
|
import com.todoroo.astrid.utility.Flags;
|
|
|
|
|
|
|
|
|
|
|
|
public class TaskListWrapperActivity extends AstridWrapperActivity {
|
|
|
|
public class TaskListWrapperActivity extends AstridWrapperActivity {
|
|
|
|
|
|
|
|
|
|
|
@ -35,8 +36,6 @@ public class TaskListWrapperActivity extends AstridWrapperActivity {
|
|
|
|
private FragmentPopover listsPopover;
|
|
|
|
private FragmentPopover listsPopover;
|
|
|
|
private FragmentPopover editPopover;
|
|
|
|
private FragmentPopover editPopover;
|
|
|
|
|
|
|
|
|
|
|
|
private boolean fromTaskEdit = false;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private final OnClickListener popupMenuClickListener = new OnClickListener() {
|
|
|
|
private final OnClickListener popupMenuClickListener = new OnClickListener() {
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public void onClick(View v) {
|
|
|
|
public void onClick(View v) {
|
|
|
@ -51,9 +50,8 @@ public class TaskListWrapperActivity extends AstridWrapperActivity {
|
|
|
|
TaskEditActivity tea = getTaskEditFragment();
|
|
|
|
TaskEditActivity tea = getTaskEditFragment();
|
|
|
|
if (tea != null) {
|
|
|
|
if (tea != null) {
|
|
|
|
try {
|
|
|
|
try {
|
|
|
|
if (!fromTaskEdit)
|
|
|
|
if (!Flags.checkAndClear(Flags.TLA_DISMISSED_FROM_TASK_EDIT))
|
|
|
|
tea.save(false);
|
|
|
|
tea.save(false);
|
|
|
|
fromTaskEdit = false;
|
|
|
|
|
|
|
|
} catch (IllegalStateException e) {
|
|
|
|
} catch (IllegalStateException e) {
|
|
|
|
// Save during pause, ignore it
|
|
|
|
// Save during pause, ignore it
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -190,16 +188,16 @@ public class TaskListWrapperActivity extends AstridWrapperActivity {
|
|
|
|
super.onPostResume();
|
|
|
|
super.onPostResume();
|
|
|
|
|
|
|
|
|
|
|
|
Filter savedFilter = getIntent().getParcelableExtra(TaskListActivity.TOKEN_FILTER);
|
|
|
|
Filter savedFilter = getIntent().getParcelableExtra(TaskListActivity.TOKEN_FILTER);
|
|
|
|
|
|
|
|
if (!Flags.checkAndClear(Flags.TLA_RESUMED_FROM_VOICE_ADD))
|
|
|
|
setupTasklistFragmentWithFilter(savedFilter);
|
|
|
|
setupTasklistFragmentWithFilter(savedFilter);
|
|
|
|
if (savedFilter != null)
|
|
|
|
if (savedFilter != null)
|
|
|
|
lists.setText(savedFilter.title);
|
|
|
|
lists.setText(savedFilter.title);
|
|
|
|
|
|
|
|
|
|
|
|
if (!fromTaskEdit) {
|
|
|
|
if (!Flags.checkAndClear(Flags.TLA_DISMISSED_FROM_TASK_EDIT)) {
|
|
|
|
TaskEditActivity tea = getTaskEditFragment();
|
|
|
|
TaskEditActivity tea = getTaskEditFragment();
|
|
|
|
if (tea != null)
|
|
|
|
if (tea != null)
|
|
|
|
onBackPressed();
|
|
|
|
onBackPressed();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
fromTaskEdit = false;
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
@ -226,11 +224,11 @@ public class TaskListWrapperActivity extends AstridWrapperActivity {
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
findViewById(R.id.taskedit_fragment_container).setVisibility(View.INVISIBLE);
|
|
|
|
findViewById(R.id.taskedit_fragment_container).setVisibility(View.INVISIBLE);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
fromTaskEdit = true;
|
|
|
|
Flags.set(Flags.TLA_DISMISSED_FROM_TASK_EDIT);
|
|
|
|
onPostResume();
|
|
|
|
onPostResume();
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
if (editPopover != null && editPopover.isShowing()) {
|
|
|
|
if (editPopover != null && editPopover.isShowing()) {
|
|
|
|
fromTaskEdit = true;
|
|
|
|
Flags.set(Flags.TLA_DISMISSED_FROM_TASK_EDIT);
|
|
|
|
editPopover.dismiss();
|
|
|
|
editPopover.dismiss();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|