From f326be47c4fb65c63738afe7fbe85108828cc6db Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Mon, 5 Aug 2013 09:05:33 -0500 Subject: [PATCH] Remove unused method parameters --- .../service/AbstractDependencyInjector.java | 2 +- .../service/DependencyInjectionService.java | 2 +- .../andlib/utility/AndroidUtilities.java | 2 +- .../todoroo/andlib/utility/DateUtilities.java | 18 +++--- .../astrid/sync/SyncProviderUtilities.java | 4 +- .../astrid/actfm/CommentsFragment.java | 10 ++-- .../astrid/actfm/TagCommentsFragment.java | 2 +- .../astrid/actfm/TagSettingsActivity.java | 2 - .../todoroo/astrid/actfm/TagViewFragment.java | 10 ---- .../astrid/actfm/TaskCommentsFragment.java | 2 +- .../actfm/sync/ActFmPreferenceService.java | 4 -- .../astrid/actfm/sync/ActFmSyncService.java | 1 - .../astrid/backup/TasksXmlImporter.java | 3 +- .../astrid/core/CoreFilterExposer.java | 3 - .../astrid/core/CustomFilterExposer.java | 2 - .../todoroo/astrid/files/FileUtilities.java | 2 +- .../astrid/gcal/CalendarReminderActivity.java | 2 +- .../astrid/gtasks/GtasksMetadataService.java | 2 - .../gtasks/GtasksPreferenceService.java | 5 -- .../astrid/gtasks/GtasksTaskListUpdater.java | 5 +- .../astrid/gtasks/auth/AuthManager.java | 2 +- .../astrid/gtasks/auth/ModernAuthManager.java | 6 +- .../astrid/locale/LocaleEditAlerts.java | 2 - .../astrid/notes/EditNoteActivity.java | 2 +- .../reminders/NotificationFragment.java | 3 +- .../ReminderDebugContextActions.java | 4 +- .../astrid/reminders/ReminderDialog.java | 10 +--- .../astrid/repeats/RepeatControlSet.java | 4 +- .../OrderedMetadataListFragmentHelper.java | 14 ++--- .../subtasks/OrderedMetadataListUpdater.java | 59 +++++++------------ .../todoroo/astrid/tags/TagCaseMigrator.java | 4 +- .../tags/reusable/FeaturedListFilterMode.java | 3 +- .../com/timsu/astrid/activities/TaskList.java | 11 +--- .../astrid/data/task/TaskController.java | 13 ++-- .../data/task/TaskModelForHandlers.java | 4 +- .../astrid/activity/DefaultFilterMode.java | 3 +- .../astrid/activity/EditPreferences.java | 2 +- .../activity/ExpandableListFragment.java | 9 +-- .../astrid/activity/FilterModeSpec.java | 3 +- .../astrid/activity/TaskEditFragment.java | 4 -- .../astrid/activity/TaskListActivity.java | 18 +----- .../astrid/activity/TaskListFragment.java | 13 +--- .../todoroo/astrid/adapter/TaskAdapter.java | 6 +- .../todoroo/astrid/adapter/UpdateAdapter.java | 6 +- .../astrid/api/TaskContextActionExposer.java | 2 +- .../src/com/todoroo/astrid/dao/TaskDao.java | 4 +- .../helper/TaskAdapterAddOnManager.java | 7 +-- .../service/Astrid2To3UpgradeHelper.java | 5 +- .../astrid/service/StartupService.java | 7 --- .../astrid/service/UpdateMessageService.java | 8 +-- .../astrid/service/UpgradeService.java | 4 +- .../todoroo/astrid/ui/AstridTimePicker.java | 2 +- .../todoroo/astrid/ui/DateAndTimePicker.java | 4 +- .../astrid/ui/DeadlineNumberPicker.java | 4 -- .../todoroo/astrid/ui/DraggableListView.java | 8 +-- .../astrid/ui/EditTitleControlSet.java | 2 +- .../astrid/ui/HideUntilControlSet.java | 2 +- .../astrid/ui/ImportanceControlSet.java | 4 +- .../com/todoroo/astrid/ui/NumberPicker.java | 22 +++---- .../todoroo/astrid/ui/NumberPickerDialog.java | 4 +- .../astrid/ui/TimeDurationControlSet.java | 2 +- .../astrid/utility/AstridPreferences.java | 2 - .../astrid/utility/SyncMetadataService.java | 4 +- .../voice/Api6VoiceOutputAssistant.java | 2 +- .../astrid/voice/VoiceOutputService.java | 7 +-- .../service/DependencyInjectionTests.java | 12 ++-- .../andlib/utility/DateUtilitiesTest.java | 4 +- .../astrid/gtasks/GtasksIndentActionTest.java | 4 +- .../astrid/gtasks/GtasksTaskMovingTest.java | 4 +- .../astrid/repeats/AdvancedRepeatTests.java | 4 +- .../repeats/RepeatAfterCompleteTests.java | 4 +- 71 files changed, 147 insertions(+), 279 deletions(-) diff --git a/api/src/com/todoroo/andlib/service/AbstractDependencyInjector.java b/api/src/com/todoroo/andlib/service/AbstractDependencyInjector.java index 85ed10d26..00d242d7a 100644 --- a/api/src/com/todoroo/andlib/service/AbstractDependencyInjector.java +++ b/api/src/com/todoroo/andlib/service/AbstractDependencyInjector.java @@ -57,7 +57,7 @@ abstract public class AbstractDependencyInjector { * @param field field tagged with {link Autowired} annotation * @return object to assign to this field, or null */ - public Object getInjection(Object object, Field field) { + public Object getInjection(Field field) { if (injectables.containsKey(field.getName())) { Object injection = injectables.get(field.getName()); diff --git a/api/src/com/todoroo/andlib/service/DependencyInjectionService.java b/api/src/com/todoroo/andlib/service/DependencyInjectionService.java index 10ed53dd1..54427c71e 100644 --- a/api/src/com/todoroo/andlib/service/DependencyInjectionService.java +++ b/api/src/com/todoroo/andlib/service/DependencyInjectionService.java @@ -108,7 +108,7 @@ public class DependencyInjectionService { } for (AbstractDependencyInjector injector : injectors) { - Object injection = injector.getInjection(caller, field); + Object injection = injector.getInjection(field); if (injection != null) { field.set(caller, injection); return; diff --git a/api/src/com/todoroo/andlib/utility/AndroidUtilities.java b/api/src/com/todoroo/andlib/utility/AndroidUtilities.java index 31afee9f3..8bbc908ee 100644 --- a/api/src/com/todoroo/andlib/utility/AndroidUtilities.java +++ b/api/src/com/todoroo/andlib/utility/AndroidUtilities.java @@ -1004,7 +1004,7 @@ public class AndroidUtilities { * @param activity * @param popup */ - public static void tryDismissPopup(Activity activity, final PopupWindow popup) { + public static void tryDismissPopup(final PopupWindow popup) { if (popup == null) { return; } diff --git a/api/src/com/todoroo/andlib/utility/DateUtilities.java b/api/src/com/todoroo/andlib/utility/DateUtilities.java index aea50892e..ea87de7be 100644 --- a/api/src/com/todoroo/andlib/utility/DateUtilities.java +++ b/api/src/com/todoroo/andlib/utility/DateUtilities.java @@ -144,7 +144,7 @@ public class DateUtilities { * @return date, with month, day, and year */ - public static String getDateString(Context context, Date date, boolean includeYear) { + public static String getDateString(Date date, boolean includeYear) { String month = DateUtils.getMonthString(date.getMonth() + Calendar.JANUARY, DateUtils.LENGTH_MEDIUM); String value; @@ -170,8 +170,8 @@ public class DateUtilities { return standardDate; } - public static String getDateString(Context context, Date date) { - return getDateString(context, date, true); + public static String getDateString(Date date) { + return getDateString(date, true); } /** @@ -180,7 +180,7 @@ public class DateUtilities { * @return date, with month, day, and year */ - public static String getDateStringHideYear(Context context, Date date) { + public static String getDateStringHideYear(Date date) { String month = DateUtils.getMonthString(date.getMonth() + Calendar.JANUARY, DateUtils.LENGTH_MEDIUM); String value; @@ -211,9 +211,9 @@ public class DateUtilities { * @return date format as getDateFormat with weekday */ - public static String getDateStringWithWeekday(Context context, Date date) { + public static String getDateStringWithWeekday(Date date) { String weekday = getWeekday(date); - return weekday + ", " + getDateString(context, date); + return weekday + ", " + getDateString(date); } /** @@ -238,7 +238,7 @@ public class DateUtilities { */ public static String getDateStringWithTimeAndWeekday(Context context, Date date) { - return getDateStringWithWeekday(context, date) + " " + getTimeString(context, date); + return getDateStringWithWeekday(date) + " " + getTimeString(context, date); } /** @@ -246,7 +246,7 @@ public class DateUtilities { */ public static String getDateStringWithTime(Context context, Date date) { - return getDateString(context, date) + " " + getTimeString(context, date); + return getDateString(date) + " " + getTimeString(context, date); } /** @@ -273,7 +273,7 @@ public class DateUtilities { return abbreviated ? DateUtilities.getWeekdayShort(new Date(date)) : DateUtilities.getWeekday(new Date(date)); } - return DateUtilities.getDateStringHideYear(context, new Date(date)); + return DateUtilities.getDateStringHideYear(new Date(date)); } public static boolean isEndOfMonth(Date d) { diff --git a/api/src/com/todoroo/astrid/sync/SyncProviderUtilities.java b/api/src/com/todoroo/astrid/sync/SyncProviderUtilities.java index 83d009e8f..6b7ac4fa3 100644 --- a/api/src/com/todoroo/astrid/sync/SyncProviderUtilities.java +++ b/api/src/com/todoroo/astrid/sync/SyncProviderUtilities.java @@ -164,11 +164,11 @@ abstract public class SyncProviderUtilities { String lastError = getLastError(); if (!TextUtils.isEmpty(lastError)) { String type = getLastErrorType(); - reportLastErrorImpl(lastError, type); + reportLastErrorImpl(); } } - protected void reportLastErrorImpl(String lastError, String type) { + protected void reportLastErrorImpl() { // Subclasses can override if necessary } diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/CommentsFragment.java b/astrid/plugin-src/com/todoroo/astrid/actfm/CommentsFragment.java index f027d4262..daf38438d 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/CommentsFragment.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/CommentsFragment.java @@ -122,7 +122,7 @@ public abstract class CommentsFragment extends SherlockListFragment { protected abstract UserActivity createUpdate(); - protected abstract void performFetch(boolean manual, SyncMessageCallback done); + protected abstract void performFetch(SyncMessageCallback done); protected abstract boolean canLoadMoreHistory(); @@ -222,7 +222,7 @@ public abstract class CommentsFragment extends SherlockListFragment { }); refreshUpdatesList(); - refreshActivity(false); // start a pull in the background + refreshActivity(); // start a pull in the background } protected void resetPictureButton() { @@ -336,10 +336,10 @@ public abstract class CommentsFragment extends SherlockListFragment { public void runOnErrors(List errors) {/**/} }; - protected void refreshActivity(boolean manual) { + protected void refreshActivity() { if (actFmPreferenceService.isLoggedIn()) { if (hasModel()) { - performFetch(manual, doneRunnable); + performFetch(doneRunnable); } else { doneRunnable.runOnSuccess(); } @@ -375,7 +375,7 @@ public abstract class CommentsFragment extends SherlockListFragment { case MENU_REFRESH_ID: { - refreshActivity(true); + refreshActivity(); return true; } diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/TagCommentsFragment.java b/astrid/plugin-src/com/todoroo/astrid/actfm/TagCommentsFragment.java index 124561feb..4504a4c4b 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/TagCommentsFragment.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/TagCommentsFragment.java @@ -150,7 +150,7 @@ public class TagCommentsFragment extends CommentsFragment { } @Override - protected void performFetch(boolean manual, SyncMessageCallback done) { + protected void performFetch(SyncMessageCallback done) { if (tagData != null) { ActFmSyncThread.getInstance().enqueueMessage(new BriefMe(UserActivity.class, null, tagData.getValue(TagData.USER_ACTIVITIES_PUSHED_AT), BriefMe.TAG_ID_KEY, tagData.getUuid()), done); new FetchHistory(tagDataDao, TagData.HISTORY_FETCH_DATE, TagData.HISTORY_HAS_MORE, NameMaps.TABLE_ID_TAGS, diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java b/astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java index 5d9f012d9..f528e6ec4 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java @@ -10,11 +10,9 @@ import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.graphics.Bitmap; -import android.graphics.Color; import android.os.Bundle; import android.text.TextUtils; import android.util.DisplayMetrics; -import android.util.Log; import android.view.View; import android.view.View.OnClickListener; import android.view.ViewGroup.LayoutParams; diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java b/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java index 44a9eb19e..1f434c940 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java @@ -13,15 +13,11 @@ import android.content.DialogInterface; import android.content.Intent; import android.content.IntentFilter; import android.os.Bundle; -import android.text.TextUtils; -import android.util.DisplayMetrics; import android.view.MotionEvent; import android.view.View; import android.view.View.OnClickListener; import android.view.View.OnTouchListener; import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.LinearLayout; import android.widget.TextView; import com.actionbarsherlock.view.Menu; @@ -55,7 +51,6 @@ import com.todoroo.astrid.dao.MetadataDao; import com.todoroo.astrid.dao.MetadataDao.MetadataCriteria; import com.todoroo.astrid.dao.TagDataDao; import com.todoroo.astrid.dao.TagMetadataDao; -import com.todoroo.astrid.dao.TaskDao.TaskCriteria; import com.todoroo.astrid.dao.TaskListMetadataDao; import com.todoroo.astrid.dao.UserDao; import com.todoroo.astrid.data.RemoteModel; @@ -65,22 +60,17 @@ import com.todoroo.astrid.data.TagMetadata; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.TaskListMetadata; import com.todoroo.astrid.data.UserActivity; -import com.todoroo.astrid.helper.AsyncImageView; import com.todoroo.astrid.service.SyncV2Service; import com.todoroo.astrid.service.TagDataService; import com.todoroo.astrid.service.ThemeService; import com.todoroo.astrid.subtasks.SubtasksTagListFragment; import com.todoroo.astrid.tags.TagFilterExposer; import com.todoroo.astrid.tags.TagService; -import com.todoroo.astrid.tags.TagService.Tag; import com.todoroo.astrid.tags.TaskToTagMetadata; import com.todoroo.astrid.utility.AstridPreferences; import com.todoroo.astrid.utility.Flags; -import com.todoroo.astrid.utility.ResourceDrawableCache; import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/TaskCommentsFragment.java b/astrid/plugin-src/com/todoroo/astrid/actfm/TaskCommentsFragment.java index 116d9a374..5bcb88fb6 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/TaskCommentsFragment.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/TaskCommentsFragment.java @@ -96,7 +96,7 @@ public class TaskCommentsFragment extends CommentsFragment { } @Override - protected void performFetch(boolean manual, SyncMessageCallback done) { + protected void performFetch(SyncMessageCallback done) { if (task != null) { ActFmSyncThread.getInstance().enqueueMessage(new BriefMe(UserActivity.class, null, task.getValue(Task.USER_ACTIVITIES_PUSHED_AT), BriefMe.TASK_ID_KEY, task.getUuid()), done); new FetchHistory(taskDao, Task.HISTORY_FETCH_DATE, Task.HISTORY_HAS_MORE, NameMaps.TABLE_ID_TASKS, diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmPreferenceService.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmPreferenceService.java index f1eb775fc..fe5c144ad 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmPreferenceService.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmPreferenceService.java @@ -134,10 +134,6 @@ public class ActFmPreferenceService extends SyncProviderUtilities { private static JSONObject user = null; - @Override - protected void reportLastErrorImpl(String lastError, String type) { - } - public synchronized static JSONObject thisUser() { if (user == null) { user = new JSONObject(); diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java index 314727095..b5d82acf9 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java @@ -24,7 +24,6 @@ import org.json.JSONObject; import java.io.IOException; import java.util.ArrayList; -import java.util.List; /** * Service for synchronizing data on Astrid.com server with local. diff --git a/astrid/plugin-src/com/todoroo/astrid/backup/TasksXmlImporter.java b/astrid/plugin-src/com/todoroo/astrid/backup/TasksXmlImporter.java index ed3fb6703..a78f98a6c 100644 --- a/astrid/plugin-src/com/todoroo/astrid/backup/TasksXmlImporter.java +++ b/astrid/plugin-src/com/todoroo/astrid/backup/TasksXmlImporter.java @@ -583,8 +583,7 @@ public class TasksXmlImporter { if (preferred != null) { Date preferredDate = BackupDateUtilities.getDateFromIso8601String(value); upgradeNotes = "Project Deadline: " + - DateUtilities.getDateString(ContextManager.getContext(), - preferredDate); + DateUtilities.getDateString(preferredDate); } task.setValue(Task.DUE_DATE, BackupDateUtilities.getTaskDueDateFromIso8601String(value).getTime()); diff --git a/astrid/plugin-src/com/todoroo/astrid/core/CoreFilterExposer.java b/astrid/plugin-src/com/todoroo/astrid/core/CoreFilterExposer.java index b2ea70f57..66dbaccfa 100644 --- a/astrid/plugin-src/com/todoroo/astrid/core/CoreFilterExposer.java +++ b/astrid/plugin-src/com/todoroo/astrid/core/CoreFilterExposer.java @@ -6,7 +6,6 @@ package com.todoroo.astrid.core; import android.content.BroadcastReceiver; -import android.content.ComponentName; import android.content.ContentValues; import android.content.Context; import android.content.Intent; @@ -16,7 +15,6 @@ import android.graphics.drawable.BitmapDrawable; import com.timsu.astrid.R; import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.sql.Criterion; -import com.todoroo.andlib.sql.Join; import com.todoroo.andlib.sql.Query; import com.todoroo.andlib.sql.QueryTemplate; import com.todoroo.andlib.utility.AndroidUtilities; @@ -26,7 +24,6 @@ import com.todoroo.astrid.api.AstridApiConstants; import com.todoroo.astrid.api.AstridFilterExposer; import com.todoroo.astrid.api.Filter; import com.todoroo.astrid.api.FilterListItem; -import com.todoroo.astrid.api.FilterWithCustomIntent; import com.todoroo.astrid.api.PermaSql; import com.todoroo.astrid.dao.MetadataDao.MetadataCriteria; import com.todoroo.astrid.dao.TaskDao.TaskCriteria; diff --git a/astrid/plugin-src/com/todoroo/astrid/core/CustomFilterExposer.java b/astrid/plugin-src/com/todoroo/astrid/core/CustomFilterExposer.java index d5a75d5fd..d09310bc9 100644 --- a/astrid/plugin-src/com/todoroo/astrid/core/CustomFilterExposer.java +++ b/astrid/plugin-src/com/todoroo/astrid/core/CustomFilterExposer.java @@ -19,13 +19,11 @@ import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.service.DependencyInjectionService; -import com.todoroo.andlib.sql.Criterion; import com.todoroo.andlib.sql.Order; import com.todoroo.andlib.sql.Query; import com.todoroo.andlib.sql.QueryTemplate; import com.todoroo.andlib.utility.DialogUtilities; import com.todoroo.andlib.utility.Preferences; -import com.todoroo.astrid.actfm.sync.ActFmPreferenceService; import com.todoroo.astrid.activity.FilterListFragment; import com.todoroo.astrid.api.AstridApiConstants; import com.todoroo.astrid.api.AstridFilterExposer; diff --git a/astrid/plugin-src/com/todoroo/astrid/files/FileUtilities.java b/astrid/plugin-src/com/todoroo/astrid/files/FileUtilities.java index d472f76b7..50a9e71ee 100644 --- a/astrid/plugin-src/com/todoroo/astrid/files/FileUtilities.java +++ b/astrid/plugin-src/com/todoroo/astrid/files/FileUtilities.java @@ -24,7 +24,7 @@ public class FileUtilities { * @return Date string for use with file attachment names */ public static String getDateStringForFilename(Context context, Date date) { - return DateUtilities.getDateStringHideYear(context, date) + ", " + getTimeStringForFilename(context, date); //$NON-NLS-1$ + return DateUtilities.getDateStringHideYear(date) + ", " + getTimeStringForFilename(context, date); //$NON-NLS-1$ } diff --git a/astrid/plugin-src/com/todoroo/astrid/gcal/CalendarReminderActivity.java b/astrid/plugin-src/com/todoroo/astrid/gcal/CalendarReminderActivity.java index b6d849b0e..845b84a89 100644 --- a/astrid/plugin-src/com/todoroo/astrid/gcal/CalendarReminderActivity.java +++ b/astrid/plugin-src/com/todoroo/astrid/gcal/CalendarReminderActivity.java @@ -203,7 +203,7 @@ public class CalendarReminderActivity extends Activity { @Override public void onClick(DialogInterface dialog, int which) { createNewList(tag.getValue(TagData.NAME) + " " - + DateUtilities.getDateStringHideYear(CalendarReminderActivity.this, new Date(startTime))); + + DateUtilities.getDateStringHideYear(new Date(startTime))); } }, new DialogInterface.OnClickListener() { diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksMetadataService.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksMetadataService.java index 1377d9bae..22dffa595 100644 --- a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksMetadataService.java +++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksMetadataService.java @@ -10,7 +10,6 @@ import android.text.TextUtils; import com.todoroo.andlib.data.AbstractModel; import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.service.Autowired; -import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.andlib.sql.Criterion; import com.todoroo.andlib.sql.Field; @@ -44,7 +43,6 @@ public final class GtasksMetadataService extends SyncMetadataService implements OrderedListFragm @Override public void beforeSetUpTaskList(Filter filter) { - updater.initialize(list, filter); + updater.initialize(); } @Override @@ -149,9 +149,9 @@ public class OrderedMetadataListFragmentHelper implements OrderedListFragm try { if (to >= getListView().getCount()) { - updater.moveTo(getFilter(), list, targetTaskId, -1); + updater.moveTo(list, targetTaskId, -1); } else { - updater.moveTo(getFilter(), list, targetTaskId, destinationTaskId); + updater.moveTo(list, targetTaskId, destinationTaskId); } } catch (Exception e) { Log.e("drag", "Drag Error", e); //$NON-NLS-1$ //$NON-NLS-2$ @@ -178,7 +178,7 @@ public class OrderedMetadataListFragmentHelper implements OrderedListFragm return; // This can happen with gestures on empty parts of the list (e.g. extra space below tasks) } try { - updater.indent(getFilter(), list, targetTaskId, delta); + updater.indent(list, targetTaskId, delta); } catch (Exception e) { Log.e("drag", "Indent Error", e); //$NON-NLS-1$ //$NON-NLS-2$ } @@ -286,12 +286,12 @@ public class OrderedMetadataListFragmentHelper implements OrderedListFragm final ArrayList chained = new ArrayList(); final int parentIndent = item.getValue(updater.indentProperty()); - updater.applyToChildren(getFilter(), list, itemId, new OrderedListNodeVisitor() { + updater.applyToChildren(list, itemId, new OrderedListNodeVisitor() { @Override public void visitNode(Node node) { Task childTask = taskService.fetchById(node.taskId, Task.RECURRENCE); if (!TextUtils.isEmpty(childTask.getValue(Task.RECURRENCE))) { - Metadata metadata = updater.getTaskMetadata(list, node.taskId); + Metadata metadata = updater.getTaskMetadata(node.taskId); metadata.setValue(updater.indentProperty(), parentIndent); metadataService.save(metadata); } @@ -323,7 +323,7 @@ public class OrderedMetadataListFragmentHelper implements OrderedListFragm @Override public void onDeleteTask(Task task) { - updater.onDeleteTask(getFilter(), list, task.getId()); + updater.onDeleteTask(list, task.getId()); taskAdapter.notifyDataSetInvalidated(); } diff --git a/astrid/plugin-src/com/todoroo/astrid/subtasks/OrderedMetadataListUpdater.java b/astrid/plugin-src/com/todoroo/astrid/subtasks/OrderedMetadataListUpdater.java index 0758f02aa..b066ab23d 100644 --- a/astrid/plugin-src/com/todoroo/astrid/subtasks/OrderedMetadataListUpdater.java +++ b/astrid/plugin-src/com/todoroo/astrid/subtasks/OrderedMetadataListUpdater.java @@ -8,7 +8,6 @@ package com.todoroo.astrid.subtasks; import com.todoroo.andlib.data.Property.IntegerProperty; import com.todoroo.andlib.data.Property.LongProperty; import com.todoroo.andlib.service.DependencyInjectionService; -import com.todoroo.astrid.api.Filter; import com.todoroo.astrid.core.PluginServices; import com.todoroo.astrid.data.Metadata; import com.todoroo.astrid.data.Task; @@ -31,7 +30,7 @@ abstract public class OrderedMetadataListUpdater { // --- abstract and empty - abstract protected Metadata getTaskMetadata(LIST list, long taskId); + abstract protected Metadata getTaskMetadata(long taskId); abstract protected IntegerProperty indentProperty(); @@ -39,15 +38,11 @@ abstract public class OrderedMetadataListUpdater { abstract protected LongProperty parentProperty(); - abstract protected void iterateThroughList(Filter filter, LIST list, OrderedListIterator iterator); + abstract protected void iterateThroughList(LIST list, OrderedListIterator iterator); abstract protected Metadata createEmptyMetadata(LIST list, long taskId); - /** - * @param list - * @param filter - */ - protected void initialize(LIST list, Filter filter) { + protected void initialize() { // } @@ -65,23 +60,12 @@ abstract public class OrderedMetadataListUpdater { // } - /** - * @param list - * @param taskId - * @param metadata - * @param indent - * @param order - */ - protected void beforeSaveIndent(LIST list, long taskId, Metadata metadata, int indent, int order) { - // - } - // --- task indenting /** * Indent a task and all its children */ - public void indent(final Filter filter, final LIST list, final long targetTaskId, final int delta) { + public void indent(final LIST list, final long targetTaskId, final int delta) { if (list == null) { return; } @@ -93,7 +77,7 @@ abstract public class OrderedMetadataListUpdater { final AtomicLong previousTask = new AtomicLong(Task.NO_ID); final AtomicLong globalOrder = new AtomicLong(-1); - iterateThroughList(filter, list, new OrderedListIterator() { + iterateThroughList(list, new OrderedListIterator() { @Override public void processTask(long taskId, Metadata metadata) { if (!metadata.isSaved()) { @@ -112,8 +96,7 @@ abstract public class OrderedMetadataListUpdater { metadata.setValue(indentProperty(), indent + delta); if (parentProperty() != null) { - long newParent = computeNewParent(filter, list, - taskId, indent + delta - 1); + long newParent = computeNewParent(list, taskId, indent + delta - 1); if (newParent == taskId) { metadata.setValue(parentProperty(), Task.NO_ID); } else { @@ -141,7 +124,7 @@ abstract public class OrderedMetadataListUpdater { } }); - onMovedOrIndented(getTaskMetadata(list, targetTaskId)); + onMovedOrIndented(getTaskMetadata(targetTaskId)); } /** @@ -153,13 +136,13 @@ abstract public class OrderedMetadataListUpdater { * @param newIndent * @return */ - private long computeNewParent(Filter filter, LIST list, long targetTaskId, int targetParentIndent) { + private long computeNewParent(LIST list, long targetTaskId, int targetParentIndent) { final AtomicInteger desiredParentIndent = new AtomicInteger(targetParentIndent); final AtomicLong targetTask = new AtomicLong(targetTaskId); final AtomicLong lastPotentialParent = new AtomicLong(Task.NO_ID); final AtomicBoolean computedParent = new AtomicBoolean(false); - iterateThroughList(filter, list, new OrderedListIterator() { + iterateThroughList(list, new OrderedListIterator() { @Override public void processTask(long taskId, Metadata metadata) { if (targetTask.get() == taskId) { @@ -187,13 +170,13 @@ abstract public class OrderedMetadataListUpdater { * * @param newTaskId task we will move above. if -1, moves to end of list */ - public void moveTo(Filter filter, LIST list, final long targetTaskId, + public void moveTo(LIST list, final long targetTaskId, final long moveBeforeTaskId) { if (list == null) { return; } - Node root = buildTreeModel(filter, list); + Node root = buildTreeModel(list); Node target = findNode(root, targetTaskId); if (target != null && target.parent != null) { @@ -219,7 +202,7 @@ abstract public class OrderedMetadataListUpdater { } traverseTreeAndWriteValues(list, root, new AtomicLong(0), -1); - onMovedOrIndented(getTaskMetadata(list, targetTaskId)); + onMovedOrIndented(getTaskMetadata(targetTaskId)); } private boolean ancestorOf(Node ancestor, Node descendant) { @@ -245,7 +228,7 @@ abstract public class OrderedMetadataListUpdater { protected void traverseTreeAndWriteValues(LIST list, Node node, AtomicLong order, int indent) { if (node.taskId != Task.NO_ID) { - Metadata metadata = getTaskMetadata(list, node.taskId); + Metadata metadata = getTaskMetadata(node.taskId); if (metadata == null) { metadata = createEmptyMetadata(list, node.taskId); } @@ -281,12 +264,12 @@ abstract public class OrderedMetadataListUpdater { return null; } - protected Node buildTreeModel(Filter filter, LIST list) { + protected Node buildTreeModel(LIST list) { final Node root = new Node(Task.NO_ID, null); final AtomicInteger previoustIndent = new AtomicInteger(-1); final AtomicReference currentNode = new AtomicReference(root); - iterateThroughList(filter, list, new OrderedListIterator() { + iterateThroughList(list, new OrderedListIterator() { @Override public void processTask(long taskId, Metadata metadata) { int indent = metadata.getValue(indentProperty()); @@ -335,10 +318,10 @@ abstract public class OrderedMetadataListUpdater { /** * Apply an operation only to the children of the task */ - public void applyToChildren(Filter filter, LIST list, long targetTaskId, + public void applyToChildren(LIST list, long targetTaskId, OrderedListNodeVisitor visitor) { - Node root = buildTreeModel(filter, list); + Node root = buildTreeModel(list); Node target = findNode(root, targetTaskId); if (target != null) { @@ -362,12 +345,12 @@ abstract public class OrderedMetadataListUpdater { * @param list * @param targetTaskId */ - public void onDeleteTask(Filter filter, LIST list, final long targetTaskId) { + public void onDeleteTask(LIST list, final long targetTaskId) { if (list == null) { return; } - Node root = buildTreeModel(filter, list); + Node root = buildTreeModel(list); Node target = findNode(root, targetTaskId); if (target != null && target.parent != null) { @@ -384,8 +367,8 @@ abstract public class OrderedMetadataListUpdater { // --- utility - public void debugPrint(Filter filter, LIST list) { - iterateThroughList(filter, list, new OrderedListIterator() { + public void debugPrint(LIST list) { + iterateThroughList(list, new OrderedListIterator() { @Override public void processTask(long taskId, Metadata metadata) { System.err.format("id %d: order %d, indent:%d, parent:%d\n", taskId, //$NON-NLS-1$ diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/TagCaseMigrator.java b/astrid/plugin-src/com/todoroo/astrid/tags/TagCaseMigrator.java index 61087c728..fa008b884 100644 --- a/astrid/plugin-src/com/todoroo/astrid/tags/TagCaseMigrator.java +++ b/astrid/plugin-src/com/todoroo/astrid/tags/TagCaseMigrator.java @@ -5,8 +5,6 @@ */ package com.todoroo.astrid.tags; -import android.content.Context; - import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.DependencyInjectionService; @@ -46,7 +44,7 @@ public class TagCaseMigrator { private final HashMap nameToRemoteId = new HashMap(); private final HashMap nameCountMap = new HashMap(); - public void performTagCaseMigration( Context context) { + public void performTagCaseMigration() { if (!Preferences.getBoolean(PREF_CASE_MIGRATION_PERFORMED, false)) { TagService.Tag[] allTagData = TagService.getInstance().getGroupedTags( TagService.GROUPED_TAGS_BY_ALPHA, Criterion.all); diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/reusable/FeaturedListFilterMode.java b/astrid/plugin-src/com/todoroo/astrid/tags/reusable/FeaturedListFilterMode.java index d356a5c58..01a2d6dd4 100644 --- a/astrid/plugin-src/com/todoroo/astrid/tags/reusable/FeaturedListFilterMode.java +++ b/astrid/plugin-src/com/todoroo/astrid/tags/reusable/FeaturedListFilterMode.java @@ -7,7 +7,6 @@ import com.todoroo.astrid.activity.FilterListFragment; import com.todoroo.astrid.activity.FilterModeSpec; import com.todoroo.astrid.activity.TaskListFragment; import com.todoroo.astrid.api.Filter; -import com.todoroo.astrid.api.FilterListItem; import com.todoroo.astrid.core.CoreFilterExposer; import com.todoroo.astrid.ui.MainMenuPopover; @@ -44,7 +43,7 @@ public class FeaturedListFilterMode implements FilterModeSpec { } @Override - public void onFilterItemClickedCallback(FilterListItem item) { + public void onFilterItemClickedCallback() { // } diff --git a/astrid/src-legacy/com/timsu/astrid/activities/TaskList.java b/astrid/src-legacy/com/timsu/astrid/activities/TaskList.java index 87107bf5a..d71a1972e 100644 --- a/astrid/src-legacy/com/timsu/astrid/activities/TaskList.java +++ b/astrid/src-legacy/com/timsu/astrid/activities/TaskList.java @@ -29,22 +29,17 @@ public class TaskList extends Activity { super.onCreate(savedInstanceState); ContextManager.setContext(this); - launchTaskList(getIntent()); + launchTaskList(); } @Override protected void onNewIntent(Intent intent) { super.onNewIntent(intent); - launchTaskList(intent); + launchTaskList(); } - /** - * intent: ignored for now - * - * @param intent - */ - private void launchTaskList(Intent intent) { + private void launchTaskList() { Intent taskListIntent = new Intent(this, TaskListActivity.class); startActivity(taskListIntent); finish(); diff --git a/astrid/src-legacy/com/timsu/astrid/data/task/TaskController.java b/astrid/src-legacy/com/timsu/astrid/data/task/TaskController.java index 68a1f983d..4085fad1e 100644 --- a/astrid/src-legacy/com/timsu/astrid/data/task/TaskController.java +++ b/astrid/src-legacy/com/timsu/astrid/data/task/TaskController.java @@ -283,7 +283,7 @@ public class TaskController extends LegacyAbstractController { return true; } - onTaskSave(task, values, duringSync); + onTaskSave(task, values); saveSucessful = database.update(tasksTable, values, KEY_ROWID + "=" + id, null) > 0; @@ -317,7 +317,7 @@ public class TaskController extends LegacyAbstractController { * @param values * @param duringSync */ - private void onTaskSave(AbstractTaskModel task, ContentValues values, boolean duringSync) { + private void onTaskSave(AbstractTaskModel task, ContentValues values) { // save task completed date if (values.containsKey(AbstractTaskModel.PROGRESS_PERCENTAGE) && values.getAsInteger(AbstractTaskModel.PROGRESS_PERCENTAGE) @@ -388,7 +388,7 @@ public class TaskController extends LegacyAbstractController { // handle repeat RepeatInfo repeatInfo = model.getRepeat(); if (repeatInfo != null) { - model.repeatTaskBy(context, this, repeatInfo); + model.repeatTaskBy(context, repeatInfo); database.update(tasksTable, values, KEY_ROWID + "=" + task.getTaskIdentifier().getId(), null); } @@ -629,12 +629,7 @@ public class TaskController extends LegacyAbstractController { } } - /** - * Updates the alarm for the task identified by the given id - * - * @param taskId - */ - public void updateAlarmForTask(TaskIdentifier taskId) throws SQLException { + public void updateAlarmForTask() throws SQLException { // TaskModelForNotify task = fetchTaskForNotify(taskId); AlertController alertController = new AlertController(context); alertController.open(); diff --git a/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForHandlers.java b/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForHandlers.java index 73e1bb591..fafb5c588 100644 --- a/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForHandlers.java +++ b/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForHandlers.java @@ -41,12 +41,10 @@ public class TaskModelForHandlers extends AbstractTaskModel { * back the due dates and updates other task properties accordingly. * * @param context - * @param taskController * @param repeatInfo */ - public void repeatTaskBy(Context context, TaskController taskController, - RepeatInfo repeatInfo) { + public void repeatTaskBy(Context context, RepeatInfo repeatInfo) { // move dates back if (getDefiniteDueDate() != null) { diff --git a/astrid/src/com/todoroo/astrid/activity/DefaultFilterMode.java b/astrid/src/com/todoroo/astrid/activity/DefaultFilterMode.java index 0371a26a0..babeef5d2 100644 --- a/astrid/src/com/todoroo/astrid/activity/DefaultFilterMode.java +++ b/astrid/src/com/todoroo/astrid/activity/DefaultFilterMode.java @@ -4,7 +4,6 @@ import android.content.Context; import com.timsu.astrid.R; import com.todoroo.astrid.api.Filter; -import com.todoroo.astrid.api.FilterListItem; import com.todoroo.astrid.core.CoreFilterExposer; import com.todoroo.astrid.ui.MainMenuPopover; @@ -31,7 +30,7 @@ public class DefaultFilterMode implements FilterModeSpec { } @Override - public void onFilterItemClickedCallback(FilterListItem item) { + public void onFilterItemClickedCallback() { // } diff --git a/astrid/src/com/todoroo/astrid/activity/EditPreferences.java b/astrid/src/com/todoroo/astrid/activity/EditPreferences.java index 07ed02c6c..fe1e2ad19 100644 --- a/astrid/src/com/todoroo/astrid/activity/EditPreferences.java +++ b/astrid/src/com/todoroo/astrid/activity/EditPreferences.java @@ -564,7 +564,7 @@ public class EditPreferences extends TodorooPreferenceActivity { return; } try { - VoiceOutputService.getVoiceOutputInstance().handleActivityResult(requestCode, resultCode, data); + VoiceOutputService.getVoiceOutputInstance().handleActivityResult(requestCode, resultCode); } catch (VerifyError e) { // unavailable } diff --git a/astrid/src/com/todoroo/astrid/activity/ExpandableListFragment.java b/astrid/src/com/todoroo/astrid/activity/ExpandableListFragment.java index 163b2d875..83aeea74e 100644 --- a/astrid/src/com/todoroo/astrid/activity/ExpandableListFragment.java +++ b/astrid/src/com/todoroo/astrid/activity/ExpandableListFragment.java @@ -42,7 +42,7 @@ public class ExpandableListFragment extends Fragment = new AdapterView.OnItemClickListener() { @Override public void onItemClick(AdapterView parent, View v, int position, long id) { - onListItemClick((ListView) parent, v, position, id); + onListItemClick(); } }; @@ -116,13 +116,8 @@ public class ExpandableListFragment extends Fragment * Subclasses should override. Subclasses can call * getListView().getItemAtPosition(position) if they need to access the * data associated with the selected item. - * - * @param l The ListView where the click happened - * @param v The view that was clicked within the ListView - * @param position The position of the view in the list - * @param id The row id of the item that was clicked */ - public void onListItemClick(ListView l, View v, int position, long id) { + public void onListItemClick() { // override me } diff --git a/astrid/src/com/todoroo/astrid/activity/FilterModeSpec.java b/astrid/src/com/todoroo/astrid/activity/FilterModeSpec.java index 04e21a3d8..cbed395a2 100644 --- a/astrid/src/com/todoroo/astrid/activity/FilterModeSpec.java +++ b/astrid/src/com/todoroo/astrid/activity/FilterModeSpec.java @@ -3,7 +3,6 @@ package com.todoroo.astrid.activity; import android.content.Context; import com.todoroo.astrid.api.Filter; -import com.todoroo.astrid.api.FilterListItem; public interface FilterModeSpec { @@ -16,7 +15,7 @@ public interface FilterModeSpec { public int getMainMenuIconAttr(); - public void onFilterItemClickedCallback(FilterListItem item); + public void onFilterItemClickedCallback(); public boolean showComments(); diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java b/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java index 5c73899e6..1729a31a4 100755 --- a/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java +++ b/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java @@ -13,8 +13,6 @@ import android.content.DialogInterface; import android.content.Intent; import android.content.res.Resources.Theme; import android.graphics.Bitmap; -import android.graphics.Color; -import android.graphics.drawable.GradientDrawable; import android.os.Bundle; import android.os.Handler; import android.speech.RecognizerIntent; @@ -37,7 +35,6 @@ import android.widget.Button; import android.widget.EditText; import android.widget.FrameLayout; import android.widget.ImageButton; -import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.ScrollView; import android.widget.TextView; @@ -69,7 +66,6 @@ import com.todoroo.astrid.data.RemoteModel; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.TaskAttachment; import com.todoroo.astrid.data.TaskOutstanding; -import com.todoroo.astrid.data.User; import com.todoroo.astrid.files.AACRecordingActivity; import com.todoroo.astrid.files.FileExplore; import com.todoroo.astrid.files.FileUtilities; diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java index 8a7611f70..6a7761a4d 100644 --- a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java +++ b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java @@ -9,12 +9,10 @@ import android.animation.LayoutTransition; import android.app.Activity; import android.app.SearchManager; import android.content.Context; -import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; import android.support.v4.app.Fragment; import android.support.v4.view.ViewPager.OnPageChangeListener; -import android.text.TextUtils; import android.util.TypedValue; import android.view.KeyEvent; import android.view.View; @@ -33,7 +31,6 @@ import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.andlib.sql.QueryTemplate; import com.todoroo.andlib.utility.AndroidUtilities; -import com.todoroo.andlib.utility.DialogUtilities; import com.todoroo.andlib.utility.Preferences; import com.todoroo.astrid.actfm.CommentsFragment; import com.todoroo.astrid.actfm.TagSettingsActivity; @@ -44,7 +41,6 @@ import com.todoroo.astrid.api.AstridApiConstants; import com.todoroo.astrid.api.Filter; import com.todoroo.astrid.api.FilterListItem; import com.todoroo.astrid.core.CoreFilterExposer; -import com.todoroo.astrid.core.CustomFilterExposer; import com.todoroo.astrid.core.PluginServices; import com.todoroo.astrid.dao.TagMetadataDao; import com.todoroo.astrid.data.RemoteModel; @@ -64,10 +60,6 @@ import com.todoroo.astrid.utility.AstridPreferences; import com.todoroo.astrid.utility.Constants; import com.todoroo.astrid.utility.Flags; -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; - public class TaskListActivity extends AstridActivity implements MainMenuListener, OnPageChangeListener { public static final String TOKEN_SELECTED_FILTER = "selectedFilter"; //$NON-NLS-1$ @@ -394,7 +386,7 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener } boolean result = super.onFilterItemClicked(item); - filterModeSpec.onFilterItemClickedCallback(item); + filterModeSpec.onFilterItemClickedCallback(); return result; } @@ -494,8 +486,8 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener @Override protected void onPause() { super.onPause(); - AndroidUtilities.tryDismissPopup(this, listsPopover); - AndroidUtilities.tryDismissPopup(this, mainMenuPopover); + AndroidUtilities.tryDismissPopup(listsPopover); + AndroidUtilities.tryDismissPopup(mainMenuPopover); } @Override @@ -507,10 +499,6 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener lists.setText(item.title); } - public TaskListFragmentPagerAdapter getFragmentPagerAdapter() { - return tlfPagerAdapter; - } - @Override public void onPageSelected(int position) { if (tlfPagerAdapter != null) { diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java b/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java index e19df4b3b..a61beb2fa 100644 --- a/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java +++ b/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java @@ -34,14 +34,12 @@ import android.view.View.OnClickListener; import android.view.View.OnKeyListener; import android.view.View.OnTouchListener; import android.view.ViewGroup; -import android.widget.AbsListView; import android.widget.AdapterView; import android.widget.AdapterView.AdapterContextMenuInfo; import android.widget.AdapterView.OnItemClickListener; import android.widget.LinearLayout; import android.widget.ListView; -import com.actionbarsherlock.app.ActionBar; import com.actionbarsherlock.app.SherlockListFragment; import com.actionbarsherlock.view.Menu; import com.actionbarsherlock.view.MenuItem; @@ -903,11 +901,6 @@ public class TaskListFragment extends SherlockListFragment implements OnSortSele } } - public void onScroll(AbsListView view, int firstVisibleItem, - int visibleItemCount, int totalItemCount) { - // do nothing - } - /* * ====================================================================== * =================================================== managing list view @@ -966,7 +959,7 @@ public class TaskListFragment extends SherlockListFragment implements OnSortSele @Override public void onCompletedTask(Task item, boolean newState) { if (newState == true) { - onTaskCompleted(item); + onTaskCompleted(); } } }); @@ -1103,7 +1096,7 @@ public class TaskListFragment extends SherlockListFragment implements OnSortSele * * @param item task that was completed */ - protected void onTaskCompleted(Task item) { + protected void onTaskCompleted() { } /** @@ -1149,7 +1142,7 @@ public class TaskListFragment extends SherlockListFragment implements OnSortSele R.string.TAd_contextCopyTask); for (int i = 0; i < contextItemExposers.length; i++) { - Object label = contextItemExposers[i].getLabel(task); + Object label = contextItemExposers[i].getLabel(); if (label != null) { if (label instanceof Integer) { menu.add(id, CONTEXT_MENU_PLUGIN_ID_FIRST + i, diff --git a/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java b/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java index 807f749c1..6ede755e5 100644 --- a/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java +++ b/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java @@ -972,7 +972,7 @@ public class TaskAdapter extends CursorAdapter { return; } - reset(viewHolder, taskId); + reset(viewHolder); if (decorations.size() == 0) { return; } @@ -1009,7 +1009,7 @@ public class TaskAdapter extends CursorAdapter { } @Override - protected void reset(ViewHolder viewHolder, long taskId) { + protected void reset(ViewHolder viewHolder) { if (viewHolder.decorations != null) { for (View view : viewHolder.decorations) { viewHolder.rowBody.removeView(view); @@ -1025,7 +1025,7 @@ public class TaskAdapter extends CursorAdapter { } @Override - protected Intent createBroadcastIntent(Task task) { + protected Intent createBroadcastIntent() { return null; } } diff --git a/astrid/src/com/todoroo/astrid/adapter/UpdateAdapter.java b/astrid/src/com/todoroo/astrid/adapter/UpdateAdapter.java index dd1df5d82..1520f088b 100644 --- a/astrid/src/com/todoroo/astrid/adapter/UpdateAdapter.java +++ b/astrid/src/com/todoroo/astrid/adapter/UpdateAdapter.java @@ -357,7 +357,7 @@ public class UpdateAdapter extends CursorAdapter { final TextView nameView = (TextView) view.findViewById(R.id.title); { - nameView.setText(getHistoryComment((AstridActivity) fragment.getActivity(), history, user, linkColor, fromView)); + nameView.setText(getHistoryComment((AstridActivity) fragment.getActivity(), history, user, fromView)); nameView.setTextColor(grayColor); } @@ -503,7 +503,7 @@ public class UpdateAdapter extends CursorAdapter { } - public static String getHistoryComment(final AstridActivity context, History history, User user, String linkColor, String fromView) { + public static String getHistoryComment(final AstridActivity context, History history, User user, String fromView) { boolean hasTask = false; JSONArray taskAttrs = null; if (!TextUtils.isEmpty(history.getValue(History.TASK))) { @@ -721,7 +721,7 @@ public class UpdateAdapter extends CursorAdapter { try { time = DateUtilities.parseIso8601(value); Date date = new Date(time); - String result = DateUtilities.getDateString(context, date, includeYear); + String result = DateUtilities.getDateString(date, includeYear); if (hasTime) { result += ", " + DateUtilities.getTimeString(context, date, false); //$NON-NLS-1$ } diff --git a/astrid/src/com/todoroo/astrid/api/TaskContextActionExposer.java b/astrid/src/com/todoroo/astrid/api/TaskContextActionExposer.java index 5e9e04714..10441dc09 100644 --- a/astrid/src/com/todoroo/astrid/api/TaskContextActionExposer.java +++ b/astrid/src/com/todoroo/astrid/api/TaskContextActionExposer.java @@ -35,7 +35,7 @@ public interface TaskContextActionExposer { * @param task * @return null if no item should be displayed, or string or id */ - public Object getLabel(Task task); + public Object getLabel(); /** * Call context menu action diff --git a/astrid/src/com/todoroo/astrid/dao/TaskDao.java b/astrid/src/com/todoroo/astrid/dao/TaskDao.java index c42913f41..02cd2fd12 100644 --- a/astrid/src/com/todoroo/astrid/dao/TaskDao.java +++ b/astrid/src/com/todoroo/astrid/dao/TaskDao.java @@ -404,7 +404,7 @@ public class TaskDao extends RemoteModelDao { task.markSaved(); if (values.containsKey(Task.COMPLETION_DATE.name) && task.isCompleted()) { - afterComplete(task, values); + afterComplete(task); } else { if (values.containsKey(Task.DUE_DATE.name) || values.containsKey(Task.REMINDER_FLAGS.name) || @@ -460,7 +460,7 @@ public class TaskDao extends RemoteModelDao { * @param task * @param values */ - private static void afterComplete(Task task, ContentValues values) { + private static void afterComplete(Task task) { Notifications.cancelNotifications(task.getId()); } diff --git a/astrid/src/com/todoroo/astrid/helper/TaskAdapterAddOnManager.java b/astrid/src/com/todoroo/astrid/helper/TaskAdapterAddOnManager.java index 45503c265..97c7fb34a 100644 --- a/astrid/src/com/todoroo/astrid/helper/TaskAdapterAddOnManager.java +++ b/astrid/src/com/todoroo/astrid/helper/TaskAdapterAddOnManager.java @@ -9,7 +9,6 @@ import android.widget.ListView; import com.todoroo.astrid.adapter.TaskAdapter.ViewHolder; import com.todoroo.astrid.api.AstridApiConstants; -import com.todoroo.astrid.data.Task; import java.util.Collection; import java.util.Collections; @@ -49,7 +48,7 @@ abstract public class TaskAdapterAddOnManager { // request details draw(viewHolder, taskId, get(taskId)); - Intent broadcastIntent = createBroadcastIntent(viewHolder.task); + Intent broadcastIntent = createBroadcastIntent(); if (broadcastIntent != null) { fragment.getActivity().sendOrderedBroadcast(broadcastIntent, AstridApiConstants.PERMISSION_READ); } @@ -59,7 +58,7 @@ abstract public class TaskAdapterAddOnManager { /** * creates a broadcast intent for requesting */ - abstract protected Intent createBroadcastIntent(Task task); + abstract protected Intent createBroadcastIntent(); /** * updates the given view @@ -69,7 +68,7 @@ abstract public class TaskAdapterAddOnManager { /** * resets the view as if there was nothing */ - abstract protected void reset(ViewHolder viewHolder, long taskId); + abstract protected void reset(ViewHolder viewHolder); /** * on receive an intent diff --git a/astrid/src/com/todoroo/astrid/service/Astrid2To3UpgradeHelper.java b/astrid/src/com/todoroo/astrid/service/Astrid2To3UpgradeHelper.java index 20c194c52..8999f7e45 100644 --- a/astrid/src/com/todoroo/astrid/service/Astrid2To3UpgradeHelper.java +++ b/astrid/src/com/todoroo/astrid/service/Astrid2To3UpgradeHelper.java @@ -117,7 +117,7 @@ public class Astrid2To3UpgradeHelper { * @param upgradeService * @param from */ - public void upgrade3To3_1(final Context context, final int from) { + public void upgrade3To3_1(final Context context) { if (!checkIfDatabaseExists(context, alertsTable)) { return; } @@ -279,8 +279,7 @@ public class Astrid2To3UpgradeHelper { data.upgradeNotes = new StringBuilder(); } data.upgradeNotes.append("Goal Deadline: " + - DateUtilities.getDateString(ContextManager.getContext(), - new Date(preferredDueDate))); + DateUtilities.getDateString(new Date(preferredDueDate))); } } else if (property == Task.REMINDER_PERIOD) { // old period was stored in seconds diff --git a/astrid/src/com/todoroo/astrid/service/StartupService.java b/astrid/src/com/todoroo/astrid/service/StartupService.java index d3ee19ec0..ce7194b1a 100644 --- a/astrid/src/com/todoroo/astrid/service/StartupService.java +++ b/astrid/src/com/todoroo/astrid/service/StartupService.java @@ -132,13 +132,6 @@ public class StartupService { */ private static boolean hasStartedUp = false; - /** - * Call to skip initialization steps (i.e. if only a notification screen is needed) - */ - public synchronized static void bypassInitialization() { - hasStartedUp = true; - } - /** * Called when this application is started up */ diff --git a/astrid/src/com/todoroo/astrid/service/UpdateMessageService.java b/astrid/src/com/todoroo/astrid/service/UpdateMessageService.java index 8bc0e38b0..42d002e1e 100644 --- a/astrid/src/com/todoroo/astrid/service/UpdateMessageService.java +++ b/astrid/src/com/todoroo/astrid/service/UpdateMessageService.java @@ -99,16 +99,16 @@ public class UpdateMessageService { } private static interface DialogShower { - void showDialog(Activity activity); + void showDialog(); } private void tryShowDialog(DialogShower ds) { try { - ds.showDialog(activity); + ds.showDialog(); } catch (BadTokenException bt) { try { Activity current = (Activity) ContextManager.getContext(); - ds.showDialog(current); + ds.showDialog(); } catch (ClassCastException c) { // Oh well, context wasn't an activity } catch (BadTokenException bt2) { @@ -125,7 +125,7 @@ public class UpdateMessageService { if (message.linkText.size() > 0) { final DialogShower ds = new DialogShower() { @Override - public void showDialog(Activity a) { + public void showDialog() { try { final Dialog d = new Dialog(activity, R.style.ReminderDialog); d.setContentView(R.layout.update_message_view); diff --git a/astrid/src/com/todoroo/astrid/service/UpgradeService.java b/astrid/src/com/todoroo/astrid/service/UpgradeService.java index 81fc57f2d..e5eece156 100644 --- a/astrid/src/com/todoroo/astrid/service/UpgradeService.java +++ b/astrid/src/com/todoroo/astrid/service/UpgradeService.java @@ -223,11 +223,11 @@ public final class UpgradeService { } if (from < V3_1_0) { - new Astrid2To3UpgradeHelper().upgrade3To3_1(UpgradeActivity.this, from); + new Astrid2To3UpgradeHelper().upgrade3To3_1(UpgradeActivity.this); } if (from < V3_8_3_1) { - new TagCaseMigrator().performTagCaseMigration(UpgradeActivity.this); + new TagCaseMigrator().performTagCaseMigration(); } if (from < V3_8_4 && Preferences.getBoolean(R.string.p_showNotes, false)) { diff --git a/astrid/src/com/todoroo/astrid/ui/AstridTimePicker.java b/astrid/src/com/todoroo/astrid/ui/AstridTimePicker.java index cc2a9ad32..625d99b4f 100644 --- a/astrid/src/com/todoroo/astrid/ui/AstridTimePicker.java +++ b/astrid/src/com/todoroo/astrid/ui/AstridTimePicker.java @@ -117,7 +117,7 @@ public class AstridTimePicker extends LinearLayout { NumberPicker.OnChangedListener autoEnableTimeCheck = new NumberPicker.OnChangedListener() { @Override - public int onChanged(NumberPicker picker, int oldVal, int newVal) { + public int onChanged(int newVal) { setHasTime(true); return newVal; } diff --git a/astrid/src/com/todoroo/astrid/ui/DateAndTimePicker.java b/astrid/src/com/todoroo/astrid/ui/DateAndTimePicker.java index 43e28f1a5..b1566c2bc 100644 --- a/astrid/src/com/todoroo/astrid/ui/DateAndTimePicker.java +++ b/astrid/src/com/todoroo/astrid/ui/DateAndTimePicker.java @@ -294,9 +294,9 @@ public class DateAndTimePicker extends LinearLayout { Date d = new Date(forDate); if (d.getTime() > 0) { if (hideYear) { - displayString.append(DateUtilities.getDateStringHideYear(context, d)); + displayString.append(DateUtilities.getDateStringHideYear(d)); } else { - displayString.append(DateUtilities.getDateString(context, d)); + displayString.append(DateUtilities.getDateString(d)); } if (Task.hasDueTime(forDate) && !hideTime) { displayString.append(useNewline ? "\n" : ", "); //$NON-NLS-1$ //$NON-NLS-2$ diff --git a/astrid/src/com/todoroo/astrid/ui/DeadlineNumberPicker.java b/astrid/src/com/todoroo/astrid/ui/DeadlineNumberPicker.java index 1e24ffab4..e8bef06bf 100644 --- a/astrid/src/com/todoroo/astrid/ui/DeadlineNumberPicker.java +++ b/astrid/src/com/todoroo/astrid/ui/DeadlineNumberPicker.java @@ -20,10 +20,6 @@ public class DeadlineNumberPicker extends NumberPicker { super(context, attrs); } - public DeadlineNumberPicker(Context context, AttributeSet attrs, int defStyle) { - super(context, attrs, defStyle); - } - @Override protected int getLayout() { return R.layout.deadline_number_picker; diff --git a/astrid/src/com/todoroo/astrid/ui/DraggableListView.java b/astrid/src/com/todoroo/astrid/ui/DraggableListView.java index 92cd05d84..90d89db92 100644 --- a/astrid/src/com/todoroo/astrid/ui/DraggableListView.java +++ b/astrid/src/com/todoroo/astrid/ui/DraggableListView.java @@ -111,7 +111,7 @@ public class DraggableListView extends ListView { this.mItemHeightNormal = itemHeightNormal; } - protected boolean isDraggableRow( View view) { + protected boolean isDraggableRow() { return true; } @@ -176,7 +176,7 @@ public class DraggableListView extends ListView { } } - if (isDraggableRow(v)) { + if (isDraggableRow()) { ViewGroup.LayoutParams params = v.getLayoutParams(); params.height = LayoutParams.WRAP_CONTENT; v.setLayoutParams(params); @@ -227,7 +227,7 @@ public class DraggableListView extends ListView { } } - if (isDraggableRow(vv)) { + if (isDraggableRow()) { ViewGroup.LayoutParams params = vv.getLayoutParams(); params.height = height; vv.setLayoutParams(params); @@ -377,7 +377,7 @@ public class DraggableListView extends ListView { View item = getChildAt(itemNum - getFirstVisiblePosition()); - if (!isDraggableRow(item)) { + if (!isDraggableRow()) { return false; } diff --git a/astrid/src/com/todoroo/astrid/ui/EditTitleControlSet.java b/astrid/src/com/todoroo/astrid/ui/EditTitleControlSet.java index f43d1babb..debfae581 100644 --- a/astrid/src/com/todoroo/astrid/ui/EditTitleControlSet.java +++ b/astrid/src/com/todoroo/astrid/ui/EditTitleControlSet.java @@ -93,7 +93,7 @@ public class EditTitleControlSet extends TaskEditControlSet implements Importanc } @Override - public void importanceChanged(int i, int color) { + public void importanceChanged(int i) { importanceValue = i; updateCompleteBox(); } diff --git a/astrid/src/com/todoroo/astrid/ui/HideUntilControlSet.java b/astrid/src/com/todoroo/astrid/ui/HideUntilControlSet.java index 40f3ebbd1..8ef94cf51 100644 --- a/astrid/src/com/todoroo/astrid/ui/HideUntilControlSet.java +++ b/astrid/src/com/todoroo/astrid/ui/HideUntilControlSet.java @@ -96,7 +96,7 @@ public class HideUntilControlSet extends PopupControlSet implements OnItemSelect } Date hideUntilAsDate = new Date(specificDate); if (hideUntilAsDate.getHours() == 0 && hideUntilAsDate.getMinutes() == 0 && hideUntilAsDate.getSeconds() == 0) { - updated[0] = new HideUntilValue(DateUtilities.getDateString(activity, new Date(specificDate)), + updated[0] = new HideUntilValue(DateUtilities.getDateString(new Date(specificDate)), Task.HIDE_UNTIL_SPECIFIC_DAY, specificDate); existingDate = specificDate; } else { diff --git a/astrid/src/com/todoroo/astrid/ui/ImportanceControlSet.java b/astrid/src/com/todoroo/astrid/ui/ImportanceControlSet.java index c4a8614d2..f0bf723d1 100644 --- a/astrid/src/com/todoroo/astrid/ui/ImportanceControlSet.java +++ b/astrid/src/com/todoroo/astrid/ui/ImportanceControlSet.java @@ -34,7 +34,7 @@ public class ImportanceControlSet extends TaskEditControlSet { private static final int TEXT_SIZE = 18; public interface ImportanceChangedListener { - public void importanceChanged(int i, int color); + public void importanceChanged(int i); } public ImportanceControlSet(Activity activity, int layout) { @@ -54,7 +54,7 @@ public class ImportanceControlSet extends TaskEditControlSet { } for (ImportanceChangedListener l : listeners) { - l.importanceChanged(i, colors[i]); + l.importanceChanged(i); } } diff --git a/astrid/src/com/todoroo/astrid/ui/NumberPicker.java b/astrid/src/com/todoroo/astrid/ui/NumberPicker.java index abe2428ab..6f0ae1e1a 100644 --- a/astrid/src/com/todoroo/astrid/ui/NumberPicker.java +++ b/astrid/src/com/todoroo/astrid/ui/NumberPicker.java @@ -34,7 +34,7 @@ public class NumberPicker extends LinearLayout implements OnClickListener, /** * return new value */ - int onChanged(NumberPicker picker, int oldVal, int newVal); + int onChanged(int newVal); } public interface Formatter { @@ -72,10 +72,10 @@ public class NumberPicker extends LinearLayout implements OnClickListener, @Override public void run() { if (mIncrement) { - changeCurrent(mCurrent + incrementBy, mSlideUpInAnimation, mSlideUpOutAnimation); + changeCurrent(mCurrent + incrementBy); mHandler.postDelayed(this, mSpeed); } else if (mDecrement) { - changeCurrent(mCurrent - incrementBy, mSlideDownInAnimation, mSlideDownOutAnimation); + changeCurrent(mCurrent - incrementBy); mHandler.postDelayed(this, mSpeed); } } @@ -105,10 +105,6 @@ public class NumberPicker extends LinearLayout implements OnClickListener, this(context, null); } - public NumberPicker(Context context, AttributeSet attrs) { - this(context, attrs, 0); - } - protected int getLayout() { return R.layout.number_picker; } @@ -121,7 +117,7 @@ public class NumberPicker extends LinearLayout implements OnClickListener, return -1; } - public NumberPicker(Context context, AttributeSet attrs, int defStyle) { + public NumberPicker(Context context, AttributeSet attrs) { super(context, attrs); setOrientation(VERTICAL); LayoutInflater mInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE); @@ -239,11 +235,9 @@ public class NumberPicker extends LinearLayout implements OnClickListener, // now perform the increment/decrement if (R.id.increment == v.getId()) { - changeCurrent(mCurrent + incrementBy, mSlideUpInAnimation, - mSlideUpOutAnimation); + changeCurrent(mCurrent + incrementBy); } else if (R.id.decrement == v.getId()) { - changeCurrent(mCurrent - incrementBy, mSlideDownInAnimation, - mSlideDownOutAnimation); + changeCurrent(mCurrent - incrementBy); } } @@ -252,7 +246,7 @@ public class NumberPicker extends LinearLayout implements OnClickListener, .valueOf(value); } - private void changeCurrent(int current, Animation in, Animation out) { + private void changeCurrent(int current) { current = notifyChange(current); // Wrap around the values if we go past the start or end @@ -268,7 +262,7 @@ public class NumberPicker extends LinearLayout implements OnClickListener, private int notifyChange(int current) { if (mListener != null) { - return mListener.onChanged(this, mCurrent, current); + return mListener.onChanged(current); } else { return current; } diff --git a/astrid/src/com/todoroo/astrid/ui/NumberPickerDialog.java b/astrid/src/com/todoroo/astrid/ui/NumberPickerDialog.java index a6c697813..6aecb3199 100644 --- a/astrid/src/com/todoroo/astrid/ui/NumberPickerDialog.java +++ b/astrid/src/com/todoroo/astrid/ui/NumberPickerDialog.java @@ -17,7 +17,7 @@ import com.timsu.astrid.R; public class NumberPickerDialog extends AlertDialog implements OnClickListener { public interface OnNumberPickedListener { - void onNumberPicked(NumberPicker view, int number); + void onNumberPicked(int number); } private final NumberPicker mPicker; @@ -51,7 +51,7 @@ public class NumberPickerDialog extends AlertDialog implements OnClickListener { public void onClick(DialogInterface dialog, int which) { if (mCallback != null) { mPicker.clearFocus(); - mCallback.onNumberPicked(mPicker, mPicker.getCurrent()); + mCallback.onNumberPicked(mPicker.getCurrent()); } } } diff --git a/astrid/src/com/todoroo/astrid/ui/TimeDurationControlSet.java b/astrid/src/com/todoroo/astrid/ui/TimeDurationControlSet.java index 620e392e3..e6bafdd23 100644 --- a/astrid/src/com/todoroo/astrid/ui/TimeDurationControlSet.java +++ b/astrid/src/com/todoroo/astrid/ui/TimeDurationControlSet.java @@ -107,7 +107,7 @@ public class TimeDurationControlSet implements OnNNumberPickedListener, }); minutePicker.setOnChangeListener(new NumberPicker.OnChangedListener() { @Override - public int onChanged(NumberPicker picker, int oldVal, int newVal) { + public int onChanged(int newVal) { if (newVal < 0) { if (hourPicker.getCurrent() == 0) { return 0; diff --git a/astrid/src/com/todoroo/astrid/utility/AstridPreferences.java b/astrid/src/com/todoroo/astrid/utility/AstridPreferences.java index a8383a201..52d272537 100644 --- a/astrid/src/com/todoroo/astrid/utility/AstridPreferences.java +++ b/astrid/src/com/todoroo/astrid/utility/AstridPreferences.java @@ -11,14 +11,12 @@ import android.content.SharedPreferences; import com.timsu.astrid.R; import com.todoroo.andlib.data.TodorooCursor; -import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.sql.Query; import com.todoroo.andlib.utility.AndroidUtilities; import com.todoroo.andlib.utility.Preferences; import com.todoroo.astrid.api.AstridApiConstants; import com.todoroo.astrid.core.PluginServices; import com.todoroo.astrid.data.User; -import com.todoroo.astrid.service.UpgradeService; import com.todoroo.astrid.tags.reusable.FeaturedListFilterExposer; public class AstridPreferences { diff --git a/astrid/src/com/todoroo/astrid/utility/SyncMetadataService.java b/astrid/src/com/todoroo/astrid/utility/SyncMetadataService.java index db1f9a100..421e1b20b 100644 --- a/astrid/src/com/todoroo/astrid/utility/SyncMetadataService.java +++ b/astrid/src/com/todoroo/astrid/utility/SyncMetadataService.java @@ -5,8 +5,6 @@ */ package com.todoroo.astrid.utility; -import android.content.Context; - import com.todoroo.andlib.data.Property; import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.service.Autowired; @@ -73,7 +71,7 @@ abstract public class SyncMetadataService { // --- implementation - public SyncMetadataService(Context context) { + public SyncMetadataService() { DependencyInjectionService.getInstance().inject(this); } diff --git a/astrid/src/com/todoroo/astrid/voice/Api6VoiceOutputAssistant.java b/astrid/src/com/todoroo/astrid/voice/Api6VoiceOutputAssistant.java index 546be4def..09c1c1d43 100644 --- a/astrid/src/com/todoroo/astrid/voice/Api6VoiceOutputAssistant.java +++ b/astrid/src/com/todoroo/astrid/voice/Api6VoiceOutputAssistant.java @@ -52,7 +52,7 @@ public class Api6VoiceOutputAssistant implements OnInitListener, VoiceOutputAssi } @Override - public boolean handleActivityResult(int requestCode, int resultCode, Intent data) { + public boolean handleActivityResult(int requestCode, int resultCode) { if (requestCode == MY_DATA_CHECK_CODE) { if (resultCode == TextToSpeech.Engine.CHECK_VOICE_DATA_PASS) { // success, create the TTS instance diff --git a/astrid/src/com/todoroo/astrid/voice/VoiceOutputService.java b/astrid/src/com/todoroo/astrid/voice/VoiceOutputService.java index 4bf8e80a2..c4cd3468d 100644 --- a/astrid/src/com/todoroo/astrid/voice/VoiceOutputService.java +++ b/astrid/src/com/todoroo/astrid/voice/VoiceOutputService.java @@ -6,8 +6,6 @@ package com.todoroo.astrid.voice; -import android.content.Intent; - import com.todoroo.andlib.utility.AndroidUtilities; @@ -26,7 +24,7 @@ public class VoiceOutputService { public interface VoiceOutputAssistant { public void checkIsTTSInstalled(); - public boolean handleActivityResult(int requestCode, int resultCode, Intent data); + public boolean handleActivityResult(int requestCode, int resultCode); public void queueSpeak(String textToSpeak); @@ -41,8 +39,7 @@ public class VoiceOutputService { } @Override - public boolean handleActivityResult(int requestCode, int resultCode, - Intent data) { + public boolean handleActivityResult(int requestCode, int resultCode) { return false; } diff --git a/tests/src/com/todoroo/andlib/service/DependencyInjectionTests.java b/tests/src/com/todoroo/andlib/service/DependencyInjectionTests.java index d43a629a3..e12cb7c1c 100644 --- a/tests/src/com/todoroo/andlib/service/DependencyInjectionTests.java +++ b/tests/src/com/todoroo/andlib/service/DependencyInjectionTests.java @@ -24,7 +24,7 @@ public class DependencyInjectionTests extends AndroidTestCase { new AbstractDependencyInjector() { @Override - public Object getInjection(Object object, Field field) { + public Object getInjection(Field field) { if (field.getName().equals("foo")) return "bar"; return null; @@ -100,7 +100,7 @@ public class DependencyInjectionTests extends AndroidTestCase { new AbstractDependencyInjector() { @Override - public Object getInjection(Object object, Field field) { + public Object getInjection(Field field) { return "malarkey"; } } @@ -109,7 +109,7 @@ public class DependencyInjectionTests extends AndroidTestCase { new AbstractDependencyInjector() { @Override - public Object getInjection(Object object, Field field) { + public Object getInjection(Field field) { if (field.getName().equals("foo")) return "bar"; return null; @@ -147,7 +147,7 @@ public class DependencyInjectionTests extends AndroidTestCase { new AbstractDependencyInjector() { @Override - public Object getInjection(Object object, Field field) { + public Object getInjection(Field field) { if (field.getName().equals("wozzle")) return "bar"; return null; @@ -181,7 +181,7 @@ public class DependencyInjectionTests extends AndroidTestCase { new AbstractDependencyInjector() { @Override - public Object getInjection(Object object, Field field) { + public Object getInjection(Field field) { if (field.getName().equals("foo")) return "bar"; return null; @@ -229,7 +229,7 @@ public class DependencyInjectionTests extends AndroidTestCase { new AbstractDependencyInjector() { @Override - public Object getInjection(Object object, Field field) { + public Object getInjection(Field field) { if (field.getName().equals("foo")) return "gotfoo"; else if (field.getName().equals("bar")) diff --git a/tests/src/com/todoroo/andlib/utility/DateUtilitiesTest.java b/tests/src/com/todoroo/andlib/utility/DateUtilitiesTest.java index 659cda067..95f72dc2f 100644 --- a/tests/src/com/todoroo/andlib/utility/DateUtilitiesTest.java +++ b/tests/src/com/todoroo/andlib/utility/DateUtilitiesTest.java @@ -45,7 +45,7 @@ public class DateUtilitiesTest extends TodorooTestCase { for (int i = 0; i < 12; i++) { d.setMonth(i); - DateUtilities.getDateString(getContext(), d); + DateUtilities.getDateString(d); } } }); @@ -59,7 +59,7 @@ public class DateUtilitiesTest extends TodorooTestCase { for (int i = 0; i < 7; i++) { d.setDate(i); - DateUtilities.getDateStringWithWeekday(getContext(), d); + DateUtilities.getDateStringWithWeekday(d); } } }); diff --git a/tests/src/com/todoroo/astrid/gtasks/GtasksIndentActionTest.java b/tests/src/com/todoroo/astrid/gtasks/GtasksIndentActionTest.java index 57cd258d7..4159aede2 100644 --- a/tests/src/com/todoroo/astrid/gtasks/GtasksIndentActionTest.java +++ b/tests/src/com/todoroo/astrid/gtasks/GtasksIndentActionTest.java @@ -128,11 +128,11 @@ public class GtasksIndentActionTest extends DatabaseTestCase { // --- helpers private void whenIncreaseIndent() { - gtasksTaskListUpdater.indent(null, storeList, task.getId(), 1); + gtasksTaskListUpdater.indent(storeList, task.getId(), 1); } private void whenDecreaseIndent() { - gtasksTaskListUpdater.indent(null, storeList, task.getId(), -1); + gtasksTaskListUpdater.indent(storeList, task.getId(), -1); } @Override diff --git a/tests/src/com/todoroo/astrid/gtasks/GtasksTaskMovingTest.java b/tests/src/com/todoroo/astrid/gtasks/GtasksTaskMovingTest.java index d27e1d71d..4b4e9062a 100644 --- a/tests/src/com/todoroo/astrid/gtasks/GtasksTaskMovingTest.java +++ b/tests/src/com/todoroo/astrid/gtasks/GtasksTaskMovingTest.java @@ -231,8 +231,8 @@ public class GtasksTaskMovingTest extends DatabaseTestCase { * moveTo = null => move to end */ private void whenTriggerMove(Task target, Task moveTo) { - gtasksTaskListUpdater.moveTo(null, list, target.getId(), moveTo == null ? -1 : moveTo.getId()); - gtasksTaskListUpdater.debugPrint(null, list); + gtasksTaskListUpdater.moveTo(list, target.getId(), moveTo == null ? -1 : moveTo.getId()); + gtasksTaskListUpdater.debugPrint(list); } private void thenExpectMetadataOrderAndIndent(Task task, long order, int indent) { diff --git a/tests/src/com/todoroo/astrid/repeats/AdvancedRepeatTests.java b/tests/src/com/todoroo/astrid/repeats/AdvancedRepeatTests.java index 4dbf5c6dd..84339bb4a 100644 --- a/tests/src/com/todoroo/astrid/repeats/AdvancedRepeatTests.java +++ b/tests/src/com/todoroo/astrid/repeats/AdvancedRepeatTests.java @@ -247,8 +247,8 @@ public class AdvancedRepeatTests extends TodorooTestCase { } private void assertDateEquals(long actual, long expected) { - assertEquals("Due Date is '" + DateUtilities.getDateStringWithWeekday(getContext(), new Date(actual)) - + "', expected '" + DateUtilities.getDateStringWithWeekday(getContext(), new Date(expected)) + "'", + assertEquals("Due Date is '" + DateUtilities.getDateStringWithWeekday(new Date(actual)) + + "', expected '" + DateUtilities.getDateStringWithWeekday(new Date(expected)) + "'", expected, actual); } diff --git a/tests/src/com/todoroo/astrid/repeats/RepeatAfterCompleteTests.java b/tests/src/com/todoroo/astrid/repeats/RepeatAfterCompleteTests.java index fa0c146bb..c2848c777 100644 --- a/tests/src/com/todoroo/astrid/repeats/RepeatAfterCompleteTests.java +++ b/tests/src/com/todoroo/astrid/repeats/RepeatAfterCompleteTests.java @@ -122,8 +122,8 @@ public class RepeatAfterCompleteTests extends TodorooTestCase { private void assertDateEquals(String message, long expected, long actual) { expected = Task.createDueDate(Task.URGENCY_SPECIFIC_DAY, expected); actual = Task.createDueDate(Task.URGENCY_SPECIFIC_DAY, actual); - assertEquals(message + ": Due Date is '" + DateUtilities.getDateStringWithWeekday(getContext(), new Date(actual)) - + "', expected '" + DateUtilities.getDateStringWithWeekday(getContext(), new Date(expected)) + "'", + assertEquals(message + ": Due Date is '" + DateUtilities.getDateStringWithWeekday(new Date(actual)) + + "', expected '" + DateUtilities.getDateStringWithWeekday(new Date(expected)) + "'", expected, actual); }