archive
/
tasks
mirror of https://github.com/tasks/tasks
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Removed/renamed a few references to remoteId variable names

Browse Source
pull/14/head
Sam Bosley 12 years ago
parent 517b935b65
commit ddb2d4ff66
6 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File

3
astrid/plugin-src/com/todoroo/astrid/actfm/TagUpdatesFragment.java
Unescape Escape View File

@ -269,9 +269,8 @@ public class TagUpdatesFragment extends ListFragment {
descriptionTitle.setVisibility(View.GONE); descriptionTitle.setVisibility(View.GONE);
} }
AsyncImageView imageView = (AsyncImageView) header.findViewById(R.id.tag_picture); AsyncImageView imageView = (AsyncImageView) header.findViewById(R.id.tag_picture);
imageView.setDefaultImageResource(TagService.getDefaultImageIDForTag(tagName)); imageView.setDefaultImageResource(TagService.getDefaultImageIDForTag(tagData.getValue(TagData.UUID)));
imageView.setUrl(tagData.getValue(TagData.PICTURE)); imageView.setUrl(tagData.getValue(TagData.PICTURE));
} }

5
astrid/plugin-src/com/todoroo/astrid/tags/TagCustomFilterCriteriaExposer.java
Unescape Escape View File

@ -23,6 +23,7 @@ import com.todoroo.astrid.api.TextInputCriterion;
import com.todoroo.astrid.dao.MetadataDao; import com.todoroo.astrid.dao.MetadataDao;
import com.todoroo.astrid.dao.TaskDao; import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.data.Metadata; import com.todoroo.astrid.data.Metadata;
import com.todoroo.astrid.data.RemoteModel;
import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.Task;
public class TagCustomFilterCriteriaExposer extends BroadcastReceiver { public class TagCustomFilterCriteriaExposer extends BroadcastReceiver {
@ -56,7 +57,7 @@ public class TagCustomFilterCriteriaExposer extends BroadcastReceiver {
MetadataDao.MetadataCriteria.withKey(TagMetadata.KEY), MetadataDao.MetadataCriteria.withKey(TagMetadata.KEY),
TagMetadata.TAG_NAME.eq("?"))).toString(), TagMetadata.TAG_NAME.eq("?"))).toString(),
values, tagNames, tagNames, values, tagNames, tagNames,
((BitmapDrawable)r.getDrawable(TagService.getDefaultImageIDForTag(0))).getBitmap(), ((BitmapDrawable)r.getDrawable(TagService.getDefaultImageIDForTag(RemoteModel.NO_UUID))).getBitmap(),
context.getString(R.string.CFC_tag_name)); context.getString(R.string.CFC_tag_name));
ret[j++] = criterion; ret[j++] = criterion;
} }
@ -72,7 +73,7 @@ public class TagCustomFilterCriteriaExposer extends BroadcastReceiver {
MetadataDao.MetadataCriteria.withKey(TagMetadata.KEY), MetadataDao.MetadataCriteria.withKey(TagMetadata.KEY),
TagMetadata.TAG_NAME.like("%?%"))).toString(), TagMetadata.TAG_NAME.like("%?%"))).toString(),
null, context.getString(R.string.CFC_tag_contains_name), "", null, context.getString(R.string.CFC_tag_contains_name), "",
((BitmapDrawable)r.getDrawable(TagService.getDefaultImageIDForTag(0))).getBitmap(), ((BitmapDrawable)r.getDrawable(TagService.getDefaultImageIDForTag(RemoteModel.NO_UUID))).getBitmap(),
context.getString(R.string.CFC_tag_contains_name)); context.getString(R.string.CFC_tag_contains_name));
ret[j++] = criterion; ret[j++] = criterion;
} }

14
astrid/plugin-src/com/todoroo/astrid/tags/TagService.java
Unescape Escape View File

@ -38,6 +38,7 @@ import com.todoroo.astrid.dao.MetadataDao;
import com.todoroo.astrid.dao.MetadataDao.MetadataCriteria; import com.todoroo.astrid.dao.MetadataDao.MetadataCriteria;
import com.todoroo.astrid.dao.TaskDao.TaskCriteria; import com.todoroo.astrid.dao.TaskDao.TaskCriteria;
import com.todoroo.astrid.data.Metadata; import com.todoroo.astrid.data.Metadata;
import com.todoroo.astrid.data.RemoteModel;
import com.todoroo.astrid.data.TagData; import com.todoroo.astrid.data.TagData;
import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.data.TaskApiDao; import com.todoroo.astrid.data.TaskApiDao;
@ -160,9 +161,9 @@ public final class TagService {
} }
public static Criterion memberOfTagData(long tagDataRemoteId) { public static Criterion memberOfTagData(long tagDataUUID) {
return Task.ID.in(Query.select(Metadata.TASK).from(Metadata.TABLE).where( return Task.ID.in(Query.select(Metadata.TASK).from(Metadata.TABLE).where(
Criterion.and(Metadata.KEY.eq(TagMetadata.KEY), TagMetadata.TAG_UUID.eq(tagDataRemoteId)))); Criterion.and(Metadata.KEY.eq(TagMetadata.KEY), TagMetadata.TAG_UUID.eq(tagDataUUID))));
} }
public static Criterion tagEq(String tag, Criterion additionalCriterion) { public static Criterion tagEq(String tag, Criterion additionalCriterion) {
@ -548,14 +549,11 @@ public final class TagService {
Flags.set(Flags.REFRESH); Flags.set(Flags.REFRESH);
} }
public static int getDefaultImageIDForTag(long remoteID) { public static int getDefaultImageIDForTag(String nameOrUUID) {
if (remoteID <= 0) { if (RemoteModel.NO_UUID.equals(nameOrUUID)) {
int random = (int)(Math.random()*4); int random = (int)(Math.random()*4);
return default_tag_images[random]; return default_tag_images[random];
} }
return default_tag_images[((int)remoteID)%4]; return default_tag_images[((int)Math.abs(nameOrUUID.hashCode()))%4];
}
public static int getDefaultImageIDForTag(String title) {
return getDefaultImageIDForTag(Math.abs(title.hashCode()));
} }
} }

12
astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java
Unescape Escape View File

@ -259,7 +259,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
private boolean overrideFinishAnim; private boolean overrideFinishAnim;
private String remoteId = RemoteModel.NO_UUID; private String uuid = RemoteModel.NO_UUID;
private WebServicesView webServices = null; private WebServicesView webServices = null;
@ -303,7 +303,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
model = task; model = task;
} }
if (savedInstanceState.containsKey(TASK_UUID)) { if (savedInstanceState.containsKey(TASK_UUID)) {
remoteId = savedInstanceState.getString(TASK_UUID); uuid = savedInstanceState.getString(TASK_UUID);
} }
} }
@ -733,7 +733,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
if (idParam > -1L) { if (idParam > -1L) {
model = taskService.fetchById(idParam, Task.PROPERTIES); model = taskService.fetchById(idParam, Task.PROPERTIES);
if (model != null && model.containsNonNullValue(Task.UUID)) { if (model != null && model.containsNonNullValue(Task.UUID)) {
remoteId = model.getValue(Task.UUID); uuid = model.getValue(Task.UUID);
} }
} }
@ -790,7 +790,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
/** Convenience method to populate fields after setting model to null */ /** Convenience method to populate fields after setting model to null */
public void repopulateFromScratch(Intent intent) { public void repopulateFromScratch(Intent intent) {
model = null; model = null;
remoteId = RemoteModel.NO_UUID; uuid = RemoteModel.NO_UUID;
populateFields(intent); populateFields(intent);
if (webServices != null) { if (webServices != null) {
webServices.setTask(model); webServices.setTask(model);
@ -1163,7 +1163,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
@Override @Override
public void onPrepareOptionsMenu (Menu menu) { public void onPrepareOptionsMenu (Menu menu) {
if(actFmPreferenceService.isLoggedIn() && !RemoteModel.NO_UUID.equals(remoteId) && menu.findItem(MENU_COMMENTS_REFRESH_ID) == null) { if(actFmPreferenceService.isLoggedIn() && !RemoteModel.NO_UUID.equals(uuid) && menu.findItem(MENU_COMMENTS_REFRESH_ID) == null) {
MenuItem item = menu.add(Menu.NONE, MENU_COMMENTS_REFRESH_ID, Menu.NONE, MenuItem item = menu.add(Menu.NONE, MENU_COMMENTS_REFRESH_ID, Menu.NONE,
R.string.ENA_refresh_comments); R.string.ENA_refresh_comments);
item.setIcon(R.drawable.icn_menu_refresh_dark); item.setIcon(R.drawable.icn_menu_refresh_dark);
@ -1232,7 +1232,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
// stick our task into the outState // stick our task into the outState
outState.putParcelable(TASK_IN_PROGRESS, model); outState.putParcelable(TASK_IN_PROGRESS, model);
outState.putString(TASK_UUID, remoteId.toString()); outState.putString(TASK_UUID, uuid.toString());
} }
@Override @Override

2
astrid/src/com/todoroo/astrid/adapter/UpdateAdapter.java
Unescape Escape View File

@ -361,7 +361,7 @@ public class UpdateAdapter extends CursorAdapter {
if (TASK_LINK_TYPE.equals(linkType)) { if (TASK_LINK_TYPE.equals(linkType)) {
long taskId = update.getValue(Update.TASK_LOCAL); long taskId = update.getValue(Update.TASK_LOCAL);
if (taskId <= 0) { if (taskId <= 0) {
Task local = PluginServices.getTaskService().fetchByRemoteId(Long.toString(update.getValue(Update.TASK)), Task.ID); Task local = PluginServices.getTaskService().fetchByUUID(Long.toString(update.getValue(Update.TASK)), Task.ID);
if (local != null) if (local != null)
taskId = local.getId(); taskId = local.getId();
} }

4
astrid/src/com/todoroo/astrid/service/TaskService.java
Unescape Escape View File

@ -101,11 +101,11 @@ public class TaskService {
/** /**
* *
* @param remoteId * @param uuid
* @param properties * @param properties
* @return item, or null if it doesn't exist * @return item, or null if it doesn't exist
*/ */
public Task fetchByRemoteId(String uuid, Property<?>... properties) { public Task fetchByUUID(String uuid, Property<?>... properties) {
TodorooCursor<Task> task = query(Query.select(properties).where(Task.UUID.eq(uuid))); TodorooCursor<Task> task = query(Query.select(properties).where(Task.UUID.eq(uuid)));
try { try {
if (task.getCount() > 0) { if (task.getCount() > 0) {

Write Preview
Loading…
Cancel
Save