diff --git a/api/src/com/todoroo/andlib/sql/Operator.java b/api/src/com/todoroo/andlib/sql/Operator.java index 58d7d491a..bb7013e4e 100644 --- a/api/src/com/todoroo/andlib/sql/Operator.java +++ b/api/src/com/todoroo/andlib/sql/Operator.java @@ -57,6 +57,6 @@ public final class Operator { @Override public String toString() { - return this.operator.toString(); + return this.operator; } } diff --git a/api/src/com/todoroo/astrid/api/FilterCategoryWithNewButton.java b/api/src/com/todoroo/astrid/api/FilterCategoryWithNewButton.java index f709cfcf3..5e7b373a1 100644 --- a/api/src/com/todoroo/astrid/api/FilterCategoryWithNewButton.java +++ b/api/src/com/todoroo/astrid/api/FilterCategoryWithNewButton.java @@ -48,14 +48,6 @@ public class FilterCategoryWithNewButton extends FilterCategory { // --- parcelable - /** - * {@inheritDoc} - */ - @Override - public int describeContents() { - return 0; - } - /** * {@inheritDoc} */ diff --git a/api/src/com/todoroo/astrid/api/FilterWithCustomIntent.java b/api/src/com/todoroo/astrid/api/FilterWithCustomIntent.java index 8432c573f..5dbd0e023 100644 --- a/api/src/com/todoroo/astrid/api/FilterWithCustomIntent.java +++ b/api/src/com/todoroo/astrid/api/FilterWithCustomIntent.java @@ -58,14 +58,6 @@ public class FilterWithCustomIntent extends Filter { // --- parcelable - /** - * {@inheritDoc} - */ - @Override - public int describeContents() { - return 0; - } - /** * {@inheritDoc} */ diff --git a/api/src/com/todoroo/astrid/api/FilterWithUpdate.java b/api/src/com/todoroo/astrid/api/FilterWithUpdate.java index 8babb07cf..f79622643 100644 --- a/api/src/com/todoroo/astrid/api/FilterWithUpdate.java +++ b/api/src/com/todoroo/astrid/api/FilterWithUpdate.java @@ -39,14 +39,6 @@ public class FilterWithUpdate extends FilterWithCustomIntent { // --- parcelable - /** - * {@inheritDoc} - */ - @Override - public int describeContents() { - return 0; - } - /** * {@inheritDoc} */ diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java b/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java index b0c6ec0a3..f55ca3055 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java @@ -461,7 +461,7 @@ public class TagViewFragment extends TaskListFragment { if (!intent.hasExtra("tag_id")) { return; } - if (tagData == null || !tagData.getValue(TagData.UUID).toString().equals(intent.getStringExtra("tag_id"))) { + if (tagData == null || !tagData.getValue(TagData.UUID).equals(intent.getStringExtra("tag_id"))) { return; } diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/TagCaseMigrator.java b/astrid/plugin-src/com/todoroo/astrid/tags/TagCaseMigrator.java index 5e42bb289..2e7ba19d7 100644 --- a/astrid/plugin-src/com/todoroo/astrid/tags/TagCaseMigrator.java +++ b/astrid/plugin-src/com/todoroo/astrid/tags/TagCaseMigrator.java @@ -151,7 +151,7 @@ public class TagCaseMigrator { } @Deprecated - private int renameHelper(String oldTag, String newTag, boolean caseSensitive) { + private void renameHelper(String oldTag, String newTag, boolean caseSensitive) { // First remove newTag from all tasks that have both oldTag and newTag. metadataService.deleteWhere( Criterion.and( @@ -168,7 +168,6 @@ public class TagCaseMigrator { ret = metadataService.update(TagService.tagEqIgnoreCase(oldTag, Criterion.all), metadata); } invalidateTaskCache(newTag); - return ret; } diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/TagFilterExposer.java b/astrid/plugin-src/com/todoroo/astrid/tags/TagFilterExposer.java index 734ea9b2a..8b5a44717 100644 --- a/astrid/plugin-src/com/todoroo/astrid/tags/TagFilterExposer.java +++ b/astrid/plugin-src/com/todoroo/astrid/tags/TagFilterExposer.java @@ -111,7 +111,7 @@ public class TagFilterExposer extends BroadcastReceiver implements AstridFilterE } Bundle extras = new Bundle(); extras.putString(TagViewFragment.EXTRA_TAG_NAME, tag.tag); - extras.putString(TagViewFragment.EXTRA_TAG_UUID, tag.uuid.toString()); + extras.putString(TagViewFragment.EXTRA_TAG_UUID, tag.uuid); filter.customExtras = extras; return filter; diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/reusable/FeaturedListFilterExposer.java b/astrid/plugin-src/com/todoroo/astrid/tags/reusable/FeaturedListFilterExposer.java index 8e1be0916..0862cb210 100644 --- a/astrid/plugin-src/com/todoroo/astrid/tags/reusable/FeaturedListFilterExposer.java +++ b/astrid/plugin-src/com/todoroo/astrid/tags/reusable/FeaturedListFilterExposer.java @@ -50,7 +50,7 @@ public class FeaturedListFilterExposer extends TagFilterExposer { ContentValues contentValues = new ContentValues(); contentValues.put(Metadata.KEY.name, TaskToTagMetadata.KEY); contentValues.put(TaskToTagMetadata.TAG_NAME.name, tag.tag); - contentValues.put(TaskToTagMetadata.TAG_UUID.name, tag.uuid.toString()); + contentValues.put(TaskToTagMetadata.TAG_UUID.name, tag.uuid); FilterWithUpdate filter = new FilterWithUpdate(tag.tag, title, tagTemplate, @@ -64,7 +64,7 @@ public class FeaturedListFilterExposer extends TagFilterExposer { Bundle extras = new Bundle(); extras.putString(TagViewFragment.EXTRA_TAG_NAME, tag.tag); - extras.putString(TagViewFragment.EXTRA_TAG_UUID, tag.uuid.toString()); + extras.putString(TagViewFragment.EXTRA_TAG_UUID, tag.uuid); filter.customExtras = extras; return filter; diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java b/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java index 175973069..cfa2fd5c7 100755 --- a/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java +++ b/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java @@ -1271,7 +1271,7 @@ public final class TaskEditFragment extends SherlockFragment implements // stick our task into the outState outState.putParcelable(TASK_IN_PROGRESS, model); - outState.putString(TASK_UUID, uuid.toString()); + outState.putString(TASK_UUID, uuid); } private void adjustInfoPopovers() { diff --git a/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java b/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java index 41f0c2214..fb1d4a7bb 100644 --- a/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java +++ b/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java @@ -249,7 +249,7 @@ public class FilterAdapter extends ArrayAdapter { } } - public int adjustFilterCount(Filter filter, int delta) { + public void adjustFilterCount(Filter filter, int delta) { int filterCount = 0; if (filterCounts.containsKey(filter)) { filterCount = filterCounts.get(filter); @@ -257,7 +257,6 @@ public class FilterAdapter extends ArrayAdapter { int newCount = Math.max(filterCount + delta, 0); filterCounts.put(filter, newCount); notifyDataSetChanged(); - return newCount; } public void incrementFilterCount(Filter filter) { diff --git a/astrid/src/com/todoroo/astrid/service/Astrid2To3UpgradeHelper.java b/astrid/src/com/todoroo/astrid/service/Astrid2To3UpgradeHelper.java index 8999f7e45..67b548ed8 100644 --- a/astrid/src/com/todoroo/astrid/service/Astrid2To3UpgradeHelper.java +++ b/astrid/src/com/todoroo/astrid/service/Astrid2To3UpgradeHelper.java @@ -278,8 +278,7 @@ public class Astrid2To3UpgradeHelper { if (data.upgradeNotes == null) { data.upgradeNotes = new StringBuilder(); } - data.upgradeNotes.append("Goal Deadline: " + - DateUtilities.getDateString(new Date(preferredDueDate))); + data.upgradeNotes.append("Goal Deadline: ").append(DateUtilities.getDateString(new Date(preferredDueDate))); } } else if (property == Task.REMINDER_PERIOD) { // old period was stored in seconds