From a6bf478422ec35375d4363bc7ed9717e1ed1bc07 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Mon, 11 Nov 2013 16:24:52 -0600 Subject: [PATCH] Apply Android Studio inspections * Remove invalid manifest entries * Remove redundant finals * Remove redundant semicolons * Remove unnecessary boxing/unboxing * Remove redundant type casts * Remove redundant toString calls * Replace StringBuilders with Strings * Remove manual array operations * Replace StringBuffer with StringBuilder * Replace for with foreach * Remove unused try/catch * Remove unused collections * Remove empty if statements * Remove unused return values * Remove redundant local variables * Remove redundant assignments and unused variables * Remove unused logo change * Remove unused strings * Fix string comparison --- .../todoroo/andlib/data/AbstractModel.java | 12 +--- .../com/todoroo/andlib/data/Property.java | 2 +- .../com/todoroo/andlib/data/package-info.java | 2 +- .../com/todoroo/andlib/sql/Functions.java | 4 +- .../java/com/todoroo/andlib/sql/Operator.java | 19 +----- .../java/com/todoroo/andlib/sql/Query.java | 24 +------ .../com/todoroo/andlib/sql/QueryTemplate.java | 9 --- .../com/todoroo/andlib/sql/SqlConstants.java | 1 - .../todoroo/andlib/sql/UnaryCriterion.java | 4 +- .../andlib/utility/AndroidUtilities.java | 15 ++--- .../todoroo/andlib/utility/DateUtilities.java | 8 +-- .../java/com/todoroo/andlib/utility/Pair.java | 2 +- .../java/com/todoroo/astrid/api/Addon.java | 2 +- .../astrid/api/CustomFilterCriterion.java | 4 +- .../com/todoroo/astrid/api/SyncAction.java | 2 +- .../todoroo/astrid/api/TaskDecoration.java | 2 +- .../com/todoroo/astrid/core/SortHelper.java | 4 +- .../com/todoroo/astrid/data/Metadata.java | 2 +- .../com/todoroo/astrid/data/RemoteModel.java | 2 +- .../com/todoroo/astrid/data/StoreObject.java | 2 +- .../java/com/todoroo/astrid/data/Task.java | 7 -- .../java/com/todoroo/astrid/data/Update.java | 2 +- .../astrid/sync/SyncProviderPreferences.java | 12 +--- .../astrid/sync/SyncProviderUtilities.java | 8 --- .../astrid/sync/SyncV2BackgroundService.java | 3 +- .../todoroo/astrid/sync/SyncV2Provider.java | 1 - api/src/main/res/values/strings.xml | 4 +- .../provider/ProviderTestUtilities.java | 2 +- .../astrid/repeats/NewRepeatTests.java | 1 - .../astrid/service/TitleParserTest.java | 64 +++++++++---------- astrid/src/main/AndroidManifest.xml | 16 +---- .../commonsware/cwac/tlv/TouchListView.java | 2 +- .../mdimension/jchronic/AstridChronic.java | 3 +- .../astrid/actfm/ActFmCameraModule.java | 3 +- .../astrid/actfm/CommentsFragment.java | 10 +-- .../astrid/actfm/TagCommentsFragment.java | 2 - .../astrid/actfm/TagSettingsActivity.java | 33 ++-------- .../todoroo/astrid/actfm/TagViewFragment.java | 6 +- .../astrid/activity/AstridActivity.java | 16 ++--- .../astrid/activity/BeastModePreferences.java | 5 +- .../astrid/activity/EditPreferences.java | 11 +--- .../astrid/activity/FilterListFragment.java | 6 +- .../activity/FilterShortcutActivity.java | 3 +- .../astrid/activity/ShortcutActivity.java | 5 +- .../activity/SortSelectionActivity.java | 2 +- .../astrid/activity/TaskEditActivity.java | 2 +- .../astrid/activity/TaskEditFragment.java | 30 +++------ .../astrid/activity/TaskListFragment.java | 16 +---- .../todoroo/astrid/adapter/FilterAdapter.java | 4 +- .../todoroo/astrid/adapter/TaskAdapter.java | 9 +-- .../astrid/alarms/AlarmControlSet.java | 8 +-- .../todoroo/astrid/backup/BackupService.java | 2 +- .../astrid/backup/TasksXmlExporter.java | 11 ++-- .../astrid/backup/TasksXmlImporter.java | 6 +- .../calls/PhoneStateChangedReceiver.java | 3 +- .../astrid/core/CustomFilterActivity.java | 2 +- .../astrid/core/CustomFilterExposer.java | 3 +- .../astrid/core/DefaultsPreferences.java | 6 +- .../astrid/core/LinkActionExposer.java | 14 +--- .../java/com/todoroo/astrid/dao/Database.java | 6 +- .../java/com/todoroo/astrid/dao/TaskDao.java | 2 +- .../com/todoroo/astrid/files/FileExplore.java | 6 +- .../todoroo/astrid/files/FileUtilities.java | 12 +--- .../todoroo/astrid/files/FilesControlSet.java | 9 ++- .../todoroo/astrid/gcal/GCalControlSet.java | 10 +-- .../astrid/gtasks/GtasksDetailExposer.java | 2 +- .../astrid/gtasks/GtasksMetadataService.java | 6 +- .../astrid/gtasks/api/GtasksApiUtilities.java | 3 +- .../astrid/gtasks/sync/GtasksSyncService.java | 4 +- .../gtasks/sync/GtasksSyncV2Provider.java | 12 ++-- .../astrid/helper/SyncActionHelper.java | 4 +- .../astrid/helper/TaskEditControlSet.java | 8 +-- .../com/todoroo/astrid/helper/UUIDHelper.java | 4 +- .../astrid/notes/EditNoteActivity.java | 11 +--- .../astrid/provider/Astrid2TaskProvider.java | 17 ++--- .../astrid/provider/SqlContentProvider.java | 3 +- .../reminders/NotificationFragment.java | 4 -- .../astrid/reminders/Notifications.java | 6 +- .../astrid/reminders/ReminderPreferences.java | 6 +- .../astrid/reminders/ReminderService.java | 10 +-- .../astrid/repeats/RepeatControlSet.java | 13 ++-- .../repeats/RepeatTaskCompleteListener.java | 9 +-- .../astrid/service/TagDataService.java | 3 +- .../todoroo/astrid/service/TaskService.java | 19 ++---- .../AstridOrderedListFragmentHelper.java | 5 +- .../subtasks/AstridOrderedListUpdater.java | 2 +- .../OrderedMetadataListFragmentHelper.java | 5 +- .../astrid/subtasks/SubtasksListFragment.java | 4 +- .../tags/TagCustomFilterCriteriaExposer.java | 2 +- .../todoroo/astrid/tags/TagFilterExposer.java | 12 ++-- .../com/todoroo/astrid/tags/TagService.java | 5 +- .../todoroo/astrid/tags/TagsControlSet.java | 13 ++-- .../com/todoroo/astrid/tags/TagsPlugin.java | 3 +- .../astrid/timers/TimerActionControlSet.java | 3 +- .../astrid/timers/TimerControlSet.java | 6 +- .../com/todoroo/astrid/ui/CalendarView.java | 6 +- .../todoroo/astrid/ui/DateAndTimeDialog.java | 2 +- .../todoroo/astrid/ui/DeadlineControlSet.java | 3 +- .../todoroo/astrid/ui/DraggableListView.java | 6 +- .../astrid/ui/EditNotesControlSet.java | 3 +- .../astrid/ui/EditTitleControlSet.java | 3 +- .../astrid/ui/HideUntilControlSet.java | 15 ++--- .../astrid/ui/ImportanceControlSet.java | 3 +- .../todoroo/astrid/ui/PopupControlSet.java | 4 +- .../com/todoroo/astrid/ui/QuickAddBar.java | 11 +--- .../astrid/ui/RandomReminderControlSet.java | 5 +- .../todoroo/astrid/ui/ReminderControlSet.java | 3 +- .../todoroo/astrid/utility/TitleParser.java | 6 +- .../voice/Api6VoiceOutputAssistant.java | 2 +- .../todoroo/astrid/widget/TasksWidget.java | 13 ++-- astrid/src/main/res/values/strings-core.xml | 3 - astrid/src/main/res/values/strings-gcal.xml | 5 -- 112 files changed, 246 insertions(+), 561 deletions(-) diff --git a/api/src/main/java/com/todoroo/andlib/data/AbstractModel.java b/api/src/main/java/com/todoroo/andlib/data/AbstractModel.java index 3966fa1ce..3d519a6fa 100644 --- a/api/src/main/java/com/todoroo/andlib/data/AbstractModel.java +++ b/api/src/main/java/com/todoroo/andlib/data/AbstractModel.java @@ -144,13 +144,7 @@ public abstract class AbstractModel implements Parcelable, Cloneable { @Override public String toString() { - StringBuilder builder = new StringBuilder(); - builder.append(getClass().getSimpleName()).append("\n") - .append("set values:\n") - .append(setValues).append("\n") - .append("values:\n") - .append(values).append("\n"); - return builder.toString(); + return getClass().getSimpleName() + "\n" + "set values:\n" + setValues + "\n" + "values:\n" + values + "\n"; } @Override @@ -546,7 +540,7 @@ public abstract class AbstractModel implements Parcelable, Cloneable { @Override public TYPE[] newArray(int size) { return (TYPE[]) Array.newInstance(cls, size); - }; - }; + } + } } diff --git a/api/src/main/java/com/todoroo/andlib/data/Property.java b/api/src/main/java/com/todoroo/andlib/data/Property.java index ac00902fa..3d8c4055d 100644 --- a/api/src/main/java/com/todoroo/andlib/data/Property.java +++ b/api/src/main/java/com/todoroo/andlib/data/Property.java @@ -170,7 +170,7 @@ public abstract class Property extends Field implements Cloneable { @Override public IntegerProperty cloneAs(String tableAlias, String columnAlias) { - return (IntegerProperty) this.cloneAs(tableAlias, columnAlias); + return this.cloneAs(tableAlias, columnAlias); } } diff --git a/api/src/main/java/com/todoroo/andlib/data/package-info.java b/api/src/main/java/com/todoroo/andlib/data/package-info.java index d63e49e7b..cc5ad6d8f 100644 --- a/api/src/main/java/com/todoroo/andlib/data/package-info.java +++ b/api/src/main/java/com/todoroo/andlib/data/package-info.java @@ -1,5 +1,5 @@ /** * Todoroo Library classes for the data layer: accessing data from a database or - * {@link ContentResolver} + * ContentResolver */ package com.todoroo.andlib.data; diff --git a/api/src/main/java/com/todoroo/andlib/sql/Functions.java b/api/src/main/java/com/todoroo/andlib/sql/Functions.java index ce2f38ea6..2444e651c 100644 --- a/api/src/main/java/com/todoroo/andlib/sql/Functions.java +++ b/api/src/main/java/com/todoroo/andlib/sql/Functions.java @@ -13,9 +13,7 @@ import com.todoroo.andlib.data.Property.StringProperty; public final class Functions { public static String caseStatement(Criterion when, Object ifTrue, Object ifFalse) { - return new StringBuilder("(CASE WHEN "). - append(when.toString()).append(" THEN ").append(value(ifTrue)). - append(" ELSE ").append(value(ifFalse)).append(" END)").toString(); + return "(CASE WHEN " + when.toString() + " THEN " + value(ifTrue) + " ELSE " + value(ifFalse) + " END)"; } private static String value(Object value) { diff --git a/api/src/main/java/com/todoroo/andlib/sql/Operator.java b/api/src/main/java/com/todoroo/andlib/sql/Operator.java index 771886159..c78168615 100644 --- a/api/src/main/java/com/todoroo/andlib/sql/Operator.java +++ b/api/src/main/java/com/todoroo/andlib/sql/Operator.java @@ -5,9 +5,6 @@ */ package com.todoroo.andlib.sql; -import java.util.HashMap; -import java.util.Map; - public final class Operator { private final String operator; @@ -17,7 +14,6 @@ public final class Operator { public static final Operator isNotNull = new Operator("IS NOT NULL"); public static final Operator gt = new Operator(">"); public static final Operator lt = new Operator("<"); - public static final Operator gte = new Operator(">="); public static final Operator lte = new Operator("<="); public static final Operator and = new Operator("AND"); public static final Operator or = new Operator("OR"); @@ -26,25 +22,12 @@ public final class Operator { public static final Operator like = new Operator("LIKE"); public static final Operator in = new Operator("IN"); - private static final Map contraryRegistry = new HashMap(); - - static { - contraryRegistry.put(eq, neq); - contraryRegistry.put(neq, eq); - contraryRegistry.put(isNull, isNotNull); - contraryRegistry.put(isNotNull, isNull); - contraryRegistry.put(gt, lte); - contraryRegistry.put(lte, gt); - contraryRegistry.put(lt, gte); - contraryRegistry.put(gte, lt); - } - private Operator(String operator) { this.operator = operator; } @Override public String toString() { - return this.operator.toString(); + return this.operator; } } diff --git a/api/src/main/java/com/todoroo/andlib/sql/Query.java b/api/src/main/java/com/todoroo/andlib/sql/Query.java index b47190ceb..a385efa23 100644 --- a/api/src/main/java/com/todoroo/andlib/sql/Query.java +++ b/api/src/main/java/com/todoroo/andlib/sql/Query.java @@ -20,7 +20,6 @@ import static com.todoroo.andlib.sql.SqlConstants.LIMIT; import static com.todoroo.andlib.sql.SqlConstants.ORDER_BY; import static com.todoroo.andlib.sql.SqlConstants.SELECT; import static com.todoroo.andlib.sql.SqlConstants.SPACE; -import static com.todoroo.andlib.sql.SqlConstants.UNION; import static com.todoroo.andlib.sql.SqlConstants.WHERE; import static java.util.Arrays.asList; @@ -32,9 +31,7 @@ public final class Query { private final ArrayList fields = new ArrayList(); private final ArrayList joins = new ArrayList(); private final ArrayList groupBies = new ArrayList(); - private final ArrayList unions = new ArrayList(); private final ArrayList orders = new ArrayList(); - private final ArrayList havings = new ArrayList(); private int limits = -1; private boolean distinct = false; @@ -102,12 +99,10 @@ public final class Query { if(queryTemplate == null) { visitWhereClause(sql); visitGroupByClause(sql); - visitUnionClause(sql); visitOrderByClause(sql); visitLimitClause(sql); } else { - if(groupBies.size() > 0 || orders.size() > 0 || - havings.size() > 0) { + if(groupBies.size() > 0 || orders.size() > 0) { throw new IllegalStateException("Can't have extras AND query template"); //$NON-NLS-1$ } sql.append(queryTemplate); @@ -136,23 +131,6 @@ public final class Query { sql.append(SPACE).append(groupBy).append(COMMA); } sql.deleteCharAt(sql.length() - 1).append(SPACE); - if (havings.isEmpty()) { - return; - } - sql.append("HAVING"); - for (Criterion havingCriterion : havings) { - sql.append(SPACE).append(havingCriterion).append(COMMA); - } - sql.deleteCharAt(sql.length() - 1).append(SPACE); - } - - private void visitUnionClause(StringBuilder sql) { - if (unions.isEmpty()) { - return; - } - for (Query query : unions) { - sql.append(UNION).append(SPACE).append(query).append(SPACE); - } } private void visitWhereClause(StringBuilder sql) { diff --git a/api/src/main/java/com/todoroo/andlib/sql/QueryTemplate.java b/api/src/main/java/com/todoroo/andlib/sql/QueryTemplate.java index f741f0034..a2bdb70d4 100644 --- a/api/src/main/java/com/todoroo/andlib/sql/QueryTemplate.java +++ b/api/src/main/java/com/todoroo/andlib/sql/QueryTemplate.java @@ -28,7 +28,6 @@ public final class QueryTemplate { private final ArrayList joins = new ArrayList(); private final ArrayList groupBies = new ArrayList(); private final ArrayList orders = new ArrayList(); - private final ArrayList havings = new ArrayList(); private Integer limit = null; public QueryTemplate join(Join... join) { @@ -84,14 +83,6 @@ public final class QueryTemplate { sql.append(SPACE).append(groupBy).append(COMMA); } sql.deleteCharAt(sql.length() - 1).append(SPACE); - if (havings.isEmpty()) { - return; - } - sql.append("HAVING"); - for (Criterion havingCriterion : havings) { - sql.append(SPACE).append(havingCriterion).append(COMMA); - } - sql.deleteCharAt(sql.length() - 1).append(SPACE); } private void visitWhereClause(StringBuilder sql) { diff --git a/api/src/main/java/com/todoroo/andlib/sql/SqlConstants.java b/api/src/main/java/com/todoroo/andlib/sql/SqlConstants.java index c3be9bdec..5a46e772a 100644 --- a/api/src/main/java/com/todoroo/andlib/sql/SqlConstants.java +++ b/api/src/main/java/com/todoroo/andlib/sql/SqlConstants.java @@ -21,7 +21,6 @@ public final class SqlConstants { public static final String OR = "OR"; public static final String ORDER_BY = "ORDER BY"; public static final String GROUP_BY = "GROUP BY"; - public static final String UNION = "UNION"; public static final String WHERE = "WHERE"; public static final String NOT = "NOT"; public static final String LIMIT = "LIMIT"; diff --git a/api/src/main/java/com/todoroo/andlib/sql/UnaryCriterion.java b/api/src/main/java/com/todoroo/andlib/sql/UnaryCriterion.java index 3429af3b4..9ba5b157c 100644 --- a/api/src/main/java/com/todoroo/andlib/sql/UnaryCriterion.java +++ b/api/src/main/java/com/todoroo/andlib/sql/UnaryCriterion.java @@ -39,7 +39,9 @@ public class UnaryCriterion extends Criterion { protected void afterPopulateOperator(StringBuilder sb) { if(value == null) { return; - } else if(value instanceof String) { + } + + if(value instanceof String) { sb.append("'").append(sanitize((String) value)).append("'"); } else { sb.append(value); diff --git a/api/src/main/java/com/todoroo/andlib/utility/AndroidUtilities.java b/api/src/main/java/com/todoroo/andlib/utility/AndroidUtilities.java index 3ab18448e..c0129412f 100644 --- a/api/src/main/java/com/todoroo/andlib/utility/AndroidUtilities.java +++ b/api/src/main/java/com/todoroo/andlib/utility/AndroidUtilities.java @@ -339,7 +339,7 @@ public class AndroidUtilities { ContentValues result = new ContentValues(); String key = null; for(int i = 0; i < pairs.length; i++) { - String newKey = null; + String newKey; int lastSpace = pairs[i].lastIndexOf(' '); if(lastSpace != -1) { newKey = pairs[i].substring(lastSpace + 1); @@ -377,8 +377,6 @@ public class AndroidUtilities { FileOutputStream fos = new FileOutputStream(out); try { copyStream(fis, fos); - } catch (Exception e) { - throw e; } finally { fis.close(); fos.close(); @@ -424,7 +422,7 @@ public class AndroidUtilities { Arrays.sort(files, new Comparator() { @Override public int compare(File o1, File o2) { - return Long.valueOf(o2.lastModified()).compareTo(Long.valueOf(o1.lastModified())); + return Long.valueOf(o2.lastModified()).compareTo(o1.lastModified()); } }); } @@ -481,7 +479,6 @@ public class AndroidUtilities { * @param methodName method name to call * @param params method parameter types * @param args arguments - * @return method return value, or null if nothing was called or exception */ public static void callMethod(Class cls, Object receiver, String methodName, Class[] params, Object... args) { @@ -517,14 +514,10 @@ public class AndroidUtilities { T[] newList = (T[]) Array.newInstance(type, length); if (list != null) { - for(int i = 0; i < list.length; i++) { - newList[i] = list[i]; - } + System.arraycopy(list, 0, newList, 0, list.length); } if (newItems != null) { - for(int i = 0; i < newItems.length; i++) { - newList[originalListLength + i] = newItems[i]; - } + System.arraycopy(newItems, 0, newList, originalListLength, newItems.length); } return newList; } diff --git a/api/src/main/java/com/todoroo/andlib/utility/DateUtilities.java b/api/src/main/java/com/todoroo/andlib/utility/DateUtilities.java index 310383071..2c8ecc5e7 100644 --- a/api/src/main/java/com/todoroo/andlib/utility/DateUtilities.java +++ b/api/src/main/java/com/todoroo/andlib/utility/DateUtilities.java @@ -26,7 +26,7 @@ public class DateUtilities { * ====================================================================== */ /** Convert date into unixtime */ - public static final long dateToUnixtime(Date date) { + public static long dateToUnixtime(Date date) { if(date == null) { return 0; } @@ -41,7 +41,7 @@ public class DateUtilities { * @param interval the amount of months to be added * @return the calculated time in milliseconds */ - public static final long addCalendarMonthsToUnixtime(long time, int interval) { + public static long addCalendarMonthsToUnixtime(long time, int interval) { Calendar c = Calendar.getInstance(); c.setTimeInMillis(time); c.add(Calendar.MONTH, interval); @@ -49,12 +49,12 @@ public class DateUtilities { } /** Returns unixtime for current time */ - public static final long now() { + public static long now() { return System.currentTimeMillis(); } /** Returns unixtime one month from now */ - public static final long oneMonthFromNow() { + public static long oneMonthFromNow() { Date date = new Date(); date.setMonth(date.getMonth() + 1); return date.getTime(); diff --git a/api/src/main/java/com/todoroo/andlib/utility/Pair.java b/api/src/main/java/com/todoroo/andlib/utility/Pair.java index fd543dfa0..b55bd1b76 100644 --- a/api/src/main/java/com/todoroo/andlib/utility/Pair.java +++ b/api/src/main/java/com/todoroo/andlib/utility/Pair.java @@ -41,7 +41,7 @@ public class Pair { return equal(getLeft(), other.getLeft()) && equal(getRight(), other.getRight()); } - public static final boolean equal(Object o1, Object o2) { + public static boolean equal(Object o1, Object o2) { if (o1 == null) { return o2 == null; } diff --git a/api/src/main/java/com/todoroo/astrid/api/Addon.java b/api/src/main/java/com/todoroo/astrid/api/Addon.java index 89ce9da5e..12b3e17ac 100644 --- a/api/src/main/java/com/todoroo/astrid/api/Addon.java +++ b/api/src/main/java/com/todoroo/astrid/api/Addon.java @@ -88,7 +88,7 @@ public class Addon implements Parcelable { @Override public Addon[] newArray(int size) { return new Addon[size]; - }; + } }; } diff --git a/api/src/main/java/com/todoroo/astrid/api/CustomFilterCriterion.java b/api/src/main/java/com/todoroo/astrid/api/CustomFilterCriterion.java index 0e2b2bcef..a1d78be27 100644 --- a/api/src/main/java/com/todoroo/astrid/api/CustomFilterCriterion.java +++ b/api/src/main/java/com/todoroo/astrid/api/CustomFilterCriterion.java @@ -86,8 +86,8 @@ abstract public class CustomFilterCriterion implements Parcelable { identifier = source.readString(); text = source.readString(); sql = source.readString(); - valuesForNewTasks = (ContentValues)source.readParcelable(ContentValues.class.getClassLoader()); - icon = (Bitmap)source.readParcelable(Bitmap.class.getClassLoader()); + valuesForNewTasks = source.readParcelable(ContentValues.class.getClassLoader()); + icon = source.readParcelable(Bitmap.class.getClassLoader()); name = source.readString(); } } diff --git a/api/src/main/java/com/todoroo/astrid/api/SyncAction.java b/api/src/main/java/com/todoroo/astrid/api/SyncAction.java index e09e2500c..77b39f28c 100644 --- a/api/src/main/java/com/todoroo/astrid/api/SyncAction.java +++ b/api/src/main/java/com/todoroo/astrid/api/SyncAction.java @@ -106,7 +106,7 @@ public class SyncAction implements Parcelable { @Override public SyncAction[] newArray(int size) { return new SyncAction[size]; - }; + } }; } diff --git a/api/src/main/java/com/todoroo/astrid/api/TaskDecoration.java b/api/src/main/java/com/todoroo/astrid/api/TaskDecoration.java index f7fea1b49..7613f3ee1 100644 --- a/api/src/main/java/com/todoroo/astrid/api/TaskDecoration.java +++ b/api/src/main/java/com/todoroo/astrid/api/TaskDecoration.java @@ -94,7 +94,7 @@ public final class TaskDecoration implements Parcelable { @Override public TaskDecoration[] newArray(int size) { return new TaskDecoration[size]; - }; + } }; } diff --git a/api/src/main/java/com/todoroo/astrid/core/SortHelper.java b/api/src/main/java/com/todoroo/astrid/core/SortHelper.java index 69c7ad62f..262f0571f 100644 --- a/api/src/main/java/com/todoroo/astrid/core/SortHelper.java +++ b/api/src/main/java/com/todoroo/astrid/core/SortHelper.java @@ -125,9 +125,7 @@ public class SortHelper { } private static String adjustedDueDateFunction() { - return new StringBuilder("(CASE WHEN (").append(Task.DUE_DATE.name).append(" / 1000) % 60 > 0") - .append(" THEN ").append(Task.DUE_DATE.name).append(" ELSE ").append("(").append(Task.DUE_DATE.name) - .append(" + ").append(DateUtilities.ONE_HOUR * 11 + DateUtilities.ONE_MINUTE * 59).append(") END)").toString(); + return "(CASE WHEN (" + Task.DUE_DATE.name + " / 1000) % 60 > 0" + " THEN " + Task.DUE_DATE.name + " ELSE " + "(" + Task.DUE_DATE.name + " + " + (DateUtilities.ONE_HOUR * 11 + DateUtilities.ONE_MINUTE * 59) + ") END)"; } } diff --git a/api/src/main/java/com/todoroo/astrid/data/Metadata.java b/api/src/main/java/com/todoroo/astrid/data/Metadata.java index 1c9421106..395a67652 100644 --- a/api/src/main/java/com/todoroo/astrid/data/Metadata.java +++ b/api/src/main/java/com/todoroo/astrid/data/Metadata.java @@ -117,7 +117,7 @@ public class Metadata extends AbstractModel { @Override public long getId() { return getIdHelper(ID); - }; + } // --- parcelable helpers diff --git a/api/src/main/java/com/todoroo/astrid/data/RemoteModel.java b/api/src/main/java/com/todoroo/astrid/data/RemoteModel.java index c3044a71e..ccd0e025a 100644 --- a/api/src/main/java/com/todoroo/astrid/data/RemoteModel.java +++ b/api/src/main/java/com/todoroo/astrid/data/RemoteModel.java @@ -50,7 +50,7 @@ abstract public class RemoteModel extends AbstractModel { /** constant value for no uuid */ public static final String NO_UUID = "0"; //$NON-NLS-1$ - public static final boolean isValidUuid(String uuid) { + public static boolean isValidUuid(String uuid) { try { long value = Long.parseLong(uuid); return value > 0; diff --git a/api/src/main/java/com/todoroo/astrid/data/StoreObject.java b/api/src/main/java/com/todoroo/astrid/data/StoreObject.java index bf703fef4..3f02bc27e 100644 --- a/api/src/main/java/com/todoroo/astrid/data/StoreObject.java +++ b/api/src/main/java/com/todoroo/astrid/data/StoreObject.java @@ -91,7 +91,7 @@ public class StoreObject extends AbstractModel { @Override public long getId() { return getIdHelper(ID); - }; + } // --- parcelable helpers diff --git a/api/src/main/java/com/todoroo/astrid/data/Task.java b/api/src/main/java/com/todoroo/astrid/data/Task.java index 57423fe2e..8b2a9cc47 100644 --- a/api/src/main/java/com/todoroo/astrid/data/Task.java +++ b/api/src/main/java/com/todoroo/astrid/data/Task.java @@ -186,13 +186,6 @@ public final class Task extends RemoteModel { /** user id = myself */ public static final String USER_ID_SELF = "0"; - public static boolean userIdIsEmail(String userId) { - if (userId == null) { - return false; - } - return userId.indexOf('@') >= 0; - } - // --- notification flags /** whether to send a reminder at deadline */ diff --git a/api/src/main/java/com/todoroo/astrid/data/Update.java b/api/src/main/java/com/todoroo/astrid/data/Update.java index 7ca51fe18..a2983f9c4 100644 --- a/api/src/main/java/com/todoroo/astrid/data/Update.java +++ b/api/src/main/java/com/todoroo/astrid/data/Update.java @@ -135,7 +135,7 @@ public class Update extends RemoteModel { @Override public long getId() { return getIdHelper(ID); - }; + } // --- parcelable helpers diff --git a/api/src/main/java/com/todoroo/astrid/sync/SyncProviderPreferences.java b/api/src/main/java/com/todoroo/astrid/sync/SyncProviderPreferences.java index 58fd5b1c4..89cb3a242 100644 --- a/api/src/main/java/com/todoroo/astrid/sync/SyncProviderPreferences.java +++ b/api/src/main/java/com/todoroo/astrid/sync/SyncProviderPreferences.java @@ -104,7 +104,7 @@ abstract public class SyncProviderPreferences extends TodorooPreferenceActivity preference.getKey())) { int index = AndroidUtilities.indexOf( r.getStringArray(R.array.sync_SPr_interval_values), - (String) value); + value); if (index <= 0) { preference.setSummary(R.string.sync_SPr_interval_desc_disabled); } else { @@ -138,12 +138,6 @@ abstract public class SyncProviderPreferences extends TodorooPreferenceActivity DateUtilities.getDateStringWithTime(SyncProviderPreferences.this, new Date(getUtilities().getLastAttemptedSyncDate()))); statusColor = Color.rgb(100, 0, 0); - - if(getUtilities().getLastSyncDate() > 0) { -// subtitle = r.getString(R.string.sync_status_failed_subtitle, -// DateUtilities.getDateStringWithTime(SyncProviderPreferences.this, -// new Date(getUtilities().getLastSyncDate()))); - } } else { long lastSyncDate = getUtilities().getLastSyncDate(); String dateString = lastSyncDate > 0 ? @@ -260,7 +254,7 @@ abstract public class SyncProviderPreferences extends TodorooPreferenceActivity return exceptionsToDisplayMessages; } - private static final String adjustErrorForDisplay(Resources r, String lastError, String service) { + private static String adjustErrorForDisplay(Resources r, String lastError, String service) { Set exceptions = getExceptionMap().keySet(); Integer resource = null; for (String key : exceptions) { @@ -272,7 +266,7 @@ abstract public class SyncProviderPreferences extends TodorooPreferenceActivity if (resource == null) { return lastError; } - return r.getString(resource.intValue(), service); + return r.getString(resource, service); } @Override diff --git a/api/src/main/java/com/todoroo/astrid/sync/SyncProviderUtilities.java b/api/src/main/java/com/todoroo/astrid/sync/SyncProviderUtilities.java index df51c59ea..a4e682a98 100644 --- a/api/src/main/java/com/todoroo/astrid/sync/SyncProviderUtilities.java +++ b/api/src/main/java/com/todoroo/astrid/sync/SyncProviderUtilities.java @@ -121,14 +121,6 @@ abstract public class SyncProviderUtilities { editor.commit(); } - /** Report last error if one exists */ - public void reportLastError() { - String lastError = getLastError(); - if (!TextUtils.isEmpty(lastError)) { - String type = getLastErrorType(); - } - } - /** Set Last Attempted Sync Date */ public void recordSyncStart() { Editor editor = getPrefs().edit(); diff --git a/api/src/main/java/com/todoroo/astrid/sync/SyncV2BackgroundService.java b/api/src/main/java/com/todoroo/astrid/sync/SyncV2BackgroundService.java index 7401e897f..5d208912d 100644 --- a/api/src/main/java/com/todoroo/astrid/sync/SyncV2BackgroundService.java +++ b/api/src/main/java/com/todoroo/astrid/sync/SyncV2BackgroundService.java @@ -151,8 +151,7 @@ abstract public class SyncV2BackgroundService extends Service { /** Create the alarm intent */ private Intent createAlarmIntent(Context context) { - Intent intent = new Intent(context, getClass()); - return intent; + return new Intent(context, getClass()); } // --- utility methods diff --git a/api/src/main/java/com/todoroo/astrid/sync/SyncV2Provider.java b/api/src/main/java/com/todoroo/astrid/sync/SyncV2Provider.java index 05fca87b6..fa74558b4 100644 --- a/api/src/main/java/com/todoroo/astrid/sync/SyncV2Provider.java +++ b/api/src/main/java/com/todoroo/astrid/sync/SyncV2Provider.java @@ -78,7 +78,6 @@ abstract public class SyncV2Provider { protected void finishSync(SyncResultCallback callback) { SyncProviderUtilities utilities = getUtilities(); utilities.recordSuccessfulSync(); - utilities.reportLastError(); utilities.stopOngoing(); if (callback != null) { callback.finished(); diff --git a/api/src/main/res/values/strings.xml b/api/src/main/res/values/strings.xml index c141e4dd2..8f169d731 100644 --- a/api/src/main/res/values/strings.xml +++ b/api/src/main/res/values/strings.xml @@ -151,9 +151,7 @@ Failed on: %s Sync w/ errors: %s - - Last successful sync: %s - + Never synchronized! diff --git a/astrid/src/instrumentTest/java/com/todoroo/astrid/provider/ProviderTestUtilities.java b/astrid/src/instrumentTest/java/com/todoroo/astrid/provider/ProviderTestUtilities.java index cbfb3a6c0..c08f8805d 100644 --- a/astrid/src/instrumentTest/java/com/todoroo/astrid/provider/ProviderTestUtilities.java +++ b/astrid/src/instrumentTest/java/com/todoroo/astrid/provider/ProviderTestUtilities.java @@ -10,7 +10,7 @@ import com.todoroo.astrid.test.DatabaseTestCase; public class ProviderTestUtilities extends DatabaseTestCase { - public static final void setDatabaseOverride(AbstractDatabase database) { + public static void setDatabaseOverride(AbstractDatabase database) { Astrid3ContentProvider.setDatabaseOverride(database); } diff --git a/astrid/src/instrumentTest/java/com/todoroo/astrid/repeats/NewRepeatTests.java b/astrid/src/instrumentTest/java/com/todoroo/astrid/repeats/NewRepeatTests.java index cc0e7ba3a..8ddc5b15e 100644 --- a/astrid/src/instrumentTest/java/com/todoroo/astrid/repeats/NewRepeatTests.java +++ b/astrid/src/instrumentTest/java/com/todoroo/astrid/repeats/NewRepeatTests.java @@ -199,7 +199,6 @@ public class NewRepeatTests extends DatabaseTestCase { Weekday curr = allWeekdays[i]; daysToAdd++; if (weekdays.contains(curr)) { - next = curr; break; } } diff --git a/astrid/src/instrumentTest/java/com/todoroo/astrid/service/TitleParserTest.java b/astrid/src/instrumentTest/java/com/todoroo/astrid/service/TitleParserTest.java index 83a2826ab..5d541bf3b 100644 --- a/astrid/src/instrumentTest/java/com/todoroo/astrid/service/TitleParserTest.java +++ b/astrid/src/instrumentTest/java/com/todoroo/astrid/service/TitleParserTest.java @@ -43,7 +43,7 @@ public class TitleParserTest extends DatabaseTestCase { /** Tests correct date is parsed **/ public void testMonthDate() { - TaskService taskService = new TaskService(); + new TaskService(); Task task = new Task(); String[] titleMonthStrings = { "Jan.", "January", @@ -69,7 +69,7 @@ public class TitleParserTest extends DatabaseTestCase { } public void testMonthSlashDay() { - TaskService taskService = new TaskService(); + new TaskService(); Task task = new Task(); for (int i = 1; i < 13; i++) { String testTitle = "Jog on " + i + "/12/13"; @@ -82,7 +82,7 @@ public class TitleParserTest extends DatabaseTestCase { } public void testArmyTime() { - TaskService taskService = new TaskService(); + new TaskService(); Task task = new Task(); String testTitle = "Jog on 23:21."; insertTitleAddTask(testTitle, task); @@ -92,7 +92,7 @@ public class TitleParserTest extends DatabaseTestCase { } public void test_AM_PM() { - TaskService taskService = new TaskService(); + new TaskService(); Task task = new Task(); String testTitle = "Jog at 8:33 PM."; insertTitleAddTask(testTitle, task); @@ -102,7 +102,7 @@ public class TitleParserTest extends DatabaseTestCase { } public void test_at_hour() { - TaskService taskService = new TaskService(); + new TaskService(); Task task = new Task(); String testTitle = "Jog at 8 PM."; insertTitleAddTask(testTitle, task); @@ -112,7 +112,7 @@ public class TitleParserTest extends DatabaseTestCase { } public void test_oclock_AM() { - TaskService taskService = new TaskService(); + new TaskService(); Task task = new Task(); String testTitle = "Jog at 8 o'clock AM."; insertTitleAddTask(testTitle, task); @@ -122,7 +122,7 @@ public class TitleParserTest extends DatabaseTestCase { } public void test_several_forms_of_eight() { - TaskService taskService = new TaskService(); + new TaskService(); Task task = new Task(); String[] testTitles = { "Jog 8 AM", @@ -138,7 +138,7 @@ public class TitleParserTest extends DatabaseTestCase { } public void test_several_forms_of_1230PM() { - TaskService taskService = new TaskService(); + new TaskService(); Task task = new Task(); String[] testTitles = { "Jog 12:30 PM", @@ -165,7 +165,7 @@ public class TitleParserTest extends DatabaseTestCase { // ----------------Days begin----------------// public void testDays() throws Exception{ Calendar today = Calendar.getInstance(); - TaskService taskService = new TaskService(); + new TaskService(); Task task = new Task(); String title = "Jog today"; @@ -231,20 +231,20 @@ public class TitleParserTest extends DatabaseTestCase { "lowest priority", "bang 0" }; - Task task = new Task(); + Task task; for (String acceptedString:acceptedStrings){ task = new Task(); String title = "Jog " + acceptedString; task.setValue(Task.TITLE, title); //test at end of task. should set importance. TaskService.createWithValues(task, null, title); - assertEquals((int)task.getValue(Task.IMPORTANCE), (int)Task.IMPORTANCE_LEAST); + assertEquals((int)task.getValue(Task.IMPORTANCE), Task.IMPORTANCE_LEAST); } for (String acceptedString:acceptedStrings){ task = new Task(); String title = acceptedString + " jog"; task.setValue(Task.TITLE, title); //test at beginning of task. should not set importance. TaskService.createWithValues(task, null, title); - assertNotSame((int)task.getValue(Task.IMPORTANCE),(int)Task.IMPORTANCE_LEAST); + assertNotSame(task.getValue(Task.IMPORTANCE),Task.IMPORTANCE_LEAST); } } @@ -260,28 +260,28 @@ public class TitleParserTest extends DatabaseTestCase { "!" }; TaskService taskService = new TaskService(); - Task task = new Task(); + Task task; for (String acceptedStringAtEnd:acceptedStringsAtEnd){ task = new Task(); task.setValue(Task.TITLE, "Jog " + acceptedStringAtEnd); //test at end of task. should set importance. taskService.save(task); - assertEquals((int)task.getValue(Task.IMPORTANCE), (int)Task.IMPORTANCE_SHOULD_DO); + assertEquals((int)task.getValue(Task.IMPORTANCE), Task.IMPORTANCE_SHOULD_DO); } for (String acceptedStringAtEnd:acceptedStringsAtEnd){ task = new Task(); task.setValue(Task.TITLE, acceptedStringAtEnd + " jog"); //test at beginning of task. should not set importance. taskService.save(task); - assertEquals((int)task.getValue(Task.IMPORTANCE), (int)Task.IMPORTANCE_SHOULD_DO); + assertEquals((int)task.getValue(Task.IMPORTANCE), Task.IMPORTANCE_SHOULD_DO); } for (String acceptedStringAnywhere:acceptedStringsAnywhere){ task = new Task(); task.setValue(Task.TITLE, "Jog " + acceptedStringAnywhere); //test at end of task. should set importance. taskService.save(task); - assertEquals((int)task.getValue(Task.IMPORTANCE), (int)Task.IMPORTANCE_SHOULD_DO); + assertEquals((int)task.getValue(Task.IMPORTANCE), Task.IMPORTANCE_SHOULD_DO); task.setValue(Task.TITLE, acceptedStringAnywhere + " jog"); //test at beginning of task. should set importance. taskService.save(task); - assertEquals((int)task.getValue(Task.IMPORTANCE), (int)Task.IMPORTANCE_SHOULD_DO); + assertEquals((int)task.getValue(Task.IMPORTANCE), Task.IMPORTANCE_SHOULD_DO); } } @@ -296,32 +296,32 @@ public class TitleParserTest extends DatabaseTestCase { "!2", "!!" }; - TaskService taskService = new TaskService(); - Task task = new Task(); + new TaskService(); + Task task; for (String acceptedStringAtEnd:acceptedStringsAtEnd){ task = new Task(); String title = "Jog " + acceptedStringAtEnd; task.setValue(Task.TITLE, title); //test at end of task. should set importance. TaskService.createWithValues(task, null, title); - assertEquals((int)task.getValue(Task.IMPORTANCE), (int)Task.IMPORTANCE_MUST_DO); + assertEquals((int)task.getValue(Task.IMPORTANCE), Task.IMPORTANCE_MUST_DO); task = new Task(); title = acceptedStringAtEnd + " jog"; task.setValue(Task.TITLE, title); //test at beginning of task. should not set importance. TaskService.createWithValues(task, null, title); - assertNotSame((int)task.getValue(Task.IMPORTANCE), (int)Task.IMPORTANCE_MUST_DO); + assertNotSame(task.getValue(Task.IMPORTANCE), Task.IMPORTANCE_MUST_DO); } for (String acceptedStringAnywhere:acceptedStringsAnywhere){ task = new Task(); String title = "Jog " + acceptedStringAnywhere; task.setValue(Task.TITLE, title); //test at end of task. should set importance. TaskService.createWithValues(task, null, title); - assertEquals((int)task.getValue(Task.IMPORTANCE), (int)Task.IMPORTANCE_MUST_DO); + assertEquals((int)task.getValue(Task.IMPORTANCE), Task.IMPORTANCE_MUST_DO); title = acceptedStringAnywhere + " jog"; task.setValue(Task.TITLE, title); //test at beginning of task. should set importance. TaskService.createWithValues(task, null, title); - assertEquals((int)task.getValue(Task.IMPORTANCE), (int)Task.IMPORTANCE_MUST_DO); + assertEquals((int)task.getValue(Task.IMPORTANCE), Task.IMPORTANCE_MUST_DO); } } @@ -339,32 +339,32 @@ public class TitleParserTest extends DatabaseTestCase { "!6", "!!!!!!!!!!!!!" }; - TaskService taskService = new TaskService(); - Task task = new Task(); + new TaskService(); + Task task; for (String acceptedStringAtEnd:acceptedStringsAtEnd){ task = new Task(); String title = "Jog " + acceptedStringAtEnd; task.setValue(Task.TITLE, title); //test at end of task. should set importance. TaskService.createWithValues(task, null, title); - assertEquals((int)task.getValue(Task.IMPORTANCE), (int)Task.IMPORTANCE_DO_OR_DIE); + assertEquals((int)task.getValue(Task.IMPORTANCE), Task.IMPORTANCE_DO_OR_DIE); task = new Task(); title = acceptedStringAtEnd + " jog"; task.setValue(Task.TITLE, title); //test at beginning of task. should not set importance. TaskService.createWithValues(task, null, title); - assertNotSame((int)task.getValue(Task.IMPORTANCE), (int)Task.IMPORTANCE_DO_OR_DIE); + assertNotSame(task.getValue(Task.IMPORTANCE), Task.IMPORTANCE_DO_OR_DIE); } for (String acceptedStringAnywhere:acceptedStringsAnywhere){ task = new Task(); String title = "Jog " + acceptedStringAnywhere; task.setValue(Task.TITLE, title); //test at end of task. should set importance. TaskService.createWithValues(task, null, title); - assertEquals((int)task.getValue(Task.IMPORTANCE), (int)Task.IMPORTANCE_DO_OR_DIE); + assertEquals((int)task.getValue(Task.IMPORTANCE), Task.IMPORTANCE_DO_OR_DIE); title = acceptedStringAnywhere + " jog"; task.setValue(Task.TITLE, title); //test at beginning of task. should set importance. TaskService.createWithValues(task, null, title); - assertEquals((int)task.getValue(Task.IMPORTANCE), (int)Task.IMPORTANCE_DO_OR_DIE); + assertEquals((int)task.getValue(Task.IMPORTANCE), Task.IMPORTANCE_DO_OR_DIE); } } @@ -409,7 +409,7 @@ public class TitleParserTest extends DatabaseTestCase { /** test weekly repeat from due date, with no due date & time set */ public void testWeeklyWithNoDueDate() throws Exception { - TaskService taskService = new TaskService(); + new TaskService(); Task task = new Task(); String title = "Jog weekly"; task.setValue(Task.TITLE, title); @@ -544,7 +544,7 @@ public class TitleParserTest extends DatabaseTestCase { "#(a cool tag)", "#(cool)" }; - Task task = new Task(); + Task task; for (String acceptedString : acceptedStrings) { task = new Task(); task.setValue(Task.TITLE, "Jog " + acceptedString); //test at end of task. should set importance. @@ -563,7 +563,7 @@ public class TitleParserTest extends DatabaseTestCase { "@(a cool tag)", "@(cool)" }; - Task task = new Task(); + Task task; for (String acceptedString : acceptedStrings) { task = new Task(); task.setValue(Task.TITLE, "Jog " + acceptedString); //test at end of task. should set importance. diff --git a/astrid/src/main/AndroidManifest.xml b/astrid/src/main/AndroidManifest.xml index dcb9f4b67..21b5ad553 100644 --- a/astrid/src/main/AndroidManifest.xml +++ b/astrid/src/main/AndroidManifest.xml @@ -88,6 +88,7 @@ android:icon="@drawable/icon" android:label="@string/app_name" android:theme="@style/Tasks" + android:allowBackup="true" android:hardwareAccelerated="false" android:manageSpaceActivity="com.todoroo.astrid.core.OldTaskPreferences"> @@ -186,11 +187,6 @@ android:name="com.todoroo.astrid.service.UpgradeService$UpgradeActivity" android:screenOrientation="portrait" /> - - @@ -386,16 +382,6 @@ android:windowSoftInputMode="stateHidden" /> - - - - - - - 0) { - if(newName.length() > 0 && oldName.length() == 0) { - tagDataService.save(tagData); - } - - return; - } - - int oldMemberCount = tagData.getValue(TagData.MEMBER_COUNT); - if (members.length() > oldMemberCount) { - } tagData.setValue(TagData.MEMBER_COUNT, members.length()); InputMethodManager imm = (InputMethodManager)getSystemService(Context.INPUT_METHOD_SERVICE); @@ -267,8 +248,6 @@ public class TagSettingsActivity extends ActionBarActivity { setTitle(getString(R.string.tag_settings_title)); } } - - String peopleJson = tagData.getValue(TagData.MEMBERS); } @Override @@ -280,12 +259,12 @@ public class TagSettingsActivity extends ActionBarActivity { saveTagPictureLocally(bitmap); } }; - if (ActFmCameraModule.activityResult(this, requestCode, resultCode, data, callback)) { - // Handled - } else if(requestCode == REQUEST_ACTFM_LOGIN && resultCode == Activity.RESULT_OK) { - saveSettings(); - } else { - super.onActivityResult(requestCode, resultCode, data); + if (!ActFmCameraModule.activityResult(this, requestCode, resultCode, data, callback)) { + if(requestCode == REQUEST_ACTFM_LOGIN && resultCode == Activity.RESULT_OK) { + saveSettings(); + } else { + super.onActivityResult(requestCode, resultCode, data); + } } } diff --git a/astrid/src/main/java/com/todoroo/astrid/actfm/TagViewFragment.java b/astrid/src/main/java/com/todoroo/astrid/actfm/TagViewFragment.java index f136643e5..16f1f3194 100644 --- a/astrid/src/main/java/com/todoroo/astrid/actfm/TagViewFragment.java +++ b/astrid/src/main/java/com/todoroo/astrid/actfm/TagViewFragment.java @@ -16,7 +16,6 @@ import android.view.MotionEvent; import android.view.View; import android.view.View.OnTouchListener; import android.view.ViewGroup; -import android.widget.EditText; import android.widget.TextView; import com.todoroo.andlib.data.TodorooCursor; @@ -94,7 +93,7 @@ public class TagViewFragment extends TaskListFragment { } }; - ((EditText) getView().findViewById(R.id.quickAddText)).setOnTouchListener(onTouch); + getView().findViewById(R.id.quickAddText).setOnTouchListener(onTouch); } /* (non-Javadoc) @@ -125,7 +124,6 @@ public class TagViewFragment extends TaskListFragment { dataLoaded = true; } - TaskListActivity activity = (TaskListActivity) getActivity(); String tag = extras.getString(EXTRA_TAG_NAME); String uuid = RemoteModel.NO_UUID; if (extras.containsKey(EXTRA_TAG_UUID)) { @@ -214,7 +212,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/src/main/java/com/todoroo/astrid/activity/AstridActivity.java b/astrid/src/main/java/com/todoroo/astrid/activity/AstridActivity.java index b4a55efbf..8168a0f6b 100644 --- a/astrid/src/main/java/com/todoroo/astrid/activity/AstridActivity.java +++ b/astrid/src/main/java/com/todoroo/astrid/activity/AstridActivity.java @@ -76,31 +76,23 @@ public class AstridActivity extends ActionBarActivity private TaskDao taskDao; public FilterListFragment getFilterListFragment() { - FilterListFragment frag = (FilterListFragment) getSupportFragmentManager() + return (FilterListFragment) getSupportFragmentManager() .findFragmentByTag(FilterListFragment.TAG_FILTERLIST_FRAGMENT); - - return frag; } public TaskListFragment getTaskListFragment() { - TaskListFragment frag = (TaskListFragment) getSupportFragmentManager() + return (TaskListFragment) getSupportFragmentManager() .findFragmentByTag(TaskListFragment.TAG_TASKLIST_FRAGMENT); - - return frag; } public TaskEditFragment getTaskEditFragment() { - TaskEditFragment frag = (TaskEditFragment) getSupportFragmentManager() + return (TaskEditFragment) getSupportFragmentManager() .findFragmentByTag(TaskEditFragment.TAG_TASKEDIT_FRAGMENT); - - return frag; } public CommentsFragment getTagUpdatesFragment() { - CommentsFragment frag = (CommentsFragment) getSupportFragmentManager() + return (CommentsFragment) getSupportFragmentManager() .findFragmentByTag(CommentsFragment.TAG_UPDATES_FRAGMENT); - - return frag; } diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/BeastModePreferences.java b/astrid/src/main/java/com/todoroo/astrid/activity/BeastModePreferences.java index ad3203049..9669c0801 100644 --- a/astrid/src/main/java/com/todoroo/astrid/activity/BeastModePreferences.java +++ b/astrid/src/main/java/com/todoroo/astrid/activity/BeastModePreferences.java @@ -25,6 +25,7 @@ import com.todoroo.andlib.utility.Preferences; import org.tasks.R; import java.util.ArrayList; +import java.util.Collections; import java.util.HashMap; public class BeastModePreferences extends ListActivity { @@ -157,9 +158,7 @@ public class BeastModePreferences extends ListActivity { while (items.size() > 0) { items.remove(0); } - for (String s : prefsArray) { - items.add(s); - } + Collections.addAll(items, prefsArray); adapter.notifyDataSetChanged(); } diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/EditPreferences.java b/astrid/src/main/java/com/todoroo/astrid/activity/EditPreferences.java index 9cfdbab39..595d28487 100644 --- a/astrid/src/main/java/com/todoroo/astrid/activity/EditPreferences.java +++ b/astrid/src/main/java/com/todoroo/astrid/activity/EditPreferences.java @@ -195,14 +195,12 @@ public class EditPreferences extends TodorooPreferenceActivity { PackageManager pm = getPackageManager(); List resolveInfoList = pm.queryIntentActivities(queryIntent, PackageManager.GET_META_DATA); - int length = resolveInfoList.size(); LinkedHashMap> categoryPreferences = new LinkedHashMap>(); // Loop through a list of all packages (including plugins, addons) // that have a settings action - for(int i = 0; i < length; i++) { - ResolveInfo resolveInfo = resolveInfoList.get(i); + for (ResolveInfo resolveInfo : resolveInfoList) { final Intent intent = new Intent(AstridApiConstants.ACTION_SETTINGS); intent.setClassName(resolveInfo.activityInfo.packageName, resolveInfo.activityInfo.name); @@ -244,7 +242,7 @@ public class EditPreferences extends TodorooPreferenceActivity { String category = MetadataHelper.resolveActivityCategoryName(resolveInfo, pm); - if(!categoryPreferences.containsKey(category)) { + if (!categoryPreferences.containsKey(category)) { categoryPreferences.put(category, new ArrayList()); } ArrayList arrayList = categoryPreferences.get(category); @@ -293,7 +291,6 @@ public class EditPreferences extends TodorooPreferenceActivity { preference.setOnPreferenceChangeListener(new SetResultOnPreferenceChangeListener(RESULT_CODE_PERFORMANCE_PREF_CHANGED) { @Override public boolean onPreferenceChange(Preference p, Object newValue) { - String valueString = newValue.toString(); Preference notes = findPreference(getString(R.string.p_showNotes)); Preference fullTitle = findPreference(getString(R.string.p_fullTaskTitle)); try { @@ -306,7 +303,6 @@ public class EditPreferences extends TodorooPreferenceActivity { return super.onPreferenceChange(p, newValue); } - ; }); } else if (r.getString(R.string.p_showNotes).equals(preference.getKey())) { @@ -337,13 +333,10 @@ public class EditPreferences extends TodorooPreferenceActivity { preference.setSummary(r.getString(R.string.p_files_dir_desc, dir)); } else if (booleanPreference(preference, value, R.string.p_field_missed_calls, R.string.MCA_missed_calls_pref_desc_disabled, R.string.MCA_missed_calls_pref_desc_enabled)) { - ; } else if (booleanPreference(preference, value, R.string.p_calendar_reminders, R.string.CRA_calendar_reminders_pref_desc_disabled, R.string.CRA_calendar_reminders_pref_desc_enabled)) { - ; } else if (booleanPreference(preference, value, R.string.p_end_at_deadline, R.string.EPr_cal_end_at_due_time, R.string.EPr_cal_start_at_due_time)) { - ; } else if (r.getString(R.string.p_force_phone_layout).equals(preference.getKey())) { preference.setOnPreferenceChangeListener(new SetResultOnPreferenceChangeListener(RESULT_CODE_PERFORMANCE_PREF_CHANGED)); } else if (r.getString(R.string.p_voiceInputEnabled).equals(preference.getKey())) { diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/FilterListFragment.java b/astrid/src/main/java/com/todoroo/astrid/activity/FilterListFragment.java index e8238afa8..22b7f6aa5 100644 --- a/astrid/src/main/java/com/todoroo/astrid/activity/FilterListFragment.java +++ b/astrid/src/main/java/com/todoroo/astrid/activity/FilterListFragment.java @@ -114,8 +114,7 @@ public class FilterListFragment extends ListFragment { Bundle savedInstanceState) { Activity activity = getActivity(); int layout = getLayout(); - ViewGroup parent = (ViewGroup) activity.getLayoutInflater().inflate(layout, container, false); - return parent; + return (ViewGroup) activity.getLayoutInflater().inflate(layout, container, false); } protected int getLayout() { @@ -243,9 +242,8 @@ public class FilterListFragment extends ListFragment { android.view.MenuItem menuItem; if(item instanceof Filter) { - Filter filter = (Filter) item; menuItem = menu.add(0, CONTEXT_MENU_SHORTCUT, 0, R.string.FLA_context_shortcut); - menuItem.setIntent(ShortcutActivity.createIntent(filter)); + menuItem.setIntent(ShortcutActivity.createIntent(item)); } for(int i = 0; i < item.contextMenuLabels.length; i++) { diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/FilterShortcutActivity.java b/astrid/src/main/java/com/todoroo/astrid/activity/FilterShortcutActivity.java index 3a4d90828..727d4967d 100644 --- a/astrid/src/main/java/com/todoroo/astrid/activity/FilterShortcutActivity.java +++ b/astrid/src/main/java/com/todoroo/astrid/activity/FilterShortcutActivity.java @@ -53,8 +53,7 @@ public class FilterShortcutActivity extends ListActivity { DialogUtilities.okDialog(FilterShortcutActivity.this, getString(R.string.FLA_no_filter_selected), null); return; } - Intent shortcutIntent = ShortcutActivity.createIntent( - (Filter) filter); + Intent shortcutIntent = ShortcutActivity.createIntent(filter); Bitmap bitmap = FilterListFragment.superImposeListIcon(FilterShortcutActivity.this); Intent intent = new Intent(); diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/ShortcutActivity.java b/astrid/src/main/java/com/todoroo/astrid/activity/ShortcutActivity.java index b39bb8205..13c179a6c 100644 --- a/astrid/src/main/java/com/todoroo/astrid/activity/ShortcutActivity.java +++ b/astrid/src/main/java/com/todoroo/astrid/activity/ShortcutActivity.java @@ -102,7 +102,7 @@ public class ShortcutActivity extends Activity { // launched from desktop shortcut, must create a fake filter String title = extras.getString(TOKEN_FILTER_TITLE); String sql = extras.getString(TOKEN_FILTER_SQL); - ContentValues values = null; + ContentValues values; if(extras.containsKey(TOKEN_FILTER_VALUES)) { values = AndroidUtilities.contentValuesFromString(extras.getString(TOKEN_FILTER_VALUES)); } else { @@ -149,8 +149,7 @@ public class ShortcutActivity extends Activity { } ((FilterWithCustomIntent) filter).customExtras = customExtras; // Something - ComponentName customTaskList = ComponentName.unflattenFromString(extras.getString(TOKEN_CUSTOM_CLASS)); - ((FilterWithCustomIntent) filter).customTaskList = customTaskList; + ((FilterWithCustomIntent) filter).customTaskList = ComponentName.unflattenFromString(extras.getString(TOKEN_CUSTOM_CLASS)); } else { filter = new Filter(title, title, sql, values); } diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/SortSelectionActivity.java b/astrid/src/main/java/com/todoroo/astrid/activity/SortSelectionActivity.java index aa999e16c..8e391ffdc 100644 --- a/astrid/src/main/java/com/todoroo/astrid/activity/SortSelectionActivity.java +++ b/astrid/src/main/java/com/todoroo/astrid/activity/SortSelectionActivity.java @@ -113,7 +113,7 @@ public class SortSelectionActivity { @Override public void onClick(DialogInterface view, int button) { int flags = 0; - int sort = 0; + int sort; if(((CheckBox)body.findViewById(R.id.reverse)).isChecked()) { flags |= SortHelper.FLAG_REVERSE_SORT; diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditActivity.java b/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditActivity.java index 2a3abab13..e21a0466c 100644 --- a/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditActivity.java +++ b/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditActivity.java @@ -46,7 +46,7 @@ public class TaskEditActivity extends AstridActivity { protected void onResume() { super.onResume(); - Fragment frag = (Fragment) getSupportFragmentManager() + Fragment frag = getSupportFragmentManager() .findFragmentByTag(TaskListFragment.TAG_TASKLIST_FRAGMENT); if (frag != null) { fragmentLayout = LAYOUT_DOUBLE; diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java b/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java index af6dfe316..0ba6da42f 100755 --- a/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java +++ b/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java @@ -260,9 +260,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { Bundle savedInstanceState) { super.onCreateView(inflater, container, savedInstanceState); - View v = inflater.inflate(R.layout.task_edit_activity, container, false); - - return v; + return inflater.inflate(R.layout.task_edit_activity, container, false); } @Override @@ -298,7 +296,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { } private void loadMoreContainer() { - View commentsBar = (View) getView().findViewById(R.id.updatesFooter); + View commentsBar = getView().findViewById(R.id.updatesFooter); long idParam = getActivity().getIntent().getLongExtra(TOKEN_ID, -1L); @@ -354,8 +352,6 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { /** Initialize UI components */ private void setUpUIComponents() { - LinearLayout basicControls = (LinearLayout) getView().findViewById( - R.id.basic_controls); LinearLayout titleControls = (LinearLayout) getView().findViewById( R.id.title_controls); LinearLayout whenDialogView = (LinearLayout) LayoutInflater.from( @@ -472,7 +468,6 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { String[] itemOrder = controlOrder.toArray(new String[controlOrder.size()]); String hideAlwaysTrigger = getString(R.string.TEA_ctrl_hide_section_pref); - LinearLayout section = basicControls; Class openControl = (Class) getActivity().getIntent().getSerializableExtra(TOKEN_OPEN_CONTROL); @@ -485,18 +480,18 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { TaskEditControlSet curr = controlSetMap.get(item); if (curr != null) { - controlSet = (LinearLayout) curr.getDisplayView(); + controlSet = curr.getDisplayView(); } if (controlSet != null) { if ((i + 1 >= itemOrder.length)) { removeTeaSeparator(controlSet); } - section.addView(controlSet); + basicControls.addView(controlSet); } if (curr != null && curr.getClass().equals(openControl) && curr instanceof PopupControlSet) { - ((PopupControlSet) curr).getDisplayView().performClick(); + curr.getDisplayView().performClick(); } } } @@ -687,7 +682,6 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { return; } - StringBuilder toast = new StringBuilder(); synchronized (controls) { for (TaskEditControlSet controlSet : controls) { if (controlSet instanceof PopupControlSet) { // Save open control set @@ -697,10 +691,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { getActivity().getIntent().putExtra(TOKEN_OPEN_CONTROL, popup.getClass()); } } - String toastText = controlSet.writeToModel(model); - if (toastText != null) { - toast.append('\n').append(toastText); - } + controlSet.writeToModel(model); } } @@ -712,8 +703,6 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { boolean taskEditActivity = (getActivity() instanceof TaskEditActivity); boolean showRepeatAlert = model.getTransitory(TaskService.TRANS_REPEAT_CHANGED) != null && !TextUtils.isEmpty(model.getValue(Task.RECURRENCE)); - if (Task.userIdIsEmail(model.getValue(Task.USER_ID))) { - } if (taskEditActivity) { Intent data = new Intent(); @@ -949,9 +938,6 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { deleteButtonClick(); return true; case MENU_COMMENTS_REFRESH_ID: { - if (editNotes != null) { - editNotes.refreshData(); - } return true; } case MENU_SHOW_COMMENTS_ID: { @@ -1070,7 +1056,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { // stick our task into the outState outState.putParcelable(TASK_IN_PROGRESS, model); - outState.putString(TASK_UUID, uuid.toString()); + outState.putString(TASK_UUID, uuid); } /* @@ -1094,7 +1080,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { int desiredWidth = MeasureSpec.makeMeasureSpec(view.getWidth(), MeasureSpec.AT_MOST); view.measure(desiredWidth, MeasureSpec.UNSPECIFIED); - height = Math.max(view.getMeasuredHeight(), height);; + height = Math.max(view.getMeasuredHeight(), height); LayoutParams pagerParams = mPager.getLayoutParams(); if (height > 0 && height != pagerParams.height) { pagerParams.height = height; diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java b/astrid/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java index 098113bed..fa1cdbf9a 100644 --- a/astrid/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java +++ b/astrid/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java @@ -42,7 +42,6 @@ import android.widget.AdapterView; import android.widget.AdapterView.AdapterContextMenuInfo; import android.widget.AdapterView.OnItemClickListener; import android.widget.ListView; -import android.widget.TextView; import com.todoroo.andlib.data.Property; import com.todoroo.andlib.data.TodorooCursor; @@ -437,9 +436,7 @@ public class TaskListFragment extends ListFragment implements OnSortSelectedList PackageManager pm = getActivity().getPackageManager(); List resolveInfoList = pm.queryIntentActivities( queryIntent, 0); - int length = resolveInfoList.size(); - for (int i = 0; i < length; i++) { - ResolveInfo resolveInfo = resolveInfoList.get(i); + for (ResolveInfo resolveInfo : resolveInfoList) { Intent intent = new Intent(AstridApiConstants.ACTION_TASK_LIST_MENU); intent.setClassName(resolveInfo.activityInfo.packageName, resolveInfo.activityInfo.name); @@ -505,7 +502,7 @@ public class TaskListFragment extends ListFragment implements OnSortSelectedList }); // set listener for astrid icon - ((TextView) getView().findViewById(android.R.id.empty)).setOnClickListener(new OnClickListener() { + getView().findViewById(android.R.id.empty).setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { quickAddBar.performButtonClick(); @@ -788,9 +785,6 @@ public class TaskListFragment extends ListFragment implements OnSortSelectedList new OnCompletedTaskListener() { @Override public void onCompletedTask(Task item, boolean newState) { - if (newState) { - onTaskCompleted(); - } } }); } @@ -912,12 +906,6 @@ public class TaskListFragment extends ListFragment implements OnSortSelectedList * ====================================================================== */ - protected void onTaskCompleted() { - if (isInbox) { - } else { - } - } - @Override public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) { diff --git a/astrid/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java b/astrid/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java index 3180e147e..c19e82736 100644 --- a/astrid/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java +++ b/astrid/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java @@ -275,7 +275,7 @@ public class FilterAdapter extends ArrayAdapter { convertView = newView(convertView, parent); ViewHolder viewHolder = (ViewHolder) convertView.getTag(); - viewHolder.item = (FilterListItem) getItem(position); + viewHolder.item = getItem(position); populateView(viewHolder); Filter selected = null; @@ -350,7 +350,7 @@ public class FilterAdapter extends ArrayAdapter { try { for (ResolveInfo filterExposerInfo : filterExposerList) { String className = filterExposerInfo.activityInfo.name; - AstridFilterExposer filterExposer = null; + AstridFilterExposer filterExposer; filterExposer = (AstridFilterExposer) Class.forName(className, true, FilterAdapter.class.getClassLoader()).newInstance(); if (filterExposer != null) { diff --git a/astrid/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java b/astrid/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java index 48c6ca626..059a5f891 100644 --- a/astrid/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java +++ b/astrid/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java @@ -313,10 +313,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable { return getFilterQueryProvider().runQuery(constraint); } - // perform query - TodorooCursor newCursor = taskService.fetchFiltered( - query.get(), constraint, fragment.taskProperties()); - return newCursor; + return taskService.fetchFiltered(query.get(), constraint, fragment.taskProperties()); } /* ====================================================================== @@ -484,7 +481,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable { } else if (Preferences.getBoolean(R.string.p_showNotes, false)) { viewHolder.details1.setVisibility(View.VISIBLE); if (details.startsWith(DETAIL_SEPARATOR)) { - StringBuffer buffer = new StringBuffer(details); + StringBuilder buffer = new StringBuilder(details); int length = DETAIL_SEPARATOR.length(); while(buffer.lastIndexOf(DETAIL_SEPARATOR, length) == 0) { buffer.delete(0, length); @@ -1064,7 +1061,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable { if (value >= IMPORTANCE_RESOURCES.length) { value = IMPORTANCE_RESOURCES.length - 1; } - Drawable[] boxes = IMPORTANCE_DRAWABLES; + Drawable[] boxes; if (!TextUtils.isEmpty(task.getValue(Task.RECURRENCE))) { boxes = completed ? IMPORTANCE_REPEAT_DRAWABLES_CHECKED : IMPORTANCE_REPEAT_DRAWABLES; } else { diff --git a/astrid/src/main/java/com/todoroo/astrid/alarms/AlarmControlSet.java b/astrid/src/main/java/com/todoroo/astrid/alarms/AlarmControlSet.java index e1faabfc9..3f6a68ad3 100644 --- a/astrid/src/main/java/com/todoroo/astrid/alarms/AlarmControlSet.java +++ b/astrid/src/main/java/com/todoroo/astrid/alarms/AlarmControlSet.java @@ -72,15 +72,15 @@ public final class AlarmControlSet extends TaskEditControlSet { } @Override - public String writeToModel(Task task) { + public void writeToModel(Task task) { if (initialized && pickerDialog != null) { pickerDialog.dismiss(); } - return super.writeToModel(task); + super.writeToModel(task); } @Override - protected String writeToModelAfterInitialized(Task task) { + protected void writeToModelAfterInitialized(Task task) { LinkedHashSet alarms = new LinkedHashSet(); for(int i = 0; i < alertsContainer.getChildCount(); i++) { Long dateValue = (Long) alertsContainer.getChildAt(i).getTag(); @@ -93,8 +93,6 @@ public final class AlarmControlSet extends TaskEditControlSet { if(AlarmService.getInstance().synchronizeAlarms(task.getId(), alarms)) { task.setValue(Task.MODIFICATION_DATE, DateUtilities.now()); } - - return null; } private void addAlarm(Date alert) { diff --git a/astrid/src/main/java/com/todoroo/astrid/backup/BackupService.java b/astrid/src/main/java/com/todoroo/astrid/backup/BackupService.java index ede4ead13..5bc644f56 100644 --- a/astrid/src/main/java/com/todoroo/astrid/backup/BackupService.java +++ b/astrid/src/main/java/com/todoroo/astrid/backup/BackupService.java @@ -133,7 +133,7 @@ public class BackupService extends Service { Arrays.sort(files, new Comparator() { @Override public int compare(File file1, File file2) { - return -Long.valueOf(file1.lastModified()).compareTo(Long.valueOf(file2.lastModified())); + return -Long.valueOf(file1.lastModified()).compareTo(file2.lastModified()); } }); for(int i = DAYS_TO_KEEP_BACKUP; i < files.length; i++) { diff --git a/astrid/src/main/java/com/todoroo/astrid/backup/TasksXmlExporter.java b/astrid/src/main/java/com/todoroo/astrid/backup/TasksXmlExporter.java index 958e58289..02d5f2290 100644 --- a/astrid/src/main/java/com/todoroo/astrid/backup/TasksXmlExporter.java +++ b/astrid/src/main/java/com/todoroo/astrid/backup/TasksXmlExporter.java @@ -356,11 +356,10 @@ public class TasksXmlExporter { * @throws IOException */ private String setupFile(File directory, ExportType exportType) throws IOException { - File astridDir = directory; - if (astridDir != null) { + if (directory != null) { // Check for /sdcard/astrid directory. If it doesn't exist, make it. - if (astridDir.exists() || astridDir.mkdir()) { - String fileName = ""; //$NON-NLS-1$ + if (directory.exists() || directory.mkdir()) { + String fileName; switch(exportType) { case EXPORT_TYPE_SERVICE: fileName = String.format(BackupConstants.BACKUP_FILE_NAME, BackupDateUtilities.getDateForExport()); @@ -374,11 +373,11 @@ public class TasksXmlExporter { default: throw new IllegalArgumentException("Invalid export type"); //$NON-NLS-1$ } - return astridDir.getAbsolutePath() + File.separator + fileName; + return directory.getAbsolutePath() + File.separator + fileName; } else { // Unable to make the /sdcard/astrid directory. throw new IOException(context.getString(R.string.DLG_error_sdcard, - astridDir.getAbsolutePath())); + directory.getAbsolutePath())); } } else { // Unable to access the sdcard because it's not in the mounted state. diff --git a/astrid/src/main/java/com/todoroo/astrid/backup/TasksXmlImporter.java b/astrid/src/main/java/com/todoroo/astrid/backup/TasksXmlImporter.java index faed7d09d..a5a78e6f6 100644 --- a/astrid/src/main/java/com/todoroo/astrid/backup/TasksXmlImporter.java +++ b/astrid/src/main/java/com/todoroo/astrid/backup/TasksXmlImporter.java @@ -249,8 +249,6 @@ public class TasksXmlImporter { String title = xpp.getAttributeValue(null, Task.TITLE.name); String created = xpp.getAttributeValue(null, Task.CREATION_DATE.name); - String deletionDate = xpp.getAttributeValue(null, Task.DELETION_DATE.name); - String completionDate = xpp.getAttributeValue(null, Task.COMPLETION_DATE.name); // if we don't have task name or creation date, skip if (created == null || title == null) { @@ -553,7 +551,7 @@ public class TasksXmlImporter { } /** helper method to set field on a task */ - private final boolean setTaskField(Task task, String field, String value) { + private boolean setTaskField(Task task, String field, String value) { if(field.equals(LegacyTaskModel.ID)) { // ignore } @@ -592,7 +590,7 @@ public class TasksXmlImporter { else if(field.equals(LegacyTaskModel.PREFERRED_DUE_DATE)) { String definite = xpp.getAttributeValue(null, LegacyTaskModel.DEFINITE_DUE_DATE); if(definite != null) { - ; // handled above + // handled above } else { task.setValue(Task.DUE_DATE, BackupDateUtilities.getTaskDueDateFromIso8601String(value).getTime()); diff --git a/astrid/src/main/java/com/todoroo/astrid/calls/PhoneStateChangedReceiver.java b/astrid/src/main/java/com/todoroo/astrid/calls/PhoneStateChangedReceiver.java index 42e54c2b4..c6a05813e 100644 --- a/astrid/src/main/java/com/todoroo/astrid/calls/PhoneStateChangedReceiver.java +++ b/astrid/src/main/java/com/todoroo/astrid/calls/PhoneStateChangedReceiver.java @@ -152,8 +152,7 @@ public class PhoneStateChangedReceiver extends BroadcastReceiver { try { if (c.moveToFirst()) { - long id = c.getLong(c.getColumnIndex(ContactsContract.PhoneLookup._ID)); - return id; + return c.getLong(c.getColumnIndex(ContactsContract.PhoneLookup._ID)); } } finally { c.close(); diff --git a/astrid/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java b/astrid/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java index b74fe2700..2193be1f9 100644 --- a/astrid/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java +++ b/astrid/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java @@ -291,7 +291,7 @@ public class CustomFilterActivity extends ActionBarActivity { } private void setUpListeners() { - ((Button)findViewById(R.id.add)).setOnClickListener(new View.OnClickListener() { + findViewById(R.id.add).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { listView.showContextMenu(); diff --git a/astrid/src/main/java/com/todoroo/astrid/core/CustomFilterExposer.java b/astrid/src/main/java/com/todoroo/astrid/core/CustomFilterExposer.java index b16d7f058..472ffdd0d 100644 --- a/astrid/src/main/java/com/todoroo/astrid/core/CustomFilterExposer.java +++ b/astrid/src/main/java/com/todoroo/astrid/core/CustomFilterExposer.java @@ -60,8 +60,7 @@ public final class CustomFilterExposer extends BroadcastReceiver implements Astr private FilterListItem[] prepareFilters(Context context) { Resources r = context.getResources(); - Filter[] savedFilters = buildSavedFilters(context, r); - return savedFilters; + return buildSavedFilters(context, r); } private Filter[] buildSavedFilters(Context context, Resources r) { diff --git a/astrid/src/main/java/com/todoroo/astrid/core/DefaultsPreferences.java b/astrid/src/main/java/com/todoroo/astrid/core/DefaultsPreferences.java index d3cba930a..01e338264 100644 --- a/astrid/src/main/java/com/todoroo/astrid/core/DefaultsPreferences.java +++ b/astrid/src/main/java/com/todoroo/astrid/core/DefaultsPreferences.java @@ -60,7 +60,7 @@ public class DefaultsPreferences extends TodorooPreferenceActivity { updateTaskListPreference(preference, value, r, R.array.EPr_default_reminders_mode, R.array.EPr_default_reminders_mode_values, R.string.EPr_default_reminders_mode_desc); } else if(r.getString(R.string.p_rmd_default_random_hours).equals(preference.getKey())) { - int index = AndroidUtilities.indexOf(r.getStringArray(R.array.EPr_reminder_random_hours), (String)value); + int index = AndroidUtilities.indexOf(r.getStringArray(R.array.EPr_reminder_random_hours), value); if(index <= 0) { preference.setSummary(r.getString(R.string.rmd_EPr_defaultRemind_desc_disabled)); } else { @@ -69,7 +69,7 @@ public class DefaultsPreferences extends TodorooPreferenceActivity { } } else if(r.getString(R.string.gcal_p_default).equals(preference.getKey())) { ListPreference listPreference = (ListPreference) preference; - int index = AndroidUtilities.indexOf(listPreference.getEntryValues(), (String)value); + int index = AndroidUtilities.indexOf(listPreference.getEntryValues(), value); if(index <= 0) { preference.setSummary(r.getString(R.string.EPr_default_addtocalendar_desc_disabled)); } else { @@ -88,7 +88,7 @@ public class DefaultsPreferences extends TodorooPreferenceActivity { private void updateTaskListPreference(Preference preference, Object value, Resources r, int keyArray, int valueArray, int summaryResource) { - int index = AndroidUtilities.indexOf(r.getStringArray(valueArray), (String)value); + int index = AndroidUtilities.indexOf(r.getStringArray(valueArray), value); if(index == -1) { // force the zeroth index index = 0; diff --git a/astrid/src/main/java/com/todoroo/astrid/core/LinkActionExposer.java b/astrid/src/main/java/com/todoroo/astrid/core/LinkActionExposer.java index ef7847464..19837d4f9 100644 --- a/astrid/src/main/java/com/todoroo/astrid/core/LinkActionExposer.java +++ b/astrid/src/main/java/com/todoroo/astrid/core/LinkActionExposer.java @@ -68,14 +68,12 @@ public class LinkActionExposer { Resources r = context.getResources(); if (hasAttachments) { BitmapDrawable icon = getBitmapDrawable(R.drawable.action_attachments, r); - FilesAction filesAction = new FilesAction(null, icon); //$NON-NLS-1$ - return filesAction; + return new FilesAction(null, icon); } if (hasNotes && !Preferences.getBoolean(R.string.p_showNotes, false)) { BitmapDrawable icon = getBitmapDrawable(R.drawable.action_notes, r); - NotesAction notesAction = new NotesAction(null, icon); //$NON-NLS-1$ - return notesAction; + return new NotesAction(null, icon); } return null; @@ -113,13 +111,7 @@ public class LinkActionExposer { icon = getBitmapDrawable(R.drawable.action_web, r); } - if(text.length() > 15) { - text = text.substring(0, 12) + "..."; //$NON-NLS-1$ - } - - TaskAction action = new TaskAction( - PendingIntent.getActivity(context, (int)id, actionIntent, 0), (BitmapDrawable)icon); - return action; + return new TaskAction(PendingIntent.getActivity(context, (int)id, actionIntent, 0), (BitmapDrawable)icon); } private static final HashMap IMAGE_CACHE = new HashMap(); diff --git a/astrid/src/main/java/com/todoroo/astrid/dao/Database.java b/astrid/src/main/java/com/todoroo/astrid/dao/Database.java index 455c5818a..241883d6f 100644 --- a/astrid/src/main/java/com/todoroo/astrid/dao/Database.java +++ b/astrid/src/main/java/com/todoroo/astrid/dao/Database.java @@ -185,11 +185,7 @@ public class Database extends AbstractDatabase { } catch (SQLiteException e) { Log.e("astrid", "db-upgrade-" + oldVersion + "-" + newVersion, e); } - case 10: try { - // - } catch (SQLiteException e) { - Log.e("astrid", "db-upgrade-" + oldVersion + "-" + newVersion, e); - } + case 10: case 11: try { database.execSQL(createTableSql(visitor, TagData.TABLE.name, TagData.PROPERTIES)); } catch (SQLiteException e) { diff --git a/astrid/src/main/java/com/todoroo/astrid/dao/TaskDao.java b/astrid/src/main/java/com/todoroo/astrid/dao/TaskDao.java index 9dc8839b9..860e15bb6 100644 --- a/astrid/src/main/java/com/todoroo/astrid/dao/TaskDao.java +++ b/astrid/src/main/java/com/todoroo/astrid/dao/TaskDao.java @@ -160,7 +160,7 @@ public class TaskDao extends RemoteModelDao { * @return true if save occurred, false otherwise (i.e. nothing changed) */ public boolean save(Task task) { - boolean saveSuccessful = false; + boolean saveSuccessful; if (task.getId() == Task.NO_ID) { try { saveSuccessful = createNew(task); diff --git a/astrid/src/main/java/com/todoroo/astrid/files/FileExplore.java b/astrid/src/main/java/com/todoroo/astrid/files/FileExplore.java index 549e1235b..a67d9cbd6 100644 --- a/astrid/src/main/java/com/todoroo/astrid/files/FileExplore.java +++ b/astrid/src/main/java/com/todoroo/astrid/files/FileExplore.java @@ -122,9 +122,7 @@ public class FileExplore extends Activity { if (!firstLvl) { Item temp[] = new Item[fileList.length + 1]; - for (int i = 0; i < fileList.length; i++) { - temp[i + 1] = fileList[i]; - } + System.arraycopy(fileList, 0, temp, 1, fileList.length); temp[0] = new Item(upString, R.drawable.directory_up); fileList = temp; } @@ -174,7 +172,7 @@ public class FileExplore extends Activity { @Override protected Dialog onCreateDialog(int id) { - Dialog dialog = null; + Dialog dialog; AlertDialog.Builder builder = new Builder(this); if (fileList == null) { diff --git a/astrid/src/main/java/com/todoroo/astrid/files/FileUtilities.java b/astrid/src/main/java/com/todoroo/astrid/files/FileUtilities.java index 6dc21b83c..8e556aaf4 100644 --- a/astrid/src/main/java/com/todoroo/astrid/files/FileUtilities.java +++ b/astrid/src/main/java/com/todoroo/astrid/files/FileUtilities.java @@ -48,24 +48,16 @@ public class FileUtilities { } private static String getNewAttachmentPath(Context context, int prefixId, String extension, AtomicReference nameReference) { - StringBuilder fileNameBuilder = new StringBuilder(); - fileNameBuilder.append(context.getString(prefixId)) - .append(" ") //$NON-NLS-1$ - .append(getDateStringForFilename(context, new Date())); String dir = getAttachmentsDirectory(context).getAbsolutePath(); - String name = getNonCollidingFileName(dir, fileNameBuilder.toString(), extension); + String name = getNonCollidingFileName(dir, context.getString(prefixId) + " " + getDateStringForFilename(context, new Date()), extension); - StringBuilder filePathBuilder = new StringBuilder(); - filePathBuilder.append(dir) - .append(File.separator) - .append(name); if (nameReference != null) { nameReference.set(name); } - return filePathBuilder.toString(); + return dir + File.separator + name; } public static File getAttachmentsDirectory(Context context) { diff --git a/astrid/src/main/java/com/todoroo/astrid/files/FilesControlSet.java b/astrid/src/main/java/com/todoroo/astrid/files/FilesControlSet.java index 1d5e51e3e..1b38aa46f 100644 --- a/astrid/src/main/java/com/todoroo/astrid/files/FilesControlSet.java +++ b/astrid/src/main/java/com/todoroo/astrid/files/FilesControlSet.java @@ -144,9 +144,8 @@ public class FilesControlSet extends PopupControlSet { } @Override - protected String writeToModelAfterInitialized(Task task) { + protected void writeToModelAfterInitialized(Task task) { // Nothing to write - return null; } @Override @@ -259,7 +258,7 @@ public class FilesControlSet extends PopupControlSet { if (!TextUtils.isEmpty(guessedType)) { useType = guessedType; } - if (useType != guessedType) { + if (!useType.equals(guessedType)) { m.setValue(TaskAttachment.CONTENT_TYPE, useType); m.putTransitory(SyncFlags.ACTFM_SUPPRESS_OUTSTANDING_ENTRIES, true); taskAttachmentDao.saveExisting(m); @@ -366,13 +365,13 @@ public class FilesControlSet extends PopupControlSet { byte[] buffer = new byte[1024]; - int bufferLength = 0; //used to store a temporary size of the buffer + int bufferLength; //used to store a temporary size of the buffer while ((bufferLength = inputStream.read(buffer)) > 0) { fileOutput.write(buffer, 0, bufferLength); downloadedSize += bufferLength; - int progress = (int) (downloadedSize*100/totalSize); + int progress = downloadedSize*100/totalSize; pd.setProgress(progress); } diff --git a/astrid/src/main/java/com/todoroo/astrid/gcal/GCalControlSet.java b/astrid/src/main/java/com/todoroo/astrid/gcal/GCalControlSet.java index 5f43cb297..aa79fc851 100644 --- a/astrid/src/main/java/com/todoroo/astrid/gcal/GCalControlSet.java +++ b/astrid/src/main/java/com/todoroo/astrid/gcal/GCalControlSet.java @@ -138,9 +138,9 @@ public class GCalControlSet extends PopupControlSet { } @Override - protected String writeToModelAfterInitialized(Task task) { + protected void writeToModelAfterInitialized(Task task) { if (!task.hasDueDate()) { - return null; + return; } boolean gcalCreateEventEnabled = Preferences.getStringValue(R.string.gcal_p_default) != null && @@ -189,16 +189,12 @@ public class GCalControlSet extends PopupControlSet { } ContentResolver cr = activity.getContentResolver(); - if(cr.update(calendarUri, updateValues, null, null) > 0) { - return activity.getString(R.string.gcal_TEA_calendar_updated); - } + cr.update(calendarUri, updateValues, null, null); } catch (Exception e) { exceptionService.reportError("unable-to-update-calendar: " + //$NON-NLS-1$ task.getValue(Task.CALENDAR_URI), e); } } - - return null; } private void viewCalendarEvent() { diff --git a/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksDetailExposer.java b/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksDetailExposer.java index c78d2648b..19b622f92 100644 --- a/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksDetailExposer.java +++ b/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksDetailExposer.java @@ -77,7 +77,7 @@ public class GtasksDetailExposer extends BroadcastReceiver { return null; } String listName = gtasksListService.getListName(listId); - if(listName == GtasksListService.LIST_NOT_FOUND) { + if(listName.equals(GtasksListService.LIST_NOT_FOUND)) { return null; } diff --git a/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksMetadataService.java b/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksMetadataService.java index 93f8876ba..49bbc5010 100644 --- a/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksMetadataService.java +++ b/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksMetadataService.java @@ -180,8 +180,8 @@ public final class GtasksMetadataService extends SyncMetadataService sibling = new AtomicReference(); OrderedListIterator iterator = new OrderedListIterator() { @Override @@ -190,7 +190,7 @@ public final class GtasksMetadataService extends SyncMetadataService resolveInfoList = pm.queryIntentActivities( queryIntent, PackageManager.GET_META_DATA); - int length = resolveInfoList.size(); ArrayList syncIntents = new ArrayList(); // Loop through a list of all packages (including plugins, addons) // that have a settings action: filter to sync actions - for (int i = 0; i < length; i++) { - ResolveInfo resolveInfo = resolveInfoList.get(i); + for (ResolveInfo resolveInfo : resolveInfoList) { Intent intent = new Intent(AstridApiConstants.ACTION_SETTINGS); intent.setClassName(resolveInfo.activityInfo.packageName, resolveInfo.activityInfo.name); diff --git a/astrid/src/main/java/com/todoroo/astrid/helper/TaskEditControlSet.java b/astrid/src/main/java/com/todoroo/astrid/helper/TaskEditControlSet.java index 4b2f5a5de..777f8c1f3 100644 --- a/astrid/src/main/java/com/todoroo/astrid/helper/TaskEditControlSet.java +++ b/astrid/src/main/java/com/todoroo/astrid/helper/TaskEditControlSet.java @@ -82,20 +82,18 @@ public abstract class TaskEditControlSet { /** * Write data from control set to model - * @return text appended to the toast */ - public String writeToModel(Task task) { + public void writeToModel(Task task) { if (initialized) { - return writeToModelAfterInitialized(task); + writeToModelAfterInitialized(task); } - return null; } /** * Write to model, if initialization logic has been called * @return toast text */ - protected abstract String writeToModelAfterInitialized(Task task); + protected abstract void writeToModelAfterInitialized(Task task); /** * Called when views need to be inflated diff --git a/astrid/src/main/java/com/todoroo/astrid/helper/UUIDHelper.java b/astrid/src/main/java/com/todoroo/astrid/helper/UUIDHelper.java index 9b002b91d..bc1dc63e0 100644 --- a/astrid/src/main/java/com/todoroo/astrid/helper/UUIDHelper.java +++ b/astrid/src/main/java/com/todoroo/astrid/helper/UUIDHelper.java @@ -11,9 +11,9 @@ public class UUIDHelper { * generated uuid and the corresponding proof text */ public static String newUUID() { - long uuid = 0; + long uuid; do { - uuid = UUID.randomUUID().getLeastSignificantBits() & 0x7fffffffffffffffL;; + uuid = UUID.randomUUID().getLeastSignificantBits() & 0x7fffffffffffffffL; } while (uuid < MIN_UUID); return Long.toString(uuid); } diff --git a/astrid/src/main/java/com/todoroo/astrid/notes/EditNoteActivity.java b/astrid/src/main/java/com/todoroo/astrid/notes/EditNoteActivity.java index 19c004e23..106f8ec02 100644 --- a/astrid/src/main/java/com/todoroo/astrid/notes/EditNoteActivity.java +++ b/astrid/src/main/java/com/todoroo/astrid/notes/EditNoteActivity.java @@ -354,17 +354,10 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene UpdateAdapter.setupImagePopupForCommentView(view, commentPictureView, item.pictureThumb, item.commentBitmap, item.title.toString(), fragment); } - public void refreshData() { - if(!task.containsNonNullValue(Task.UUID)) { - return; - } - } - private void addComment() { addComment(commentField.getText().toString(), UserActivity.ACTION_TASK_COMMENT, task.getUuid(), task.getValue(Task.TITLE), true); } - private void addComment(String message, String actionCode, String uuid, String title, boolean usePicture) { // Allow for users to just add picture if (TextUtils.isEmpty(message) && usePicture) { @@ -434,10 +427,10 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene } public static NoteOrUpdate fromUpdate(UserActivity u) { - String pictureThumb = ""; //$NON-NLS-1$ + String pictureThumb; Spanned title; Bitmap commentBitmap = null; - long createdAt = 0; + long createdAt; if(u == null) { throw new RuntimeException("UserActivity should never be null"); diff --git a/astrid/src/main/java/com/todoroo/astrid/provider/Astrid2TaskProvider.java b/astrid/src/main/java/com/todoroo/astrid/provider/Astrid2TaskProvider.java index fecd13752..5537cd839 100644 --- a/astrid/src/main/java/com/todoroo/astrid/provider/Astrid2TaskProvider.java +++ b/astrid/src/main/java/com/todoroo/astrid/provider/Astrid2TaskProvider.java @@ -144,13 +144,13 @@ public class Astrid2TaskProvider extends ContentProvider { MatrixCursor ret = new MatrixCursor(TAGS_FIELD_LIST); - for (int i = 0; i < tags.length; i++) { - Object[] values = new Object[2]; - values[0] = tagNameToLong(tags[i].tag); - values[1] = tags[i].tag; + for (Tag tag : tags) { + Object[] values = new Object[2]; + values[0] = tagNameToLong(tag.tag); + values[1] = tag.tag; - ret.addRow(values); - } + ret.addRow(values); + } return ret; } @@ -267,10 +267,7 @@ public class Astrid2TaskProvider extends ContentProvider { task.setValue(Task.IMPORTANCE, values.getAsInteger(IMPORTANCE)); } if(values.containsKey(COMPLETED)) { - task.setValue(Task.COMPLETION_DATE, - values.getAsBoolean(COMPLETED) ? DateUtilities.now() : 0); - if(task.isCompleted()) { - } + task.setValue(Task.COMPLETION_DATE, values.getAsBoolean(COMPLETED) ? DateUtilities.now() : 0); } // map selection criteria diff --git a/astrid/src/main/java/com/todoroo/astrid/provider/SqlContentProvider.java b/astrid/src/main/java/com/todoroo/astrid/provider/SqlContentProvider.java index 162d5120f..410c9d8f2 100644 --- a/astrid/src/main/java/com/todoroo/astrid/provider/SqlContentProvider.java +++ b/astrid/src/main/java/com/todoroo/astrid/provider/SqlContentProvider.java @@ -128,8 +128,7 @@ public class SqlContentProvider extends ContentProvider { public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder) { - Cursor cursor = database.rawQuery(selection, null); - return cursor; + return database.rawQuery(selection, null); } } diff --git a/astrid/src/main/java/com/todoroo/astrid/reminders/NotificationFragment.java b/astrid/src/main/java/com/todoroo/astrid/reminders/NotificationFragment.java index 74c89339c..4748832f7 100644 --- a/astrid/src/main/java/com/todoroo/astrid/reminders/NotificationFragment.java +++ b/astrid/src/main/java/com/todoroo/astrid/reminders/NotificationFragment.java @@ -48,10 +48,6 @@ public class NotificationFragment extends TaskListFragment { private long taskId; - @Override - protected void onTaskCompleted() { - } - @Override protected void initializeData() { displayNotificationPopup(); diff --git a/astrid/src/main/java/com/todoroo/astrid/reminders/Notifications.java b/astrid/src/main/java/com/todoroo/astrid/reminders/Notifications.java index 75a8437f7..92d6f3d6b 100644 --- a/astrid/src/main/java/com/todoroo/astrid/reminders/Notifications.java +++ b/astrid/src/main/java/com/todoroo/astrid/reminders/Notifications.java @@ -135,8 +135,7 @@ public class Notifications extends BroadcastReceiver { /** @return a random reminder string */ public static String getRandomReminder(String[] reminders) { int next = ReminderService.random.nextInt(reminders.length); - String reminder = reminders[next]; - return reminder; + return reminders[next]; } /** @@ -373,8 +372,7 @@ public class Notifications extends BroadcastReceiver { voiceReminder = false; } else if(notificationPreference != null) { if(notificationPreference.length() > 0 && soundIntervalOk) { - Uri notificationSound = Uri.parse(notificationPreference); - notification.sound = notificationSound; + notification.sound = Uri.parse(notificationPreference); } else { notification.sound = null; } diff --git a/astrid/src/main/java/com/todoroo/astrid/reminders/ReminderPreferences.java b/astrid/src/main/java/com/todoroo/astrid/reminders/ReminderPreferences.java index f2afc0614..fdebbbcf4 100644 --- a/astrid/src/main/java/com/todoroo/astrid/reminders/ReminderPreferences.java +++ b/astrid/src/main/java/com/todoroo/astrid/reminders/ReminderPreferences.java @@ -32,7 +32,7 @@ public class ReminderPreferences extends TodorooPreferenceActivity { Resources r = getResources(); if(r.getString(R.string.p_rmd_quietStart).equals(preference.getKey())) { - int index = AndroidUtilities.indexOf(r.getStringArray(R.array.EPr_quiet_hours_start_values), (String)value); + int index = AndroidUtilities.indexOf(r.getStringArray(R.array.EPr_quiet_hours_start_values), value); Preference endPreference = findPreference(getString(R.string.p_rmd_quietEnd)); if(index <= 0) { preference.setSummary(r.getString(R.string.rmd_EPr_quiet_hours_desc_none)); @@ -43,7 +43,7 @@ public class ReminderPreferences extends TodorooPreferenceActivity { endPreference.setEnabled(true); } } else if(r.getString(R.string.p_rmd_quietEnd).equals(preference.getKey())) { - int index = AndroidUtilities.indexOf(r.getStringArray(R.array.EPr_quiet_hours_end_values), (String)value); + int index = AndroidUtilities.indexOf(r.getStringArray(R.array.EPr_quiet_hours_end_values), value); int quietHoursStart = Preferences.getIntegerFromString(R.string.p_rmd_quietStart, -1); if(index == -1 || quietHoursStart == -1) { preference.setSummary(r.getString(R.string.rmd_EPr_quiet_hours_desc_none)); @@ -52,7 +52,7 @@ public class ReminderPreferences extends TodorooPreferenceActivity { preference.setSummary(r.getString(R.string.rmd_EPr_quiet_hours_end_desc, setting)); } } else if(r.getString(R.string.p_rmd_time).equals(preference.getKey())) { - int index = AndroidUtilities.indexOf(r.getStringArray(R.array.EPr_rmd_time_values), (String)value); + int index = AndroidUtilities.indexOf(r.getStringArray(R.array.EPr_rmd_time_values), value); if (index != -1 && index < r.getStringArray(R.array.EPr_rmd_time).length) { // FIXME this does not fix the underlying cause of the ArrayIndexOutofBoundsException String setting = r.getStringArray(R.array.EPr_rmd_time)[index]; diff --git a/astrid/src/main/java/com/todoroo/astrid/reminders/ReminderService.java b/astrid/src/main/java/com/todoroo/astrid/reminders/ReminderService.java index 2005cafae..edb165f0c 100644 --- a/astrid/src/main/java/com/todoroo/astrid/reminders/ReminderService.java +++ b/astrid/src/main/java/com/todoroo/astrid/reminders/ReminderService.java @@ -334,7 +334,7 @@ public final class ReminderService { quietHoursEndDate.setMinutes(0); quietHoursEndDate.setSeconds(0); - long millisToQuiet = quietHoursStartDate.getTime() - getNowValue(); + long millisToQuiet; long millisToEndOfDay = dueDate - getNowValue(); // @@ -357,11 +357,11 @@ public final class ReminderService { if (millisAfterQuiet > (millisToQuiet / ((float)(1-(1/periodDivFactor))) )) { dueDateAlarm = quietHoursEndDate.getTime(); } else { - dueDateAlarm = getNowValue() + (long) (millisToQuiet / periodDivFactor); + dueDateAlarm = getNowValue() + (millisToQuiet / periodDivFactor); } } else { // after quietHours, reuse dueDate for end of day - dueDateAlarm = getNowValue() + (long)(millisToEndOfDay / periodDivFactor); + dueDateAlarm = getNowValue() + (millisToEndOfDay / periodDivFactor); } } else { // wrap across 24/hour boundary if(hour >= quietHoursStart) { @@ -373,12 +373,12 @@ public final class ReminderService { } else { // quietHours didnt start yet millisToQuiet = quietHoursStartDate.getTime() - getNowValue(); - dueDateAlarm = getNowValue() + (long)(millisToQuiet / periodDivFactor); + dueDateAlarm = getNowValue() + (millisToQuiet / periodDivFactor); } } } else { // Quiet hours not activated, simply schedule the reminder on 1/periodDivFactor towards the end of day - dueDateAlarm = getNowValue() + (long)(millisToEndOfDay / periodDivFactor); + dueDateAlarm = getNowValue() + (millisToEndOfDay / periodDivFactor); } if(dueDate > getNowValue() && dueDateAlarm < getNowValue()) { diff --git a/astrid/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java b/astrid/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java index 0d7e1c8cb..e9a7f3271 100644 --- a/astrid/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java +++ b/astrid/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java @@ -319,14 +319,11 @@ public class RepeatControlSet extends PopupControlSet { } @Override - protected String writeToModelAfterInitialized(Task task) { + protected void writeToModelAfterInitialized(Task task) { String result; if(!doRepeat) { result = ""; //$NON-NLS-1$ } else { - if(TextUtils.isEmpty(task.getValue(Task.RECURRENCE))) { - } - RRule rrule = new RRule(); rrule.setInterval(repeatValue); switch(interval.getSelectedItemPosition()) { @@ -337,9 +334,9 @@ public class RepeatControlSet extends PopupControlSet { rrule.setFreq(Frequency.WEEKLY); ArrayList days = new ArrayList(); - for(int i = 0; i < daysOfWeek.length; i++) { - if (daysOfWeek[i].isChecked()) { - days.add(new WeekdayNum(0, (Weekday) daysOfWeek[i].getTag())); + for (CompoundButton dayOfWeek : daysOfWeek) { + if (dayOfWeek.isChecked()) { + days.add(new WeekdayNum(0, (Weekday) dayOfWeek.getTag())); } } rrule.setByDay(days); @@ -376,8 +373,6 @@ public class RepeatControlSet extends PopupControlSet { if(task.repeatAfterCompletion()) { type.setSelection(1); } - - return null; } public boolean isRecurrenceSet() { diff --git a/astrid/src/main/java/com/todoroo/astrid/repeats/RepeatTaskCompleteListener.java b/astrid/src/main/java/com/todoroo/astrid/repeats/RepeatTaskCompleteListener.java index 445cf4878..380c20ccc 100644 --- a/astrid/src/main/java/com/todoroo/astrid/repeats/RepeatTaskCompleteListener.java +++ b/astrid/src/main/java/com/todoroo/astrid/repeats/RepeatTaskCompleteListener.java @@ -89,7 +89,6 @@ public class RepeatTaskCompleteListener extends BroadcastReceiver { broadcastIntent.putExtra(AstridApiConstants.EXTRAS_NEW_DUE_DATE, newDueDate); context.sendOrderedBroadcast(broadcastIntent, null); Flags.set(Flags.REFRESH); - return; } } @@ -182,8 +181,7 @@ public class RepeatTaskCompleteListener extends BroadcastReceiver { private static WeekdayNum findNextWeekday(List byDay, Calendar date) { WeekdayNum next = byDay.get(0); - for (int i = 0; i < byDay.size(); i++) { - WeekdayNum weekday = byDay.get(i); + for (WeekdayNum weekday : byDay) { if (weekday.wday.javaDayNum > date.get(Calendar.DAY_OF_WEEK)) { return weekday; } @@ -191,12 +189,11 @@ public class RepeatTaskCompleteListener extends BroadcastReceiver { return next; } - private static long invokeRecurrence(RRule rrule, Date original, - DateValue startDateAsDV) { + private static long invokeRecurrence(RRule rrule, Date original, DateValue startDateAsDV) { long newDueDate = -1; RecurrenceIterator iterator = RecurrenceIteratorFactory.createRecurrenceIterator(rrule, startDateAsDV, TimeZone.getDefault()); - DateValue nextDate = startDateAsDV; + DateValue nextDate; for(int i = 0; i < 10; i++) { // ten tries then we give up if(!iterator.hasNext()) { diff --git a/astrid/src/main/java/com/todoroo/astrid/service/TagDataService.java b/astrid/src/main/java/com/todoroo/astrid/service/TagDataService.java index a89fd6087..e0bdac692 100644 --- a/astrid/src/main/java/com/todoroo/astrid/service/TagDataService.java +++ b/astrid/src/main/java/com/todoroo/astrid/service/TagDataService.java @@ -95,8 +95,7 @@ public class TagDataService { criteria = Criterion.and(criteria, extraCriterion); } - Query result = Query.select(AndroidUtilities.addToArray(Property.class, activityProperties)).where(criteria); - return result; + return Query.select(AndroidUtilities.addToArray(Property.class, activityProperties)).where(criteria); } public Cursor getActivityForTagData(TagData tagData, Criterion extraCriterion) { diff --git a/astrid/src/main/java/com/todoroo/astrid/service/TaskService.java b/astrid/src/main/java/com/todoroo/astrid/service/TaskService.java index 38e3b3725..da3136c5c 100644 --- a/astrid/src/main/java/com/todoroo/astrid/service/TaskService.java +++ b/astrid/src/main/java/com/todoroo/astrid/service/TaskService.java @@ -98,18 +98,6 @@ public class TaskService { public void setComplete(Task item, boolean completed) { if(completed) { item.setValue(Task.COMPLETION_DATE, DateUtilities.now()); - - long reminderLast = item.getValue(Task.REMINDER_LAST); - String socialReminder = item.getValue(Task.SOCIAL_REMINDER); - if (reminderLast > 0) { - long diff = DateUtilities.now() - reminderLast; - if (diff > 0 && diff < DateUtilities.ONE_DAY) { - // within one day of last reminder - } - if (diff > 0 && diff < DateUtilities.ONE_WEEK) { - // within one week of last reminder - } - } } else { item.setValue(Task.COMPLETION_DATE, 0L); } @@ -173,7 +161,9 @@ public class TaskService { public void delete(Task item) { if(!item.isSaved()) { return; - } else if(item.containsValue(Task.TITLE) && item.getValue(Task.TITLE).length() == 0) { + } + + if(item.containsValue(Task.TITLE) && item.getValue(Task.TITLE).length() == 0) { taskDao.delete(item.getId()); item.setId(Task.NO_ID); } else { @@ -462,9 +452,8 @@ public class TaskService { } private static Query queryForTask(Task task, Property[] activityProperties) { - Query result = Query.select(AndroidUtilities.addToArray(Property.class, activityProperties)) + return Query.select(AndroidUtilities.addToArray(Property.class, activityProperties)) .where(Criterion.and(UserActivity.ACTION.eq(UserActivity.ACTION_TASK_COMMENT), UserActivity.TARGET_ID.eq(task.getUuid()), UserActivity.DELETED_AT.eq(0))); - return result; } } diff --git a/astrid/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java b/astrid/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java index 26e59c562..117c35097 100644 --- a/astrid/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java +++ b/astrid/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java @@ -75,8 +75,7 @@ public class AstridOrderedListFragmentHelper implements OrderedListFragmen } public DraggableListView getTouchListView() { - DraggableListView tlv = (DraggableListView) fragment.getListView(); - return tlv; + return (DraggableListView) fragment.getListView(); } @Override @@ -184,7 +183,7 @@ public class AstridOrderedListFragmentHelper implements OrderedListFragmen if(v == null) { return; } - ((DraggableTaskAdapter) taskAdapter).getListener().onClick(v); + taskAdapter.getListener().onClick(v); } }; diff --git a/astrid/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListUpdater.java b/astrid/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListUpdater.java index 40e961926..55fc6edf9 100644 --- a/astrid/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListUpdater.java +++ b/astrid/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListUpdater.java @@ -404,7 +404,7 @@ public abstract class AstridOrderedListUpdater { private static void recursivelyBuildChildren(Node node, JSONArray children, JSONTreeModelBuilder callback) throws JSONException { for (int i = 1; i < children.length(); i++) { JSONArray subarray = children.optJSONArray(i); - String uuid = RemoteModel.NO_UUID; + String uuid; if (subarray == null) { uuid = children.getString(i); } else { diff --git a/astrid/src/main/java/com/todoroo/astrid/subtasks/OrderedMetadataListFragmentHelper.java b/astrid/src/main/java/com/todoroo/astrid/subtasks/OrderedMetadataListFragmentHelper.java index 123538117..660bd340f 100644 --- a/astrid/src/main/java/com/todoroo/astrid/subtasks/OrderedMetadataListFragmentHelper.java +++ b/astrid/src/main/java/com/todoroo/astrid/subtasks/OrderedMetadataListFragmentHelper.java @@ -77,8 +77,7 @@ public class OrderedMetadataListFragmentHelper implements OrderedListFragm } public DraggableListView getTouchListView() { - DraggableListView tlv = (DraggableListView) fragment.getListView(); - return tlv; + return (DraggableListView) fragment.getListView(); } @Override @@ -196,7 +195,7 @@ public class OrderedMetadataListFragmentHelper implements OrderedListFragm if(v == null) { return; } - ((DraggableTaskAdapter) taskAdapter).getListener().onClick(v); + taskAdapter.getListener().onClick(v); } }; diff --git a/astrid/src/main/java/com/todoroo/astrid/subtasks/SubtasksListFragment.java b/astrid/src/main/java/com/todoroo/astrid/subtasks/SubtasksListFragment.java index 0d482d363..0c714e2aa 100644 --- a/astrid/src/main/java/com/todoroo/astrid/subtasks/SubtasksListFragment.java +++ b/astrid/src/main/java/com/todoroo/astrid/subtasks/SubtasksListFragment.java @@ -36,9 +36,7 @@ public class SubtasksListFragment extends TaskListFragment { } protected OrderedListFragmentHelperInterface createFragmentHelper() { - AstridOrderedListFragmentHelper olfh = - new AstridOrderedListFragmentHelper(this, new SubtasksFilterUpdater()); - return olfh; + return new AstridOrderedListFragmentHelper(this, new SubtasksFilterUpdater()); } @Override diff --git a/astrid/src/main/java/com/todoroo/astrid/tags/TagCustomFilterCriteriaExposer.java b/astrid/src/main/java/com/todoroo/astrid/tags/TagCustomFilterCriteriaExposer.java index 73562f81a..1d304caeb 100644 --- a/astrid/src/main/java/com/todoroo/astrid/tags/TagCustomFilterCriteriaExposer.java +++ b/astrid/src/main/java/com/todoroo/astrid/tags/TagCustomFilterCriteriaExposer.java @@ -76,7 +76,7 @@ public class TagCustomFilterCriteriaExposer extends BroadcastReceiver { null, context.getString(R.string.CFC_tag_contains_name), "", ((BitmapDrawable)r.getDrawable(TagService.getDefaultImageIDForTag(RemoteModel.NO_UUID))).getBitmap(), context.getString(R.string.CFC_tag_contains_name)); - ret[j++] = criterion; + ret[j] = criterion; } // transmit filter list diff --git a/astrid/src/main/java/com/todoroo/astrid/tags/TagFilterExposer.java b/astrid/src/main/java/com/todoroo/astrid/tags/TagFilterExposer.java index 76b622bcd..743cd8021 100644 --- a/astrid/src/main/java/com/todoroo/astrid/tags/TagFilterExposer.java +++ b/astrid/src/main/java/com/todoroo/astrid/tags/TagFilterExposer.java @@ -95,7 +95,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; @@ -132,8 +132,7 @@ public class TagFilterExposer extends BroadcastReceiver implements AstridFilterE addTags(list); // transmit filter list - FilterListItem[] listAsArray = list.toArray(new FilterListItem[list.size()]); - return listAsArray; + return list.toArray(new FilterListItem[list.size()]); } private void addTags(ArrayList list) { @@ -168,14 +167,13 @@ public class TagFilterExposer extends BroadcastReceiver implements AstridFilterE filters.add(untagged); } - for(int i = 0; i < tags.length; i++) { - Filter f = constructFilter(context, tags[i]); + for (Tag tag : tags) { + Filter f = constructFilter(context, tag); if (f != null) { filters.add(f); } } - FilterCategory filter = new FilterCategory(context.getString(name), filters.toArray(new Filter[filters.size()])); - return filter; + return new FilterCategory(context.getString(name), filters.toArray(new Filter[filters.size()])); } protected Filter constructFilter(Context context, Tag tag) { diff --git a/astrid/src/main/java/com/todoroo/astrid/tags/TagService.java b/astrid/src/main/java/com/todoroo/astrid/tags/TagService.java index a6ea153b9..8f7df9910 100644 --- a/astrid/src/main/java/com/todoroo/astrid/tags/TagService.java +++ b/astrid/src/main/java/com/todoroo/astrid/tags/TagService.java @@ -413,12 +413,9 @@ public final class TagService { } int result = tagDataDao.update(TagData.UUID.eq(uuid), template); - boolean tagRenamed = result > 0; - Metadata metadataTemplate = new Metadata(); metadataTemplate.setValue(TaskToTagMetadata.TAG_NAME, newName); result = metadataDao.update(Criterion.and(MetadataCriteria.withKey(TaskToTagMetadata.KEY), TaskToTagMetadata.TAG_UUID.eq(uuid)), metadataTemplate); - tagRenamed = tagRenamed || result > 0; return result; } @@ -428,6 +425,6 @@ public final class TagService { int random = (int)(Math.random()*4); return default_tag_images[random]; } - return default_tag_images[((int)Math.abs(nameOrUUID.hashCode()))%4]; + return default_tag_images[(Math.abs(nameOrUUID.hashCode()))%4]; } } diff --git a/astrid/src/main/java/com/todoroo/astrid/tags/TagsControlSet.java b/astrid/src/main/java/com/todoroo/astrid/tags/TagsControlSet.java index f8faf3a96..9dcb10f19 100644 --- a/astrid/src/main/java/com/todoroo/astrid/tags/TagsControlSet.java +++ b/astrid/src/main/java/com/todoroo/astrid/tags/TagsControlSet.java @@ -86,8 +86,8 @@ public final class TagsControlSet extends PopupControlSet { private ArrayList getTagNames(Tag[] tags) { ArrayList names = new ArrayList(); - for (int i = 0; i < tags.length; i++) { - names.add(tags[i].toString()); + for (Tag tag : tags) { + names.add(tag.toString()); } return names; } @@ -232,8 +232,7 @@ public final class TagsControlSet extends PopupControlSet { return null; } View lastItem = newTags.getChildAt(newTags.getChildCount()-1); - TextView lastText = (TextView) lastItem.findViewById(R.id.text1); - return lastText; + return (TextView) lastItem.findViewById(R.id.text1); } @Override @@ -300,10 +299,10 @@ public final class TagsControlSet extends PopupControlSet { } @Override - protected String writeToModelAfterInitialized(Task task) { + protected void writeToModelAfterInitialized(Task task) { // this is a case where we're asked to save but the UI was not yet populated if(!populated) { - return null; + return; } LinkedHashSet tags = getTagSet(); @@ -311,8 +310,6 @@ public final class TagsControlSet extends PopupControlSet { TagService.getInstance().synchronizeTags(task.getId(), task.getValue(Task.UUID), tags); Flags.set(Flags.TAGS_CHANGED); task.setValue(Task.MODIFICATION_DATE, DateUtilities.now()); - - return null; } @Override diff --git a/astrid/src/main/java/com/todoroo/astrid/tags/TagsPlugin.java b/astrid/src/main/java/com/todoroo/astrid/tags/TagsPlugin.java index c562a3832..4231b8347 100644 --- a/astrid/src/main/java/com/todoroo/astrid/tags/TagsPlugin.java +++ b/astrid/src/main/java/com/todoroo/astrid/tags/TagsPlugin.java @@ -35,8 +35,7 @@ public class TagsPlugin extends BroadcastReceiver { */ public static Intent newTagDialog(Context context) { Class settingsComponent = AstridPreferences.useTabletLayout(context) ? TagSettingsActivityTablet.class : TagSettingsActivity.class; - Intent intent = new Intent(context, settingsComponent); - return intent; + return new Intent(context, settingsComponent); } } diff --git a/astrid/src/main/java/com/todoroo/astrid/timers/TimerActionControlSet.java b/astrid/src/main/java/com/todoroo/astrid/timers/TimerActionControlSet.java index 67ad2d76c..f1bd6e599 100644 --- a/astrid/src/main/java/com/todoroo/astrid/timers/TimerActionControlSet.java +++ b/astrid/src/main/java/com/todoroo/astrid/timers/TimerActionControlSet.java @@ -57,9 +57,8 @@ public class TimerActionControlSet extends TaskEditControlSet { } @Override - protected String writeToModelAfterInitialized(Task task) { + protected void writeToModelAfterInitialized(Task task) { // Nothing to do here - return null; } private final OnClickListener timerListener = new OnClickListener() { diff --git a/astrid/src/main/java/com/todoroo/astrid/timers/TimerControlSet.java b/astrid/src/main/java/com/todoroo/astrid/timers/TimerControlSet.java index 4ee796d19..9a8d1de51 100644 --- a/astrid/src/main/java/com/todoroo/astrid/timers/TimerControlSet.java +++ b/astrid/src/main/java/com/todoroo/astrid/timers/TimerControlSet.java @@ -63,12 +63,11 @@ public class TimerControlSet extends PopupControlSet implements TimerActionListe } @Override - protected String writeToModelAfterInitialized(Task task) { + protected void writeToModelAfterInitialized(Task task) { if (initialized) { estimated.writeToModel(task); elapsed.writeToModel(task); } - return null; } // --- TimeDurationTaskEditControlSet @@ -102,9 +101,8 @@ public class TimerControlSet extends PopupControlSet implements TimerActionListe } @Override - protected String writeToModelAfterInitialized(Task task) { + protected void writeToModelAfterInitialized(Task task) { task.setValue(property, controlSet.getTimeDurationInSeconds()); - return null; } public String getDisplayString() { diff --git a/astrid/src/main/java/com/todoroo/astrid/ui/CalendarView.java b/astrid/src/main/java/com/todoroo/astrid/ui/CalendarView.java index be675b2e4..3a8cec991 100644 --- a/astrid/src/main/java/com/todoroo/astrid/ui/CalendarView.java +++ b/astrid/src/main/java/com/todoroo/astrid/ui/CalendarView.java @@ -97,7 +97,7 @@ public class CalendarView extends View { initCalendarView(context); } - private final void initCalendarView(Context context) { + private void initCalendarView(Context context) { Display display = ((WindowManager) context.getSystemService( Context.WINDOW_SERVICE)).getDefaultDisplay(); @@ -308,8 +308,8 @@ public class CalendarView extends View { boxWidth = (getMeasuredWidth() - (PADDING*2)) / 7.0f; boxHeight = (int) (((getMeasuredHeight() - (monthTitleHeight) - 16) - (PADDING * 8)) / 7); - float textX = 0; - float textY = 0; + float textX; + float textY; int firstDayOfWeek = calendar.getFirstDayOfWeek(); calendar.set(Calendar.DAY_OF_WEEK, firstDayOfWeek); diff --git a/astrid/src/main/java/com/todoroo/astrid/ui/DateAndTimeDialog.java b/astrid/src/main/java/com/todoroo/astrid/ui/DateAndTimeDialog.java index 1e895cfd9..2fa2a075f 100644 --- a/astrid/src/main/java/com/todoroo/astrid/ui/DateAndTimeDialog.java +++ b/astrid/src/main/java/com/todoroo/astrid/ui/DateAndTimeDialog.java @@ -49,7 +49,7 @@ public class DateAndTimeDialog extends Dialog { LayoutParams params = getWindow().getAttributes(); params.height = LayoutParams.FILL_PARENT; params.width = LayoutParams.FILL_PARENT; - getWindow().setAttributes((android.view.WindowManager.LayoutParams) params); + getWindow().setAttributes(params); dateAndTimePicker = (DateAndTimePicker) findViewById(R.id.date_and_time); dateAndTimePicker.initializeWithDate(startDate); diff --git a/astrid/src/main/java/com/todoroo/astrid/ui/DeadlineControlSet.java b/astrid/src/main/java/com/todoroo/astrid/ui/DeadlineControlSet.java index 18a3b6ef1..343df323a 100644 --- a/astrid/src/main/java/com/todoroo/astrid/ui/DeadlineControlSet.java +++ b/astrid/src/main/java/com/todoroo/astrid/ui/DeadlineControlSet.java @@ -117,14 +117,13 @@ public class DeadlineControlSet extends PopupControlSet { } @Override - protected String writeToModelAfterInitialized(Task task) { + protected void writeToModelAfterInitialized(Task task) { long dueDate = dateAndTimePicker.constructDueDate(); if (dueDate != task.getValue(Task.DUE_DATE)) // Clear snooze if due date has changed { task.setValue(Task.REMINDER_SNOOZE, 0L); } task.setValue(Task.DUE_DATE, dueDate); - return null; } private void initializeWithDate(long dueDate) { diff --git a/astrid/src/main/java/com/todoroo/astrid/ui/DraggableListView.java b/astrid/src/main/java/com/todoroo/astrid/ui/DraggableListView.java index e1894025c..5d546d512 100644 --- a/astrid/src/main/java/com/todoroo/astrid/ui/DraggableListView.java +++ b/astrid/src/main/java/com/todoroo/astrid/ui/DraggableListView.java @@ -305,7 +305,7 @@ public class DraggableListView extends ListView { return null; } - return (View) getChildAt(itemNum - getFirstVisiblePosition()); + return getChildAt(itemNum - getFirstVisiblePosition()); } // --- drag logic @@ -348,7 +348,7 @@ public class DraggableListView extends ListView { // bye! } } - }; + } protected void initiateDrag(MotionEvent ev) { int x = (int) mTouchCurrentX; @@ -359,7 +359,7 @@ public class DraggableListView extends ListView { return; } - View item = (View) getChildAt(itemNum - getFirstVisiblePosition()); + View item = getChildAt(itemNum - getFirstVisiblePosition()); mDragPoint = new Point(x - item.getLeft(), y - item.getTop()); mCoordOffset = new Point((int)ev.getRawX() - x, (int)ev.getRawY() - y); diff --git a/astrid/src/main/java/com/todoroo/astrid/ui/EditNotesControlSet.java b/astrid/src/main/java/com/todoroo/astrid/ui/EditNotesControlSet.java index 12061c987..cbc08a312 100644 --- a/astrid/src/main/java/com/todoroo/astrid/ui/EditNotesControlSet.java +++ b/astrid/src/main/java/com/todoroo/astrid/ui/EditNotesControlSet.java @@ -83,9 +83,8 @@ public class EditNotesControlSet extends PopupControlSet { } @Override - protected String writeToModelAfterInitialized(Task task) { + protected void writeToModelAfterInitialized(Task task) { task.setValue(Task.NOTES, editText.getText().toString()); - return null; } @Override diff --git a/astrid/src/main/java/com/todoroo/astrid/ui/EditTitleControlSet.java b/astrid/src/main/java/com/todoroo/astrid/ui/EditTitleControlSet.java index f100f8a63..f7877d62f 100644 --- a/astrid/src/main/java/com/todoroo/astrid/ui/EditTitleControlSet.java +++ b/astrid/src/main/java/com/todoroo/astrid/ui/EditTitleControlSet.java @@ -84,13 +84,12 @@ public class EditTitleControlSet extends TaskEditControlSet implements Importanc } @Override - protected String writeToModelAfterInitialized(Task task) { + protected void writeToModelAfterInitialized(Task task) { task.setValue(Task.TITLE, editText.getText().toString()); boolean newState = completeBox.isChecked(); if (newState != task.isCompleted()) { taskService.setComplete(task, newState); } - return null; } @Override diff --git a/astrid/src/main/java/com/todoroo/astrid/ui/HideUntilControlSet.java b/astrid/src/main/java/com/todoroo/astrid/ui/HideUntilControlSet.java index d62bc8bc9..8c8acb709 100644 --- a/astrid/src/main/java/com/todoroo/astrid/ui/HideUntilControlSet.java +++ b/astrid/src/main/java/com/todoroo/astrid/ui/HideUntilControlSet.java @@ -93,9 +93,7 @@ public class HideUntilControlSet extends PopupControlSet implements OnItemSelect if(specificDate > 0) { HideUntilValue[] updated = new HideUntilValue[values.length + 1]; - for(int i = 0; i < values.length; i++) { - updated[i + 1] = values[i]; - } + System.arraycopy(values, 0, updated, 1, values.length); Date hideUntilAsDate = new Date(specificDate); if(hideUntilAsDate.getHours() == 0 && hideUntilAsDate.getMinutes() == 0 && hideUntilAsDate.getSeconds() == 0) { updated[0] = new HideUntilValue(DateUtilities.getDateString(new Date(specificDate)), @@ -264,21 +262,16 @@ public class HideUntilControlSet extends PopupControlSet implements OnItemSelect } @Override - protected String writeToModelAfterInitialized(Task task) { + protected void writeToModelAfterInitialized(Task task) { if(adapter == null || spinner == null) { - return null; + return; } HideUntilValue item = adapter.getItem(spinner.getSelectedItemPosition()); if(item == null) { - return null; + return; } long value = task.createHideUntil(item.setting, item.date); task.setValue(Task.HIDE_UNTIL, value); - - if (value != 0) { - return activity.getString(R.string.TEA_hideUntil_message, DateAndTimePicker.getDisplayString(activity, value, false, false, false)); - } - return null; } } diff --git a/astrid/src/main/java/com/todoroo/astrid/ui/ImportanceControlSet.java b/astrid/src/main/java/com/todoroo/astrid/ui/ImportanceControlSet.java index 47cf3c45f..e7e13fabd 100644 --- a/astrid/src/main/java/com/todoroo/astrid/ui/ImportanceControlSet.java +++ b/astrid/src/main/java/com/todoroo/astrid/ui/ImportanceControlSet.java @@ -138,10 +138,9 @@ public class ImportanceControlSet extends TaskEditControlSet { } @Override - protected String writeToModelAfterInitialized(Task task) { + protected void writeToModelAfterInitialized(Task task) { if(getImportance() != null) { task.setValue(Task.IMPORTANCE, getImportance()); } - return null; } } diff --git a/astrid/src/main/java/com/todoroo/astrid/ui/PopupControlSet.java b/astrid/src/main/java/com/todoroo/astrid/ui/PopupControlSet.java index 562cfb024..b3ee26d74 100644 --- a/astrid/src/main/java/com/todoroo/astrid/ui/PopupControlSet.java +++ b/astrid/src/main/java/com/todoroo/astrid/ui/PopupControlSet.java @@ -147,11 +147,11 @@ public abstract class PopupControlSet extends TaskEditControlSet { } @Override - public String writeToModel(Task task) { + public void writeToModel(Task task) { if (initialized && dialog != null) { dialog.dismiss(); } - return super.writeToModel(task); + super.writeToModel(task); } @Override diff --git a/astrid/src/main/java/com/todoroo/astrid/ui/QuickAddBar.java b/astrid/src/main/java/com/todoroo/astrid/ui/QuickAddBar.java index 90632ee02..9220b9ca7 100644 --- a/astrid/src/main/java/com/todoroo/astrid/ui/QuickAddBar.java +++ b/astrid/src/main/java/com/todoroo/astrid/ui/QuickAddBar.java @@ -261,7 +261,6 @@ public class QuickAddBar extends LinearLayout { if (title != null) { title = title.trim(); } - boolean assignedToMe = true; Task task = new Task(); if (title != null) { @@ -280,16 +279,10 @@ public class QuickAddBar extends LinearLayout { TaskService.createWithValues(task, fragment.getFilter().valuesForNewTasks, title); - if (Task.userIdIsEmail(task.getValue(Task.USER_ID))) { - } - resetControlSets(); addToCalendar(task, title); - if(!TextUtils.isEmpty(title)) { - } - TextView quickAdd = (TextView) findViewById(R.id.quickAddText); quickAdd.setText(""); //$NON-NLS-1$ @@ -297,9 +290,9 @@ public class QuickAddBar extends LinearLayout { fragment.loadTaskListContent(true); fragment.selectCustomId(task.getId()); if (task.getTransitory(TaskService.TRANS_QUICK_ADD_MARKUP) != null) { - showAlertForMarkupTask((AstridActivity) activity, task, title); + showAlertForMarkupTask(activity, task, title); } else if (!TextUtils.isEmpty(task.getValue(Task.RECURRENCE))) { - showAlertForRepeatingTask((AstridActivity) activity, task); + showAlertForRepeatingTask(activity, task); } } diff --git a/astrid/src/main/java/com/todoroo/astrid/ui/RandomReminderControlSet.java b/astrid/src/main/java/com/todoroo/astrid/ui/RandomReminderControlSet.java index 00d1052d4..54ed8cc4b 100644 --- a/astrid/src/main/java/com/todoroo/astrid/ui/RandomReminderControlSet.java +++ b/astrid/src/main/java/com/todoroo/astrid/ui/RandomReminderControlSet.java @@ -95,16 +95,13 @@ public class RandomReminderControlSet extends TaskEditControlSet { } @Override - protected String writeToModelAfterInitialized(Task task) { + protected void writeToModelAfterInitialized(Task task) { if(settingCheckbox.isChecked()) { int hourValue = hours[periodSpinner.getSelectedItemPosition()]; task.setValue(Task.REMINDER_PERIOD, hourValue * DateUtilities.ONE_HOUR); - if (task.getSetValues().containsKey(Task.REMINDER_PERIOD.name)) { - } } else { task.setValue(Task.REMINDER_PERIOD, 0L); } - return null; } public boolean hasRandomReminder() { diff --git a/astrid/src/main/java/com/todoroo/astrid/ui/ReminderControlSet.java b/astrid/src/main/java/com/todoroo/astrid/ui/ReminderControlSet.java index 06cc16438..6034e10b0 100644 --- a/astrid/src/main/java/com/todoroo/astrid/ui/ReminderControlSet.java +++ b/astrid/src/main/java/com/todoroo/astrid/ui/ReminderControlSet.java @@ -157,12 +157,11 @@ public class ReminderControlSet extends PopupControlSet { } @Override - protected String writeToModelAfterInitialized(Task task) { + protected void writeToModelAfterInitialized(Task task) { task.setValue(Task.REMINDER_FLAGS, getValue()); randomControlSet.writeToModel(task); alarmControl.writeToModel(task); - return null; } @Override diff --git a/astrid/src/main/java/com/todoroo/astrid/utility/TitleParser.java b/astrid/src/main/java/com/todoroo/astrid/utility/TitleParser.java index 261585d6e..94f4790ed 100644 --- a/astrid/src/main/java/com/todoroo/astrid/utility/TitleParser.java +++ b/astrid/src/main/java/com/todoroo/astrid/utility/TitleParser.java @@ -38,8 +38,7 @@ public class TitleParser { pattern = pattern.substring(1); } if ('(' == pattern.charAt(0)) { - String list = pattern.substring(1, pattern.length()-1); - return list; + return pattern.substring(1, pattern.length()-1); } return pattern; } @@ -188,8 +187,7 @@ public class TitleParser { Matcher m = pattern.matcher(inputText); if (m.find()) { String toParse = stripParens(m.group(0)); - Calendar dayCal = AstridChronic.parse(toParse).getBeginCalendar(); - cal = dayCal; + cal = AstridChronic.parse(toParse).getBeginCalendar(); inputText = removeIfParenthetical(m, inputText); //then put it into task } diff --git a/astrid/src/main/java/com/todoroo/astrid/voice/Api6VoiceOutputAssistant.java b/astrid/src/main/java/com/todoroo/astrid/voice/Api6VoiceOutputAssistant.java index 7f94ee78b..248194866 100644 --- a/astrid/src/main/java/com/todoroo/astrid/voice/Api6VoiceOutputAssistant.java +++ b/astrid/src/main/java/com/todoroo/astrid/voice/Api6VoiceOutputAssistant.java @@ -67,7 +67,7 @@ public class Api6VoiceOutputAssistant implements OnInitListener, VoiceOutputAssi } private void initTTS() { - mTts = new TextToSpeech(context, (OnInitListener)this); + mTts = new TextToSpeech(context, this); } @Override diff --git a/astrid/src/main/java/com/todoroo/astrid/widget/TasksWidget.java b/astrid/src/main/java/com/todoroo/astrid/widget/TasksWidget.java index 1a711c272..4e7dc5fc6 100644 --- a/astrid/src/main/java/com/todoroo/astrid/widget/TasksWidget.java +++ b/astrid/src/main/java/com/todoroo/astrid/widget/TasksWidget.java @@ -152,9 +152,8 @@ public class TasksWidget extends AppWidgetProvider { // "System server dead" was sometimes thrown here by the OS. Abort if that happens } } else { - int id = extrasId; - RemoteViews updateViews = buildUpdate(this, id); - manager.updateAppWidget(id, updateViews); + RemoteViews updateViews = buildUpdate(this, extrasId); + manager.updateAppWidget(extrasId, updateViews); } stopSelf(); @@ -194,7 +193,7 @@ public class TasksWidget extends AppWidgetProvider { database.openForReading(); cursor = taskService.fetchFiltered(query, null, Task.ID, Task.TITLE, Task.DUE_DATE, Task.COMPLETION_DATE); Task task = new Task(); - int i = 0; + int i; for (i = 0; i < cursor.getCount() && i < numberOfTasks; i++) { cursor.moveToPosition(i); task.readFromCursor(cursor); @@ -320,7 +319,6 @@ public class TasksWidget extends AppWidgetProvider { * Android 2.1. */ private RemoteViews getThemedRemoteViews(Context context) { - int theme = ThemeService.getWidgetTheme(); String packageName = context.getPackageName(); Resources r = context.getResources(); int layout; @@ -370,13 +368,12 @@ public class TasksWidget extends AppWidgetProvider { ((FilterWithCustomIntent) filter).customTaskList = component; String serializedExtras = Preferences.getStringValue(WidgetConfigActivity.PREF_CUSTOM_EXTRAS + widgetId); - Bundle extras = AndroidUtilities.bundleFromSerializedString(serializedExtras); - ((FilterWithCustomIntent) filter).customExtras = extras; + ((FilterWithCustomIntent) filter).customExtras = AndroidUtilities.bundleFromSerializedString(serializedExtras); } // Validate tagData long id = Preferences.getLong(WidgetConfigActivity.PREF_TAG_ID + widgetId, 0); - TagData tagData = null; + TagData tagData; if (id > 0) { tagData = tagDataService.fetchById(id, TagData.ID, TagData.NAME, TagData.TASK_COUNT, TagData.UUID, TagData.PICTURE, TagData.USER_ID, TagData.MEMBER_COUNT); if (tagData != null && !tagData.getValue(TagData.NAME).equals(filter.title)) { // Tag has been renamed; rebuild filter diff --git a/astrid/src/main/res/values/strings-core.xml b/astrid/src/main/res/values/strings-core.xml index 95d49a5c8..2fb8c96df 100644 --- a/astrid/src/main/res/values/strings-core.xml +++ b/astrid/src/main/res/values/strings-core.xml @@ -229,9 +229,6 @@ Hide until %s - - Task will be hidden until %s - Description diff --git a/astrid/src/main/res/values/strings-gcal.xml b/astrid/src/main/res/values/strings-gcal.xml index b703c3e64..6ac50f18b 100644 --- a/astrid/src/main/res/values/strings-gcal.xml +++ b/astrid/src/main/res/values/strings-gcal.xml @@ -16,11 +16,6 @@ Open Calendar Event - - - - Calendar event also updated! - Don\'t add