diff --git a/astrid/plugin-src/com/todoroo/astrid/backup/BackupPreferences.java b/astrid/plugin-src/com/todoroo/astrid/backup/BackupPreferences.java index 4f144cfa3..03b698ec7 100644 --- a/astrid/plugin-src/com/todoroo/astrid/backup/BackupPreferences.java +++ b/astrid/plugin-src/com/todoroo/astrid/backup/BackupPreferences.java @@ -16,7 +16,7 @@ import com.todoroo.andlib.utility.DialogUtilities; import com.todoroo.andlib.widget.TodorooPreferences; import com.todoroo.astrid.activity.AddOnActivity; import com.todoroo.astrid.core.PluginServices; -import com.todoroo.astrid.utility.Preferences; +import com.todoroo.andlib.utility.Preferences; /** * Displays synchronization preferences and an action panel so users can diff --git a/astrid/plugin-src/com/todoroo/astrid/backup/BackupService.java b/astrid/plugin-src/com/todoroo/astrid/backup/BackupService.java index c3dfab9c2..97a9cf4a9 100644 --- a/astrid/plugin-src/com/todoroo/astrid/backup/BackupService.java +++ b/astrid/plugin-src/com/todoroo/astrid/backup/BackupService.java @@ -17,7 +17,7 @@ import com.timsu.astrid.R; import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.astrid.core.PluginServices; -import com.todoroo.astrid.utility.Preferences; +import com.todoroo.andlib.utility.Preferences; /** * Inspired heavily by SynchronizationService diff --git a/astrid/plugin-src/com/todoroo/astrid/backup/TasksXmlExporter.java b/astrid/plugin-src/com/todoroo/astrid/backup/TasksXmlExporter.java index 8aa556530..857defcbd 100644 --- a/astrid/plugin-src/com/todoroo/astrid/backup/TasksXmlExporter.java +++ b/astrid/plugin-src/com/todoroo/astrid/backup/TasksXmlExporter.java @@ -17,19 +17,20 @@ import android.widget.Toast; import com.timsu.astrid.R; import com.todoroo.andlib.data.AbstractModel; import com.todoroo.andlib.data.Property; -import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.data.Property.PropertyVisitor; +import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.service.ExceptionService; import com.todoroo.andlib.sql.Order; import com.todoroo.andlib.sql.Query; import com.todoroo.andlib.utility.DateUtilities; +import com.todoroo.andlib.utility.Preferences; import com.todoroo.astrid.core.PluginServices; import com.todoroo.astrid.dao.MetadataDao.MetadataCriteria; import com.todoroo.astrid.data.Metadata; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.service.MetadataService; import com.todoroo.astrid.service.TaskService; -import com.todoroo.astrid.utility.Preferences; +import com.todoroo.astrid.utility.AstridPreferences; public class TasksXmlExporter { @@ -141,7 +142,7 @@ public class TasksXmlExporter { xml.startTag(null, BackupConstants.ASTRID_TAG); xml.attribute(null, BackupConstants.ASTRID_ATTR_VERSION, - Integer.toString(Preferences.getCurrentVersion())); + Integer.toString(AstridPreferences.getCurrentVersion())); xml.attribute(null, BackupConstants.ASTRID_ATTR_FORMAT, Integer.toString(FORMAT)); diff --git a/astrid/plugin-src/com/todoroo/astrid/core/DefaultsPreferences.java b/astrid/plugin-src/com/todoroo/astrid/core/DefaultsPreferences.java index a59400630..e2541f004 100644 --- a/astrid/plugin-src/com/todoroo/astrid/core/DefaultsPreferences.java +++ b/astrid/plugin-src/com/todoroo/astrid/core/DefaultsPreferences.java @@ -10,7 +10,7 @@ import android.preference.Preference; import com.timsu.astrid.R; import com.todoroo.andlib.utility.AndroidUtilities; import com.todoroo.andlib.widget.TodorooPreferences; -import com.todoroo.astrid.utility.Preferences; +import com.todoroo.andlib.utility.Preferences; /** * Displays the preference screen for users to edit their preferences diff --git a/astrid/plugin-src/com/todoroo/astrid/gcal/Calendars.java b/astrid/plugin-src/com/todoroo/astrid/gcal/Calendars.java index 8f4befc42..c668d9b8a 100644 --- a/astrid/plugin-src/com/todoroo/astrid/gcal/Calendars.java +++ b/astrid/plugin-src/com/todoroo/astrid/gcal/Calendars.java @@ -9,7 +9,7 @@ import android.net.Uri; import com.timsu.astrid.R; import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.utility.AndroidUtilities; -import com.todoroo.astrid.utility.Preferences; +import com.todoroo.andlib.utility.Preferences; @SuppressWarnings("nls") public class Calendars { diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksMetadata.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksMetadata.java index 1ba4a76a1..1ec4853af 100644 --- a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksMetadata.java +++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksMetadata.java @@ -6,7 +6,7 @@ import com.todoroo.andlib.data.Property.LongProperty; import com.todoroo.andlib.data.Property.StringProperty; import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.astrid.data.Metadata; -import com.todoroo.astrid.utility.Preferences; +import com.todoroo.andlib.utility.Preferences; /** * Metadata entries for a GTasks Task diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksSyncActionExposer.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksSyncActionExposer.java index 46e3cd963..645c2fd85 100644 --- a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksSyncActionExposer.java +++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksSyncActionExposer.java @@ -32,6 +32,7 @@ public class GtasksSyncActionExposer extends BroadcastReceiver { if(!gtasksPreferenceService.isLoggedIn()) return; + // TODO Intent syncIntent = new Intent(intent.getAction(), null, context, GtasksSyncActionExposer.class); PendingIntent pendingIntent = PendingIntent.getBroadcast(context, 0, syncIntent, 0); diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncProvider.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncProvider.java index ae80504ff..25ac58dd1 100644 --- a/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncProvider.java +++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncProvider.java @@ -47,7 +47,7 @@ import com.todoroo.astrid.service.AstridDependencyInjector; import com.todoroo.astrid.sync.SyncContainer; import com.todoroo.astrid.sync.SyncProvider; import com.todoroo.astrid.utility.Constants; -import com.todoroo.astrid.utility.Preferences; +import com.todoroo.andlib.utility.Preferences; import com.todoroo.gtasks.GoogleTaskService; import com.todoroo.gtasks.GoogleTaskService.ConvenientTaskCreator; import com.todoroo.gtasks.GoogleTaskTask; diff --git a/astrid/plugin-src/com/todoroo/astrid/locale/LocaleReceiver.java b/astrid/plugin-src/com/todoroo/astrid/locale/LocaleReceiver.java index 4c30a3157..382253575 100644 --- a/astrid/plugin-src/com/todoroo/astrid/locale/LocaleReceiver.java +++ b/astrid/plugin-src/com/todoroo/astrid/locale/LocaleReceiver.java @@ -19,7 +19,7 @@ import com.todoroo.astrid.core.PluginServices; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.reminders.Notifications; import com.todoroo.astrid.utility.Constants; -import com.todoroo.astrid.utility.Preferences; +import com.todoroo.andlib.utility.Preferences; /** * Receiver is activated when Locale conditions are triggered diff --git a/astrid/plugin-src/com/todoroo/astrid/notes/NoteDetailExposer.java b/astrid/plugin-src/com/todoroo/astrid/notes/NoteDetailExposer.java index 1b989e76a..96397e5f7 100644 --- a/astrid/plugin-src/com/todoroo/astrid/notes/NoteDetailExposer.java +++ b/astrid/plugin-src/com/todoroo/astrid/notes/NoteDetailExposer.java @@ -12,7 +12,7 @@ import com.timsu.astrid.R; import com.todoroo.astrid.api.AstridApiConstants; import com.todoroo.astrid.core.PluginServices; import com.todoroo.astrid.data.Task; -import com.todoroo.astrid.utility.Preferences; +import com.todoroo.andlib.utility.Preferences; /** * Exposes Task Detail for notes diff --git a/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevBackgroundService.java b/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevBackgroundService.java index 1c9c0fb7d..c00b8639b 100644 --- a/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevBackgroundService.java +++ b/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevBackgroundService.java @@ -15,7 +15,7 @@ import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.astrid.core.PluginServices; import com.todoroo.astrid.producteev.sync.ProducteevSyncProvider; import com.todoroo.astrid.utility.Constants; -import com.todoroo.astrid.utility.Preferences; +import com.todoroo.andlib.utility.Preferences; /** * SynchronizationService is the service that performs Astrid's background diff --git a/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevControlSet.java b/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevControlSet.java index 967a7a381..6f5f2ea2a 100644 --- a/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevControlSet.java +++ b/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevControlSet.java @@ -34,7 +34,7 @@ import com.todoroo.astrid.producteev.sync.ProducteevSyncProvider; import com.todoroo.astrid.producteev.sync.ProducteevTask; import com.todoroo.astrid.producteev.sync.ProducteevUser; import com.todoroo.astrid.service.MetadataService; -import com.todoroo.astrid.utility.Preferences; +import com.todoroo.andlib.utility.Preferences; /** * Control Set for managing task/dashboard assignments in Producteev diff --git a/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevDetailExposer.java b/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevDetailExposer.java index b6aa03fba..dc5260adf 100644 --- a/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevDetailExposer.java +++ b/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevDetailExposer.java @@ -17,7 +17,7 @@ import com.todoroo.astrid.producteev.sync.ProducteevDashboard; import com.todoroo.astrid.producteev.sync.ProducteevDataService; import com.todoroo.astrid.producteev.sync.ProducteevNote; import com.todoroo.astrid.producteev.sync.ProducteevTask; -import com.todoroo.astrid.utility.Preferences; +import com.todoroo.andlib.utility.Preferences; /** * Exposes Task Details for Producteev: diff --git a/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevLoginActivity.java b/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevLoginActivity.java index 9e135b84a..6394220aa 100644 --- a/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevLoginActivity.java +++ b/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevLoginActivity.java @@ -44,7 +44,7 @@ import com.todoroo.astrid.producteev.api.ApiAuthenticationException; import com.todoroo.astrid.producteev.api.ProducteevInvoker; import com.todoroo.astrid.producteev.sync.ProducteevSyncProvider; import com.todoroo.astrid.utility.Constants; -import com.todoroo.astrid.utility.Preferences; +import com.todoroo.andlib.utility.Preferences; /** * This activity allows users to sign in or log in to Producteev diff --git a/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevUtilities.java b/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevUtilities.java index bbf7f12fa..2ad883ff1 100644 --- a/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevUtilities.java +++ b/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevUtilities.java @@ -2,7 +2,7 @@ package com.todoroo.astrid.producteev; import com.timsu.astrid.R; import com.todoroo.astrid.sync.SyncProviderUtilities; -import com.todoroo.astrid.utility.Preferences; +import com.todoroo.andlib.utility.Preferences; /** * Displays synchronization preferences and an action panel so users can diff --git a/astrid/plugin-src/com/todoroo/astrid/producteev/sync/ProducteevSyncProvider.java b/astrid/plugin-src/com/todoroo/astrid/producteev/sync/ProducteevSyncProvider.java index e0f426125..992e4ce41 100644 --- a/astrid/plugin-src/com/todoroo/astrid/producteev/sync/ProducteevSyncProvider.java +++ b/astrid/plugin-src/com/todoroo/astrid/producteev/sync/ProducteevSyncProvider.java @@ -52,7 +52,7 @@ import com.todoroo.astrid.sync.SyncContainer; import com.todoroo.astrid.sync.SyncProvider; import com.todoroo.astrid.tags.TagService; import com.todoroo.astrid.utility.Constants; -import com.todoroo.astrid.utility.Preferences; +import com.todoroo.andlib.utility.Preferences; @SuppressWarnings("nls") public class ProducteevSyncProvider extends SyncProvider { diff --git a/astrid/plugin-src/com/todoroo/astrid/producteev/sync/ProducteevTask.java b/astrid/plugin-src/com/todoroo/astrid/producteev/sync/ProducteevTask.java index a98701aa1..6795d4136 100644 --- a/astrid/plugin-src/com/todoroo/astrid/producteev/sync/ProducteevTask.java +++ b/astrid/plugin-src/com/todoroo/astrid/producteev/sync/ProducteevTask.java @@ -3,7 +3,7 @@ package com.todoroo.astrid.producteev.sync; import com.todoroo.andlib.data.Property.LongProperty; import com.todoroo.astrid.data.Metadata; import com.todoroo.astrid.producteev.ProducteevUtilities; -import com.todoroo.astrid.utility.Preferences; +import com.todoroo.andlib.utility.Preferences; /** * Metadata entries for a Producteev Task diff --git a/astrid/plugin-src/com/todoroo/astrid/reminders/NotificationActivity.java b/astrid/plugin-src/com/todoroo/astrid/reminders/NotificationActivity.java index 96aa4cf03..a456b9459 100644 --- a/astrid/plugin-src/com/todoroo/astrid/reminders/NotificationActivity.java +++ b/astrid/plugin-src/com/todoroo/astrid/reminders/NotificationActivity.java @@ -48,7 +48,7 @@ import com.todoroo.astrid.dao.TaskDao.TaskCriteria; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.repeats.RepeatControlSet; import com.todoroo.astrid.ui.NumberPicker; -import com.todoroo.astrid.utility.Preferences; +import com.todoroo.andlib.utility.Preferences; /** * This activity is launched when a user opens up a notification from the diff --git a/astrid/plugin-src/com/todoroo/astrid/reminders/Notifications.java b/astrid/plugin-src/com/todoroo/astrid/reminders/Notifications.java index 5e8386f25..69f3f3a33 100644 --- a/astrid/plugin-src/com/todoroo/astrid/reminders/Notifications.java +++ b/astrid/plugin-src/com/todoroo/astrid/reminders/Notifications.java @@ -26,7 +26,7 @@ import com.todoroo.astrid.dao.TaskDao; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.service.AstridDependencyInjector; import com.todoroo.astrid.utility.Constants; -import com.todoroo.astrid.utility.Preferences; +import com.todoroo.andlib.utility.Preferences; public class Notifications extends BroadcastReceiver { diff --git a/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderPreferences.java b/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderPreferences.java index ce031f8e3..dc528f3b9 100644 --- a/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderPreferences.java +++ b/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderPreferences.java @@ -9,7 +9,7 @@ import android.preference.Preference; import com.timsu.astrid.R; import com.todoroo.andlib.utility.AndroidUtilities; import com.todoroo.andlib.widget.TodorooPreferences; -import com.todoroo.astrid.utility.Preferences; +import com.todoroo.andlib.utility.Preferences; /** * Displays the preference screen for users to edit their preferences diff --git a/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderService.java b/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderService.java index 9b837d2e4..089ce626f 100644 --- a/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderService.java +++ b/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderService.java @@ -25,7 +25,7 @@ import com.todoroo.astrid.dao.TaskDao; import com.todoroo.astrid.dao.TaskDao.TaskCriteria; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.utility.Constants; -import com.todoroo.astrid.utility.Preferences; +import com.todoroo.andlib.utility.Preferences; /** diff --git a/astrid/rmilk-src/org/weloveastrid/rmilk/MilkDetailExposer.java b/astrid/rmilk-src/org/weloveastrid/rmilk/MilkDetailExposer.java index 7ab9fec5a..42f893476 100644 --- a/astrid/rmilk-src/org/weloveastrid/rmilk/MilkDetailExposer.java +++ b/astrid/rmilk-src/org/weloveastrid/rmilk/MilkDetailExposer.java @@ -19,7 +19,7 @@ import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.astrid.api.AstridApiConstants; import com.todoroo.astrid.data.Metadata; -import com.todoroo.astrid.utility.Preferences; +import com.todoroo.andlib.utility.Preferences; /** * Exposes Task Details for Remember the Milk: diff --git a/astrid/src/com/todoroo/astrid/activity/EditPreferences.java b/astrid/src/com/todoroo/astrid/activity/EditPreferences.java index 681e5a436..563047d44 100644 --- a/astrid/src/com/todoroo/astrid/activity/EditPreferences.java +++ b/astrid/src/com/todoroo/astrid/activity/EditPreferences.java @@ -33,7 +33,7 @@ import com.todoroo.astrid.service.StartupService; import com.todoroo.astrid.service.TaskService; import com.todoroo.astrid.utility.Constants; import com.todoroo.astrid.utility.Flags; -import com.todoroo.astrid.utility.Preferences; +import com.todoroo.andlib.utility.Preferences; /** * Displays the preference screen for users to edit their preferences diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java index 91c2f5f79..c7bff5c36 100644 --- a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java +++ b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java @@ -88,7 +88,7 @@ import com.todoroo.astrid.service.StartupService; import com.todoroo.astrid.service.TaskService; import com.todoroo.astrid.utility.Constants; import com.todoroo.astrid.utility.Flags; -import com.todoroo.astrid.utility.Preferences; +import com.todoroo.andlib.utility.Preferences; import com.todoroo.astrid.widget.TasksWidget; /** diff --git a/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java b/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java index 61a9282a4..7f1145b2d 100644 --- a/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java +++ b/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java @@ -34,7 +34,7 @@ import com.todoroo.astrid.api.FilterCategory; import com.todoroo.astrid.api.FilterListHeader; import com.todoroo.astrid.api.FilterListItem; import com.todoroo.astrid.service.TaskService; -import com.todoroo.astrid.utility.Preferences; +import com.todoroo.andlib.utility.Preferences; public class FilterAdapter extends BaseExpandableListAdapter { diff --git a/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java b/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java index d7e881fd4..ce14b624e 100644 --- a/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java +++ b/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java @@ -58,7 +58,7 @@ import com.todoroo.astrid.service.AddOnService; import com.todoroo.astrid.service.TaskService; import com.todoroo.astrid.timers.TimerDecorationExposer; import com.todoroo.astrid.utility.Constants; -import com.todoroo.astrid.utility.Preferences; +import com.todoroo.andlib.utility.Preferences; /** * Adapter for displaying a user's tasks as a list diff --git a/astrid/src/com/todoroo/astrid/dao/TaskDao.java b/astrid/src/com/todoroo/astrid/dao/TaskDao.java index 9a30c945b..f9643d559 100644 --- a/astrid/src/com/todoroo/astrid/dao/TaskDao.java +++ b/astrid/src/com/todoroo/astrid/dao/TaskDao.java @@ -23,7 +23,7 @@ import com.todoroo.astrid.data.Task; import com.todoroo.astrid.provider.Astrid2TaskProvider; import com.todoroo.astrid.reminders.Notifications; import com.todoroo.astrid.reminders.ReminderService; -import com.todoroo.astrid.utility.Preferences; +import com.todoroo.andlib.utility.Preferences; import com.todoroo.astrid.widget.PowerWidget; import com.todoroo.astrid.widget.PowerWidget42; import com.todoroo.astrid.widget.TasksWidget; diff --git a/astrid/src/com/todoroo/astrid/service/AddOnService.java b/astrid/src/com/todoroo/astrid/service/AddOnService.java index 8201ea2bf..df0b88041 100644 --- a/astrid/src/com/todoroo/astrid/service/AddOnService.java +++ b/astrid/src/com/todoroo/astrid/service/AddOnService.java @@ -22,7 +22,7 @@ import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.astrid.data.AddOn; import com.todoroo.astrid.utility.Constants; -import com.todoroo.astrid.utility.Preferences; +import com.todoroo.andlib.utility.Preferences; /** * Astrid Service for managing add-ons diff --git a/astrid/src/com/todoroo/astrid/service/Astrid2To3UpgradeHelper.java b/astrid/src/com/todoroo/astrid/service/Astrid2To3UpgradeHelper.java index 2fd348f19..766b7295a 100644 --- a/astrid/src/com/todoroo/astrid/service/Astrid2To3UpgradeHelper.java +++ b/astrid/src/com/todoroo/astrid/service/Astrid2To3UpgradeHelper.java @@ -42,7 +42,7 @@ import com.todoroo.astrid.legacy.LegacyRepeatInfo; import com.todoroo.astrid.legacy.LegacyTaskModel; import com.todoroo.astrid.legacy.TransitionalAlarm; import com.todoroo.astrid.tags.TagService; -import com.todoroo.astrid.utility.Preferences; +import com.todoroo.andlib.utility.Preferences; @SuppressWarnings("deprecation") public class Astrid2To3UpgradeHelper { diff --git a/astrid/src/com/todoroo/astrid/service/StartupService.java b/astrid/src/com/todoroo/astrid/service/StartupService.java index 5ddf2f265..e7e5a395b 100644 --- a/astrid/src/com/todoroo/astrid/service/StartupService.java +++ b/astrid/src/com/todoroo/astrid/service/StartupService.java @@ -11,8 +11,8 @@ import android.app.AlertDialog; import android.app.PendingIntent; import android.content.Context; import android.content.DialogInterface; -import android.content.Intent; import android.content.DialogInterface.OnClickListener; +import android.content.Intent; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.util.Log; @@ -25,6 +25,7 @@ import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.andlib.service.ExceptionService; import com.todoroo.andlib.service.ExceptionService.TodorooUncaughtExceptionHandler; import com.todoroo.andlib.utility.AndroidUtilities; +import com.todoroo.andlib.utility.Preferences; import com.todoroo.astrid.backup.BackupConstants; import com.todoroo.astrid.backup.BackupService; import com.todoroo.astrid.backup.TasksXmlImporter; @@ -32,8 +33,8 @@ import com.todoroo.astrid.dao.Database; import com.todoroo.astrid.producteev.ProducteevBackgroundService; import com.todoroo.astrid.producteev.ProducteevUtilities; import com.todoroo.astrid.reminders.ReminderStartupReceiver; +import com.todoroo.astrid.utility.AstridPreferences; import com.todoroo.astrid.utility.Constants; -import com.todoroo.astrid.utility.Preferences; import com.todoroo.astrid.widget.TasksWidget.UpdateService; /** @@ -86,7 +87,7 @@ public class StartupService { ContextManager.setContext(context); // read current version - int latestSetVersion = Preferences.getCurrentVersion(); + int latestSetVersion = AstridPreferences.getCurrentVersion(); int version = 0; try { @@ -106,7 +107,7 @@ public class StartupService { boolean justUpgraded = latestSetVersion != version; if(justUpgraded && version > 0) { upgradeService.performUpgrade(context, latestSetVersion); - Preferences.setCurrentVersion(version); + AstridPreferences.setCurrentVersion(version); } upgradeService.performSecondaryUpgrade(context); @@ -138,7 +139,7 @@ public class StartupService { } }).start(); - Preferences.setPreferenceDefaults(); + AstridPreferences.setPreferenceDefaults(); // check for task killers if(!Constants.OEM) @@ -152,7 +153,8 @@ public class StartupService { */ private void databaseRestoreIfEmpty(Context context) { try { - if(Preferences.getCurrentVersion() > 135 && !context.getDatabasePath(database.getName()).exists()) { + if(AstridPreferences.getCurrentVersion() >= UpgradeService.V3_0_0 && + !context.getDatabasePath(database.getName()).exists()) { // we didn't have a database! restore latest file File directory = BackupConstants.defaultExportDirectory(); if(!directory.exists()) diff --git a/astrid/src/com/todoroo/astrid/service/UpgradeService.java b/astrid/src/com/todoroo/astrid/service/UpgradeService.java index 0e3ee295c..5645c6833 100644 --- a/astrid/src/com/todoroo/astrid/service/UpgradeService.java +++ b/astrid/src/com/todoroo/astrid/service/UpgradeService.java @@ -12,18 +12,18 @@ import com.timsu.astrid.R; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.andlib.utility.DialogUtilities; +import com.todoroo.andlib.utility.Preferences; import com.todoroo.astrid.activity.TaskListActivity; import com.todoroo.astrid.dao.Database; -import com.todoroo.astrid.utility.Preferences; public final class UpgradeService { - private static final int V3_3_0 = 155; - private static final int V3_2_0 = 147; - private static final int V3_1_0 = 146; - private static final int V3_0_0 = 136; - private static final int V2_14_4 = 135; + public static final int V3_3_0 = 155; + public static final int V3_2_0 = 147; + public static final int V3_1_0 = 146; + public static final int V3_0_0 = 136; + public static final int V2_14_4 = 135; @Autowired private Database database; diff --git a/astrid/src/com/todoroo/astrid/utility/AstridPreferences.java b/astrid/src/com/todoroo/astrid/utility/AstridPreferences.java new file mode 100644 index 000000000..79946067a --- /dev/null +++ b/astrid/src/com/todoroo/astrid/utility/AstridPreferences.java @@ -0,0 +1,47 @@ +package com.todoroo.astrid.utility; + +import android.content.Context; +import android.content.SharedPreferences; +import android.content.SharedPreferences.Editor; +import android.content.res.Resources; + +import com.timsu.astrid.R; +import com.todoroo.andlib.service.ContextManager; +import com.todoroo.andlib.utility.Preferences; + +public class AstridPreferences { + + private static final String P_CURRENT_VERSION = "cv"; //$NON-NLS-1$ + + /** Set preference defaults, if unset. called at startup */ + public static void setPreferenceDefaults() { + Context context = ContextManager.getContext(); + SharedPreferences prefs = Preferences.getPrefs(context); + Editor editor = prefs.edit(); + Resources r = context.getResources(); + + Preferences.setIfUnset(prefs, editor, r, R.string.p_default_urgency_key, 0); + Preferences.setIfUnset(prefs, editor, r, R.string.p_default_importance_key, 2); + Preferences.setIfUnset(prefs, editor, r, R.string.p_default_hideUntil_key, 0); + Preferences.setIfUnset(prefs, editor, r, R.string.p_default_reminders_key, 6); + Preferences.setIfUnset(prefs, editor, r, R.string.p_rmd_default_random_hours, 0); + Preferences.setIfUnset(prefs, editor, r, R.string.p_fontSize, 20); + + editor.commit(); + } + + /* ====================================================================== + * ========================================================= system prefs + * ====================================================================== */ + + /** CurrentVersion: the currently installed version of Astrid */ + public static int getCurrentVersion() { + return Preferences.getInt(P_CURRENT_VERSION, 0); + } + + /** CurrentVersion: the currently installed version of Astrid */ + public static void setCurrentVersion(int version) { + Preferences.setInt(P_CURRENT_VERSION, version); + } + +} diff --git a/astrid/src/com/todoroo/astrid/utility/Preferences.java b/astrid/src/com/todoroo/astrid/utility/Preferences.java deleted file mode 100644 index 88a918ab7..000000000 --- a/astrid/src/com/todoroo/astrid/utility/Preferences.java +++ /dev/null @@ -1,285 +0,0 @@ -package com.todoroo.astrid.utility; - -import android.content.Context; -import android.content.SharedPreferences; -import android.content.SharedPreferences.Editor; -import android.content.res.Resources; -import android.preference.PreferenceManager; - -import com.timsu.astrid.R; -import com.todoroo.andlib.service.ContextManager; - -import edu.umd.cs.findbugs.annotations.CheckForNull; - -public class Preferences { - - private static final String P_CURRENT_VERSION = "cv"; //$NON-NLS-1$ - - /** Set preference defaults, if unset. called at startup */ - public static void setPreferenceDefaults() { - Context context = ContextManager.getContext(); - SharedPreferences prefs = getPrefs(context); - Editor editor = prefs.edit(); - Resources r = context.getResources(); - - setIfUnset(prefs, editor, r, R.string.p_default_urgency_key, 0); - setIfUnset(prefs, editor, r, R.string.p_default_importance_key, 2); - setIfUnset(prefs, editor, r, R.string.p_default_hideUntil_key, 0); - setIfUnset(prefs, editor, r, R.string.p_default_reminders_key, 6); - setIfUnset(prefs, editor, r, R.string.p_rmd_default_random_hours, 0); - setIfUnset(prefs, editor, r, R.string.p_fontSize, 20); - - editor.commit(); - } - - /** - * Helper to write to editor if key specified is null - * @param prefs - * @param editor - * @param r - * @param keyResource - * @param value - */ - public static void setIfUnset(SharedPreferences prefs, Editor editor, Resources r, int keyResource, int value) { - String key = r.getString(keyResource); - if(!prefs.contains(key)) - editor.putString(key, Integer.toString(value)); - } - - /** - * Helper to write to editor if key specified is null - * @param prefs - * @param editor - * @param r - * @param keyResource - * @param value - */ - public static void setIfUnset(SharedPreferences prefs, Editor editor, Resources r, int keyResource, boolean value) { - String key = r.getString(keyResource); - if(!prefs.contains(key)) - editor.putBoolean(key, value); - } - - /* ====================================================================== - * ========================================================= system prefs - * ====================================================================== */ - - /** CurrentVersion: the currently installed version of Astrid */ - public static int getCurrentVersion() { - Context context = ContextManager.getContext(); - return getPrefs(context).getInt(P_CURRENT_VERSION, 0); - } - - /** CurrentVersion: the currently installed version of Astrid */ - public static void setCurrentVersion(int version) { - Context context = ContextManager.getContext(); - Editor editor = getPrefs(context).edit(); - editor.putInt(P_CURRENT_VERSION, version); - editor.commit(); - } - - /* ====================================================================== - * ======================================================= helper methods - * ====================================================================== */ - - /** Get preferences object from the context */ - public static SharedPreferences getPrefs(Context context) { - context = context.getApplicationContext(); - return PreferenceManager.getDefaultSharedPreferences(context); - } - - /** @return true if given preference is set */ - public static boolean isSet(String key) { - Context context = ContextManager.getContext(); - return getPrefs(context).contains(key); - } - - // --- preference fetching (string) - - /** Gets an string value from a string preference. Returns null - * if the value is not set - * - * @param context - * @param key - * @return integer value, or null on error - */ - public static String getStringValue(String key) { - Context context = ContextManager.getContext(); - return getPrefs(context).getString(key, null); - } - - /** Gets an string value from a string preference. Returns null - * if the value is not set - * - * @param context - * @param key - * @return integer value, or null on error - */ - public static String getStringValue(int keyResource) { - Context context = ContextManager.getContext(); - return getPrefs(context).getString(context.getResources().getString(keyResource), null); - } - - /** Gets an integer value from a string preference. Returns null - * if the value is not set or not an integer. - * - * @param keyResource resource from string.xml - * @return integer value, or null on error - */ - @CheckForNull - public static int getIntegerFromString(int keyResource, int defaultValue) { - Context context = ContextManager.getContext(); - Resources r = context.getResources(); - String value = getPrefs(context).getString(r.getString(keyResource), null); - if(value == null) - return defaultValue; - - try { - return Integer.parseInt(value); - } catch (Exception e) { - return defaultValue; - } - } - - /** Gets an float value from a string preference. Returns null - * if the value is not set or not an flat. - * - * @param keyResource resource from string.xml - * @return - */ - @CheckForNull - public static Float getFloatFromString(int keyResource) { - Context context = ContextManager.getContext(); - Resources r = context.getResources(); - String value = getPrefs(context).getString(r.getString(keyResource), ""); //$NON-NLS-1$ - - try { - return Float.parseFloat(value); - } catch (Exception e) { - return null; - } - } - - /** - * Sets string preference - */ - public static void setString(int keyResource, String newValue) { - Context context = ContextManager.getContext(); - setString(context.getString(keyResource), newValue); - } - - /** - * Sets string preference - */ - public static void setString(String key, String newValue) { - Context context = ContextManager.getContext(); - Editor editor = getPrefs(context).edit(); - editor.putString(key, newValue); - editor.commit(); - } - - /** - * Sets string preference from integer value - */ - public static void setStringFromInteger(int keyResource, int newValue) { - Context context = ContextManager.getContext(); - Editor editor = getPrefs(context).edit(); - editor.putString(context.getString(keyResource), Integer.toString(newValue)); - editor.commit(); - } - - // --- preference fetching (boolean) - - /** Gets a boolean preference (e.g. a CheckBoxPreference setting) - * - * @param key - * @param defValue - * @return default if value is unset otherwise the value - */ - public static boolean getBoolean(String key, boolean defValue) { - Context context = ContextManager.getContext(); - return getPrefs(context).getBoolean(key, defValue); - } - - /** Gets a boolean preference (e.g. a CheckBoxPreference setting) - * - * @param keyResource - * @param defValue - * @return default if value is unset otherwise the value - */ - public static boolean getBoolean(int keyResources, boolean defValue) { - return getBoolean(ContextManager.getString(keyResources), defValue); - } - - /** - * Sets boolean preference - * @param key - * @param value - */ - public static void setBoolean(int keyResource, boolean value) { - setBoolean(ContextManager.getString(keyResource), value); - } - - /** - * Sets boolean preference - * @param key - * @param value - */ - public static void setBoolean(String key, boolean value) { - Context context = ContextManager.getContext(); - Editor editor = getPrefs(context).edit(); - editor.putBoolean(key, value); - editor.commit(); - } - - // --- preference fetching (int) - - /** Gets a int preference - * - * @param key - * @param defValue - * @return default if value is unset otherwise the value - */ - public static int getInt(String key, int defValue) { - Context context = ContextManager.getContext(); - return getPrefs(context).getInt(key, defValue); - } - - /** - * Sets int preference - * @param key - * @param value - */ - public static void setInt(String key, int value) { - Context context = ContextManager.getContext(); - Editor editor = getPrefs(context).edit(); - editor.putInt(key, value); - editor.commit(); - } - - // --- preference fetching (long) - - /** Gets a long preference - * - * @param key - * @param defValue - * @return default if value is unset otherwise the value - */ - public static long getLong(String key, long defValue) { - Context context = ContextManager.getContext(); - return getPrefs(context).getLong(key, defValue); - } - - /** - * Sets long preference - * @param key - * @param value - */ - public static void setLong(String key, long value) { - Context context = ContextManager.getContext(); - Editor editor = getPrefs(context).edit(); - editor.putLong(key, value); - editor.commit(); - } - -} diff --git a/astrid/src/com/todoroo/astrid/widget/ConfigurePowerWidget42Activity.java b/astrid/src/com/todoroo/astrid/widget/ConfigurePowerWidget42Activity.java index b9a35333b..01b5762c5 100644 --- a/astrid/src/com/todoroo/astrid/widget/ConfigurePowerWidget42Activity.java +++ b/astrid/src/com/todoroo/astrid/widget/ConfigurePowerWidget42Activity.java @@ -22,7 +22,7 @@ import com.todoroo.astrid.api.Filter; import com.todoroo.astrid.api.FilterCategory; import com.todoroo.astrid.api.FilterListItem; import com.todoroo.astrid.utility.Constants; -import com.todoroo.astrid.utility.Preferences; +import com.todoroo.andlib.utility.Preferences; /** * Configure options for the Power Pack widget. Select a color, filter to use, enable/disable encouragements. diff --git a/astrid/src/com/todoroo/astrid/widget/ConfigurePowerWidgetActivity.java b/astrid/src/com/todoroo/astrid/widget/ConfigurePowerWidgetActivity.java index aecdb6d68..6ce3c1deb 100644 --- a/astrid/src/com/todoroo/astrid/widget/ConfigurePowerWidgetActivity.java +++ b/astrid/src/com/todoroo/astrid/widget/ConfigurePowerWidgetActivity.java @@ -22,7 +22,7 @@ import com.todoroo.astrid.api.Filter; import com.todoroo.astrid.api.FilterCategory; import com.todoroo.astrid.api.FilterListItem; import com.todoroo.astrid.utility.Constants; -import com.todoroo.astrid.utility.Preferences; +import com.todoroo.andlib.utility.Preferences; /** * Configure options for the Power Pack widget. Select a color, filter to use, enable/disable encouragements. diff --git a/astrid/src/com/todoroo/astrid/widget/PowerWidget.java b/astrid/src/com/todoroo/astrid/widget/PowerWidget.java index c3e6969eb..7e92f689d 100644 --- a/astrid/src/com/todoroo/astrid/widget/PowerWidget.java +++ b/astrid/src/com/todoroo/astrid/widget/PowerWidget.java @@ -34,7 +34,7 @@ import com.todoroo.astrid.dao.TaskDao; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.service.AstridDependencyInjector; import com.todoroo.astrid.service.TaskService; -import com.todoroo.astrid.utility.Preferences; +import com.todoroo.andlib.utility.Preferences; /** * Power Pack widget. Supports 4x4 size. Configured via diff --git a/astrid/src/com/todoroo/astrid/widget/TasksWidget.java b/astrid/src/com/todoroo/astrid/widget/TasksWidget.java index c1206e6b5..fa6b47d62 100644 --- a/astrid/src/com/todoroo/astrid/widget/TasksWidget.java +++ b/astrid/src/com/todoroo/astrid/widget/TasksWidget.java @@ -29,7 +29,7 @@ import com.todoroo.astrid.dao.Database; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.service.AstridDependencyInjector; import com.todoroo.astrid.service.TaskService; -import com.todoroo.astrid.utility.Preferences; +import com.todoroo.andlib.utility.Preferences; public class TasksWidget extends AppWidgetProvider { diff --git a/astrid/src/com/todoroo/astrid/widget/WidgetConfigActivity.java b/astrid/src/com/todoroo/astrid/widget/WidgetConfigActivity.java index 0c521409f..8f0d70005 100644 --- a/astrid/src/com/todoroo/astrid/widget/WidgetConfigActivity.java +++ b/astrid/src/com/todoroo/astrid/widget/WidgetConfigActivity.java @@ -17,7 +17,7 @@ import com.todoroo.astrid.api.Filter; import com.todoroo.astrid.api.FilterCategory; import com.todoroo.astrid.api.FilterListItem; import com.todoroo.astrid.utility.Constants; -import com.todoroo.astrid.utility.Preferences; +import com.todoroo.andlib.utility.Preferences; public class WidgetConfigActivity extends ExpandableListActivity { diff --git a/tests/src/com/todoroo/astrid/backup/BackupServiceTests.java b/tests/src/com/todoroo/astrid/backup/BackupServiceTests.java index 3d579232b..812e0f84a 100644 --- a/tests/src/com/todoroo/astrid/backup/BackupServiceTests.java +++ b/tests/src/com/todoroo/astrid/backup/BackupServiceTests.java @@ -13,7 +13,7 @@ import com.todoroo.astrid.backup.BackupService.BackupDirectorySetting; import com.todoroo.astrid.dao.TaskDao; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.test.DatabaseTestCase; -import com.todoroo.astrid.utility.Preferences; +import com.todoroo.andlib.utility.Preferences; public class BackupServiceTests extends DatabaseTestCase { diff --git a/tests/src/com/todoroo/astrid/gtasks/GtasksDecorationExposerTest.java b/tests/src/com/todoroo/astrid/gtasks/GtasksDecorationExposerTest.java index 71aa5071f..eb3181a5d 100644 --- a/tests/src/com/todoroo/astrid/gtasks/GtasksDecorationExposerTest.java +++ b/tests/src/com/todoroo/astrid/gtasks/GtasksDecorationExposerTest.java @@ -12,7 +12,7 @@ import com.todoroo.astrid.data.StoreObject; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.test.DatabaseTestCase; import com.todoroo.astrid.utility.Flags; -import com.todoroo.astrid.utility.Preferences; +import com.todoroo.andlib.utility.Preferences; public class GtasksDecorationExposerTest extends DatabaseTestCase { diff --git a/tests/src/com/todoroo/astrid/gtasks/GtasksMetadataServiceTest.java b/tests/src/com/todoroo/astrid/gtasks/GtasksMetadataServiceTest.java index bc82494be..d2059af74 100644 --- a/tests/src/com/todoroo/astrid/gtasks/GtasksMetadataServiceTest.java +++ b/tests/src/com/todoroo/astrid/gtasks/GtasksMetadataServiceTest.java @@ -9,7 +9,7 @@ import com.todoroo.astrid.core.PluginServices; import com.todoroo.astrid.data.Metadata; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.test.DatabaseTestCase; -import com.todoroo.astrid.utility.Preferences; +import com.todoroo.andlib.utility.Preferences; public class GtasksMetadataServiceTest extends DatabaseTestCase { diff --git a/tests/src/com/todoroo/astrid/model/TaskTests.java b/tests/src/com/todoroo/astrid/model/TaskTests.java index b4ee677dc..4cd752aca 100644 --- a/tests/src/com/todoroo/astrid/model/TaskTests.java +++ b/tests/src/com/todoroo/astrid/model/TaskTests.java @@ -10,7 +10,7 @@ import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.service.TaskService; import com.todoroo.astrid.test.DatabaseTestCase; -import com.todoroo.astrid.utility.Preferences; +import com.todoroo.astrid.utility.AstridPreferences; public class TaskTests extends DatabaseTestCase { @@ -35,7 +35,7 @@ public class TaskTests extends DatabaseTestCase { /** Check defaults */ public void checkDefaults() { - Preferences.setPreferenceDefaults(); + AstridPreferences.setPreferenceDefaults(); ContentValues defaults = new Task().getDefaultValues(); assertTrue(defaults.containsKey(Task.TITLE.name)); assertTrue(defaults.containsKey(Task.DUE_DATE.name)); diff --git a/tests/src/com/todoroo/astrid/reminders/NotificationTests.java b/tests/src/com/todoroo/astrid/reminders/NotificationTests.java index d9e15d8d3..a0764a24a 100644 --- a/tests/src/com/todoroo/astrid/reminders/NotificationTests.java +++ b/tests/src/com/todoroo/astrid/reminders/NotificationTests.java @@ -12,7 +12,7 @@ import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.astrid.dao.TaskDao; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.test.DatabaseTestCase; -import com.todoroo.astrid.utility.Preferences; +import com.todoroo.andlib.utility.Preferences; public class NotificationTests extends DatabaseTestCase { diff --git a/tests/src/com/todoroo/astrid/reminders/ReminderServiceTests.java b/tests/src/com/todoroo/astrid/reminders/ReminderServiceTests.java index c8e98aedf..336adedac 100644 --- a/tests/src/com/todoroo/astrid/reminders/ReminderServiceTests.java +++ b/tests/src/com/todoroo/astrid/reminders/ReminderServiceTests.java @@ -8,7 +8,7 @@ import com.todoroo.astrid.dao.TaskDao; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.reminders.ReminderService.AlarmScheduler; import com.todoroo.astrid.test.DatabaseTestCase; -import com.todoroo.astrid.utility.Preferences; +import com.todoroo.astrid.utility.AstridPreferences; public class ReminderServiceTests extends DatabaseTestCase { @@ -23,7 +23,7 @@ public class ReminderServiceTests extends DatabaseTestCase { super.setUp(); service = ReminderService.getInstance(); original = service.getScheduler(); - Preferences.setPreferenceDefaults(); + AstridPreferences.setPreferenceDefaults(); } @Override diff --git a/tests/src/com/todoroo/astrid/repeats/RepeatTests.java b/tests/src/com/todoroo/astrid/repeats/RepeatTests.java index f835f30b8..653722913 100644 --- a/tests/src/com/todoroo/astrid/repeats/RepeatTests.java +++ b/tests/src/com/todoroo/astrid/repeats/RepeatTests.java @@ -17,7 +17,7 @@ import com.todoroo.astrid.dao.TaskDao; import com.todoroo.astrid.data.Metadata; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.test.DatabaseTestCase; -import com.todoroo.astrid.utility.Preferences; +import com.todoroo.andlib.utility.Preferences; public class RepeatTests extends DatabaseTestCase {