|
|
@ -50,8 +50,8 @@ public class GoogleTaskListFragment extends TaskEditControlFragment {
|
|
|
|
@Inject Tracker tracker;
|
|
|
|
@Inject Tracker tracker;
|
|
|
|
|
|
|
|
|
|
|
|
private long taskId;
|
|
|
|
private long taskId;
|
|
|
|
private GtasksList originalList;
|
|
|
|
@Nullable private GtasksList originalList;
|
|
|
|
private GtasksList selectedList;
|
|
|
|
@Nullable private GtasksList selectedList;
|
|
|
|
|
|
|
|
|
|
|
|
@Nullable
|
|
|
|
@Nullable
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
@ -59,8 +59,15 @@ public class GoogleTaskListFragment extends TaskEditControlFragment {
|
|
|
|
View view = super.onCreateView(inflater, container, savedInstanceState);
|
|
|
|
View view = super.onCreateView(inflater, container, savedInstanceState);
|
|
|
|
if (savedInstanceState != null) {
|
|
|
|
if (savedInstanceState != null) {
|
|
|
|
taskId = savedInstanceState.getLong(EXTRA_TASK_ID);
|
|
|
|
taskId = savedInstanceState.getLong(EXTRA_TASK_ID);
|
|
|
|
originalList = new GtasksList((StoreObject) savedInstanceState.getParcelable(EXTRA_ORIGINAL_LIST));
|
|
|
|
|
|
|
|
selectedList = new GtasksList((StoreObject) savedInstanceState.getParcelable(EXTRA_SELECTED_LIST));
|
|
|
|
StoreObject originalStoreObject = savedInstanceState.getParcelable(EXTRA_ORIGINAL_LIST);
|
|
|
|
|
|
|
|
if (originalStoreObject != null) {
|
|
|
|
|
|
|
|
originalList = new GtasksList(originalStoreObject);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
StoreObject selectedStoreObject = savedInstanceState.getParcelable(EXTRA_SELECTED_LIST);
|
|
|
|
|
|
|
|
if (selectedStoreObject != null) {
|
|
|
|
|
|
|
|
selectedList = new GtasksList(selectedStoreObject);
|
|
|
|
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
Metadata metadata = gtasksMetadataService.getActiveTaskMetadata(taskId);
|
|
|
|
Metadata metadata = gtasksMetadataService.getActiveTaskMetadata(taskId);
|
|
|
|
if (metadata != null) {
|
|
|
|
if (metadata != null) {
|
|
|
@ -81,8 +88,12 @@ public class GoogleTaskListFragment extends TaskEditControlFragment {
|
|
|
|
super.onSaveInstanceState(outState);
|
|
|
|
super.onSaveInstanceState(outState);
|
|
|
|
|
|
|
|
|
|
|
|
outState.putLong(EXTRA_TASK_ID, taskId);
|
|
|
|
outState.putLong(EXTRA_TASK_ID, taskId);
|
|
|
|
outState.putParcelable(EXTRA_ORIGINAL_LIST, originalList.getStoreObject());
|
|
|
|
if (originalList != null) {
|
|
|
|
outState.putParcelable(EXTRA_SELECTED_LIST, selectedList.getStoreObject());
|
|
|
|
outState.putParcelable(EXTRA_ORIGINAL_LIST, originalList.getStoreObject());
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
if (selectedList != null) {
|
|
|
|
|
|
|
|
outState.putParcelable(EXTRA_SELECTED_LIST, selectedList.getStoreObject());
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
@ -137,7 +148,7 @@ public class GoogleTaskListFragment extends TaskEditControlFragment {
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public boolean hasChanges(Task original) {
|
|
|
|
public boolean hasChanges(Task original) {
|
|
|
|
return !selectedList.equals(originalList);
|
|
|
|
return selectedList != null && !selectedList.equals(originalList);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|