From ddb2d4ff6606d6300c62a23d9b13164c6ab6753f Mon Sep 17 00:00:00 2001 From: Sam Bosley Date: Mon, 1 Oct 2012 16:11:19 -0700 Subject: [PATCH] Removed/renamed a few references to remoteId variable names --- .../todoroo/astrid/actfm/TagUpdatesFragment.java | 3 +-- .../tags/TagCustomFilterCriteriaExposer.java | 5 +++-- .../com/todoroo/astrid/tags/TagService.java | 14 ++++++-------- .../todoroo/astrid/activity/TaskEditFragment.java | 12 ++++++------ .../com/todoroo/astrid/adapter/UpdateAdapter.java | 2 +- .../com/todoroo/astrid/service/TaskService.java | 4 ++-- 6 files changed, 19 insertions(+), 21 deletions(-) diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/TagUpdatesFragment.java b/astrid/plugin-src/com/todoroo/astrid/actfm/TagUpdatesFragment.java index 5a1b010b4..923fe3256 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/TagUpdatesFragment.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/TagUpdatesFragment.java @@ -269,9 +269,8 @@ public class TagUpdatesFragment extends ListFragment { descriptionTitle.setVisibility(View.GONE); } - 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)); } diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/TagCustomFilterCriteriaExposer.java b/astrid/plugin-src/com/todoroo/astrid/tags/TagCustomFilterCriteriaExposer.java index 1712530ba..f10e66cc3 100644 --- a/astrid/plugin-src/com/todoroo/astrid/tags/TagCustomFilterCriteriaExposer.java +++ b/astrid/plugin-src/com/todoroo/astrid/tags/TagCustomFilterCriteriaExposer.java @@ -23,6 +23,7 @@ import com.todoroo.astrid.api.TextInputCriterion; import com.todoroo.astrid.dao.MetadataDao; import com.todoroo.astrid.dao.TaskDao; import com.todoroo.astrid.data.Metadata; +import com.todoroo.astrid.data.RemoteModel; import com.todoroo.astrid.data.Task; public class TagCustomFilterCriteriaExposer extends BroadcastReceiver { @@ -56,7 +57,7 @@ public class TagCustomFilterCriteriaExposer extends BroadcastReceiver { MetadataDao.MetadataCriteria.withKey(TagMetadata.KEY), TagMetadata.TAG_NAME.eq("?"))).toString(), 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)); ret[j++] = criterion; } @@ -72,7 +73,7 @@ public class TagCustomFilterCriteriaExposer extends BroadcastReceiver { MetadataDao.MetadataCriteria.withKey(TagMetadata.KEY), TagMetadata.TAG_NAME.like("%?%"))).toString(), 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)); ret[j++] = criterion; } diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/TagService.java b/astrid/plugin-src/com/todoroo/astrid/tags/TagService.java index 2889bdd2e..a210e6c9d 100644 --- a/astrid/plugin-src/com/todoroo/astrid/tags/TagService.java +++ b/astrid/plugin-src/com/todoroo/astrid/tags/TagService.java @@ -38,6 +38,7 @@ import com.todoroo.astrid.dao.MetadataDao; import com.todoroo.astrid.dao.MetadataDao.MetadataCriteria; import com.todoroo.astrid.dao.TaskDao.TaskCriteria; import com.todoroo.astrid.data.Metadata; +import com.todoroo.astrid.data.RemoteModel; import com.todoroo.astrid.data.TagData; import com.todoroo.astrid.data.Task; 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( - 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) { @@ -548,14 +549,11 @@ public final class TagService { Flags.set(Flags.REFRESH); } - public static int getDefaultImageIDForTag(long remoteID) { - if (remoteID <= 0) { + public static int getDefaultImageIDForTag(String nameOrUUID) { + if (RemoteModel.NO_UUID.equals(nameOrUUID)) { int random = (int)(Math.random()*4); return default_tag_images[random]; } - return default_tag_images[((int)remoteID)%4]; - } - public static int getDefaultImageIDForTag(String title) { - return getDefaultImageIDForTag(Math.abs(title.hashCode())); + return default_tag_images[((int)Math.abs(nameOrUUID.hashCode()))%4]; } } diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java b/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java index d8a0ed106..e2ac05d1e 100755 --- a/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java +++ b/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java @@ -259,7 +259,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { private boolean overrideFinishAnim; - private String remoteId = RemoteModel.NO_UUID; + private String uuid = RemoteModel.NO_UUID; private WebServicesView webServices = null; @@ -303,7 +303,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { model = task; } 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) { model = taskService.fetchById(idParam, Task.PROPERTIES); 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 */ public void repopulateFromScratch(Intent intent) { model = null; - remoteId = RemoteModel.NO_UUID; + uuid = RemoteModel.NO_UUID; populateFields(intent); if (webServices != null) { webServices.setTask(model); @@ -1163,7 +1163,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { @Override 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, R.string.ENA_refresh_comments); item.setIcon(R.drawable.icn_menu_refresh_dark); @@ -1232,7 +1232,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { // stick our task into the outState outState.putParcelable(TASK_IN_PROGRESS, model); - outState.putString(TASK_UUID, remoteId.toString()); + outState.putString(TASK_UUID, uuid.toString()); } @Override diff --git a/astrid/src/com/todoroo/astrid/adapter/UpdateAdapter.java b/astrid/src/com/todoroo/astrid/adapter/UpdateAdapter.java index 139dfb8c4..a4b1fb40d 100644 --- a/astrid/src/com/todoroo/astrid/adapter/UpdateAdapter.java +++ b/astrid/src/com/todoroo/astrid/adapter/UpdateAdapter.java @@ -361,7 +361,7 @@ public class UpdateAdapter extends CursorAdapter { if (TASK_LINK_TYPE.equals(linkType)) { long taskId = update.getValue(Update.TASK_LOCAL); 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) taskId = local.getId(); } diff --git a/astrid/src/com/todoroo/astrid/service/TaskService.java b/astrid/src/com/todoroo/astrid/service/TaskService.java index 9f8fdea14..c150d3927 100644 --- a/astrid/src/com/todoroo/astrid/service/TaskService.java +++ b/astrid/src/com/todoroo/astrid/service/TaskService.java @@ -101,11 +101,11 @@ public class TaskService { /** * - * @param remoteId + * @param uuid * @param properties * @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 = query(Query.select(properties).where(Task.UUID.eq(uuid))); try { if (task.getCount() > 0) {