From df321eda144e75d95004683d5ac65edf3e8c0545 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Tue, 29 Oct 2013 11:37:12 -0500 Subject: [PATCH] Remove history, apply inspections * Remove unused method parameters * Remove unnecessary throws * Remove unused return values * Remove constant return values --- .../com/todoroo/andlib/data/DatabaseDao.java | 8 +- .../service/AbstractDependencyInjector.java | 4 +- .../service/DependencyInjectionService.java | 2 +- .../andlib/utility/AndroidUtilities.java | 22 +-- .../todoroo/andlib/utility/DateUtilities.java | 20 ++- .../java/com/todoroo/astrid/data/History.java | 144 ------------------ .../java/com/todoroo/astrid/data/TagData.java | 10 -- .../java/com/todoroo/astrid/data/Task.java | 10 -- .../com/todoroo/astrid/sync/SyncProvider.java | 20 +-- .../astrid/sync/SyncProviderUtilities.java | 7 - .../todoroo/astrid/sync/SyncV2Provider.java | 4 +- .../astrid/actfm/CommentsFragment.java | 31 +--- .../astrid/actfm/TagCommentsFragment.java | 7 +- .../astrid/actfm/TaskCommentsFragment.java | 7 +- .../astrid/actfm/sync/messages/NameMaps.java | 1 - .../astrid/activity/EditPreferences.java | 9 +- .../astrid/activity/FilterListFragment.java | 8 +- .../astrid/activity/TaskEditFragment.java | 118 ++------------ .../astrid/activity/TaskEditViewPager.java | 2 +- .../astrid/activity/TaskListFragment.java | 29 +--- .../todoroo/astrid/adapter/FilterAdapter.java | 47 ++---- .../todoroo/astrid/adapter/TaskAdapter.java | 9 +- .../todoroo/astrid/adapter/UpdateAdapter.java | 56 ++----- .../astrid/alarms/AlarmControlSet.java | 4 +- .../astrid/api/TaskContextActionExposer.java | 7 - .../astrid/backup/BackupConstants.java | 5 - .../astrid/backup/TasksXmlImporter.java | 18 +-- .../java/com/todoroo/astrid/dao/Database.java | 15 -- .../java/com/todoroo/astrid/dao/TaskDao.java | 4 +- .../todoroo/astrid/files/FileUtilities.java | 2 +- .../astrid/gcal/CalendarReminderActivity.java | 2 +- .../astrid/gtasks/GtasksMetadataService.java | 3 +- .../astrid/gtasks/GtasksPreferences.java | 2 +- .../astrid/gtasks/GtasksTaskListUpdater.java | 4 +- .../astrid/gtasks/api/GtasksInvoker.java | 3 +- .../astrid/gtasks/sync/GtasksSyncService.java | 2 +- .../gtasks/sync/GtasksSyncV2Provider.java | 5 +- .../helper/TaskAdapterAddOnManager.java | 12 +- .../astrid/notes/EditNoteActivity.java | 43 ++---- .../reminders/NotificationFragment.java | 2 +- .../ReminderDebugContextActions.java | 16 -- .../astrid/repeats/RepeatControlSet.java | 3 +- .../todoroo/astrid/service/AddOnService.java | 5 - .../astrid/service/MetadataService.java | 8 +- .../astrid/service/StartupService.java | 2 +- .../astrid/service/TagDataService.java | 20 +-- .../todoroo/astrid/service/TaskService.java | 17 +-- .../subtasks/AstridOrderedListUpdater.java | 8 +- .../OrderedMetadataListFragmentHelper.java | 12 +- .../subtasks/OrderedMetadataListUpdater.java | 65 +++----- .../todoroo/astrid/tags/TagFilterExposer.java | 9 +- .../todoroo/astrid/tags/TagsControlSet.java | 13 +- .../com/todoroo/astrid/ui/AstridDialog.java | 3 +- .../todoroo/astrid/ui/AstridTimePicker.java | 2 +- .../todoroo/astrid/ui/DateAndTimePicker.java | 4 +- .../astrid/ui/DeadlineNumberPicker.java | 4 - .../todoroo/astrid/ui/DraggableListView.java | 41 ++--- .../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/SyncMetadataService.java | 4 +- .../voice/Api6VoiceOutputAssistant.java | 6 +- .../astrid/voice/VoiceOutputService.java | 8 +- astrid/src/main/res/values-ca/strings.xml | 2 - astrid/src/main/res/values-cs/strings.xml | 2 - astrid/src/main/res/values-da/strings.xml | 2 - astrid/src/main/res/values-de/strings.xml | 2 - astrid/src/main/res/values-es/strings.xml | 2 - astrid/src/main/res/values-fr/strings.xml | 2 - astrid/src/main/res/values-it/strings.xml | 2 - astrid/src/main/res/values-iw/strings.xml | 2 - astrid/src/main/res/values-ja/strings.xml | 2 - astrid/src/main/res/values-ko/strings.xml | 2 - astrid/src/main/res/values-nb/strings.xml | 2 - astrid/src/main/res/values-nl/strings.xml | 2 - astrid/src/main/res/values-pl/strings.xml | 2 - astrid/src/main/res/values-pt-rBR/strings.xml | 2 - astrid/src/main/res/values-pt/strings.xml | 1 - astrid/src/main/res/values-ru/strings.xml | 2 - astrid/src/main/res/values-sv/strings.xml | 2 - astrid/src/main/res/values-th/strings.xml | 1 - astrid/src/main/res/values-tr/strings.xml | 2 - astrid/src/main/res/values-uk/strings.xml | 2 - astrid/src/main/res/values-zh-rCN/strings.xml | 2 - astrid/src/main/res/values-zh-rTW/strings.xml | 2 - astrid/src/main/res/values/strings-core.xml | 6 - 89 files changed, 191 insertions(+), 851 deletions(-) delete mode 100644 api/src/main/java/com/todoroo/astrid/data/History.java diff --git a/api/src/main/java/com/todoroo/andlib/data/DatabaseDao.java b/api/src/main/java/com/todoroo/andlib/data/DatabaseDao.java index c6f07aa55..b9d6bac3b 100644 --- a/api/src/main/java/com/todoroo/andlib/data/DatabaseDao.java +++ b/api/src/main/java/com/todoroo/andlib/data/DatabaseDao.java @@ -89,7 +89,7 @@ public class DatabaseDao { // --- listeners public interface ModelUpdateListener { - public void onModelUpdated(MTYPE model, boolean outstandingEntries); + public void onModelUpdated(MTYPE model); } private final ArrayList> listeners = @@ -99,10 +99,10 @@ public class DatabaseDao { listeners.add(listener); } - protected void onModelUpdated(TYPE model, boolean outstandingEntries) { + protected void onModelUpdated(TYPE model) { TYPE modelCopy = (TYPE) model.clone(); for(ModelUpdateListener listener : listeners) { - listener.onModelUpdated(modelCopy, outstandingEntries); + listener.onModelUpdated(modelCopy); } } @@ -320,7 +320,7 @@ public class DatabaseDao { } } if (result.get()) { - onModelUpdated(item, recordOutstanding && numOutstanding > 0); + onModelUpdated(item); item.markSaved(); } } diff --git a/api/src/main/java/com/todoroo/andlib/service/AbstractDependencyInjector.java b/api/src/main/java/com/todoroo/andlib/service/AbstractDependencyInjector.java index 6bf4adc93..67f5a36c4 100644 --- a/api/src/main/java/com/todoroo/andlib/service/AbstractDependencyInjector.java +++ b/api/src/main/java/com/todoroo/andlib/service/AbstractDependencyInjector.java @@ -54,13 +54,11 @@ abstract public class AbstractDependencyInjector { * Gets the injected object for this field. If implementing class does not * know how to handle this dependency, it should return null * - * @param object - * object to perform dependency injection on * @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/main/java/com/todoroo/andlib/service/DependencyInjectionService.java b/api/src/main/java/com/todoroo/andlib/service/DependencyInjectionService.java index 285b33e7f..3909ff824 100644 --- a/api/src/main/java/com/todoroo/andlib/service/DependencyInjectionService.java +++ b/api/src/main/java/com/todoroo/andlib/service/DependencyInjectionService.java @@ -107,7 +107,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/main/java/com/todoroo/andlib/utility/AndroidUtilities.java b/api/src/main/java/com/todoroo/andlib/utility/AndroidUtilities.java index 6368fdb1d..bd47d987f 100644 --- a/api/src/main/java/com/todoroo/andlib/utility/AndroidUtilities.java +++ b/api/src/main/java/com/todoroo/andlib/utility/AndroidUtilities.java @@ -27,7 +27,6 @@ import android.view.View; import android.view.View.OnTouchListener; import android.view.ViewGroup; import android.view.inputmethod.InputMethodManager; -import android.widget.PopupWindow; import android.widget.TextView; import com.todoroo.andlib.service.ExceptionService; @@ -605,15 +604,14 @@ 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 Object callApiMethod(int minSdk, Object receiver, + public static void callApiMethod(int minSdk, Object receiver, String methodName, Class[] params, Object... args) { if(getSdkVersion() < minSdk) { - return null; + return; } - return AndroidUtilities.callMethod(receiver.getClass(), + AndroidUtilities.callMethod(receiver.getClass(), receiver, methodName, params, args); } @@ -896,20 +894,6 @@ public class AndroidUtilities { } } - /** - * Dismiss a popup window (should call from main thread) - */ - public static void tryDismissPopup(Activity activity, final PopupWindow popup) { - if (popup == null) { - return; - } - try { - popup.dismiss(); - } catch (Exception e) { - // window already closed or something - } - } - /** * Tries to parse an int from a string, returning the default value on failure */ 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 2c417dcc6..2478ded64 100644 --- a/api/src/main/java/com/todoroo/andlib/utility/DateUtilities.java +++ b/api/src/main/java/com/todoroo/andlib/utility/DateUtilities.java @@ -123,11 +123,10 @@ public class DateUtilities { } /** - * @param context android context * @param date date to format * @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 = new SimpleDateFormat("MMM").format(date); String value; String standardDate; @@ -151,16 +150,15 @@ 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); } /** - * @param context android context * @param date date to format * @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; @@ -190,9 +188,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); } /** @@ -214,14 +212,14 @@ public class DateUtilities { * @return date format as getDateFormat with weekday */ public static String getDateStringWithTimeAndWeekday(Context context, Date date) { - return getDateStringWithWeekday(context, date) + " " + getTimeString(context, date); + return getDateStringWithWeekday(date) + " " + getTimeString(context, date); } /** * @return date with time at the end */ public static String getDateStringWithTime(Context context, Date date) { - return getDateString(context, date) + " " + getTimeString(context, date); + return getDateString(date) + " " + getTimeString(context, date); } /** @@ -248,7 +246,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/main/java/com/todoroo/astrid/data/History.java b/api/src/main/java/com/todoroo/astrid/data/History.java deleted file mode 100644 index f0cedb01e..000000000 --- a/api/src/main/java/com/todoroo/astrid/data/History.java +++ /dev/null @@ -1,144 +0,0 @@ -package com.todoroo.astrid.data; - -import android.content.ContentValues; -import android.net.Uri; - -import com.todoroo.andlib.data.AbstractModel; -import com.todoroo.andlib.data.Property; -import com.todoroo.andlib.data.Property.LongProperty; -import com.todoroo.andlib.data.Property.StringProperty; -import com.todoroo.andlib.data.Table; -import com.todoroo.andlib.data.TodorooCursor; -import com.todoroo.astrid.api.AstridApiConstants; - -public class History extends AbstractModel { - - /** table for this model */ - public static final Table TABLE = new Table("history", History.class); - - /** content uri for this model */ - public static final Uri CONTENT_URI = Uri.parse("content://" + AstridApiConstants.API_PACKAGE + "/" + - TABLE.name); - - // --- properties - - /** ID */ - public static final LongProperty ID = new LongProperty( - TABLE, ID_PROPERTY_NAME); - - /** Remote ID */ - public static final StringProperty UUID = new StringProperty( - TABLE, RemoteModel.UUID_PROPERTY_NAME); - - /** Created at */ - public static final LongProperty CREATED_AT = new LongProperty( - TABLE, "created_at", Property.PROP_FLAG_DATE); - - /** User id */ - public static final StringProperty USER_UUID = new StringProperty( - TABLE, "user_id", Property.PROP_FLAG_USER_ID); - - /** Column name */ - public static final StringProperty COLUMN = new StringProperty( - TABLE, "columnString"); - - /** Old value */ - public static final StringProperty OLD_VALUE = new StringProperty( - TABLE, "old_value", Property.PROP_FLAG_NULLABLE); - - /** New value */ - public static final StringProperty NEW_VALUE = new StringProperty( - TABLE, "new_value", Property.PROP_FLAG_NULLABLE); - - /** Table identifier */ - public static final StringProperty TABLE_ID = new StringProperty( - TABLE, "table_id"); - - /** Target identifier */ - public static final StringProperty TARGET_ID = new StringProperty( - TABLE, "target_id"); - - /** Task name and id (JSONArray) */ - public static final StringProperty TASK = new StringProperty( - TABLE, "task"); - - /** Associated tag id */ - public static final StringProperty TAG_ID = new StringProperty( - TABLE, "tag_id"); - - - /** Default values container */ - private static final ContentValues defaultValues = new ContentValues(); - - @Override - public ContentValues getDefaultValues() { - return defaultValues; - } - - static { - defaultValues.put(UUID.name, 0L); - defaultValues.put(CREATED_AT.name, 0L); - defaultValues.put(USER_UUID.name, RemoteModel.NO_UUID); - defaultValues.put(OLD_VALUE.name, ""); - defaultValues.put(NEW_VALUE.name, ""); - defaultValues.put(TAG_ID.name, RemoteModel.NO_UUID); - defaultValues.put(TASK.name, ""); - } - - @Override - public long getId() { - return getIdHelper(ID); - } - - public History() { - super(); - } - - public History(TodorooCursor cursor) { - this(); - readPropertiesFromCursor(cursor); - } - - public void readFromCursor(TodorooCursor cursor) { - super.readPropertiesFromCursor(cursor); - } - - /** List of all properties for this model */ - public static final Property[] PROPERTIES = generateProperties(History.class); - - private static final Creator CREATOR = new ModelCreator(History.class); - - @Override - protected Creator getCreator() { - return CREATOR; - } - - // ---- Column ids - public static final String COL_TAG_ADDED = "tag_added"; - public static final String COL_TAG_REMOVED = "tag_removed"; - public static final String COL_SHARED_WITH = "shared_with"; - public static final String COL_UNSHARED_WITH = "unshared_with"; - public static final String COL_MEMBER_ADDED = "member_added"; - public static final String COL_MEMBER_REMOVED = "member_removed"; - public static final String COL_COMPLETED_AT = "completed_at"; - public static final String COL_DELETED_AT = "deleted_at"; - public static final String COL_IMPORTANCE = "importance"; - public static final String COL_NOTES_LENGTH = "notes_length"; - public static final String COL_PUBLIC = "public"; - public static final String COL_DUE = "due"; - public static final String COL_REPEAT = "repeat"; - public static final String COL_TASK_REPEATED = "task_repeated"; - public static final String COL_TITLE = "title"; - public static final String COL_NAME = "name"; - public static final String COL_DESCRIPTION = "description"; - public static final String COL_PICTURE_ID = "picture_id"; - public static final String COL_DEFAULT_LIST_IMAGE_ID = "default_list_image_id"; - public static final String COL_IS_SILENT = "is_silent"; - public static final String COL_IS_FAVORITE = "is_favorite"; - public static final String COL_USER_ID = "user_id"; - public static final String COL_ATTACHMENT_ADDED = "attachment_added"; - public static final String COL_ATTACHMENT_REMOVED = "attachment_removed"; - public static final String COL_ACKNOWLEDGED = "acknowledged"; - - -} diff --git a/api/src/main/java/com/todoroo/astrid/data/TagData.java b/api/src/main/java/com/todoroo/astrid/data/TagData.java index 802e61a41..86042e234 100644 --- a/api/src/main/java/com/todoroo/astrid/data/TagData.java +++ b/api/src/main/java/com/todoroo/astrid/data/TagData.java @@ -141,14 +141,6 @@ public final class TagData extends RemoteModel { public static final StringProperty TAG_ORDERING = new StringProperty( TABLE, "tagOrdering"); - /** History fetch date */ - public static final LongProperty HISTORY_FETCH_DATE = new LongProperty( - TABLE, "historyFetch"); - - /** History has more*/ - public static final IntegerProperty HISTORY_HAS_MORE = new IntegerProperty( - TABLE, "historyHasMore"); - /** Last autosync */ public static final LongProperty LAST_AUTOSYNC = new LongProperty( TABLE, "lastAutosync"); @@ -185,8 +177,6 @@ public final class TagData extends RemoteModel { defaultValues.put(FLAGS.name, 0); defaultValues.put(COMPLETION_DATE.name, 0); defaultValues.put(DELETION_DATE.name, 0); - defaultValues.put(HISTORY_FETCH_DATE.name, 0); - defaultValues.put(HISTORY_HAS_MORE.name, 0); defaultValues.put(LAST_AUTOSYNC.name, 0); defaultValues.put(THUMB.name, ""); 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 d12e84984..006d11410 100644 --- a/api/src/main/java/com/todoroo/astrid/data/Task.java +++ b/api/src/main/java/com/todoroo/astrid/data/Task.java @@ -187,14 +187,6 @@ public final class Task extends RemoteModel { public static final LongProperty USER_ACTIVITIES_PUSHED_AT = new LongProperty( TABLE, "activities_pushed_at", Property.PROP_FLAG_DATE); - /** History fetch time */ - public static final LongProperty HISTORY_FETCH_DATE = new LongProperty( - TABLE, "historyFetch"); - - /** History has more*/ - public static final IntegerProperty HISTORY_HAS_MORE = new IntegerProperty( - TABLE, "historyHasMore"); - /** List of all properties for this model */ public static final Property[] PROPERTIES = generateProperties(Task.class); @@ -317,8 +309,6 @@ public final class Task extends RemoteModel { defaultValues.put(IS_PUBLIC.name, 0); defaultValues.put(IS_READONLY.name, 0); defaultValues.put(CLASSIFICATION.name, ""); - defaultValues.put(HISTORY_FETCH_DATE.name, 0); - defaultValues.put(HISTORY_HAS_MORE.name, 0); defaultValues.put(LAST_SYNC.name, 0); defaultValues.put(UUID.name, NO_UUID); diff --git a/api/src/main/java/com/todoroo/astrid/sync/SyncProvider.java b/api/src/main/java/com/todoroo/astrid/sync/SyncProvider.java index 4058258bc..4ea07bd33 100644 --- a/api/src/main/java/com/todoroo/astrid/sync/SyncProvider.java +++ b/api/src/main/java/com/todoroo/astrid/sync/SyncProvider.java @@ -81,7 +81,7 @@ public abstract class SyncProvider { * @param task * task to create */ - abstract protected TYPE create(TYPE task) throws IOException; + abstract protected void create(TYPE task); /** * Push variables from given task to the remote server, and read the newly @@ -93,7 +93,7 @@ public abstract class SyncProvider { * remote task that we merged with. may be null * @return task pulled on remote server */ - abstract protected TYPE push(TYPE task, TYPE remote) throws IOException; + abstract protected TYPE push(TYPE task, TYPE remote); /** * Fetch remote task. Used to re-read merged tasks @@ -102,18 +102,18 @@ public abstract class SyncProvider { * task with id's to re-read * @return new Task */ - abstract protected TYPE pull(TYPE task) throws IOException; + abstract protected TYPE pull(TYPE task); /** * Reads a task container from a task in the database */ - abstract protected TYPE read(TodorooCursor task) throws IOException; + abstract protected TYPE read(TodorooCursor task); /** * Save task. Used to save local tasks that have been updated and remote * tasks that need to be created locally */ - abstract protected void write(TYPE task) throws IOException; + abstract protected void write(TYPE task); /** * Finds a task in the list with the same remote identifier(s) as @@ -159,7 +159,7 @@ public abstract class SyncProvider { public void synchronize(final Context context, final boolean showSyncToast) { // display toast if(context instanceof Activity) { - if(getUtilities().isLoggedIn() && getUtilities().shouldShowToast()) { + if(getUtilities().isLoggedIn()) { ((Activity) context).runOnUiThread(new Runnable() { @Override public void run() { @@ -210,7 +210,7 @@ public abstract class SyncProvider { * * @param data synchronization data structure */ - protected void synchronizeTasks(SyncData data) throws IOException { + protected void synchronizeTasks(SyncData data) { int length; // create internal data structures @@ -246,7 +246,7 @@ public abstract class SyncProvider { } } - protected void readRemotelyUpdated(SyncData data) throws IOException { + protected void readRemotelyUpdated(SyncData data) { int length; // Rearrange remoteTasks so completed tasks get synchronized first. // This prevents bugs where a repeated task has two copies come down @@ -298,7 +298,7 @@ public abstract class SyncProvider { } } - protected void sendLocallyUpdated(SyncData data) throws IOException { + protected void sendLocallyUpdated(SyncData data) { int length; length = data.localUpdated.getCount(); for(int i = 0; i < length; i++) { @@ -330,7 +330,7 @@ public abstract class SyncProvider { } protected void sendLocallyCreated(SyncData data, - HashMap remoteNewTaskNameMap) throws IOException { + HashMap remoteNewTaskNameMap) { int length; length = data.localCreated.getCount(); for(int i = 0; i < length; i++) { 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 b806df417..fee53ce57 100644 --- a/api/src/main/java/com/todoroo/astrid/sync/SyncProviderUtilities.java +++ b/api/src/main/java/com/todoroo/astrid/sync/SyncProviderUtilities.java @@ -47,13 +47,6 @@ abstract public class SyncProviderUtilities { return PreferenceManager.getDefaultSharedPreferences(ContextManager.getContext()); } - /** - * @return true if we should show sync toast when synchronizing - */ - public boolean shouldShowToast() { - return true; - } - /** * @return true if we have a token for this user, false otherwise */ 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 49f064785..8ac64911b 100644 --- a/api/src/main/java/com/todoroo/astrid/sync/SyncV2Provider.java +++ b/api/src/main/java/com/todoroo/astrid/sync/SyncV2Provider.java @@ -5,8 +5,6 @@ */ package com.todoroo.astrid.sync; -import android.app.Activity; - import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.andlib.service.ExceptionService; @@ -75,7 +73,7 @@ abstract public class SyncV2Provider { /** * Sign out of service, deleting all synchronization metadata */ - abstract public void signOut(Activity activity); + abstract public void signOut(); /** * @return sync utility instance diff --git a/astrid/src/main/java/com/todoroo/astrid/actfm/CommentsFragment.java b/astrid/src/main/java/com/todoroo/astrid/actfm/CommentsFragment.java index 8af9c3b8f..04df5f362 100644 --- a/astrid/src/main/java/com/todoroo/astrid/actfm/CommentsFragment.java +++ b/astrid/src/main/java/com/todoroo/astrid/actfm/CommentsFragment.java @@ -10,7 +10,6 @@ import android.content.Intent; import android.content.res.Resources; import android.database.Cursor; import android.graphics.Bitmap; -import android.graphics.Color; import android.os.Bundle; import android.text.Editable; import android.text.TextUtils; @@ -39,7 +38,6 @@ import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.astrid.actfm.ActFmCameraModule.CameraResultCallback; import com.todoroo.astrid.actfm.ActFmCameraModule.ClearImageCallback; -import com.todoroo.astrid.actfm.sync.messages.NameMaps; import com.todoroo.astrid.activity.AstridActivity; import com.todoroo.astrid.activity.TaskListActivity; import com.todoroo.astrid.adapter.UpdateAdapter; @@ -103,8 +101,6 @@ public abstract class CommentsFragment extends SherlockListFragment { protected abstract UserActivity createUpdate(); - protected abstract boolean canLoadMoreHistory(); - @Override public void onActivityCreated(Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); @@ -226,12 +222,9 @@ public abstract class CommentsFragment extends SherlockListFragment { cursor = updateAdapter.getCursor(); cursor.requery(); activity.startManagingCursor(cursor); - if (footerView != null && !canLoadMoreHistory()) { + if (footerView != null) { listView.removeFooterView(footerView); footerView = null; - } else if (footerView == null && canLoadMoreHistory()) { - addFooterToListView(listView); - listView.setAdapter(updateAdapter); } } @@ -246,27 +239,7 @@ public abstract class CommentsFragment extends SherlockListFragment { if (footerView != null) { listView.removeFooterView(footerView); } - if (canLoadMoreHistory()) { - footerView = new Button(getActivity()); - footerView.setText(R.string.TEA_load_more); - footerView.setBackgroundColor(Color.alpha(0)); - footerView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - int historyCount = 0; - Cursor c = updateAdapter.getCursor(); - for (c.moveToFirst(); !c.isAfterLast(); c.moveToNext()) { - if (NameMaps.TABLE_ID_HISTORY.equals(c.getString(UpdateAdapter.TYPE_PROPERTY_INDEX))) { - historyCount++; - } - } - } - }); - listView.addFooterView(footerView); - } else { - footerView = null; - } - + footerView = null; } protected void setLastViewed() { diff --git a/astrid/src/main/java/com/todoroo/astrid/actfm/TagCommentsFragment.java b/astrid/src/main/java/com/todoroo/astrid/actfm/TagCommentsFragment.java index f3b2b14fe..e6a530c37 100644 --- a/astrid/src/main/java/com/todoroo/astrid/actfm/TagCommentsFragment.java +++ b/astrid/src/main/java/com/todoroo/astrid/actfm/TagCommentsFragment.java @@ -67,7 +67,7 @@ public class TagCommentsFragment extends CommentsFragment { @Override protected Cursor getCursor() { - return tagDataService.getActivityAndHistoryForTagData(tagData, null, UpdateAdapter.USER_TABLE_ALIAS, UpdateAdapter.USER_PROPERTIES); + return tagDataService.getActivityForTagData(tagData, null, UpdateAdapter.USER_TABLE_ALIAS, UpdateAdapter.USER_PROPERTIES); } @Override @@ -75,11 +75,6 @@ public class TagCommentsFragment extends CommentsFragment { return (tagData == null) ? UpdateAdapter.FROM_RECENT_ACTIVITY_VIEW : UpdateAdapter.FROM_TAG_VIEW; } - @Override - protected boolean canLoadMoreHistory() { - return hasModel() && tagData.getValue(TagData.HISTORY_HAS_MORE) > 0; - } - @Override protected void addHeaderToListView(ListView listView) { if (AstridPreferences.useTabletLayout(getActivity()) && tagData != null) { diff --git a/astrid/src/main/java/com/todoroo/astrid/actfm/TaskCommentsFragment.java b/astrid/src/main/java/com/todoroo/astrid/actfm/TaskCommentsFragment.java index 3f5af449a..120e2aecd 100644 --- a/astrid/src/main/java/com/todoroo/astrid/actfm/TaskCommentsFragment.java +++ b/astrid/src/main/java/com/todoroo/astrid/actfm/TaskCommentsFragment.java @@ -55,7 +55,7 @@ public class TaskCommentsFragment extends CommentsFragment { @Override protected Cursor getCursor() { - return taskService.getActivityAndHistoryForTask(task); + return taskService.getActivityForTask(task); } @Override @@ -68,11 +68,6 @@ public class TaskCommentsFragment extends CommentsFragment { // Do nothing } - @Override - protected boolean canLoadMoreHistory() { - return hasModel() && task.getValue(Task.HISTORY_HAS_MORE) > 0; - } - @Override protected UserActivity createUpdate() { UserActivity update = new UserActivity(); diff --git a/astrid/src/main/java/com/todoroo/astrid/actfm/sync/messages/NameMaps.java b/astrid/src/main/java/com/todoroo/astrid/actfm/sync/messages/NameMaps.java index 22defb275..753fb4421 100644 --- a/astrid/src/main/java/com/todoroo/astrid/actfm/sync/messages/NameMaps.java +++ b/astrid/src/main/java/com/todoroo/astrid/actfm/sync/messages/NameMaps.java @@ -24,7 +24,6 @@ public class NameMaps { public static final String TABLE_ID_TAGS = "tags"; public static final String TABLE_ID_USERS = "users"; public static final String TABLE_ID_USER_ACTIVITY = "user_activities"; - public static final String TABLE_ID_HISTORY = "history"; public static final String TABLE_ID_ATTACHMENTS = "task_attachments"; public static final String TABLE_ID_TASK_LIST_METADATA = "task_list_metadata"; 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 a1ccbd988..9cfdbab39 100644 --- a/astrid/src/main/java/com/todoroo/astrid/activity/EditPreferences.java +++ b/astrid/src/main/java/com/todoroo/astrid/activity/EditPreferences.java @@ -345,12 +345,7 @@ public class EditPreferences extends TodorooPreferenceActivity { 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) { - @Override - public boolean onPreferenceChange(Preference p, Object newValue) { - return super.onPreferenceChange(p, newValue); - } - }); + preference.setOnPreferenceChangeListener(new SetResultOnPreferenceChangeListener(RESULT_CODE_PERFORMANCE_PREF_CHANGED)); } else if (r.getString(R.string.p_voiceInputEnabled).equals(preference.getKey())) { if (value != null && !(Boolean) value) { preference.setSummary(R.string.EPr_voiceInputEnabled_desc_disabled); @@ -395,7 +390,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/main/java/com/todoroo/astrid/activity/FilterListFragment.java b/astrid/src/main/java/com/todoroo/astrid/activity/FilterListFragment.java index 09644be2f..ae4332cd3 100644 --- a/astrid/src/main/java/com/todoroo/astrid/activity/FilterListFragment.java +++ b/astrid/src/main/java/com/todoroo/astrid/activity/FilterListFragment.java @@ -114,12 +114,12 @@ public class FilterListFragment extends SherlockListFragment { public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { Activity activity = getActivity(); - int layout = getLayout(activity); + int layout = getLayout(); ViewGroup parent = (ViewGroup) activity.getLayoutInflater().inflate(layout, container, false); return parent; } - protected int getLayout(Activity activity) { + protected int getLayout() { return R.layout.filter_list_activity; } @@ -265,7 +265,7 @@ public class FilterListFragment extends SherlockListFragment { /** * Creates a shortcut on the user's home screen */ - private static void createShortcut(Activity activity, Filter filter, Intent shortcutIntent, String label) { + private static void createShortcut(Activity activity, Intent shortcutIntent, String label) { if(label.length() == 0) { return; } @@ -340,7 +340,7 @@ public class FilterListFragment extends SherlockListFragment { @Override public void run() { String label = editText.getText().toString(); - createShortcut(activity, filter, shortcutIntent, label); + createShortcut(activity, shortcutIntent, label); } }; editText.setOnEditorActionListener(new OnEditorActionListener() { 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 b8b186c0e..18f8bbff2 100755 --- a/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java +++ b/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java @@ -142,14 +142,8 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { */ public static final String TOKEN_PICTURE_IN_PROGRESS = "picture_in_progress"; //$NON-NLS-1$ - /** - * Tab to start on - */ - public static final String TOKEN_TAB = "tab"; //$NON-NLS-1$ - // --- request codes - public static final int REQUEST_LOG_IN = 0; private static final int REQUEST_VOICE_RECOG = 10; public static final int REQUEST_CODE_CONTACT = 20; public static final int REQUEST_CODE_RECORD = 30; @@ -237,14 +231,6 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { * ====================================================================== */ - /** - * Container Activity must implement this interface and we ensure that it - * does during the onAttach() callback - */ - public interface OnTaskEditDetailsClickedListener { - public void onTaskEditDetailsClicked(int category, int position); - } - public TaskEditFragment() { DependencyInjectionService.getInstance().inject(this); } @@ -358,7 +344,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { commentsBar.setVisibility(View.VISIBLE); } setCurrentTab(TAB_VIEW_UPDATES); - setPagerHeightForPosition(TAB_VIEW_UPDATES); + setPagerHeightForPosition(); Handler handler = new Handler(); handler.postDelayed(new Runnable() { @Override @@ -672,13 +658,6 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { } - public long getTaskIdInProgress() { - if (model != null && model.getId() > 0) { - return model.getId(); - } - return getActivity().getIntent().getLongExtra(TOKEN_ID, -1); - } - private void setIsNewTask(boolean isNewTask) { this.isNewTask = isNewTask; Activity activity = getActivity(); @@ -710,12 +689,6 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { } - public void refreshFilesDisplay() { - boolean hasAttachments = taskAttachmentDao.taskHasAttachments(model.getUuid()); - filesControlSet.getDisplayView().setVisibility(hasAttachments ? View.VISIBLE : View.GONE); - filesControlSet.readFromTask(model); - } - /** Populate UI component values from the model */ private void populateFields() { populateFields(getActivity().getIntent()); @@ -758,8 +731,6 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { } } - addDueTimeToToast(toast.toString()); - boolean tagsChanged = Flags.check(Flags.TAGS_CHANGED); model.putTransitory(TaskService.TRANS_EDIT_SAVE, true); taskService.save(model); @@ -852,28 +823,6 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { save(false); } - /** - * Displays a Toast reporting that the selected task has been saved and, if - * it has a due date, that is due in 'x' amount of time, to 1 time-unit of - * precision - */ - private String addDueTimeToToast(String additionalMessage) { - int stringResource; - - long due = model.getValue(Task.DUE_DATE); - String toastMessage; - if (due != 0) { - stringResource = R.string.TEA_onTaskSave_due; - CharSequence formattedDate = DateUtilities.getRelativeDay( - getActivity(), due); - toastMessage = getString(stringResource, formattedDate); - } else { - toastMessage = getString(R.string.TEA_onTaskSave_notDue); - } - - return toastMessage + additionalMessage; - } - protected void discardButtonClick() { shouldSaveState = false; @@ -1157,43 +1106,15 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { * ====================================================================== */ - public int getTabForPosition(int position) { - int tab = TaskEditViewPager.getPageForPosition(position, tabStyle); - switch(tab) { - case TaskEditViewPager.TAB_SHOW_ACTIVITY: - return TAB_VIEW_UPDATES; - } - - // error experienced - return TAB_VIEW_UPDATES; - } - - /** - * Returns the correct view for TaskEditViewPager - * - * @param position - * in the horizontal scroll view - */ - - public View getPageView(int position) { - switch(getTabForPosition(position)) { - case TAB_VIEW_UPDATES: - return editNotes; - } - return null; + public View getPageView() { + return editNotes; } - private void setPagerHeightForPosition(int position) { + private void setPagerHeightForPosition() { int height = 0; - View view = null; - switch(getTabForPosition(position)) { - case TAB_VIEW_UPDATES: - view = editNotes; - break; - } - - if (view == null || mPager == null) { + View view = editNotes; + if (mPager == null) { return; } @@ -1208,27 +1129,6 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { } } - public static void setViewHeightBasedOnChildren(LinearLayout view) { - - int totalHeight = 0; - int desiredWidth = MeasureSpec.makeMeasureSpec(view.getWidth(), - MeasureSpec.AT_MOST); - for (int i = 0; i < view.getChildCount(); i++) { - View listItem = view.getChildAt(i); - listItem.measure(desiredWidth, MeasureSpec.UNSPECIFIED); - totalHeight += listItem.getMeasuredHeight(); - } - - ViewGroup.LayoutParams params = view.getLayoutParams(); - if(params == null) { - return; - } - - params.height = totalHeight; - view.setLayoutParams(params); - view.requestLayout(); - } - // Tab Page listener when page/tab changes @Override public void onPageScrolled(int position, float positionOffset, @@ -1237,7 +1137,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { @Override public void onPageSelected(final int position) { - setPagerHeightForPosition(position); + setPagerHeightForPosition(); } @Override @@ -1248,7 +1148,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { @Override public void updatesChanged() { if (mPager != null && mPager.getCurrentItem() == TAB_VIEW_UPDATES) { - setPagerHeightForPosition(TAB_VIEW_UPDATES); + setPagerHeightForPosition(); } } @@ -1256,7 +1156,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { @Override public void commentAdded() { setCurrentTab(TAB_VIEW_UPDATES); - setPagerHeightForPosition(TAB_VIEW_UPDATES); + setPagerHeightForPosition(); scrollToView(editNotes); } diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditViewPager.java b/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditViewPager.java index f69ecfe98..5b064a96a 100644 --- a/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditViewPager.java +++ b/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditViewPager.java @@ -51,7 +51,7 @@ public class TaskEditViewPager extends PagerAdapter { @Override public Object instantiateItem(View pager, int position) { - View pageView = parent.getPageView(position); + View pageView = parent.getPageView(); ((ViewPager) pager).addView(pageView, 0); return pageView; 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 aa3eaf1dc..2fa8a88c1 100644 --- a/astrid/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java +++ b/astrid/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java @@ -448,10 +448,10 @@ public class TaskListFragment extends SherlockListFragment implements OnSortSele return; } - addMenuItems(menu, activity); + addMenuItems(menu); } - protected void addMenuItems(Menu menu, Activity activity) { + protected void addMenuItems(Menu menu) { // ask about plug-ins Intent queryIntent = new Intent( AstridApiConstants.ACTION_TASK_LIST_MENU); @@ -856,8 +856,8 @@ public class TaskListFragment extends SherlockListFragment implements OnSortSele new OnCompletedTaskListener() { @Override public void onCompletedTask(Task item, boolean newState) { - if (newState == true) { - onTaskCompleted(item); + if (newState) { + onTaskCompleted(); } } }); @@ -984,13 +984,7 @@ public class TaskListFragment extends SherlockListFragment implements OnSortSele * ====================================================================== */ - /** - * A task was completed from the task adapter - * - * @param item - * task that was completed - */ - protected void onTaskCompleted(Task item) { + protected void onTaskCompleted() { if (isInbox) { } else { } @@ -1038,19 +1032,6 @@ public class TaskListFragment extends SherlockListFragment implements OnSortSele menu.add(id, CONTEXT_MENU_COPY_TASK_ID, Menu.NONE, R.string.TAd_contextCopyTask); - for (int i = 0; i < contextItemExposers.length; i++) { - Object label = contextItemExposers[i].getLabel(task); - if (label != null) { - if (label instanceof Integer) { - menu.add(id, CONTEXT_MENU_PLUGIN_ID_FIRST + i, - Menu.NONE, (Integer) label); - } else { - menu.add(id, CONTEXT_MENU_PLUGIN_ID_FIRST + i, - Menu.NONE, (String) label); - } - } - } - long taskId = task.getId(); for (ContextMenuItem item : contextMenuExtensionLoader.getList()) { android.view.MenuItem menuItem = menu.add(id, 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 58bc290d7..0425157e2 100644 --- a/astrid/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java +++ b/astrid/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java @@ -202,15 +202,14 @@ public class FilterAdapter extends ArrayAdapter { offerFilter(item); } - public int addOrLookup(Filter filter) { + public void addOrLookup(Filter filter) { int index = getPosition(filter); if (index >= 0) { Filter existing = getItem(index); transferImageReferences(filter, existing); - return index; + return; } add(filter); - return getCount() - 1; } // Helper function: if a filter was created from serialized extras, it may not @@ -223,7 +222,7 @@ public class FilterAdapter extends ArrayAdapter { } } - public int adjustFilterCount(Filter filter, int delta) { + public void adjustFilterCount(Filter filter, int delta) { int filterCount = 0; if (filterCounts.containsKey(filter)) { filterCount = filterCounts.get(filter); @@ -231,15 +230,14 @@ public class FilterAdapter extends ArrayAdapter { int newCount = Math.max(filterCount + delta, 0); filterCounts.put(filter, newCount); notifyDataSetChanged(); - return newCount; } - public int incrementFilterCount(Filter filter) { - return adjustFilterCount(filter, 1); + public void incrementFilterCount(Filter filter) { + adjustFilterCount(filter, 1); } - public int decrementFilterCount(Filter filter) { - return adjustFilterCount(filter, -1); + public void decrementFilterCount(Filter filter) { + adjustFilterCount(filter, -1); } public void refreshFilterCount(final Filter filter) { @@ -348,10 +346,6 @@ public class FilterAdapter extends ArrayAdapter { return selection; } - protected boolean shouldDirectlyPopulateFilters() { - return true; - } - /* ====================================================================== * ============================================================= receiver * ====================================================================== */ @@ -376,26 +370,13 @@ public class FilterAdapter extends ArrayAdapter { @Override public void onReceive(Context context, Intent intent) { try { - if (shouldDirectlyPopulateFilters()) { - for (ResolveInfo filterExposerInfo : filterExposerList) { - String className = filterExposerInfo.activityInfo.name; - AstridFilterExposer filterExposer = null; - filterExposer = (AstridFilterExposer) Class.forName(className, true, FilterAdapter.class.getClassLoader()).newInstance(); - - if (filterExposer != null) { - populateFiltersToAdapter(filterExposer.getFilters()); - } - } - } else { - try { - Bundle extras = intent.getExtras(); - extras.setClassLoader(FilterListHeader.class.getClassLoader()); - final Parcelable[] filters = extras.getParcelableArray(AstridApiConstants.EXTRAS_RESPONSE); - populateFiltersToAdapter(filters); - } catch (Exception e) { - Log.e("receive-filter-" + //$NON-NLS-1$ - intent.getStringExtra(AstridApiConstants.EXTRAS_ADDON), - e.toString(), e); + for (ResolveInfo filterExposerInfo : filterExposerList) { + String className = filterExposerInfo.activityInfo.name; + AstridFilterExposer filterExposer = null; + filterExposer = (AstridFilterExposer) Class.forName(className, true, FilterAdapter.class.getClassLoader()).newInstance(); + + if (filterExposer != null) { + populateFiltersToAdapter(filterExposer.getFilters()); } } } catch (Exception e) { 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 aff5cae20..592f8875a 100644 --- a/astrid/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java +++ b/astrid/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java @@ -942,7 +942,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable { return; } - reset(viewHolder, taskId); + reset(viewHolder); if(decorations.size() == 0) { return; } @@ -979,7 +979,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable { } @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); @@ -993,11 +993,6 @@ public class TaskAdapter extends CursorAdapter implements Filterable { viewHolder.view.setBackgroundResource(android.R.drawable.list_selector_background); } } - - @Override - protected Intent createBroadcastIntent(Task task) { - return null; - } } /* ====================================================================== diff --git a/astrid/src/main/java/com/todoroo/astrid/adapter/UpdateAdapter.java b/astrid/src/main/java/com/todoroo/astrid/adapter/UpdateAdapter.java index b3e52fe2b..d37a94945 100644 --- a/astrid/src/main/java/com/todoroo/astrid/adapter/UpdateAdapter.java +++ b/astrid/src/main/java/com/todoroo/astrid/adapter/UpdateAdapter.java @@ -34,8 +34,6 @@ import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.andlib.utility.Preferences; import com.todoroo.astrid.actfm.sync.ActFmPreferenceService; import com.todoroo.astrid.actfm.sync.messages.NameMaps; -import com.todoroo.astrid.activity.AstridActivity; -import com.todoroo.astrid.data.History; import com.todoroo.astrid.data.RemoteModel; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.User; @@ -67,7 +65,6 @@ public class UpdateAdapter extends CursorAdapter { private static final StringProperty USER_NAME = User.NAME.cloneAs(USER_TABLE_ALIAS, "userName"); //$NON-NLS-1$ public static final StringProperty ACTIVITY_TYPE_PROPERTY = new StringProperty(null, "'" + NameMaps.TABLE_ID_USER_ACTIVITY + "' as type"); //$NON-NLS-1$//$NON-NLS-2$ - public static final StringProperty HISTORY_TYPE_PROPERTY = new StringProperty(null, "'" + NameMaps.TABLE_ID_HISTORY + "'"); //$NON-NLS-1$ //$NON-NLS-2$ public static final Property[] USER_PROPERTIES = { USER_PICTURE, @@ -89,20 +86,6 @@ public class UpdateAdapter extends CursorAdapter { ACTIVITY_TYPE_PROPERTY, }; - public static final Property[] HISTORY_PROPERTIES = { - History.CREATED_AT, - History.USER_UUID, - History.COLUMN, - History.TABLE_ID, - History.OLD_VALUE, - History.NEW_VALUE, - History.TASK, - History.USER_UUID, - History.ID, - HISTORY_TYPE_PROPERTY, - }; - - public static final int TYPE_PROPERTY_INDEX = USER_ACTIVITY_PROPERTIES.length - 1; public static final String FROM_TAG_VIEW = "from_tag"; //$NON-NLS-1$ @@ -176,7 +159,6 @@ public class UpdateAdapter extends CursorAdapter { private class ModelHolder { public UserActivity activity = new UserActivity(); public User user = new User(); - public History history = new History(); } /** Creates a new view for use in the list view */ @@ -206,18 +188,12 @@ public class UpdateAdapter extends CursorAdapter { User user = mh.user; user.clear(); - History history = mh.history; boolean isSelf; - if (NameMaps.TABLE_ID_USER_ACTIVITY.equals(type)) { - readUserActivityProperties(cursor, update); - isSelf = Task.USER_ID_SELF.equals(update.getValue(UserActivity.USER_UUID)); - } else { - readHistoryProperties(cursor, history); - isSelf = Task.USER_ID_SELF.equals(history.getValue(History.USER_UUID)); - } + readUserActivityProperties(cursor, update); + isSelf = Task.USER_ID_SELF.equals(update.getValue(UserActivity.USER_UUID)); readUserProperties(cursor, user, self, isSelf); - setFieldContentsAndVisibility(view, update, user, history, type); + setFieldContentsAndVisibility(view, update, type); } public static void readUserActivityProperties(TodorooCursor unionCursor, UserActivity activity) { @@ -231,17 +207,6 @@ public class UpdateAdapter extends CursorAdapter { activity.setValue(UserActivity.USER_UUID, unionCursor.getString(7)); } - public static void readHistoryProperties(TodorooCursor unionCursor, History history) { - history.setValue(History.CREATED_AT, unionCursor.getLong(0)); - history.setValue(History.USER_UUID, unionCursor.getString(1)); - history.setValue(History.COLUMN, unionCursor.getString(2)); - history.setValue(History.TABLE_ID, unionCursor.getString(3)); - history.setValue(History.OLD_VALUE, unionCursor.getString(4)); - history.setValue(History.NEW_VALUE, unionCursor.getString(5)); - history.setValue(History.TASK, unionCursor.getString(6)); - history.setValue(History.USER_UUID, unionCursor.getString(7)); - } - public static void readUserProperties(TodorooCursor joinCursor, User user, User self, boolean isSelf) { if (isSelf) { user.mergeWith(self.getSetValues()); @@ -255,28 +220,27 @@ public class UpdateAdapter extends CursorAdapter { } /** Helper method to set the contents and visibility of each field */ - public synchronized void setFieldContentsAndVisibility(View view, UserActivity activity, User user, History history, String type) { + public synchronized void setFieldContentsAndVisibility(View view, UserActivity activity, String type) { // picture if (NameMaps.TABLE_ID_USER_ACTIVITY.equals(type)) { - setupUserActivityRow(view, activity, user); + setupUserActivityRow(view, activity); } } - private void setupUserActivityRow(View view, UserActivity activity, User user) { + private void setupUserActivityRow(View view, UserActivity activity) { final ImageView commentPictureView = (ImageView)view.findViewById(R.id.comment_picture); { String pictureThumb = activity.getPictureUrl(UserActivity.PICTURE, RemoteModel.PICTURE_MEDIUM); - String pictureFull = activity.getPictureUrl(UserActivity.PICTURE, RemoteModel.PICTURE_LARGE); Bitmap updateBitmap = null; if (TextUtils.isEmpty(pictureThumb)) { updateBitmap = activity.getPictureBitmap(UserActivity.PICTURE); } - setupImagePopupForCommentView(view, commentPictureView, pictureThumb, pictureFull, updateBitmap, + setupImagePopupForCommentView(view, commentPictureView, pictureThumb, updateBitmap, activity.getValue(UserActivity.MESSAGE), fragment); } // name final TextView nameView = (TextView)view.findViewById(R.id.title); { - nameView.setText(getUpdateComment((AstridActivity)fragment.getActivity(), activity, user, linkColor, fromView)); + nameView.setText(getUpdateComment(activity)); nameView.setMovementMethod(new LinkMovementMethod()); nameView.setTextColor(color); } @@ -296,7 +260,7 @@ public class UpdateAdapter extends CursorAdapter { return false; } - public static void setupImagePopupForCommentView(View view, ImageView commentPictureView, final String pictureThumb, final String pictureFull, final Bitmap updateBitmap, + public static void setupImagePopupForCommentView(View view, ImageView commentPictureView, final String pictureThumb, final Bitmap updateBitmap, final String message, final Fragment fragment) { if ((!TextUtils.isEmpty(pictureThumb) && !"null".equals(pictureThumb)) || updateBitmap != null) { //$NON-NLS-1$ commentPictureView.setVisibility(View.VISIBLE); @@ -330,7 +294,7 @@ public class UpdateAdapter extends CursorAdapter { } } - public static Spanned getUpdateComment(final AstridActivity context, UserActivity activity, User user, String linkColor, String fromView) { + public static Spanned getUpdateComment(UserActivity activity) { String message = activity.getValue(UserActivity.MESSAGE); return Html.fromHtml(message); } 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 854fbae52..e1faabfc9 100644 --- a/astrid/src/main/java/com/todoroo/astrid/alarms/AlarmControlSet.java +++ b/astrid/src/main/java/com/todoroo/astrid/alarms/AlarmControlSet.java @@ -97,7 +97,7 @@ public final class AlarmControlSet extends TaskEditControlSet { return null; } - private boolean addAlarm(Date alert) { + private void addAlarm(Date alert) { final View alertItem = LayoutInflater.from(activity).inflate(R.layout.alarm_edit_row, null); alertsContainer.addView(alertItem); @@ -143,7 +143,5 @@ public final class AlarmControlSet extends TaskEditControlSet { alertsContainer.removeView(alertItem); } }); - - return true; } } diff --git a/astrid/src/main/java/com/todoroo/astrid/api/TaskContextActionExposer.java b/astrid/src/main/java/com/todoroo/astrid/api/TaskContextActionExposer.java index 92c4c5e91..6409a9f54 100644 --- a/astrid/src/main/java/com/todoroo/astrid/api/TaskContextActionExposer.java +++ b/astrid/src/main/java/com/todoroo/astrid/api/TaskContextActionExposer.java @@ -31,13 +31,6 @@ public interface TaskContextActionExposer { } } - /** - * Expose context menu item label, or null if item should not be shown - * - * @return null if no item should be displayed, or string or id - */ - public Object getLabel(Task task); - /** * Call context menu action */ diff --git a/astrid/src/main/java/com/todoroo/astrid/backup/BackupConstants.java b/astrid/src/main/java/com/todoroo/astrid/backup/BackupConstants.java index 240f241e8..a014bc1fd 100644 --- a/astrid/src/main/java/com/todoroo/astrid/backup/BackupConstants.java +++ b/astrid/src/main/java/com/todoroo/astrid/backup/BackupConstants.java @@ -9,7 +9,6 @@ import android.os.Environment; import java.io.File; - /** * Constants for backup XML attributes and nodes. * @@ -46,8 +45,6 @@ public class BackupConstants { public static final String TAG_TAG = "tag"; public static final String TAG_ATTR_NAME = "name"; - public static final String ALERT_TAG = "alert"; - public static final String ALERT_ATTR_DATE = "date"; public static final String SYNC_TAG = "sync"; public static final String SYNC_ATTR_SERVICE = "service"; public static final String SYNC_ATTR_REMOTE_ID = "remote_id"; @@ -78,6 +75,4 @@ public class BackupConstants { } return null; } - - } 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 8cb7670ea..6cc2203f2 100644 --- a/astrid/src/main/java/com/todoroo/astrid/backup/TasksXmlImporter.java +++ b/astrid/src/main/java/com/todoroo/astrid/backup/TasksXmlImporter.java @@ -474,9 +474,6 @@ public class TasksXmlImporter { if (tag.equals(BackupConstants.TAG_TAG)) { // Process parseTag(); - } else if (tag.equals(BackupConstants.ALERT_TAG)) { - // Process - parseAlert(); } else if (tag.equals(BackupConstants.SYNC_TAG)) { // Process parseSync(); @@ -491,7 +488,7 @@ public class TasksXmlImporter { } } - private boolean parseSync() { + private void parseSync() { String service = xpp.getAttributeValue(null, BackupConstants.SYNC_ATTR_SERVICE); String remoteId = xpp.getAttributeValue(null, BackupConstants.SYNC_ATTR_REMOTE_ID); if (service != null && remoteId != null) { @@ -507,20 +504,12 @@ public class TasksXmlImporter { metadata.setValue(Metadata.VALUE3, (taskId)); metadata.setValue(Metadata.VALUE4, syncOnComplete ? "1" : "0"); //$NON-NLS-1$ //$NON-NLS-2$ metadataService.save(metadata); - return true; } - return false; } - private boolean parseAlert() { - // drop it - return false; - } - - private boolean parseTag() { + private void parseTag() { String tagName = xpp.getAttributeValue(null, BackupConstants.TAG_ATTR_NAME); tags.add(tagName); - return true; } private void saveTags() { @@ -621,8 +610,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/src/main/java/com/todoroo/astrid/dao/Database.java b/astrid/src/main/java/com/todoroo/astrid/dao/Database.java index 22898bfe5..377c8faca 100644 --- a/astrid/src/main/java/com/todoroo/astrid/dao/Database.java +++ b/astrid/src/main/java/com/todoroo/astrid/dao/Database.java @@ -14,7 +14,6 @@ import com.todoroo.andlib.data.AbstractModel; import com.todoroo.andlib.data.Property; import com.todoroo.andlib.data.Table; import com.todoroo.andlib.service.ContextManager; -import com.todoroo.astrid.data.History; import com.todoroo.astrid.data.Metadata; import com.todoroo.astrid.data.StoreObject; import com.todoroo.astrid.data.TagData; @@ -68,7 +67,6 @@ public class Database extends AbstractDatabase { User.TABLE, UserActivity.TABLE, TagMetadata.TABLE, - History.TABLE, TaskAttachment.TABLE, TaskListMetadata.TABLE, TaskOutstanding.TABLE, @@ -144,13 +142,6 @@ public class Database extends AbstractDatabase { append(')'); database.execSQL(sql.toString()); sql.setLength(0); - - sql.append("CREATE INDEX IF NOT EXISTS hist_tag_id ON "). - append(History.TABLE).append('('). - append(History.TAG_ID.name). - append(')'); - database.execSQL(sql.toString()); - sql.setLength(0); } @Override @@ -359,11 +350,9 @@ public class Database extends AbstractDatabase { tryExecSQL(addColumnSql(Task.TABLE, Task.IS_PUBLIC, visitor, "0")); tryExecSQL(addColumnSql(Task.TABLE, Task.IS_READONLY, visitor, "0")); tryExecSQL(addColumnSql(Task.TABLE, Task.CLASSIFICATION, visitor, null)); - tryExecSQL(addColumnSql(Task.TABLE, Task.HISTORY_FETCH_DATE, visitor, null)); tryExecSQL(addColumnSql(Task.TABLE, Task.ATTACHMENTS_PUSHED_AT, visitor, null)); tryExecSQL(addColumnSql(Task.TABLE, Task.USER_ACTIVITIES_PUSHED_AT, visitor, null)); tryExecSQL(addColumnSql(TagData.TABLE, TagData.PUSHED_AT, visitor, null)); - tryExecSQL(addColumnSql(TagData.TABLE, TagData.HISTORY_FETCH_DATE, visitor, null)); tryExecSQL(addColumnSql(TagData.TABLE, TagData.TASKS_PUSHED_AT, visitor, null)); tryExecSQL(addColumnSql(TagData.TABLE, TagData.METADATA_PUSHED_AT, visitor, null)); tryExecSQL(addColumnSql(TagData.TABLE, TagData.USER_ACTIVITIES_PUSHED_AT, visitor, null)); @@ -374,11 +363,7 @@ public class Database extends AbstractDatabase { case 30: case 31: - tryExecSQL(addColumnSql(Task.TABLE, Task.HISTORY_HAS_MORE, visitor, null)); - tryExecSQL(addColumnSql(TagData.TABLE, TagData.HISTORY_HAS_MORE, visitor, null)); case 32: - tryExecSQL("DROP TABLE " + History.TABLE.name); - tryExecSQL(createTableSql(visitor, History.TABLE.name, History.PROPERTIES)); tryExecSQL(addColumnSql(User.TABLE, User.TASKS_PUSHED_AT, visitor, null)); case 33: tryExecSQL(addColumnSql(TagData.TABLE, TagData.LAST_AUTOSYNC, visitor, null)); 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 168879c99..c5a579983 100644 --- a/astrid/src/main/java/com/todoroo/astrid/dao/TaskDao.java +++ b/astrid/src/main/java/com/todoroo/astrid/dao/TaskDao.java @@ -368,7 +368,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) || @@ -420,7 +420,7 @@ public class TaskDao extends RemoteModelDao { /** * Called after the task was just completed */ - private static void afterComplete(Task task, ContentValues values) { + private static void afterComplete(Task task) { Notifications.cancelNotifications(task.getId()); } 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 ac5cddec4..6dc21b83c 100644 --- a/astrid/src/main/java/com/todoroo/astrid/files/FileUtilities.java +++ b/astrid/src/main/java/com/todoroo/astrid/files/FileUtilities.java @@ -25,7 +25,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$ } private static String getTimeStringForFilename(Context context, Date date) { diff --git a/astrid/src/main/java/com/todoroo/astrid/gcal/CalendarReminderActivity.java b/astrid/src/main/java/com/todoroo/astrid/gcal/CalendarReminderActivity.java index 086d15d71..49445acd4 100644 --- a/astrid/src/main/java/com/todoroo/astrid/gcal/CalendarReminderActivity.java +++ b/astrid/src/main/java/com/todoroo/astrid/gcal/CalendarReminderActivity.java @@ -202,7 +202,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/src/main/java/com/todoroo/astrid/gtasks/GtasksMetadataService.java b/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksMetadataService.java index 997f2100f..9c1758b68 100644 --- a/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksMetadataService.java +++ b/astrid/src/main/java/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,7 @@ public final class GtasksMetadataService extends SyncMetadataService() { @Override - public void onModelUpdated(final Task model, boolean outstandingEntries) { + public void onModelUpdated(final Task model) { if(model.checkAndClearTransitory(SyncFlags.GTASKS_SUPPRESS_SYNC)) { return; } diff --git a/astrid/src/main/java/com/todoroo/astrid/gtasks/sync/GtasksSyncV2Provider.java b/astrid/src/main/java/com/todoroo/astrid/gtasks/sync/GtasksSyncV2Provider.java index f9e28dfcf..b04d644fa 100644 --- a/astrid/src/main/java/com/todoroo/astrid/gtasks/sync/GtasksSyncV2Provider.java +++ b/astrid/src/main/java/com/todoroo/astrid/gtasks/sync/GtasksSyncV2Provider.java @@ -5,7 +5,6 @@ */ package com.todoroo.astrid.gtasks.sync; -import android.app.Activity; import android.text.TextUtils; import com.google.api.services.tasks.model.Tasks; @@ -91,7 +90,7 @@ public class GtasksSyncV2Provider extends SyncV2Provider { } @Override - public void signOut(Activity activity) { + public void signOut() { gtasksPreferenceService.clearLastSyncDate(); gtasksPreferenceService.setToken(null); Preferences.setString(GtasksPreferenceService.PREF_USER_NAME, null); @@ -340,7 +339,7 @@ public class GtasksSyncV2Provider extends SyncV2Provider { return container; } - private void write(GtasksTaskContainer task) throws IOException { + private void write(GtasksTaskContainer task) { // merge astrid dates with google dates if(task.task.isSaved()) { diff --git a/astrid/src/main/java/com/todoroo/astrid/helper/TaskAdapterAddOnManager.java b/astrid/src/main/java/com/todoroo/astrid/helper/TaskAdapterAddOnManager.java index 7cffa270b..33b673b74 100644 --- a/astrid/src/main/java/com/todoroo/astrid/helper/TaskAdapterAddOnManager.java +++ b/astrid/src/main/java/com/todoroo/astrid/helper/TaskAdapterAddOnManager.java @@ -3,13 +3,10 @@ */ package com.todoroo.astrid.helper; -import android.content.Intent; import android.support.v4.app.ListFragment; 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; @@ -45,21 +42,14 @@ abstract public class TaskAdapterAddOnManager { // request details draw(viewHolder, taskId, get(taskId)); - Intent broadcastIntent = createBroadcastIntent(viewHolder.task); - if(broadcastIntent != null) { - fragment.getActivity().sendOrderedBroadcast(broadcastIntent, AstridApiConstants.PERMISSION_READ); - } return true; } - /** creates a broadcast intent for requesting */ - abstract protected Intent createBroadcastIntent(Task task); - /** updates the given view */ abstract protected void draw(ViewHolder viewHolder, long taskId, Collection list); /** 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 */ public void addNew(long taskId, String addOn, TYPE item, ViewHolder thisViewHolder) { 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 a5ae951ad..80222093f 100644 --- a/astrid/src/main/java/com/todoroo/astrid/notes/EditNoteActivity.java +++ b/astrid/src/main/java/com/todoroo/astrid/notes/EditNoteActivity.java @@ -7,7 +7,6 @@ package com.todoroo.astrid.notes; import android.app.Activity; import android.content.Intent; -import android.content.res.Resources; import android.database.sqlite.SQLiteException; import android.graphics.Bitmap; import android.graphics.Color; @@ -49,7 +48,6 @@ import com.todoroo.astrid.adapter.UpdateAdapter; import com.todoroo.astrid.core.PluginServices; import com.todoroo.astrid.dao.MetadataDao.MetadataCriteria; import com.todoroo.astrid.dao.UserActivityDao; -import com.todoroo.astrid.data.History; import com.todoroo.astrid.data.Metadata; import com.todoroo.astrid.data.RemoteModel; import com.todoroo.astrid.data.Task; @@ -82,7 +80,6 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene private final ArrayList items = new ArrayList(); private EditText commentField; - private TextView loadingText; private final View commentsBar; private View timerView; private View commentButton; @@ -93,11 +90,8 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene private final AstridActivity activity; - private final Resources resources; - private final int cameraButton; private final String linkColor; - private int historyCount = 0; private final int color; private final int grayColor; @@ -119,7 +113,6 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene this.activity = (AstridActivity) fragment.getActivity(); - this.resources = fragment.getResources(); TypedValue tv = new TypedValue(); fragment.getActivity().getTheme().resolveAttribute(R.attr.asTextColor, tv, false); color = tv.data; @@ -146,7 +139,7 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene } private void fetchTask(long id) { - task = PluginServices.getTaskService().fetchById(id, Task.NOTES, Task.ID, Task.UUID, Task.TITLE, Task.HISTORY_FETCH_DATE, Task.HISTORY_HAS_MORE, Task.USER_ACTIVITIES_PUSHED_AT, Task.ATTACHMENTS_PUSHED_AT); + task = PluginServices.getTaskService().fetchById(id, Task.NOTES, Task.ID, Task.UUID, Task.TITLE, Task.USER_ACTIVITIES_PUSHED_AT, Task.ATTACHMENTS_PUSHED_AT); } public void loadViewForTaskID(long t){ @@ -262,16 +255,11 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene pictureButton.setImageBitmap(pendingCommentPicture); } } - - //TODO add loading text back in - // loadingText = (TextView) findViewById(R.id.loading); - loadingText = new TextView(getContext()); } private void setUpListAdapter() { items.clear(); this.removeAllViews(); - historyCount = 0; TodorooCursor notes = metadataService.query( Query.select(Metadata.PROPERTIES).where( MetadataCriteria.byTaskAndwithKey(task.getId(), @@ -288,29 +276,22 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene User self = UpdateAdapter.getSelfUser(); - TodorooCursor updates = taskService.getActivityAndHistoryForTask(task); + TodorooCursor updates = taskService.getActivityForTask(task); try { UserActivity update = new UserActivity(); - History history = new History(); User user = new User(); for(updates.moveToFirst(); !updates.isAfterLast(); updates.moveToNext()) { update.clear(); user.clear(); String type = updates.getString(UpdateAdapter.TYPE_PROPERTY_INDEX); - NoteOrUpdate noa; + NoteOrUpdate noa = null; boolean isSelf; if (NameMaps.TABLE_ID_USER_ACTIVITY.equals(type)) { UpdateAdapter.readUserActivityProperties(updates, update); isSelf = Task.USER_ID_SELF.equals(update.getValue(UserActivity.USER_UUID)); UpdateAdapter.readUserProperties(updates, user, self, isSelf); - noa = NoteOrUpdate.fromUpdateOrHistory(activity, update, null, user, linkColor); - } else { - UpdateAdapter.readHistoryProperties(updates, history); - isSelf = Task.USER_ID_SELF.equals(history.getValue(History.USER_UUID)); - UpdateAdapter.readUserProperties(updates, user, self, isSelf); - noa = NoteOrUpdate.fromUpdateOrHistory(activity, null, history, user, linkColor); - historyCount++; + noa = NoteOrUpdate.fromUpdate(update, user); } if(noa != null) { items.add(noa); @@ -338,7 +319,7 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene this.addView(notesView); } - if (items.size() > commentItems || task.getValue(Task.HISTORY_HAS_MORE) > 0) { + if (items.size() > commentItems) { Button loadMore = new Button(getContext()); loadMore.setText(R.string.TEA_load_more); loadMore.setTextColor(activity.getResources().getColor(R.color.task_edit_deadline_gray)); @@ -349,8 +330,6 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene // Perform action on click commentItems += 10; setUpListAdapter(); - if (task.getValue(Task.HISTORY_HAS_MORE) > 0) { - } } }); this.addView(loadMore); @@ -374,11 +353,7 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene // name final TextView nameView = (TextView)view.findViewById(R.id.title); { nameView.setText(item.title); - if (NameMaps.TABLE_ID_HISTORY.equals(item.type)) { - nameView.setTextColor(grayColor); - } else { - nameView.setTextColor(color); - } + nameView.setTextColor(color); Linkify.addLinks(nameView, Linkify.ALL); } @@ -392,7 +367,7 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene // picture final ImageView commentPictureView = (ImageView)view.findViewById(R.id.comment_picture); - UpdateAdapter.setupImagePopupForCommentView(view, commentPictureView, item.pictureThumb, item.pictureFull, item.commentBitmap, item.title.toString(), fragment); + UpdateAdapter.setupImagePopupForCommentView(view, commentPictureView, item.pictureThumb, item.commentBitmap, item.title.toString(), fragment); } public void refreshData() { @@ -486,7 +461,7 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene m.getValue(Metadata.CREATION_DATE), null); } - public static NoteOrUpdate fromUpdateOrHistory(AstridActivity context, UserActivity u, History history, User user, String linkColor) { + public static NoteOrUpdate fromUpdate(UserActivity u, User user) { String userImage = ""; //$NON-NLS-1$ String pictureThumb = ""; //$NON-NLS-1$ String pictureFull = ""; //$NON-NLS-1$ @@ -504,7 +479,7 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene if (TextUtils.isEmpty(pictureThumb)) { commentBitmap = u.getPictureBitmap(UserActivity.PICTURE); } - title = UpdateAdapter.getUpdateComment(context, u, user, linkColor, UpdateAdapter.FROM_TASK_VIEW); + title = UpdateAdapter.getUpdateComment(u); userImage = ""; //$NON-NLS-1$ if (user.containsNonNullValue(UpdateAdapter.USER_PICTURE)) { userImage = user.getPictureUrl(UpdateAdapter.USER_PICTURE, RemoteModel.PICTURE_THUMB); 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 a2a3b58a5..cffbcde3a 100644 --- a/astrid/src/main/java/com/todoroo/astrid/reminders/NotificationFragment.java +++ b/astrid/src/main/java/com/todoroo/astrid/reminders/NotificationFragment.java @@ -50,7 +50,7 @@ public class NotificationFragment extends TaskListFragment { private long taskId; @Override - protected void onTaskCompleted(Task item) { + protected void onTaskCompleted() { } @Override diff --git a/astrid/src/main/java/com/todoroo/astrid/reminders/ReminderDebugContextActions.java b/astrid/src/main/java/com/todoroo/astrid/reminders/ReminderDebugContextActions.java index 2858510a4..74a3f7532 100644 --- a/astrid/src/main/java/com/todoroo/astrid/reminders/ReminderDebugContextActions.java +++ b/astrid/src/main/java/com/todoroo/astrid/reminders/ReminderDebugContextActions.java @@ -19,14 +19,6 @@ public class ReminderDebugContextActions { public static class WhenReminder implements TaskContextActionExposer { - @Override - public Object getLabel(Task task) { - if (Constants.DEBUG) { - return "when alarm?"; - } - return null; - } - @Override public void invoke(Task task) { AlarmScheduler original = ReminderService.getInstance().getScheduler(); @@ -52,14 +44,6 @@ public class ReminderDebugContextActions { public static class MakeNotification implements TaskContextActionExposer { - @Override - public Object getLabel(Task task) { - if (Constants.DEBUG) { - return "when alarm?"; //$NON-NLS-1$ - } - return null; - } - @Override public void invoke(Task task) { new Notifications().showTaskNotification(task.getId(), 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 a53019a63..8691a4696 100644 --- a/astrid/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java +++ b/astrid/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java @@ -126,8 +126,7 @@ public class RepeatControlSet extends PopupControlSet { new NumberPickerDialog(activity, new OnNumberPickedListener() { @Override - public void onNumberPicked(NumberPicker view, - int number) { + public void onNumberPicked(int number) { setRepeatValue(number); } }, activity.getResources().getString(R.string.repeat_interval_prompt), diff --git a/astrid/src/main/java/com/todoroo/astrid/service/AddOnService.java b/astrid/src/main/java/com/todoroo/astrid/service/AddOnService.java index 34d5a2b13..55c4b1b78 100644 --- a/astrid/src/main/java/com/todoroo/astrid/service/AddOnService.java +++ b/astrid/src/main/java/com/todoroo/astrid/service/AddOnService.java @@ -23,11 +23,6 @@ public class AddOnService { /** Astrid Power Pack package */ public static final String POWER_PACK_PACKAGE = "com.todoroo.astrid.ppack"; - /** Checks whether power pack should be enabled */ - public boolean hasPowerPack() { - return true; - } - /** * Check whether a given add-on is installed */ diff --git a/astrid/src/main/java/com/todoroo/astrid/service/MetadataService.java b/astrid/src/main/java/com/todoroo/astrid/service/MetadataService.java index 17b7d6370..064f0988f 100644 --- a/astrid/src/main/java/com/todoroo/astrid/service/MetadataService.java +++ b/astrid/src/main/java/com/todoroo/astrid/service/MetadataService.java @@ -72,8 +72,8 @@ public class MetadataService { /** * Delete from metadata table where rows match a certain condition */ - public int deleteWhere(Criterion where) { - return metadataDao.deleteWhere(where); + public void deleteWhere(Criterion where) { + metadataDao.deleteWhere(where); } /** @@ -81,8 +81,8 @@ public class MetadataService { * @param where predicate for which rows to update * @param metadata values to set */ - public int update(Criterion where, Metadata metadata) { - return metadataDao.update(where, metadata); + public void update(Criterion where, Metadata metadata) { + metadataDao.update(where, metadata); } /** diff --git a/astrid/src/main/java/com/todoroo/astrid/service/StartupService.java b/astrid/src/main/java/com/todoroo/astrid/service/StartupService.java index c23dff098..8cc5bfd98 100644 --- a/astrid/src/main/java/com/todoroo/astrid/service/StartupService.java +++ b/astrid/src/main/java/com/todoroo/astrid/service/StartupService.java @@ -230,7 +230,7 @@ public class StartupService { // the corresponding metadata will also update tagDataDao.addListener(new ModelUpdateListener() { @Override - public void onModelUpdated(TagData model, boolean outstandingEntries) { + public void onModelUpdated(TagData model) { ContentValues values = model.getSetValues(); Metadata m = new Metadata(); if (values != null) { 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 4d9c8a538..d3cb1c418 100644 --- a/astrid/src/main/java/com/todoroo/astrid/service/TagDataService.java +++ b/astrid/src/main/java/com/todoroo/astrid/service/TagDataService.java @@ -24,7 +24,6 @@ import com.todoroo.astrid.api.PermaSql; import com.todoroo.astrid.dao.MetadataDao.MetadataCriteria; import com.todoroo.astrid.dao.TagDataDao; import com.todoroo.astrid.dao.UserActivityDao; -import com.todoroo.astrid.data.History; import com.todoroo.astrid.data.Metadata; import com.todoroo.astrid.data.RemoteModel; import com.todoroo.astrid.data.TagData; @@ -59,8 +58,8 @@ public class TagDataService { /** * Save a single piece of metadata */ - public boolean save(TagData tagData) { - return tagDataDao.persist(tagData); + public void save(TagData tagData) { + tagDataDao.persist(tagData); } /** @@ -155,22 +154,11 @@ public class TagDataService { return userActivityDao.query(queryForTagData(tagData, criterion, null, UserActivity.PROPERTIES, null).orderBy(Order.desc(UserActivity.CREATED_AT))); } - public Cursor getActivityAndHistoryForTagData(TagData tagData, Criterion extraCriterion, String userTableAlias, Property...userProperties) { + public Cursor getActivityForTagData(TagData tagData, Criterion extraCriterion, String userTableAlias, Property... userProperties) { Query activityQuery = queryForTagData(tagData, extraCriterion, userTableAlias, UpdateAdapter.USER_ACTIVITY_PROPERTIES, userProperties) .from(UserActivity.TABLE); - Criterion historyCriterion; - if (tagData == null) { - historyCriterion = Criterion.none; - } else { - historyCriterion = History.TAG_ID.eq(tagData.getUuid()); - } - - Query historyQuery = Query.select(AndroidUtilities.addToArray(Property.class, UpdateAdapter.HISTORY_PROPERTIES, userProperties)).from(History.TABLE) - .where(historyCriterion) - .join(Join.left(User.TABLE.as(userTableAlias), History.USER_UUID.eq(Field.field(userTableAlias + "." + User.UUID.name)))); //$NON-NLS-1$ - - Query resultQuery = activityQuery.union(historyQuery).orderBy(Order.desc("1")); //$NON-NLS-1$ + Query resultQuery = activityQuery.orderBy(Order.desc("1")); //$NON-NLS-1$ return userActivityDao.query(resultQuery); } 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 240135b8b..76968cf8c 100644 --- a/astrid/src/main/java/com/todoroo/astrid/service/TaskService.java +++ b/astrid/src/main/java/com/todoroo/astrid/service/TaskService.java @@ -22,7 +22,6 @@ import com.todoroo.andlib.utility.AndroidUtilities; import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.andlib.utility.Preferences; import com.todoroo.astrid.actfm.sync.ActFmPreferenceService; -import com.todoroo.astrid.actfm.sync.messages.NameMaps; import com.todoroo.astrid.adapter.UpdateAdapter; import com.todoroo.astrid.api.Filter; import com.todoroo.astrid.api.PermaSql; @@ -33,7 +32,6 @@ import com.todoroo.astrid.dao.TaskDao; import com.todoroo.astrid.dao.TaskDao.TaskCriteria; import com.todoroo.astrid.dao.TaskOutstandingDao; import com.todoroo.astrid.dao.UserActivityDao; -import com.todoroo.astrid.data.History; import com.todoroo.astrid.data.Metadata; import com.todoroo.astrid.data.RemoteModel; import com.todoroo.astrid.data.SyncFlags; @@ -344,13 +342,11 @@ public class TaskService { /** * Clear details cache. Useful if user performs some operation that * affects details - * - * @return # of affected rows */ - public int clearDetails(Criterion criterion) { + public void clearDetails(Criterion criterion) { Task template = new Task(); template.setValue(Task.DETAILS_DATE, 0L); - return taskDao.update(criterion, template); + taskDao.update(criterion, template); } /** @@ -540,15 +536,10 @@ public class TaskService { return task; } - public TodorooCursor getActivityAndHistoryForTask(Task task) { + public TodorooCursor getActivityForTask(Task task) { Query taskQuery = queryForTask(task, UpdateAdapter.USER_TABLE_ALIAS, UpdateAdapter.USER_ACTIVITY_PROPERTIES, UpdateAdapter.USER_PROPERTIES); - Query historyQuery = Query.select(AndroidUtilities.addToArray(Property.class, UpdateAdapter.HISTORY_PROPERTIES, UpdateAdapter.USER_PROPERTIES)).from(History.TABLE) - .where(Criterion.and(History.TABLE_ID.eq(NameMaps.TABLE_ID_TASKS), History.TARGET_ID.eq(task.getUuid()))) - .from(History.TABLE) - .join(Join.left(User.TABLE.as(UpdateAdapter.USER_TABLE_ALIAS), History.USER_UUID.eq(Field.field(UpdateAdapter.USER_TABLE_ALIAS + "." + User.UUID.name)))); //$NON-NLS-1$; - - Query resultQuery = taskQuery.union(historyQuery).orderBy(Order.desc("1")); //$NON-NLS-1$ + Query resultQuery = taskQuery.orderBy(Order.desc("1")); //$NON-NLS-1$ return userActivityDao.query(resultQuery); } 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 8d91e2845..da6dfc10b 100644 --- a/astrid/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListUpdater.java +++ b/astrid/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListUpdater.java @@ -436,15 +436,11 @@ public abstract class AstridOrderedListUpdater { return tree.toString(); } - try { - recursivelySerialize(root, tree); - } catch (JSONException e) { - Log.e("OrderedListUpdater", "Error serializing tree model", e); //$NON-NLS-1$//$NON-NLS-2$ - } + recursivelySerialize(root, tree); return tree.toString(); } - private static void recursivelySerialize(Node node, JSONArray serializeTo) throws JSONException { + private static void recursivelySerialize(Node node, JSONArray serializeTo) { ArrayList children = node.children; serializeTo.put(node.uuid); for (Node child : children) { 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 c191cae82..b9d3bd5d0 100644 --- a/astrid/src/main/java/com/todoroo/astrid/subtasks/OrderedMetadataListFragmentHelper.java +++ b/astrid/src/main/java/com/todoroo/astrid/subtasks/OrderedMetadataListFragmentHelper.java @@ -146,9 +146,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$ @@ -175,7 +175,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$ } @@ -283,12 +283,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); } @@ -320,7 +320,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/src/main/java/com/todoroo/astrid/subtasks/OrderedMetadataListUpdater.java b/astrid/src/main/java/com/todoroo/astrid/subtasks/OrderedMetadataListUpdater.java index 8299a1baf..4b91a1794 100644 --- a/astrid/src/main/java/com/todoroo/astrid/subtasks/OrderedMetadataListUpdater.java +++ b/astrid/src/main/java/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,7 +38,7 @@ 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); @@ -56,7 +55,7 @@ abstract public class OrderedMetadataListUpdater { /** * 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; } @@ -68,7 +67,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()) { @@ -87,7 +86,7 @@ abstract public class OrderedMetadataListUpdater { metadata.setValue(indentProperty(), indent + delta); if(parentProperty() != null) { - long newParent = computeNewParent(filter, list, + long newParent = computeNewParent(list, taskId, indent + delta - 1); if (newParent == taskId) { metadata.setValue(parentProperty(), Task.NO_ID); @@ -116,20 +115,20 @@ abstract public class OrderedMetadataListUpdater { } }); - onMovedOrIndented(getTaskMetadata(list, targetTaskId)); + onMovedOrIndented(getTaskMetadata(targetTaskId)); } /** * Helper function to iterate through a list and compute a new parent for the target task * based on the target parent's indent */ - 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) { @@ -155,13 +154,13 @@ abstract public class OrderedMetadataListUpdater { * Move a task and all its children to the position right above * taskIdToMoveto. Will change the indent level to match taskIdToMoveTo. */ - 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) { @@ -187,7 +186,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) { @@ -213,7 +212,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); } @@ -249,12 +248,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()); @@ -303,10 +302,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) { @@ -326,12 +325,12 @@ abstract public class OrderedMetadataListUpdater { /** * Removes a task from the order hierarchy and un-indent children */ - 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) { @@ -345,32 +344,4 @@ abstract public class OrderedMetadataListUpdater { traverseTreeAndWriteValues(list, root, new AtomicLong(0), -1); } - - // --- utility - - public void debugPrint(Filter filter, LIST list) { - iterateThroughList(filter, 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$ - metadata.getValue(orderProperty()), - metadata.getValue(indentProperty()), - parentProperty() == null ? Task.NO_ID : metadata.getValue(parentProperty())); - } - }); - } - - - public void debugPrint(Node root, int depth) { - for(int i = 0; i < depth; i++) { - System.err.print(" + "); - } - System.err.format("%03d", root.taskId); - System.err.print("\n"); - - for(int i = 0; i < root.children.size(); i++) { - debugPrint(root.children.get(i), depth + 1); - } - } - } 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 40aeae42c..76b622bcd 100644 --- a/astrid/src/main/java/com/todoroo/astrid/tags/TagFilterExposer.java +++ b/astrid/src/main/java/com/todoroo/astrid/tags/TagFilterExposer.java @@ -210,8 +210,7 @@ public class TagFilterExposer extends BroadcastReceiver implements AstridFilterE } DependencyInjectionService.getInstance().inject(this); - TagData tagData = tagDataDao.fetch(uuid, TagData.MEMBER_COUNT, TagData.USER_ID); - showDialog(tagData); + showDialog(); } protected DialogInterface.OnClickListener getOkListener() { @@ -253,7 +252,7 @@ public class TagFilterExposer extends BroadcastReceiver implements AstridFilterE Toast.LENGTH_SHORT).show(); } - protected abstract void showDialog(TagData tagData); + protected abstract void showDialog(); protected abstract Intent ok(); } @@ -261,7 +260,7 @@ public class TagFilterExposer extends BroadcastReceiver implements AstridFilterE public static class DeleteTagActivity extends TagActivity { @Override - protected void showDialog(TagData tagData) { + protected void showDialog() { DialogUtilities.okCancelDialog(this, getString(R.string.DLG_delete_this_tag_question, tag), getOkListener(), getCancelListener()); } @@ -277,7 +276,7 @@ public class TagFilterExposer extends BroadcastReceiver implements AstridFilterE private EditText editor; @Override - protected void showDialog(TagData tagData) { + protected void showDialog() { editor = new EditText(this); DialogUtilities.viewDialog(this, getString(R.string.DLG_rename_this_tag_header, tag), editor, getOkListener(), getCancelListener()); } 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 ff0f79f94..620ccc473 100644 --- a/astrid/src/main/java/com/todoroo/astrid/tags/TagsControlSet.java +++ b/astrid/src/main/java/com/todoroo/astrid/tags/TagsControlSet.java @@ -144,7 +144,7 @@ public final class TagsControlSet extends PopupControlSet { } /** Adds a tag to the tag field */ - boolean addTag(String tagName, boolean reuse) { + void addTag(String tagName, boolean reuse) { LayoutInflater inflater = activity.getLayoutInflater(); // check if already exists @@ -153,7 +153,7 @@ public final class TagsControlSet extends PopupControlSet { View view = newTags.getChildAt(i); lastText = (TextView) view.findViewById(R.id.text1); if(lastText.getText().equals(tagName)) { - return false; + return; } } @@ -222,8 +222,6 @@ public final class TagsControlSet extends PopupControlSet { } } }); - - return true; } /** @@ -310,10 +308,9 @@ public final class TagsControlSet extends PopupControlSet { LinkedHashSet tags = getTagSet(); - if(TagService.getInstance().synchronizeTags(task.getId(), task.getValue(Task.UUID), tags)) { - Flags.set(Flags.TAGS_CHANGED); - task.setValue(Task.MODIFICATION_DATE, DateUtilities.now()); - } + TagService.getInstance().synchronizeTags(task.getId(), task.getValue(Task.UUID), tags); + Flags.set(Flags.TAGS_CHANGED); + task.setValue(Task.MODIFICATION_DATE, DateUtilities.now()); return null; } diff --git a/astrid/src/main/java/com/todoroo/astrid/ui/AstridDialog.java b/astrid/src/main/java/com/todoroo/astrid/ui/AstridDialog.java index 1dc9c8742..c446df5d6 100644 --- a/astrid/src/main/java/com/todoroo/astrid/ui/AstridDialog.java +++ b/astrid/src/main/java/com/todoroo/astrid/ui/AstridDialog.java @@ -55,7 +55,7 @@ public class AstridDialog extends Dialog { return this; } - public AstridDialog setButtonListeners(View.OnClickListener... listeners) { + public void setButtonListeners(View.OnClickListener... listeners) { int index = 0; for (View.OnClickListener l : listeners) { buttons[index].setOnClickListener(l); @@ -64,7 +64,6 @@ public class AstridDialog extends Dialog { break; } } - return this; } public AstridDialog setAstridText(int resId) { diff --git a/astrid/src/main/java/com/todoroo/astrid/ui/AstridTimePicker.java b/astrid/src/main/java/com/todoroo/astrid/ui/AstridTimePicker.java index 0074d33b5..5b2ba49d2 100644 --- a/astrid/src/main/java/com/todoroo/astrid/ui/AstridTimePicker.java +++ b/astrid/src/main/java/com/todoroo/astrid/ui/AstridTimePicker.java @@ -119,7 +119,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/main/java/com/todoroo/astrid/ui/DateAndTimePicker.java b/astrid/src/main/java/com/todoroo/astrid/ui/DateAndTimePicker.java index 01bff05e4..90d9ffb7a 100644 --- a/astrid/src/main/java/com/todoroo/astrid/ui/DateAndTimePicker.java +++ b/astrid/src/main/java/com/todoroo/astrid/ui/DateAndTimePicker.java @@ -297,9 +297,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/main/java/com/todoroo/astrid/ui/DeadlineNumberPicker.java b/astrid/src/main/java/com/todoroo/astrid/ui/DeadlineNumberPicker.java index b4eab139c..69c3f5afd 100644 --- a/astrid/src/main/java/com/todoroo/astrid/ui/DeadlineNumberPicker.java +++ b/astrid/src/main/java/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/main/java/com/todoroo/astrid/ui/DraggableListView.java b/astrid/src/main/java/com/todoroo/astrid/ui/DraggableListView.java index 2c51a5962..d9325194d 100644 --- a/astrid/src/main/java/com/todoroo/astrid/ui/DraggableListView.java +++ b/astrid/src/main/java/com/todoroo/astrid/ui/DraggableListView.java @@ -112,10 +112,6 @@ public class DraggableListView extends ListView { this.mItemHeightNormal = itemHeightNormal; } - protected boolean isDraggableRow(View view) { - return true; - } - /* * pointToPosition() doesn't consider invisible views, but we need to, so * implement a slightly different version. @@ -177,13 +173,11 @@ public class DraggableListView extends ListView { } } - if (isDraggableRow(v)) { - ViewGroup.LayoutParams params = v.getLayoutParams(); - params.height = LayoutParams.WRAP_CONTENT; - v.setLayoutParams(params); - v.setVisibility(View.VISIBLE); - v.setPadding(0, 0, 0, 0); - } + ViewGroup.LayoutParams params = v.getLayoutParams(); + params.height = LayoutParams.WRAP_CONTENT; + v.setLayoutParams(params); + v.setVisibility(View.VISIBLE); + v.setPadding(0, 0, 0, 0); } } @@ -228,13 +222,11 @@ public class DraggableListView extends ListView { } } - if (isDraggableRow(vv)) { - ViewGroup.LayoutParams params = vv.getLayoutParams(); - params.height = height; - vv.setLayoutParams(params); - vv.setVisibility(visibility); - vv.setPadding(0, marginTop, 0, 0); - } + ViewGroup.LayoutParams params = vv.getLayoutParams(); + params.height = height; + vv.setLayoutParams(params); + vv.setVisibility(visibility); + vv.setPadding(0, marginTop, 0, 0); } // Request re-layout since we changed the items layout // and not doing this would cause bogus hitbox calculation @@ -366,24 +358,17 @@ public class DraggableListView extends ListView { } }; - /** - * @return true if drag was initiated - */ - protected boolean initiateDrag(MotionEvent ev) { + protected void initiateDrag(MotionEvent ev) { int x = (int) mTouchCurrentX; int y = (int) mTouchCurrentY; int itemNum = pointToPosition(x, y); if (itemNum == AdapterView.INVALID_POSITION) { - return false; + return; } View item = (View) getChildAt(itemNum - getFirstVisiblePosition()); - if(!isDraggableRow(item)) { - return false; - } - mDragPoint = new Point(x - item.getLeft(), y - item.getTop()); mCoordOffset = new Point((int)ev.getRawX() - x, (int)ev.getRawY() - y); @@ -409,8 +394,6 @@ public class DraggableListView extends ListView { Vibrator v = (Vibrator) getContext().getSystemService(Context.VIBRATOR_SERVICE); v.vibrate(50); - - return true; } private void startDragging(Bitmap bm, int x, int y) { 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 2f15d9c11..f100f8a63 100644 --- a/astrid/src/main/java/com/todoroo/astrid/ui/EditTitleControlSet.java +++ b/astrid/src/main/java/com/todoroo/astrid/ui/EditTitleControlSet.java @@ -94,7 +94,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/main/java/com/todoroo/astrid/ui/HideUntilControlSet.java b/astrid/src/main/java/com/todoroo/astrid/ui/HideUntilControlSet.java index d7decab88..e7ab103e9 100644 --- a/astrid/src/main/java/com/todoroo/astrid/ui/HideUntilControlSet.java +++ b/astrid/src/main/java/com/todoroo/astrid/ui/HideUntilControlSet.java @@ -99,7 +99,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/main/java/com/todoroo/astrid/ui/ImportanceControlSet.java b/astrid/src/main/java/com/todoroo/astrid/ui/ImportanceControlSet.java index 880b400a9..b46dfeb4c 100644 --- a/astrid/src/main/java/com/todoroo/astrid/ui/ImportanceControlSet.java +++ b/astrid/src/main/java/com/todoroo/astrid/ui/ImportanceControlSet.java @@ -36,7 +36,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) { @@ -56,7 +56,7 @@ public class ImportanceControlSet extends TaskEditControlSet { } for (ImportanceChangedListener l : listeners) { - l.importanceChanged(i, colors[i]); + l.importanceChanged(i); } } diff --git a/astrid/src/main/java/com/todoroo/astrid/ui/NumberPicker.java b/astrid/src/main/java/com/todoroo/astrid/ui/NumberPicker.java index 0b3ad0de9..c3d22acaa 100644 --- a/astrid/src/main/java/com/todoroo/astrid/ui/NumberPicker.java +++ b/astrid/src/main/java/com/todoroo/astrid/ui/NumberPicker.java @@ -32,7 +32,7 @@ public class NumberPicker extends LinearLayout implements OnClickListener, public interface OnChangedListener { /** return new value */ - int onChanged(NumberPicker picker, int oldVal, int newVal); + int onChanged(int newVal); } public interface Formatter { @@ -69,10 +69,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); } } @@ -104,10 +104,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; } @@ -120,7 +116,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); mInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE); @@ -243,11 +239,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); } } @@ -256,7 +250,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 @@ -272,7 +266,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/main/java/com/todoroo/astrid/ui/NumberPickerDialog.java b/astrid/src/main/java/com/todoroo/astrid/ui/NumberPickerDialog.java index 160f08651..388df48fd 100644 --- a/astrid/src/main/java/com/todoroo/astrid/ui/NumberPickerDialog.java +++ b/astrid/src/main/java/com/todoroo/astrid/ui/NumberPickerDialog.java @@ -17,7 +17,7 @@ import org.tasks.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/main/java/com/todoroo/astrid/ui/TimeDurationControlSet.java b/astrid/src/main/java/com/todoroo/astrid/ui/TimeDurationControlSet.java index 54465589a..0d35d69ee 100644 --- a/astrid/src/main/java/com/todoroo/astrid/ui/TimeDurationControlSet.java +++ b/astrid/src/main/java/com/todoroo/astrid/ui/TimeDurationControlSet.java @@ -103,7 +103,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/main/java/com/todoroo/astrid/utility/SyncMetadataService.java b/astrid/src/main/java/com/todoroo/astrid/utility/SyncMetadataService.java index 63fc40b87..fbd70dbe6 100644 --- a/astrid/src/main/java/com/todoroo/astrid/utility/SyncMetadataService.java +++ b/astrid/src/main/java/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; @@ -59,7 +57,7 @@ abstract public class SyncMetadataService { // --- implementation - public SyncMetadataService(Context context) { + public SyncMetadataService() { DependencyInjectionService.getInstance().inject(this); } 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 8f9ba9bda..7f94ee78b 100644 --- a/astrid/src/main/java/com/todoroo/astrid/voice/Api6VoiceOutputAssistant.java +++ b/astrid/src/main/java/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 void handleActivityResult(int requestCode, int resultCode) { if (requestCode == MY_DATA_CHECK_CODE) { if (resultCode == TextToSpeech.Engine.CHECK_VOICE_DATA_PASS) { // success, create the TTS instance @@ -63,11 +63,7 @@ public class Api6VoiceOutputAssistant implements OnInitListener, VoiceOutputAssi installIntent.setAction(TextToSpeech.Engine.ACTION_INSTALL_TTS_DATA); context.startActivity(installIntent); } - - return true; } - - return false; } private void initTTS() { diff --git a/astrid/src/main/java/com/todoroo/astrid/voice/VoiceOutputService.java b/astrid/src/main/java/com/todoroo/astrid/voice/VoiceOutputService.java index 571278ee2..0578a6f67 100644 --- a/astrid/src/main/java/com/todoroo/astrid/voice/VoiceOutputService.java +++ b/astrid/src/main/java/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; @@ -28,7 +26,7 @@ public class VoiceOutputService { public interface VoiceOutputAssistant { public void checkIsTTSInstalled(); - public boolean handleActivityResult(int requestCode, int resultCode, Intent data); + public void handleActivityResult(int requestCode, int resultCode); public void queueSpeak(String textToSpeak); @@ -43,9 +41,7 @@ public class VoiceOutputService { } @Override - public boolean handleActivityResult(int requestCode, int resultCode, - Intent data) { - return false; + public void handleActivityResult(int requestCode, int resultCode) { } @Override diff --git a/astrid/src/main/res/values-ca/strings.xml b/astrid/src/main/res/values-ca/strings.xml index 3a9309389..aa685d780 100644 --- a/astrid/src/main/res/values-ca/strings.xml +++ b/astrid/src/main/res/values-ca/strings.xml @@ -123,8 +123,6 @@ Desa els canvis No ho desis Comentaris - Tasca desada: venç %s - Tasca desada Activitat Sense venciment diff --git a/astrid/src/main/res/values-cs/strings.xml b/astrid/src/main/res/values-cs/strings.xml index 89cc7974b..fcab8a2a7 100644 --- a/astrid/src/main/res/values-cs/strings.xml +++ b/astrid/src/main/res/values-cs/strings.xml @@ -115,8 +115,6 @@ Uložit změny Neukládat Komentáře - Úkol uložen: termín je %s - Úkol uložen Činnost Bez termínu diff --git a/astrid/src/main/res/values-da/strings.xml b/astrid/src/main/res/values-da/strings.xml index aeecce123..14332483e 100644 --- a/astrid/src/main/res/values-da/strings.xml +++ b/astrid/src/main/res/values-da/strings.xml @@ -81,8 +81,6 @@ Tid allerede brugt på denne opgave Gem ændringer Gem ikke - Opgave gemt: deadline %s - Opgave gemt Aktivitet No date diff --git a/astrid/src/main/res/values-de/strings.xml b/astrid/src/main/res/values-de/strings.xml index 98f893ae0..525aa34e4 100644 --- a/astrid/src/main/res/values-de/strings.xml +++ b/astrid/src/main/res/values-de/strings.xml @@ -120,8 +120,6 @@ Nicht speichern Kommentare aktualisieren Kommentare - Aufgabe gespeichert: fällig %s - Aufgabe gespeichert Aktivität Kein Datum diff --git a/astrid/src/main/res/values-es/strings.xml b/astrid/src/main/res/values-es/strings.xml index fc9b8658a..559196190 100644 --- a/astrid/src/main/res/values-es/strings.xml +++ b/astrid/src/main/res/values-es/strings.xml @@ -126,8 +126,6 @@ No guardar Actualizar comentarios Comentarios - Tarea guardada: finaliza %s - Tarea guardada Actividad Estimado %s Transcurrido %s diff --git a/astrid/src/main/res/values-fr/strings.xml b/astrid/src/main/res/values-fr/strings.xml index 4ba3b6b75..754c84649 100644 --- a/astrid/src/main/res/values-fr/strings.xml +++ b/astrid/src/main/res/values-fr/strings.xml @@ -123,8 +123,6 @@ Ne pas enregistrer Mettre à jour les commentaires Commentaires - Tâche enregistrée : prévue dans %s - Tâche enregistrée Activité Restant %s Passé %s diff --git a/astrid/src/main/res/values-it/strings.xml b/astrid/src/main/res/values-it/strings.xml index 8242bb275..fc4ff2ba5 100644 --- a/astrid/src/main/res/values-it/strings.xml +++ b/astrid/src/main/res/values-it/strings.xml @@ -114,8 +114,6 @@ Salva le modifiche Non salvare Commenti - Attività Salvata: entro %s - Attvità salvata Attività No date diff --git a/astrid/src/main/res/values-iw/strings.xml b/astrid/src/main/res/values-iw/strings.xml index 24a577564..3f26cfd1e 100644 --- a/astrid/src/main/res/values-iw/strings.xml +++ b/astrid/src/main/res/values-iw/strings.xml @@ -122,8 +122,6 @@ לא לשמור רַעְנֵן הערות הערות - המשימה נשמרה: יעד %s - המשימה נשמרה פעילות ללא תאריך diff --git a/astrid/src/main/res/values-ja/strings.xml b/astrid/src/main/res/values-ja/strings.xml index 85c603fd6..1f47b5fe2 100644 --- a/astrid/src/main/res/values-ja/strings.xml +++ b/astrid/src/main/res/values-ja/strings.xml @@ -99,8 +99,6 @@ 変更の保存 保存しない コメント - タスクは保存されました: 期限は%s - タスクは保存されました 活動 No date diff --git a/astrid/src/main/res/values-ko/strings.xml b/astrid/src/main/res/values-ko/strings.xml index db5c41e3d..4c1c5f28f 100644 --- a/astrid/src/main/res/values-ko/strings.xml +++ b/astrid/src/main/res/values-ko/strings.xml @@ -129,8 +129,6 @@ 저장하지 않음 댓글 새로고침 댓글 - 일정 저장: 마감일 %s - 일정을 저장했습니다 활동 내역 동부표준시 %s 경과 시간: %s diff --git a/astrid/src/main/res/values-nb/strings.xml b/astrid/src/main/res/values-nb/strings.xml index 279cb4d6a..0412d483a 100644 --- a/astrid/src/main/res/values-nb/strings.xml +++ b/astrid/src/main/res/values-nb/strings.xml @@ -74,8 +74,6 @@ Tid brukt på oppgaven til nå Lagre endringer Ikke lagre - Oppgave lagret: forfaller %s - Oppgave lagret No date Specific day diff --git a/astrid/src/main/res/values-nl/strings.xml b/astrid/src/main/res/values-nl/strings.xml index 360e09766..b5134e77e 100644 --- a/astrid/src/main/res/values-nl/strings.xml +++ b/astrid/src/main/res/values-nl/strings.xml @@ -124,8 +124,6 @@ Niet opslaan Opmerkingen vernieuwen Opmerkingen - Taak opgeslagen: eind %s - Taak opgeslagen Activiteit Gesch. %s Verstreken %s diff --git a/astrid/src/main/res/values-pl/strings.xml b/astrid/src/main/res/values-pl/strings.xml index 707b263fb..24c9de7ef 100644 --- a/astrid/src/main/res/values-pl/strings.xml +++ b/astrid/src/main/res/values-pl/strings.xml @@ -120,8 +120,6 @@ Nie zapisuj Odśwież komentarze Komentarze - Zadanie zapisano: termin do %s - Zadanie zapisane Aktywność Brak daty diff --git a/astrid/src/main/res/values-pt-rBR/strings.xml b/astrid/src/main/res/values-pt-rBR/strings.xml index 59570aed9..4cbe48f6b 100644 --- a/astrid/src/main/res/values-pt-rBR/strings.xml +++ b/astrid/src/main/res/values-pt-rBR/strings.xml @@ -123,8 +123,6 @@ Não salvar Atualizar comentários Comentários - Tarefa salva: vence em %s - Tarefa salva Atividades Decorrido %s diff --git a/astrid/src/main/res/values-pt/strings.xml b/astrid/src/main/res/values-pt/strings.xml index a0ddea18e..ee7051f17 100644 --- a/astrid/src/main/res/values-pt/strings.xml +++ b/astrid/src/main/res/values-pt/strings.xml @@ -80,7 +80,6 @@ Tempo já gasto na tarefa Guardar Alterações Não Gravar - Tarefa Guardada No date Specific day diff --git a/astrid/src/main/res/values-ru/strings.xml b/astrid/src/main/res/values-ru/strings.xml index f74107899..624b2eb8f 100644 --- a/astrid/src/main/res/values-ru/strings.xml +++ b/astrid/src/main/res/values-ru/strings.xml @@ -124,8 +124,6 @@ Не сохранять Обновить комментарии Комментарии - Задача сохранена: срок %s - Задача сохранена Действия Без даты diff --git a/astrid/src/main/res/values-sv/strings.xml b/astrid/src/main/res/values-sv/strings.xml index 88c64ec7b..4324566a0 100644 --- a/astrid/src/main/res/values-sv/strings.xml +++ b/astrid/src/main/res/values-sv/strings.xml @@ -116,8 +116,6 @@ Spara inte Uppdatera kommentarer Kommentarer - Uppgift sparad: förfaller %s - Uppgift sparad Aktivitet No date diff --git a/astrid/src/main/res/values-th/strings.xml b/astrid/src/main/res/values-th/strings.xml index 1a9523fc7..acf4e8bd0 100644 --- a/astrid/src/main/res/values-th/strings.xml +++ b/astrid/src/main/res/values-th/strings.xml @@ -57,7 +57,6 @@ บันทึกย่อ บันทึกการเปลี่ยนแปลง ไม่บันทึก - งานที่บันทึกไว้ No date Specific day diff --git a/astrid/src/main/res/values-tr/strings.xml b/astrid/src/main/res/values-tr/strings.xml index 5addc5f49..98f932407 100644 --- a/astrid/src/main/res/values-tr/strings.xml +++ b/astrid/src/main/res/values-tr/strings.xml @@ -112,8 +112,6 @@ Değişiklikleri Kaydet Kaydetme Yorumlar - Görev Kaydedildi: tarihi %s - Görev kaydedildi Etkinlik No date diff --git a/astrid/src/main/res/values-uk/strings.xml b/astrid/src/main/res/values-uk/strings.xml index 8ab3afef5..57f0c7122 100644 --- a/astrid/src/main/res/values-uk/strings.xml +++ b/astrid/src/main/res/values-uk/strings.xml @@ -129,8 +129,6 @@ Не зберігати зміни Оновити коментарі Коментарі - Завдання збережено: завдяки %s - Завдання збережено Активність Зал. %s Час, що минув %s diff --git a/astrid/src/main/res/values-zh-rCN/strings.xml b/astrid/src/main/res/values-zh-rCN/strings.xml index 658a44043..7acda37e7 100644 --- a/astrid/src/main/res/values-zh-rCN/strings.xml +++ b/astrid/src/main/res/values-zh-rCN/strings.xml @@ -115,8 +115,6 @@ 保存更改 不保存 注释 - 已设截止日期的任务：按 %s - 任务已储存 活动 No date diff --git a/astrid/src/main/res/values-zh-rTW/strings.xml b/astrid/src/main/res/values-zh-rTW/strings.xml index ad746b200..b84e080f0 100644 --- a/astrid/src/main/res/values-zh-rTW/strings.xml +++ b/astrid/src/main/res/values-zh-rTW/strings.xml @@ -115,8 +115,6 @@ 儲存變更 不要儲存 註釋 - 工作已儲存: %s 到期 - 工作已儲存 活動 No date diff --git a/astrid/src/main/res/values/strings-core.xml b/astrid/src/main/res/values/strings-core.xml index 9d29d0994..db9513656 100644 --- a/astrid/src/main/res/values/strings-core.xml +++ b/astrid/src/main/res/values/strings-core.xml @@ -261,12 +261,6 @@ Comments - - Task Saved: due %s - - - Task Saved - Activity