|
|
@ -5,20 +5,13 @@
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
package com.todoroo.astrid.actfm;
|
|
|
|
package com.todoroo.astrid.actfm;
|
|
|
|
|
|
|
|
|
|
|
|
import android.app.Activity;
|
|
|
|
|
|
|
|
import android.content.Intent;
|
|
|
|
|
|
|
|
import android.os.Bundle;
|
|
|
|
import android.os.Bundle;
|
|
|
|
|
|
|
|
|
|
|
|
import com.todoroo.andlib.utility.DateUtilities;
|
|
|
|
import com.todoroo.andlib.utility.DateUtilities;
|
|
|
|
import com.todoroo.astrid.activity.TaskListActivity;
|
|
|
|
|
|
|
|
import com.todoroo.astrid.activity.TaskListFragment;
|
|
|
|
import com.todoroo.astrid.activity.TaskListFragment;
|
|
|
|
import com.todoroo.astrid.dao.TagDataDao;
|
|
|
|
import com.todoroo.astrid.dao.TagDataDao;
|
|
|
|
import com.todoroo.astrid.data.RemoteModel;
|
|
|
|
import com.todoroo.astrid.data.RemoteModel;
|
|
|
|
import com.todoroo.astrid.data.TagData;
|
|
|
|
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;
|
|
|
|
import javax.inject.Inject;
|
|
|
|
|
|
|
|
|
|
|
@ -26,17 +19,8 @@ public class TagViewFragment extends TaskListFragment {
|
|
|
|
|
|
|
|
|
|
|
|
public static final String EXTRA_TAG_NAME = "tag"; //$NON-NLS-1$
|
|
|
|
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_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;
|
|
|
|
protected TagData tagData;
|
|
|
|
|
|
|
|
|
|
|
|
@Inject TagDataDao tagDataDao;
|
|
|
|
@Inject TagDataDao tagDataDao;
|
|
|
@ -67,9 +51,6 @@ public class TagViewFragment extends TaskListFragment {
|
|
|
|
String uuid = RemoteModel.NO_UUID;
|
|
|
|
String uuid = RemoteModel.NO_UUID;
|
|
|
|
if (extras.containsKey(EXTRA_TAG_UUID)) {
|
|
|
|
if (extras.containsKey(EXTRA_TAG_UUID)) {
|
|
|
|
uuid = extras.getString(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();
|
|
|
|
super.initializeData();
|
|
|
|
|
|
|
|
|
|
|
|
if (extras.getBoolean(TOKEN_START_ACTIVITY, false)) {
|
|
|
|
|
|
|
|
extras.remove(TOKEN_START_ACTIVITY);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@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
|
|
|
|
@Override
|
|
|
|
protected boolean hasDraggableOption() {
|
|
|
|
protected boolean hasDraggableOption() {
|
|
|
|
return tagData != null;
|
|
|
|
return tagData != null;
|
|
|
|