From 9906b181db75b11045af99e4c01f05b278a45f97 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Wed, 7 Aug 2013 09:38:58 -0500 Subject: [PATCH] Update packages, remove cloud messaging --- .idea/libraries/gcm.xml | 11 - .idea/runConfigurations/tests.xml | 22 + .idea/runConfigurations/tests_sync.xml | 22 + api/AndroidManifest.xml | 2 +- .../andlib/service/ExceptionService.java | 2 +- .../todoroo/andlib/utility/DateUtilities.java | 2 +- .../andlib/utility/DialogUtilities.java | 2 +- api/src/com/todoroo/astrid/data/Task.java | 3 +- .../com/todoroo/astrid/sync/SyncProvider.java | 3 +- .../astrid/sync/SyncProviderPreferences.java | 3 +- astrid/AndroidManifest.xml | 31 +- astrid/astrid.iml | 1 - astrid/libs/gcm-src.jar | Bin 12814 -> 0 bytes astrid/libs/gcm.jar | Bin 13662 -> 0 bytes .../commonsware/cwac/tlv/TouchListView.java | 3 +- .../com/timsu/astrid/GCMIntentService.java | 472 ------------------ .../astrid/data/task/AbstractTaskModel.java | 1 - .../utilities/LegacyTasksXmlExporter.java | 2 +- .../astrid/actfm/ActFmCameraModule.java | 3 +- .../astrid/actfm/ActFmGoogleAuthActivity.java | 3 +- .../astrid/actfm/CommentsActivity.java | 3 +- .../astrid/actfm/CommentsFragment.java | 2 +- .../astrid/actfm/TagCommentsFragment.java | 3 +- .../astrid/actfm/TagSettingsActivity.java | 2 +- .../todoroo/astrid/actfm/TagViewFragment.java | 2 +- .../astrid/actfm/TaskCommentsFragment.java | 3 +- .../astrid/actfm/sync/ActFmInvoker.java | 13 +- .../actfm/sync/ActFmPreferenceService.java | 2 +- .../astrid/actfm/sync/ActFmSyncService.java | 31 -- .../astrid/actfm/sync/ActFmSyncThread.java | 2 +- .../actfm/sync/ActFmSyncV2Provider.java | 10 +- .../actfm/sync/messages/MakeChanges.java | 2 +- .../astrid/activity/AstridActivity.java | 3 +- .../astrid/activity/BeastModePreferences.java | 3 +- .../astrid/activity/DefaultFilterMode.java | 3 +- .../astrid/activity/EditPreferences.java | 3 +- .../astrid/activity/FilterListFragment.java | 3 +- .../activity/FilterShortcutActivity.java | 3 +- .../astrid/activity/ShortcutActivity.java | 3 +- .../activity/SortSelectionActivity.java | 3 +- .../astrid/activity/TaskEditActivity.java | 3 +- .../astrid/activity/TaskEditFragment.java | 3 +- .../astrid/activity/TaskEditViewPager.java | 3 +- .../astrid/activity/TaskListActivity.java | 3 +- .../astrid/activity/TaskListFragment.java | 3 +- .../todoroo/astrid/adapter/FilterAdapter.java | 3 +- .../todoroo/astrid/adapter/TaskAdapter.java | 2 +- .../todoroo/astrid/adapter/UpdateAdapter.java | 2 +- .../astrid/alarms/AlarmControlSet.java | 3 +- .../todoroo/astrid/backup/BackupActivity.java | 3 +- .../astrid/backup/BackupPreferences.java | 3 +- .../todoroo/astrid/backup/BackupService.java | 3 +- .../astrid/backup/FilePickerBuilder.java | 3 +- .../astrid/backup/TasksXmlExporter.java | 2 +- .../astrid/backup/TasksXmlImporter.java | 2 +- .../astrid/calls/MissedCallActivity.java | 3 +- .../calls/PhoneStateChangedReceiver.java | 3 +- .../astrid/core/CoreFilterExposer.java | 3 +- .../astrid/core/CustomFilterActivity.java | 3 +- .../astrid/core/CustomFilterAdapter.java | 3 +- .../astrid/core/CustomFilterExposer.java | 3 +- .../astrid/core/DefaultsPreferences.java | 3 +- .../astrid/core/LinkActionExposer.java | 3 +- .../astrid/core/OldTaskPreferences.java | 5 +- .../src/com/todoroo/astrid/dao/TaskDao.java | 3 +- .../astrid/files/AACRecordingActivity.java | 3 +- .../com/todoroo/astrid/files/FileExplore.java | 3 +- .../todoroo/astrid/files/FileUtilities.java | 3 +- .../todoroo/astrid/files/FilesControlSet.java | 3 +- .../astrid/gcal/CalendarAlarmListCreator.java | 2 +- .../astrid/gcal/CalendarAlarmReceiver.java | 3 +- .../astrid/gcal/CalendarAlarmScheduler.java | 3 +- .../astrid/gcal/CalendarReminderActivity.java | 3 +- .../astrid/gcal/CalendarStartupReceiver.java | 3 +- .../com/todoroo/astrid/gcal/Calendars.java | 3 +- .../todoroo/astrid/gcal/GCalControlSet.java | 3 +- .../com/todoroo/astrid/gcal/GCalHelper.java | 3 +- .../astrid/gcal/GCalTaskCompleteListener.java | 3 +- .../GtasksCustomFilterCriteriaExposer.java | 3 +- .../astrid/gtasks/GtasksFilterExposer.java | 3 +- .../astrid/gtasks/GtasksListAdder.java | 3 +- .../astrid/gtasks/GtasksListFragment.java | 3 +- .../gtasks/GtasksPreferenceService.java | 3 +- .../astrid/gtasks/GtasksPreferences.java | 3 +- .../astrid/gtasks/api/GtasksInvoker.java | 3 +- .../gtasks/auth/GtasksLoginActivity.java | 3 +- .../gtasks/auth/GtasksTokenValidator.java | 3 +- .../gtasks/sync/GtasksSyncV2Provider.java | 2 +- .../astrid/helper/SyncActionHelper.java | 3 +- .../astrid/helper/TaskEditControlSet.java | 3 +- .../astrid/locale/LocaleEditAlerts.java | 3 +- .../todoroo/astrid/locale/LocaleReceiver.java | 3 +- .../astrid/notes/EditNoteActivity.java | 2 +- .../astrid/notes/NotesDecorationExposer.java | 3 +- .../astrid/notes/NotesDetailExposer.java | 3 +- .../astrid/opencrx/OpencrxControlSet.java | 3 +- .../astrid/provider/Astrid2TaskProvider.java | 1 - .../reminders/NotificationFragment.java | 3 +- .../astrid/reminders/Notifications.java | 3 +- .../reminders/ReengagementFragment.java | 3 +- .../reminders/ReengagementReceiver.java | 2 +- .../astrid/reminders/ReminderDialog.java | 3 +- .../astrid/reminders/ReminderPreferences.java | 3 +- .../astrid/reminders/ReminderService.java | 3 +- .../astrid/repeats/RepeatControlSet.java | 3 +- .../astrid/repeats/RepeatDetailExposer.java | 3 +- .../todoroo/astrid/repeats/RepeatsPlugin.java | 3 +- .../service/Astrid2To3UpgradeHelper.java | 3 +- .../astrid/service/StartupService.java | 3 +- .../todoroo/astrid/service/ThemeService.java | 3 +- .../service/UpdateMessagePreference.java | 2 +- .../astrid/service/UpdateMessageService.java | 2 +- .../astrid/service/UpgradeService.java | 5 +- .../AstridOrderedListFragmentHelper.java | 3 +- .../OrderedMetadataListFragmentHelper.java | 3 +- .../astrid/subtasks/SubtasksListFragment.java | 3 +- .../subtasks/SubtasksTagListFragment.java | 3 +- .../tags/TagCustomFilterCriteriaExposer.java | 3 +- .../todoroo/astrid/tags/TagFilterExposer.java | 3 +- .../com/todoroo/astrid/tags/TagService.java | 3 +- .../todoroo/astrid/tags/TagsControlSet.java | 3 +- .../tags/reusable/FeaturedListFilterMode.java | 3 +- .../tags/reusable/FeaturedListFragment.java | 3 +- .../reusable/FeaturedTaskListFragment.java | 3 +- .../tags/reusable/ReusableTaskAdapter.java | 3 +- .../astrid/timers/TimerActionControlSet.java | 3 +- .../astrid/timers/TimerControlSet.java | 3 +- .../astrid/timers/TimerDecorationExposer.java | 3 +- .../astrid/timers/TimerFilterExposer.java | 3 +- .../todoroo/astrid/timers/TimerPlugin.java | 3 +- .../com/todoroo/astrid/ui/AstridDialog.java | 3 +- .../todoroo/astrid/ui/AstridTimePicker.java | 3 +- .../todoroo/astrid/ui/ContactListAdapter.java | 3 +- .../todoroo/astrid/ui/DateAndTimeDialog.java | 3 +- .../todoroo/astrid/ui/DateAndTimePicker.java | 3 +- .../todoroo/astrid/ui/DateChangedAlerts.java | 3 +- .../todoroo/astrid/ui/DeadlineControlSet.java | 3 +- .../todoroo/astrid/ui/DraggableListView.java | 3 +- .../astrid/ui/EditNotesControlSet.java | 3 +- .../astrid/ui/EditTitleControlSet.java | 3 +- .../astrid/ui/FeedbackPromptDialogs.java | 3 +- .../astrid/ui/HideUntilControlSet.java | 3 +- .../astrid/ui/ImportanceControlSet.java | 3 +- .../todoroo/astrid/ui/MainMenuPopover.java | 3 +- .../com/todoroo/astrid/ui/NumberPicker.java | 3 +- .../todoroo/astrid/ui/PopupControlSet.java | 3 +- .../com/todoroo/astrid/ui/QuickAddBar.java | 3 +- .../astrid/ui/RandomReminderControlSet.java | 3 +- .../todoroo/astrid/ui/ReminderControlSet.java | 3 +- .../astrid/ui/TaskListFragmentPager.java | 3 +- .../astrid/ui/TimeDurationControlSet.java | 3 +- .../utility/AstridDefaultPreferenceSpec.java | 3 +- .../utility/AstridLitePreferenceSpec.java | 3 +- .../astrid/utility/AstridPreferences.java | 3 +- .../astrid/utility/ResourceDrawableCache.java | 3 +- .../astrid/voice/VoiceInputAssistant.java | 3 +- .../todoroo/astrid/voice/VoiceRecognizer.java | 3 +- .../todoroo/astrid/widget/TasksWidget.java | 3 +- .../astrid/widget/WidgetConfigActivity.java | 3 +- tests-sync/AndroidManifest.xml | 4 +- tests-sync/project.properties | 2 +- tests-sync/tests-sync.iml | 6 +- tests/AndroidManifest.xml | 4 +- tests/project.properties | 2 +- tests/tests.iml | 5 +- 165 files changed, 333 insertions(+), 726 deletions(-) delete mode 100644 .idea/libraries/gcm.xml create mode 100644 .idea/runConfigurations/tests.xml create mode 100644 .idea/runConfigurations/tests_sync.xml delete mode 100644 astrid/libs/gcm-src.jar delete mode 100644 astrid/libs/gcm.jar delete mode 100644 astrid/src/com/timsu/astrid/GCMIntentService.java diff --git a/.idea/libraries/gcm.xml b/.idea/libraries/gcm.xml deleted file mode 100644 index a12ddc69e..000000000 --- a/.idea/libraries/gcm.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/runConfigurations/tests.xml b/.idea/runConfigurations/tests.xml new file mode 100644 index 000000000..3578fdfc9 --- /dev/null +++ b/.idea/runConfigurations/tests.xml @@ -0,0 +1,22 @@ + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations/tests_sync.xml b/.idea/runConfigurations/tests_sync.xml new file mode 100644 index 000000000..471ad575c --- /dev/null +++ b/.idea/runConfigurations/tests_sync.xml @@ -0,0 +1,22 @@ + + + + + \ No newline at end of file diff --git a/api/AndroidManifest.xml b/api/AndroidManifest.xml index d63ccf83e..d7008d6e6 100644 --- a/api/AndroidManifest.xml +++ b/api/AndroidManifest.xml @@ -5,7 +5,7 @@ ** See the file "LICENSE" for the full license governing this code. --> diff --git a/api/src/com/todoroo/andlib/service/ExceptionService.java b/api/src/com/todoroo/andlib/service/ExceptionService.java index d0e82e932..8527fc14a 100644 --- a/api/src/com/todoroo/andlib/service/ExceptionService.java +++ b/api/src/com/todoroo/andlib/service/ExceptionService.java @@ -12,7 +12,7 @@ import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; import android.util.Log; -import com.todoroo.astrid.api.R; +import org.astrid.api.R; /** * Exception handling utility class - reports and logs errors diff --git a/api/src/com/todoroo/andlib/utility/DateUtilities.java b/api/src/com/todoroo/andlib/utility/DateUtilities.java index 54f95d773..029a30219 100644 --- a/api/src/com/todoroo/andlib/utility/DateUtilities.java +++ b/api/src/com/todoroo/andlib/utility/DateUtilities.java @@ -9,7 +9,7 @@ import android.content.Context; import android.text.format.DateFormat; import android.text.format.DateUtils; -import com.todoroo.astrid.api.R; +import org.astrid.api.R; import java.text.ParseException; import java.text.SimpleDateFormat; diff --git a/api/src/com/todoroo/andlib/utility/DialogUtilities.java b/api/src/com/todoroo/andlib/utility/DialogUtilities.java index 71da64eb3..8500a75a3 100644 --- a/api/src/com/todoroo/andlib/utility/DialogUtilities.java +++ b/api/src/com/todoroo/andlib/utility/DialogUtilities.java @@ -15,7 +15,7 @@ import android.content.DialogInterface; import android.view.View; import android.webkit.WebView; -import com.todoroo.astrid.api.R; +import org.astrid.api.R; public class DialogUtilities { diff --git a/api/src/com/todoroo/astrid/data/Task.java b/api/src/com/todoroo/astrid/data/Task.java index a63a56bae..8ff8ce530 100644 --- a/api/src/com/todoroo/astrid/data/Task.java +++ b/api/src/com/todoroo/astrid/data/Task.java @@ -19,7 +19,8 @@ import com.todoroo.andlib.data.Table; import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.astrid.api.AstridApiConstants; -import com.todoroo.astrid.api.R; + +import org.astrid.api.R; import java.util.Date; diff --git a/api/src/com/todoroo/astrid/sync/SyncProvider.java b/api/src/com/todoroo/astrid/sync/SyncProvider.java index 771d949a3..4fba3976b 100644 --- a/api/src/com/todoroo/astrid/sync/SyncProvider.java +++ b/api/src/com/todoroo/astrid/sync/SyncProvider.java @@ -18,9 +18,10 @@ import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.andlib.service.ExceptionService; import com.todoroo.andlib.service.NotificationManager; import com.todoroo.andlib.utility.DialogUtilities; -import com.todoroo.astrid.api.R; import com.todoroo.astrid.data.Task; +import org.astrid.api.R; + import java.io.IOException; import java.util.ArrayList; import java.util.Collections; diff --git a/api/src/com/todoroo/astrid/sync/SyncProviderPreferences.java b/api/src/com/todoroo/astrid/sync/SyncProviderPreferences.java index 7838ce0a3..d957d2ecc 100644 --- a/api/src/com/todoroo/astrid/sync/SyncProviderPreferences.java +++ b/api/src/com/todoroo/astrid/sync/SyncProviderPreferences.java @@ -23,7 +23,8 @@ import com.todoroo.andlib.utility.AndroidUtilities; import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.andlib.utility.DialogUtilities; import com.todoroo.andlib.utility.TodorooPreferenceActivity; -import com.todoroo.astrid.api.R; + +import org.astrid.api.R; import java.util.Date; import java.util.HashMap; diff --git a/astrid/AndroidManifest.xml b/astrid/AndroidManifest.xml index ac59bcd18..10d239a3c 100644 --- a/astrid/AndroidManifest.xml +++ b/astrid/AndroidManifest.xml @@ -7,7 +7,7 @@ + android:versionCode="312"> @@ -26,26 +26,18 @@ - - - - - - + - - - @@ -75,16 +67,11 @@ android:protectionLevel="normal" android:label="@string/write_permission_label"/> - - - @@ -392,17 +380,6 @@ android:name="com.todoroo.astrid.actfm.CommentsActivity" android:windowSoftInputMode="stateHidden"/> - - - - - - - - - diff --git a/astrid/astrid.iml b/astrid/astrid.iml index e61bf42ff..072c5a2df 100644 --- a/astrid/astrid.iml +++ b/astrid/astrid.iml @@ -37,7 +37,6 @@ - diff --git a/astrid/libs/gcm-src.jar b/astrid/libs/gcm-src.jar deleted file mode 100644 index e2d9b43e9c7a06104505aff18878318b2cfc6111..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12814 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 KAZ7gH>Hh##xH#$n diff --git a/astrid/libs/gcm.jar b/astrid/libs/gcm.jar deleted file mode 100644 index ac109a830ebe95e89e1456e23328212ad70576dc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 13662 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 K2s`$_e*GU@T3ng{ diff --git a/astrid/src/com/commonsware/cwac/tlv/TouchListView.java b/astrid/src/com/commonsware/cwac/tlv/TouchListView.java index 5aacc82e8..1f401745e 100644 --- a/astrid/src/com/commonsware/cwac/tlv/TouchListView.java +++ b/astrid/src/com/commonsware/cwac/tlv/TouchListView.java @@ -33,10 +33,11 @@ import android.view.WindowManager; import android.widget.AdapterView; import android.widget.ImageView; -import org.astrid.R; import com.todoroo.andlib.utility.AndroidUtilities; import com.todoroo.astrid.ui.ErrorCatchingListView; +import org.astrid.R; + public class TouchListView extends ErrorCatchingListView { private ImageView mDragView; diff --git a/astrid/src/com/timsu/astrid/GCMIntentService.java b/astrid/src/com/timsu/astrid/GCMIntentService.java deleted file mode 100644 index fa678d5c0..000000000 --- a/astrid/src/com/timsu/astrid/GCMIntentService.java +++ /dev/null @@ -1,472 +0,0 @@ -package com.timsu.astrid; - -import android.app.Notification; -import android.app.PendingIntent; -import android.content.Context; -import android.content.Intent; -import android.os.Build; -import android.provider.Settings.Secure; -import android.text.TextUtils; -import android.util.Log; - -import org.astrid.R; -import com.google.android.gcm.GCMBaseIntentService; -import com.google.android.gcm.GCMConstants; -import com.google.android.gcm.GCMRegistrar; -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.service.NotificationManager; -import com.todoroo.andlib.service.NotificationManager.AndroidNotificationManager; -import com.todoroo.andlib.sql.Query; -import com.todoroo.andlib.sql.QueryTemplate; -import com.todoroo.andlib.utility.AndroidUtilities; -import com.todoroo.andlib.utility.DateUtilities; -import com.todoroo.andlib.utility.Preferences; -import com.todoroo.astrid.actfm.TagViewFragment; -import com.todoroo.astrid.actfm.sync.ActFmPreferenceService; -import com.todoroo.astrid.actfm.sync.ActFmSyncService; -import com.todoroo.astrid.actfm.sync.ActFmSyncThread; -import com.todoroo.astrid.actfm.sync.ActFmSyncV2Provider; -import com.todoroo.astrid.actfm.sync.messages.BriefMe; -import com.todoroo.astrid.activity.ShortcutActivity; -import com.todoroo.astrid.activity.TaskListActivity; -import com.todoroo.astrid.activity.TaskListFragment; -import com.todoroo.astrid.api.AstridApiConstants; -import com.todoroo.astrid.api.Filter; -import com.todoroo.astrid.api.FilterWithCustomIntent; -import com.todoroo.astrid.dao.UserActivityDao; -import com.todoroo.astrid.data.SyncFlags; -import com.todoroo.astrid.data.TagData; -import com.todoroo.astrid.data.Task; -import com.todoroo.astrid.data.UserActivity; -import com.todoroo.astrid.reminders.Notifications; -import com.todoroo.astrid.service.AstridDependencyInjector; -import com.todoroo.astrid.service.TagDataService; -import com.todoroo.astrid.service.TaskService; -import com.todoroo.astrid.sync.SyncResultCallbackAdapter; -import com.todoroo.astrid.tags.TagFilterExposer; -import com.todoroo.astrid.utility.Constants; - -import java.io.IOException; - - -public class GCMIntentService extends GCMBaseIntentService { - - public static final String SENDER_ID = "1003855277730"; //$NON-NLS-1$ - public static final String PREF_REGISTRATION = "gcm_id"; - public static final String PREF_NEEDS_REGISTRATION = "gcm_needs_reg"; - public static final String PREF_NEEDS_RETRY = "gcm_needs_retry"; - - private static final String PREF_LAST_GCM = "c2dm_last"; - public static final String PREF_C2DM_REGISTRATION = "c2dm_key"; - - public static String getDeviceID() { - String id = Secure.getString(ContextManager.getContext().getContentResolver(), Secure.ANDROID_ID); - if (AndroidUtilities.getSdkVersion() > 8) { //Gingerbread and above - //the following uses relection to get android.os.Build.SERIAL to avoid having to build with Gingerbread - try { - if (!Build.UNKNOWN.equals(Build.SERIAL)) { - id = Build.SERIAL; - } - } catch (Exception e) { - // Ah well - } - } - - if (TextUtils.isEmpty(id) || "9774d56d682e549c".equals(id)) { // check for failure or devices affected by the "9774d56d682e549c" bug - return null; - } - - return id; - } - - static { - AstridDependencyInjector.initialize(); - } - - @Autowired - private ActFmSyncService actFmSyncService; - - @Autowired - private ActFmPreferenceService actFmPreferenceService; - - @Autowired - private TaskService taskService; - - @Autowired - private TagDataService tagDataService; - - @Autowired - private UserActivityDao userActivityDao; - - public GCMIntentService() { - super(SENDER_ID); - DependencyInjectionService.getInstance().inject(this); - } - - - // ===================== Messaging =================== // - - private final SyncResultCallbackAdapter refreshOnlyCallback = new SyncResultCallbackAdapter() { - @Override - public void finished() { - ContextManager.getContext().sendBroadcast(new Intent(AstridApiConstants.BROADCAST_EVENT_REFRESH)); - } - }; - - private static final long MIN_MILLIS_BETWEEN_FULL_SYNCS = DateUtilities.ONE_HOUR; - - @Override - protected void onMessage(Context context, Intent intent) { - if (actFmPreferenceService.isLoggedIn()) { - if (intent.hasExtra("web_update")) { - if (DateUtilities.now() - actFmPreferenceService.getLastSyncDate() > MIN_MILLIS_BETWEEN_FULL_SYNCS && !actFmPreferenceService.isOngoing()) { - new ActFmSyncV2Provider().synchronizeActiveTasks(false, refreshOnlyCallback); - } else { - handleWebUpdate(intent); - } - } else { - handleMessage(intent); - } - } - } - - /** - * Handle web task or list changed - */ - protected void handleWebUpdate(Intent intent) { - if (intent.hasExtra("tag_id")) { - String uuid = intent.getStringExtra("tag_id"); - TodorooCursor cursor = tagDataService.query( - Query.select(TagData.PUSHED_AT).where(TagData.UUID.eq( - uuid))); - long pushedAt = 0; - try { - TagData tagData = new TagData(); - if (cursor.getCount() > 0) { - cursor.moveToNext(); - tagData.readFromCursor(cursor); - pushedAt = tagData.getValue(TagData.PUSHED_AT); - } - } finally { - cursor.close(); - } - ActFmSyncThread.getInstance().enqueueMessage(new BriefMe(TagData.class, uuid, pushedAt), ActFmSyncThread.DEFAULT_REFRESH_RUNNABLE); - } else if (intent.hasExtra("task_id")) { - String uuid = intent.getStringExtra("task_id"); - TodorooCursor cursor = taskService.query( - Query.select(Task.PROPERTIES).where(Task.UUID.eq( - uuid))); - long pushedAt = 0; - try { - final Task task = new Task(); - if (cursor.getCount() > 0) { - cursor.moveToNext(); - task.readFromCursor(cursor); - pushedAt = task.getValue(Task.PUSHED_AT); - } - ActFmSyncThread.getInstance().enqueueMessage(new BriefMe(Task.class, uuid, pushedAt), ActFmSyncThread.DEFAULT_REFRESH_RUNNABLE); - } finally { - cursor.close(); - } - } - } - - // --- message handling - - /** - * Handle message. Run on separate thread. - */ - private void handleMessage(Intent intent) { - String message = intent.getStringExtra("alert"); - Context context = ContextManager.getContext(); - if (TextUtils.isEmpty(message)) { - return; - } - - long lastNotification = Preferences.getLong(PREF_LAST_GCM, 0); - if (DateUtilities.now() - lastNotification < 5000L) { - return; - } - Preferences.setLong(PREF_LAST_GCM, DateUtilities.now()); - Intent notifyIntent = null; - int notifId; - - final String user_id = intent.getStringExtra("oid"); - final String token_id = intent.getStringExtra("tid"); - // unregister - if (!actFmPreferenceService.isLoggedIn() || !ActFmPreferenceService.userId().equals(user_id)) { - new Thread() { - @Override - public void run() { - try { - actFmSyncService.invoke("user_unset_c2dm", "tid", token_id, "oid", user_id); - } catch (IOException e) { - // - } - } - }.start(); - return; - } - - - // fetch data - if (intent.hasExtra("tag_id")) { - notifyIntent = createTagIntent(context, intent); - notifId = intent.getStringExtra("tag_id").hashCode(); - } else if (intent.hasExtra("task_id")) { - notifyIntent = createTaskIntent(intent); - notifId = intent.getStringExtra("task_id").hashCode(); - } else { - return; - } - - if (notifyIntent == null) { - return; - } - - notifyIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); - notifyIntent.putExtra(TaskListActivity.TOKEN_SOURCE, Constants.SOURCE_C2DM); - PendingIntent pendingIntent = PendingIntent.getActivity(context, - notifId, notifyIntent, 0); - - int icon = calculateIcon(intent); - - // create notification - NotificationManager nm = new AndroidNotificationManager(ContextManager.getContext()); - Notification notification = new Notification(icon, - message, System.currentTimeMillis()); - String title; - if (intent.hasExtra("title")) { - title = "Astrid: " + intent.getStringExtra("title"); - } else { - title = ContextManager.getString(R.string.app_name); - } - notification.setLatestEventInfo(ContextManager.getContext(), title, - message, pendingIntent); - notification.flags |= Notification.FLAG_AUTO_CANCEL; - - boolean sounds = !"false".equals(intent.getStringExtra("sound")); - notification.defaults = 0; - if (sounds && !Notifications.isQuietHours()) { - notification.defaults |= Notification.DEFAULT_SOUND; - notification.defaults |= Notification.DEFAULT_VIBRATE; - } - nm.notify(notifId, notification); - - if (intent.hasExtra("tag_id")) { - Intent broadcastIntent = new Intent(TagViewFragment.BROADCAST_TAG_ACTIVITY); - broadcastIntent.putExtras(intent); - ContextManager.getContext().sendBroadcast(broadcastIntent, AstridApiConstants.PERMISSION_READ); - } - } - - private int calculateIcon(Intent intent) { - if (intent.hasExtra("type")) { - String type = intent.getStringExtra("type"); - if ("f".equals(type)) { - return R.drawable.notif_c2dm_done; - } - if ("s".equals(type)) { - return R.drawable.notif_c2dm_assign; - } - if ("l".equals(type)) { - return R.drawable.notif_c2dm_assign; - } - } else { - String message = intent.getStringExtra("alert"); - if (message.contains(" finished ")) { - return R.drawable.notif_c2dm_done; - } - if (message.contains(" invited you to ")) { - return R.drawable.notif_c2dm_assign; - } - if (message.contains(" sent you ")) { - return R.drawable.notif_c2dm_assign; - } - } - return R.drawable.notif_c2dm_msg; - } - - private Intent createTaskIntent(Intent intent) { - String uuid = intent.getStringExtra("task_id"); - TodorooCursor cursor = taskService.query( - Query.select(Task.PROPERTIES).where(Task.UUID.eq( - uuid))); - long pushedAt = 0; - try { - final Task task = new Task(); - if (cursor.getCount() == 0) { - task.setValue(Task.TITLE, intent.getStringExtra("title")); - task.setValue(Task.UUID, intent.getStringExtra("task_id")); - task.setValue(Task.USER_ID, Task.USER_ID_UNASSIGNED); - task.putTransitory(SyncFlags.ACTFM_SUPPRESS_OUTSTANDING_ENTRIES, true); - taskService.save(task); - } else { - cursor.moveToNext(); - task.readFromCursor(cursor); - pushedAt = task.getValue(Task.PUSHED_AT); - } - ActFmSyncThread.getInstance().enqueueMessage(new BriefMe(Task.class, uuid, pushedAt), null); - - Filter filter = new Filter("", task.getValue(Task.TITLE), - new QueryTemplate().where(Task.ID.eq(task.getId())), - null); - - return ShortcutActivity.createIntent(filter); - } finally { - cursor.close(); - } - } - - private Intent createTagIntent(final Context context, final Intent intent) { - String uuid = intent.getStringExtra("tag_id"); - TodorooCursor cursor = tagDataService.query( - Query.select(TagData.PROPERTIES).where(TagData.UUID.eq( - uuid))); - long pushedAt = 0; - try { - final TagData tagData = new TagData(); - if (cursor.getCount() == 0) { - tagData.setValue(TagData.NAME, intent.getStringExtra("title")); - tagData.setValue(TagData.UUID, intent.getStringExtra("tag_id")); - tagData.putTransitory(SyncFlags.ACTFM_SUPPRESS_OUTSTANDING_ENTRIES, true); - tagDataService.save(tagData); - } else { - cursor.moveToNext(); - tagData.readFromCursor(cursor); - pushedAt = tagData.getValue(TagData.PUSHED_AT); - } - ActFmSyncThread.getInstance().enqueueMessage(new BriefMe(TagData.class, uuid, pushedAt), null); - - FilterWithCustomIntent filter = TagFilterExposer.filterFromTagData(context, tagData); - - if (intent.hasExtra("activity_id")) { - UserActivity update = new UserActivity(); - update.setValue(UserActivity.UUID, intent.getStringExtra("activity_id")); - update.setValue(UserActivity.USER_UUID, intent.getStringExtra("user_id")); - - update.setValue(UserActivity.ACTION, "tag_comment"); - update.setValue(UserActivity.TARGET_NAME, intent.getStringExtra("title")); - String message = intent.getStringExtra("alert"); - if (message.contains(":")) { - message = message.substring(message.indexOf(':') + 2); - } - update.setValue(UserActivity.MESSAGE, message); - update.setValue(UserActivity.CREATED_AT, DateUtilities.now()); - update.setValue(UserActivity.TARGET_ID, intent.getStringExtra("tag_id")); - update.putTransitory(SyncFlags.ACTFM_SUPPRESS_OUTSTANDING_ENTRIES, true); - userActivityDao.createNew(update); - } - - if (filter != null) { - Intent launchIntent = new Intent(context, TaskListActivity.class); - launchIntent.putExtra(TaskListFragment.TOKEN_FILTER, filter); - filter.customExtras.putBoolean(TagViewFragment.TOKEN_START_ACTIVITY, shouldLaunchActivity(intent)); - launchIntent.putExtras(filter.customExtras); - - return launchIntent; - } else { - return null; - } - } finally { - cursor.close(); - } - } - - private boolean shouldLaunchActivity(Intent intent) { - if (intent.hasExtra("type")) { - String type = intent.getStringExtra("type"); - if ("f".equals(type)) { - return true; - } - if ("s".equals(type)) { - return false; - } - if ("l".equals(type)) { - return false; - } - } else { - String message = intent.getStringExtra("alert"); - if (message.contains(" finished ")) { - return true; - } - if (message.contains(" invited you to ")) { - return false; - } - if (message.contains(" sent you ")) { - return false; - } - } - return true; - } - - // ==================== Registration ============== // - - public static void register(Context context) { - try { - if (AndroidUtilities.getSdkVersion() >= 8) { - GCMRegistrar.checkDevice(context); - GCMRegistrar.checkManifest(context); - final String regId = GCMRegistrar.getRegistrationId(context); - if ("".equals(regId)) { - GCMRegistrar.register(context, GCMIntentService.SENDER_ID); - } else { - // TODO: Already registered--do something? - } - } - } catch (Exception e) { - // phone may not support gcm - Log.e("actfm-sync", "gcm-register", e); - } - } - - public static void unregister(Context context) { - try { - if (AndroidUtilities.getSdkVersion() >= 8) { - GCMRegistrar.unregister(context); - } - } catch (Exception e) { - Log.e("actfm-sync", "gcm-unregister", e); - } - } - - @Override - protected void onRegistered(Context context, String registrationId) { - actFmSyncService.setGCMRegistration(registrationId); - } - - @Override - protected void onUnregistered(Context context, String registrationId) { - // Server can unregister automatically next time it tries to send a message - } - - - @Override - protected void onError(Context context, String intent) { - if ((GCMConstants.ERROR_AUTHENTICATION_FAILED.equals(intent) || GCMConstants.ERROR_ACCOUNT_MISSING.equals(intent)) - && !Preferences.getBoolean(PREF_NEEDS_RETRY, false)) { - Preferences.setBoolean(PREF_NEEDS_RETRY, true); - } - } - - // =========== Migration ============= // - - public static class GCMMigration { - @Autowired - private ActFmPreferenceService actFmPreferenceService; - - public GCMMigration() { - DependencyInjectionService.getInstance().inject(this); - } - - public void performMigration(Context context) { - if (actFmPreferenceService.isLoggedIn()) { - GCMIntentService.register(context); - } - } - } - -} diff --git a/astrid/src/com/timsu/astrid/data/task/AbstractTaskModel.java b/astrid/src/com/timsu/astrid/data/task/AbstractTaskModel.java index ac9ef63c7..e6c94617d 100644 --- a/astrid/src/com/timsu/astrid/data/task/AbstractTaskModel.java +++ b/astrid/src/com/timsu/astrid/data/task/AbstractTaskModel.java @@ -12,7 +12,6 @@ import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteOpenHelper; import android.util.Log; -import org.astrid.R; import com.timsu.astrid.data.LegacyAbstractController; import com.timsu.astrid.data.LegacyAbstractModel; import com.timsu.astrid.data.enums.Importance; diff --git a/astrid/src/com/timsu/astrid/utilities/LegacyTasksXmlExporter.java b/astrid/src/com/timsu/astrid/utilities/LegacyTasksXmlExporter.java index 943cec6d7..9cdd4a94f 100644 --- a/astrid/src/com/timsu/astrid/utilities/LegacyTasksXmlExporter.java +++ b/astrid/src/com/timsu/astrid/utilities/LegacyTasksXmlExporter.java @@ -12,7 +12,6 @@ import android.util.Log; import android.util.Xml; import android.widget.Toast; -import org.astrid.R; import com.timsu.astrid.data.alerts.AlertController; import com.timsu.astrid.data.sync.SyncDataController; import com.timsu.astrid.data.sync.SyncMapping; @@ -24,6 +23,7 @@ import com.timsu.astrid.data.task.TaskIdentifier; import com.timsu.astrid.data.task.TaskModelForXml; import com.todoroo.astrid.backup.BackupDateUtilities; +import org.astrid.R; import org.xmlpull.v1.XmlSerializer; import java.io.File; diff --git a/astrid/src/com/todoroo/astrid/actfm/ActFmCameraModule.java b/astrid/src/com/todoroo/astrid/actfm/ActFmCameraModule.java index fd82ae307..059e115dc 100644 --- a/astrid/src/com/todoroo/astrid/actfm/ActFmCameraModule.java +++ b/astrid/src/com/todoroo/astrid/actfm/ActFmCameraModule.java @@ -18,10 +18,11 @@ import android.provider.MediaStore; import android.support.v4.app.Fragment; import android.widget.ArrayAdapter; -import org.astrid.R; import com.todoroo.andlib.utility.AndroidUtilities; import com.todoroo.andlib.utility.DateUtilities; +import org.astrid.R; + import java.io.File; import java.io.IOException; import java.util.ArrayList; diff --git a/astrid/src/com/todoroo/astrid/actfm/ActFmGoogleAuthActivity.java b/astrid/src/com/todoroo/astrid/actfm/ActFmGoogleAuthActivity.java index cca79bde7..105387e5b 100644 --- a/astrid/src/com/todoroo/astrid/actfm/ActFmGoogleAuthActivity.java +++ b/astrid/src/com/todoroo/astrid/actfm/ActFmGoogleAuthActivity.java @@ -23,10 +23,11 @@ import android.widget.TextView; import android.widget.Toast; import com.google.api.client.googleapis.extensions.android2.auth.GoogleAccountManager; -import org.astrid.R; import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.utility.DialogUtilities; +import org.astrid.R; + import java.io.IOException; import java.util.ArrayList; import java.util.concurrent.TimeUnit; diff --git a/astrid/src/com/todoroo/astrid/actfm/CommentsActivity.java b/astrid/src/com/todoroo/astrid/actfm/CommentsActivity.java index 7dbca6da3..f45af28fe 100644 --- a/astrid/src/com/todoroo/astrid/actfm/CommentsActivity.java +++ b/astrid/src/com/todoroo/astrid/actfm/CommentsActivity.java @@ -12,11 +12,12 @@ import android.widget.TextView; import com.actionbarsherlock.app.ActionBar; import com.actionbarsherlock.view.MenuItem; -import org.astrid.R; import com.todoroo.andlib.utility.AndroidUtilities; import com.todoroo.astrid.activity.AstridActivity; import com.todoroo.astrid.service.ThemeService; +import org.astrid.R; + public class CommentsActivity extends AstridActivity { @Override protected void onCreate(Bundle savedInstanceState) { diff --git a/astrid/src/com/todoroo/astrid/actfm/CommentsFragment.java b/astrid/src/com/todoroo/astrid/actfm/CommentsFragment.java index fd75a1827..1e7ce2224 100644 --- a/astrid/src/com/todoroo/astrid/actfm/CommentsFragment.java +++ b/astrid/src/com/todoroo/astrid/actfm/CommentsFragment.java @@ -34,7 +34,6 @@ import com.actionbarsherlock.app.SherlockListFragment; import com.actionbarsherlock.view.Menu; import com.actionbarsherlock.view.MenuInflater; import com.actionbarsherlock.view.MenuItem; -import org.astrid.R; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.astrid.actfm.ActFmCameraModule.CameraResultCallback; @@ -51,6 +50,7 @@ import com.todoroo.astrid.data.RemoteModel; import com.todoroo.astrid.data.UserActivity; import com.todoroo.astrid.helper.AsyncImageView; +import org.astrid.R; import org.json.JSONArray; import org.json.JSONObject; diff --git a/astrid/src/com/todoroo/astrid/actfm/TagCommentsFragment.java b/astrid/src/com/todoroo/astrid/actfm/TagCommentsFragment.java index 293b9ee30..9b829de18 100644 --- a/astrid/src/com/todoroo/astrid/actfm/TagCommentsFragment.java +++ b/astrid/src/com/todoroo/astrid/actfm/TagCommentsFragment.java @@ -15,7 +15,6 @@ import android.view.ViewGroup; import android.widget.ListView; import android.widget.TextView; -import org.astrid.R; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.andlib.utility.Preferences; @@ -37,6 +36,8 @@ import com.todoroo.astrid.tags.TagService; import com.todoroo.astrid.utility.AstridPreferences; import com.todoroo.astrid.utility.ResourceDrawableCache; +import org.astrid.R; + public class TagCommentsFragment extends CommentsFragment { private TagData tagData; diff --git a/astrid/src/com/todoroo/astrid/actfm/TagSettingsActivity.java b/astrid/src/com/todoroo/astrid/actfm/TagSettingsActivity.java index 870df9a18..39ca1aaac 100644 --- a/astrid/src/com/todoroo/astrid/actfm/TagSettingsActivity.java +++ b/astrid/src/com/todoroo/astrid/actfm/TagSettingsActivity.java @@ -28,7 +28,6 @@ import com.actionbarsherlock.app.SherlockFragmentActivity; import com.actionbarsherlock.view.Menu; import com.actionbarsherlock.view.MenuItem; import com.actionbarsherlock.view.Window; -import org.astrid.R; import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.DependencyInjectionService; @@ -61,6 +60,7 @@ import com.todoroo.astrid.tags.TagService; import com.todoroo.astrid.utility.AstridPreferences; import com.todoroo.astrid.utility.ResourceDrawableCache; +import org.astrid.R; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; diff --git a/astrid/src/com/todoroo/astrid/actfm/TagViewFragment.java b/astrid/src/com/todoroo/astrid/actfm/TagViewFragment.java index b8d9704bb..e96b6cc83 100644 --- a/astrid/src/com/todoroo/astrid/actfm/TagViewFragment.java +++ b/astrid/src/com/todoroo/astrid/actfm/TagViewFragment.java @@ -22,7 +22,6 @@ import android.widget.TextView; import com.actionbarsherlock.view.Menu; import com.actionbarsherlock.view.MenuItem; -import org.astrid.R; import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.ContextManager; @@ -70,6 +69,7 @@ import com.todoroo.astrid.tags.TaskToTagMetadata; import com.todoroo.astrid.utility.AstridPreferences; import com.todoroo.astrid.utility.Flags; +import org.astrid.R; import org.json.JSONArray; import java.util.List; diff --git a/astrid/src/com/todoroo/astrid/actfm/TaskCommentsFragment.java b/astrid/src/com/todoroo/astrid/actfm/TaskCommentsFragment.java index ef17a3bc4..d974c2285 100644 --- a/astrid/src/com/todoroo/astrid/actfm/TaskCommentsFragment.java +++ b/astrid/src/com/todoroo/astrid/actfm/TaskCommentsFragment.java @@ -5,7 +5,6 @@ import android.database.Cursor; import android.view.ViewGroup; import android.widget.ListView; -import org.astrid.R; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.astrid.actfm.sync.ActFmSyncThread; @@ -19,6 +18,8 @@ import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.UserActivity; import com.todoroo.astrid.service.TaskService; +import org.astrid.R; + public class TaskCommentsFragment extends CommentsFragment { public static final String EXTRA_TASK = "extra_task"; //$NON-NLS-1$ diff --git a/astrid/src/com/todoroo/astrid/actfm/sync/ActFmInvoker.java b/astrid/src/com/todoroo/astrid/actfm/sync/ActFmInvoker.java index 669d355cc..da46ef292 100644 --- a/astrid/src/com/todoroo/astrid/actfm/sync/ActFmInvoker.java +++ b/astrid/src/com/todoroo/astrid/actfm/sync/ActFmInvoker.java @@ -8,8 +8,6 @@ package com.todoroo.astrid.actfm.sync; import android.text.TextUtils; import android.util.Log; -import com.timsu.astrid.GCMIntentService; -import org.astrid.R; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.andlib.service.RestClient; @@ -17,12 +15,12 @@ import com.todoroo.andlib.utility.AndroidUtilities; import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.andlib.utility.Pair; import com.todoroo.andlib.utility.Preferences; -import com.todoroo.astrid.utility.Constants; import org.apache.commons.codec.digest.DigestUtils; import org.apache.http.HttpEntity; import org.apache.http.entity.mime.MultipartEntity; import org.apache.http.entity.mime.content.StringBody; +import org.astrid.R; import org.json.JSONException; import org.json.JSONObject; @@ -190,15 +188,6 @@ public class ActFmInvoker { Object[] params = {"token", tok, "data", data, "time", timeString}; - if (changesHappened) { - String gcm = Preferences.getStringValue(GCMIntentService.PREF_REGISTRATION); - ActFmSyncThread.syncLog("Sending GCM token: " + gcm); - if (!TextUtils.isEmpty(gcm)) { - params = AndroidUtilities.addToArray(Object.class, params, "gcm", gcm); - entity.addPart("gcm", new StringBody(gcm)); - } - } - String request = createFetchUrl("api/" + API_VERSION, "synchronize", params); if (SYNC_DEBUG) { Log.e("act-fm-post", request); diff --git a/astrid/src/com/todoroo/astrid/actfm/sync/ActFmPreferenceService.java b/astrid/src/com/todoroo/astrid/actfm/sync/ActFmPreferenceService.java index 4c5d3b743..3b7bcca6c 100644 --- a/astrid/src/com/todoroo/astrid/actfm/sync/ActFmPreferenceService.java +++ b/astrid/src/com/todoroo/astrid/actfm/sync/ActFmPreferenceService.java @@ -7,13 +7,13 @@ package com.todoroo.astrid.actfm.sync; import android.text.TextUtils; -import org.astrid.R; import com.todoroo.andlib.utility.Preferences; import com.todoroo.astrid.dao.RemoteModelDao; import com.todoroo.astrid.data.RemoteModel; import com.todoroo.astrid.sync.SyncProviderUtilities; import com.todoroo.astrid.utility.AstridPreferences; +import org.astrid.R; import org.json.JSONException; import org.json.JSONObject; diff --git a/astrid/src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java b/astrid/src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java index 131196901..ab5b17a44 100644 --- a/astrid/src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java +++ b/astrid/src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java @@ -8,7 +8,6 @@ package com.todoroo.astrid.actfm.sync; import android.text.TextUtils; import android.util.Log; -import com.timsu.astrid.GCMIntentService; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.andlib.utility.Preferences; @@ -45,36 +44,6 @@ public final class ActFmSyncService { DependencyInjectionService.getInstance().inject(this); } - // --- data fetch methods - public void setGCMRegistration(String regId) { - try { - String deviceId = GCMIntentService.getDeviceID(); - String existingC2DM = Preferences.getStringValue(GCMIntentService.PREF_C2DM_REGISTRATION); - - ArrayList params = new ArrayList(); - params.add("gcm"); - params.add(regId); - if (!TextUtils.isEmpty(deviceId)) { - params.add("device_id"); - params.add(deviceId); - } - if (!TextUtils.isEmpty(existingC2DM)) { // Unregisters C2DM with the server for migration purposes - params.add("c2dm"); - params.add(existingC2DM); - } - - invoke("user_set_gcm", params.toArray(new Object[params.size()])); - - Preferences.setString(GCMIntentService.PREF_REGISTRATION, regId); - Preferences.setString(GCMIntentService.PREF_C2DM_REGISTRATION, null); - Preferences.setString(GCMIntentService.PREF_NEEDS_REGISTRATION, null); - Preferences.setBoolean(GCMIntentService.PREF_NEEDS_RETRY, false); - } catch (IOException e) { - Preferences.setString(GCMIntentService.PREF_NEEDS_REGISTRATION, regId); - Log.e("gcm", "error-gcm-register", e); - } - } - // --- generic invokation /** diff --git a/astrid/src/com/todoroo/astrid/actfm/sync/ActFmSyncThread.java b/astrid/src/com/todoroo/astrid/actfm/sync/ActFmSyncThread.java index 7639c6f8c..27c5087b2 100644 --- a/astrid/src/com/todoroo/astrid/actfm/sync/ActFmSyncThread.java +++ b/astrid/src/com/todoroo/astrid/actfm/sync/ActFmSyncThread.java @@ -11,7 +11,6 @@ import android.net.NetworkInfo; import android.support.v4.app.NotificationCompat; import android.util.Log; -import org.astrid.R; import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.ContextManager; @@ -59,6 +58,7 @@ import com.todoroo.astrid.utility.Constants; import com.todoroo.astrid.widget.TasksWidget; import org.apache.http.entity.mime.MultipartEntity; +import org.astrid.R; import org.json.JSONArray; import org.json.JSONObject; diff --git a/astrid/src/com/todoroo/astrid/actfm/sync/ActFmSyncV2Provider.java b/astrid/src/com/todoroo/astrid/actfm/sync/ActFmSyncV2Provider.java index 2ef48d0d0..979b0b600 100644 --- a/astrid/src/com/todoroo/astrid/actfm/sync/ActFmSyncV2Provider.java +++ b/astrid/src/com/todoroo/astrid/actfm/sync/ActFmSyncV2Provider.java @@ -8,8 +8,6 @@ package com.todoroo.astrid.actfm.sync; import android.app.Activity; import android.content.DialogInterface; -import com.timsu.astrid.GCMIntentService; -import org.astrid.R; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.utility.DialogUtilities; @@ -20,6 +18,7 @@ import com.todoroo.astrid.service.AstridDependencyInjector; import com.todoroo.astrid.sync.SyncResultCallback; import com.todoroo.astrid.sync.SyncV2Provider; +import org.astrid.R; import org.json.JSONObject; import java.io.IOException; @@ -57,7 +56,6 @@ public class ActFmSyncV2Provider extends SyncV2Provider { actFmPreferenceService.setToken(null); actFmPreferenceService.clearLastSyncDate(); ActFmPreferenceService.premiumLogout(); - GCMIntentService.unregister(ContextManager.getContext()); DialogUtilities.okCancelCustomDialog(activity, activity.getString(R.string.actfm_logout_clear_tasks_title), @@ -105,12 +103,6 @@ public class ActFmSyncV2Provider extends SyncV2Provider { */ public void updateUserStatus() { - if (Preferences.getStringValue(GCMIntentService.PREF_NEEDS_REGISTRATION) != null) { - actFmSyncService.setGCMRegistration(Preferences.getStringValue(GCMIntentService.PREF_NEEDS_REGISTRATION)); - } else if (Preferences.getBoolean(GCMIntentService.PREF_NEEDS_RETRY, false)) { - GCMIntentService.register(ContextManager.getContext()); - } - try { JSONObject status = actFmSyncService.invoke("user_status"); //$NON-NLS-1$ if (status.has("id")) { diff --git a/astrid/src/com/todoroo/astrid/actfm/sync/messages/MakeChanges.java b/astrid/src/com/todoroo/astrid/actfm/sync/messages/MakeChanges.java index a3d6fd3b2..daf401def 100644 --- a/astrid/src/com/todoroo/astrid/actfm/sync/messages/MakeChanges.java +++ b/astrid/src/com/todoroo/astrid/actfm/sync/messages/MakeChanges.java @@ -3,7 +3,6 @@ package com.todoroo.astrid.actfm.sync.messages; import android.text.TextUtils; import android.util.Log; -import org.astrid.R; import com.todoroo.andlib.data.AbstractModel; import com.todoroo.andlib.data.Property; import com.todoroo.andlib.data.Property.StringProperty; @@ -33,6 +32,7 @@ import com.todoroo.astrid.service.MetadataService; import com.todoroo.astrid.tags.TagService; import com.todoroo.astrid.tags.TaskToTagMetadata; +import org.astrid.R; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; diff --git a/astrid/src/com/todoroo/astrid/activity/AstridActivity.java b/astrid/src/com/todoroo/astrid/activity/AstridActivity.java index 8c131cb9f..04657ca4c 100644 --- a/astrid/src/com/todoroo/astrid/activity/AstridActivity.java +++ b/astrid/src/com/todoroo/astrid/activity/AstridActivity.java @@ -20,7 +20,6 @@ import android.widget.EditText; import android.widget.Toast; import com.actionbarsherlock.app.SherlockFragmentActivity; -import org.astrid.R; import com.todoroo.aacenc.RecognizerApi.RecognizerApiListener; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.ContextManager; @@ -48,6 +47,8 @@ import com.todoroo.astrid.ui.DateChangedAlerts; import com.todoroo.astrid.ui.QuickAddBar; import com.todoroo.astrid.voice.VoiceRecognizer; +import org.astrid.R; + /** * This wrapper activity contains all the glue-code to handle the callbacks between the different * fragments that could be visible on the screen in landscape-mode. diff --git a/astrid/src/com/todoroo/astrid/activity/BeastModePreferences.java b/astrid/src/com/todoroo/astrid/activity/BeastModePreferences.java index 368adc11f..d76009328 100644 --- a/astrid/src/com/todoroo/astrid/activity/BeastModePreferences.java +++ b/astrid/src/com/todoroo/astrid/activity/BeastModePreferences.java @@ -20,9 +20,10 @@ import android.widget.TextView; import com.commonsware.cwac.tlv.TouchListView; import com.commonsware.cwac.tlv.TouchListView.DropListener; -import org.astrid.R; import com.todoroo.andlib.utility.Preferences; +import org.astrid.R; + import java.util.ArrayList; import java.util.HashMap; diff --git a/astrid/src/com/todoroo/astrid/activity/DefaultFilterMode.java b/astrid/src/com/todoroo/astrid/activity/DefaultFilterMode.java index 196d5898f..25131a34f 100644 --- a/astrid/src/com/todoroo/astrid/activity/DefaultFilterMode.java +++ b/astrid/src/com/todoroo/astrid/activity/DefaultFilterMode.java @@ -2,11 +2,12 @@ package com.todoroo.astrid.activity; import android.content.Context; -import org.astrid.R; import com.todoroo.astrid.api.Filter; import com.todoroo.astrid.core.CoreFilterExposer; import com.todoroo.astrid.ui.MainMenuPopover; +import org.astrid.R; + public class DefaultFilterMode implements FilterModeSpec { @Override diff --git a/astrid/src/com/todoroo/astrid/activity/EditPreferences.java b/astrid/src/com/todoroo/astrid/activity/EditPreferences.java index 80ce33b76..6a2fcefd2 100644 --- a/astrid/src/com/todoroo/astrid/activity/EditPreferences.java +++ b/astrid/src/com/todoroo/astrid/activity/EditPreferences.java @@ -23,7 +23,6 @@ import android.preference.PreferenceScreen; import android.text.TextUtils; import android.widget.Toast; -import org.astrid.R; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.service.DependencyInjectionService; @@ -57,6 +56,8 @@ import com.todoroo.astrid.voice.VoiceOutputService; import com.todoroo.astrid.voice.VoiceRecognizer; import com.todoroo.astrid.widget.TasksWidget; +import org.astrid.R; + import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedHashMap; diff --git a/astrid/src/com/todoroo/astrid/activity/FilterListFragment.java b/astrid/src/com/todoroo/astrid/activity/FilterListFragment.java index 36523c079..8dad87e1c 100644 --- a/astrid/src/com/todoroo/astrid/activity/FilterListFragment.java +++ b/astrid/src/com/todoroo/astrid/activity/FilterListFragment.java @@ -41,7 +41,6 @@ import android.widget.Toast; import com.actionbarsherlock.app.SherlockListFragment; import com.actionbarsherlock.view.Menu; import com.actionbarsherlock.view.MenuItem; -import org.astrid.R; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.andlib.service.ExceptionService; @@ -56,6 +55,8 @@ import com.todoroo.astrid.tags.TagService; import com.todoroo.astrid.tags.TagsPlugin; import com.todoroo.astrid.utility.AstridPreferences; +import org.astrid.R; + /** * Activity that displays a user's task lists and allows users * to filter their task list. diff --git a/astrid/src/com/todoroo/astrid/activity/FilterShortcutActivity.java b/astrid/src/com/todoroo/astrid/activity/FilterShortcutActivity.java index 96b61bde7..55bdbbb10 100644 --- a/astrid/src/com/todoroo/astrid/activity/FilterShortcutActivity.java +++ b/astrid/src/com/todoroo/astrid/activity/FilterShortcutActivity.java @@ -13,12 +13,13 @@ import android.view.View; import android.widget.Button; import android.widget.ListView; -import org.astrid.R; import com.todoroo.andlib.utility.DialogUtilities; import com.todoroo.astrid.adapter.FilterAdapter; import com.todoroo.astrid.api.Filter; import com.todoroo.astrid.service.ThemeService; +import org.astrid.R; + public class FilterShortcutActivity extends ListActivity { diff --git a/astrid/src/com/todoroo/astrid/activity/ShortcutActivity.java b/astrid/src/com/todoroo/astrid/activity/ShortcutActivity.java index 139daf205..875aad7e8 100644 --- a/astrid/src/com/todoroo/astrid/activity/ShortcutActivity.java +++ b/astrid/src/com/todoroo/astrid/activity/ShortcutActivity.java @@ -11,7 +11,6 @@ import android.content.ContentValues; import android.content.Intent; import android.os.Bundle; -import org.astrid.R; import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.sql.QueryTemplate; import com.todoroo.andlib.utility.AndroidUtilities; @@ -20,6 +19,8 @@ import com.todoroo.astrid.api.FilterWithCustomIntent; import com.todoroo.astrid.api.FilterWithUpdate; import com.todoroo.astrid.data.Task; +import org.astrid.R; + import java.util.Map.Entry; import java.util.Set; diff --git a/astrid/src/com/todoroo/astrid/activity/SortSelectionActivity.java b/astrid/src/com/todoroo/astrid/activity/SortSelectionActivity.java index 136f65b91..a682a4d0b 100644 --- a/astrid/src/com/todoroo/astrid/activity/SortSelectionActivity.java +++ b/astrid/src/com/todoroo/astrid/activity/SortSelectionActivity.java @@ -13,9 +13,10 @@ import android.view.View; import android.widget.CheckBox; import android.widget.RadioButton; -import org.astrid.R; import com.todoroo.astrid.core.SortHelper; +import org.astrid.R; + /** * Shows the sort / hidden dialog * diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java index b2b7d7cf8..251cd4ac2 100644 --- a/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java +++ b/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java @@ -11,12 +11,13 @@ import android.view.KeyEvent; import android.widget.TextView; import com.actionbarsherlock.app.ActionBar; -import org.astrid.R; import com.todoroo.andlib.utility.AndroidUtilities; import com.todoroo.andlib.utility.Preferences; import com.todoroo.astrid.actfm.sync.ActFmPreferenceService; import com.todoroo.astrid.service.ThemeService; +import org.astrid.R; + public class TaskEditActivity extends AstridActivity { /** * @see android.app.Activity#onCreate(Bundle) diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java b/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java index 69c214581..71d9a94a4 100755 --- a/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java +++ b/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java @@ -44,7 +44,6 @@ import com.actionbarsherlock.app.SherlockFragment; import com.actionbarsherlock.view.Menu; import com.actionbarsherlock.view.MenuInflater; import com.actionbarsherlock.view.MenuItem; -import org.astrid.R; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.andlib.service.ExceptionService; @@ -100,6 +99,8 @@ import com.todoroo.astrid.voice.VoiceInputAssistant; import com.todoroo.astrid.voice.VoiceRecognizer; import com.viewpagerindicator.TabPageIndicator; +import org.astrid.R; + import java.io.File; import java.io.FileOutputStream; import java.util.ArrayList; diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditViewPager.java b/astrid/src/com/todoroo/astrid/activity/TaskEditViewPager.java index fb9f576b4..a5f5ddba5 100644 --- a/astrid/src/com/todoroo/astrid/activity/TaskEditViewPager.java +++ b/astrid/src/com/todoroo/astrid/activity/TaskEditViewPager.java @@ -11,9 +11,10 @@ import android.support.v4.view.PagerAdapter; import android.support.v4.view.ViewPager; import android.view.View; -import org.astrid.R; import com.viewpagerindicator.TitleProvider; +import org.astrid.R; + import java.util.ArrayList; public class TaskEditViewPager extends PagerAdapter implements TitleProvider { diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java index 6e4169adb..bcbf81055 100644 --- a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java +++ b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java @@ -26,7 +26,6 @@ import android.widget.PopupWindow.OnDismissListener; import android.widget.TextView; import com.actionbarsherlock.app.ActionBar; -import org.astrid.R; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.andlib.sql.QueryTemplate; @@ -60,6 +59,8 @@ import com.todoroo.astrid.utility.AstridPreferences; import com.todoroo.astrid.utility.Constants; import com.todoroo.astrid.utility.Flags; +import org.astrid.R; + public class TaskListActivity extends AstridActivity implements MainMenuListener, OnPageChangeListener { public static final String TOKEN_SELECTED_FILTER = "selectedFilter"; //$NON-NLS-1$ diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java b/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java index 6b5e92325..5eb7db0a2 100644 --- a/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java +++ b/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java @@ -43,7 +43,6 @@ import android.widget.ListView; import com.actionbarsherlock.app.SherlockListFragment; import com.actionbarsherlock.view.Menu; import com.actionbarsherlock.view.MenuItem; -import org.astrid.R; import com.todoroo.andlib.data.Property; import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.service.Autowired; @@ -101,6 +100,8 @@ import com.todoroo.astrid.utility.AstridPreferences; import com.todoroo.astrid.utility.Flags; import com.todoroo.astrid.widget.TasksWidget; +import org.astrid.R; + import java.util.List; import java.util.Timer; import java.util.TimerTask; diff --git a/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java b/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java index 776e92b2f..b88f9df27 100644 --- a/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java +++ b/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java @@ -32,7 +32,6 @@ import android.widget.ListView; import android.widget.RelativeLayout; import android.widget.TextView; -import org.astrid.R; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.service.DependencyInjectionService; @@ -57,6 +56,8 @@ import com.todoroo.astrid.tags.TagService; import com.todoroo.astrid.utility.Constants; import com.todoroo.astrid.utility.ResourceDrawableCache; +import org.astrid.R; + import java.util.HashMap; import java.util.List; import java.util.concurrent.LinkedBlockingQueue; diff --git a/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java b/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java index 4298946bc..f0408de86 100644 --- a/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java +++ b/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java @@ -42,7 +42,6 @@ import android.widget.LinearLayout; import android.widget.RelativeLayout; import android.widget.TextView; -import org.astrid.R; import com.todoroo.andlib.data.Property; import com.todoroo.andlib.data.Property.IntegerProperty; import com.todoroo.andlib.data.Property.LongProperty; @@ -79,6 +78,7 @@ import com.todoroo.astrid.ui.CheckableImageView; import com.todoroo.astrid.utility.Constants; import com.todoroo.astrid.utility.ResourceDrawableCache; +import org.astrid.R; import org.json.JSONException; import org.json.JSONObject; diff --git a/astrid/src/com/todoroo/astrid/adapter/UpdateAdapter.java b/astrid/src/com/todoroo/astrid/adapter/UpdateAdapter.java index e1292c431..6f8142fc7 100644 --- a/astrid/src/com/todoroo/astrid/adapter/UpdateAdapter.java +++ b/astrid/src/com/todoroo/astrid/adapter/UpdateAdapter.java @@ -29,7 +29,6 @@ import android.view.ViewGroup.LayoutParams; import android.widget.CursorAdapter; import android.widget.TextView; -import org.astrid.R; import com.todoroo.andlib.data.Property; import com.todoroo.andlib.data.Property.StringProperty; import com.todoroo.andlib.data.TodorooCursor; @@ -47,6 +46,7 @@ import com.todoroo.astrid.data.User; import com.todoroo.astrid.data.UserActivity; import com.todoroo.astrid.helper.AsyncImageView; +import org.astrid.R; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; diff --git a/astrid/src/com/todoroo/astrid/alarms/AlarmControlSet.java b/astrid/src/com/todoroo/astrid/alarms/AlarmControlSet.java index 167fb9bf9..1d6ff7966 100644 --- a/astrid/src/com/todoroo/astrid/alarms/AlarmControlSet.java +++ b/astrid/src/com/todoroo/astrid/alarms/AlarmControlSet.java @@ -13,7 +13,6 @@ import android.widget.ImageButton; import android.widget.LinearLayout; import android.widget.TextView; -import org.astrid.R; import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.astrid.data.Metadata; @@ -23,6 +22,8 @@ import com.todoroo.astrid.ui.DateAndTimeDialog; import com.todoroo.astrid.ui.DateAndTimeDialog.DateAndTimeDialogListener; import com.todoroo.astrid.ui.DateAndTimePicker; +import org.astrid.R; + import java.util.Date; import java.util.LinkedHashSet; diff --git a/astrid/src/com/todoroo/astrid/backup/BackupActivity.java b/astrid/src/com/todoroo/astrid/backup/BackupActivity.java index 26915de89..bc6b247df 100644 --- a/astrid/src/com/todoroo/astrid/backup/BackupActivity.java +++ b/astrid/src/com/todoroo/astrid/backup/BackupActivity.java @@ -10,10 +10,11 @@ import android.os.Bundle; import android.view.View; import android.view.View.OnClickListener; -import org.astrid.R; import com.todoroo.andlib.service.ContextManager; import com.todoroo.astrid.utility.Flags; +import org.astrid.R; + public class BackupActivity extends Activity { @Override diff --git a/astrid/src/com/todoroo/astrid/backup/BackupPreferences.java b/astrid/src/com/todoroo/astrid/backup/BackupPreferences.java index fa1a64603..bd1797cf6 100644 --- a/astrid/src/com/todoroo/astrid/backup/BackupPreferences.java +++ b/astrid/src/com/todoroo/astrid/backup/BackupPreferences.java @@ -14,7 +14,6 @@ import android.preference.Preference.OnPreferenceClickListener; import android.view.View; import android.view.ViewGroup.OnHierarchyChangeListener; -import org.astrid.R; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.andlib.utility.DateUtilities; @@ -23,6 +22,8 @@ import com.todoroo.andlib.utility.Preferences; import com.todoroo.andlib.utility.TodorooPreferenceActivity; import com.todoroo.astrid.actfm.sync.ActFmPreferenceService; +import org.astrid.R; + import java.util.Date; /** diff --git a/astrid/src/com/todoroo/astrid/backup/BackupService.java b/astrid/src/com/todoroo/astrid/backup/BackupService.java index fbfe01b3e..4c7402114 100644 --- a/astrid/src/com/todoroo/astrid/backup/BackupService.java +++ b/astrid/src/com/todoroo/astrid/backup/BackupService.java @@ -13,12 +13,13 @@ import android.content.Intent; import android.os.IBinder; import android.util.Log; -import org.astrid.R; import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.andlib.utility.Preferences; import com.todoroo.astrid.core.PluginServices; +import org.astrid.R; + import java.io.File; import java.io.FileFilter; import java.util.Arrays; diff --git a/astrid/src/com/todoroo/astrid/backup/FilePickerBuilder.java b/astrid/src/com/todoroo/astrid/backup/FilePickerBuilder.java index e4deee510..588195811 100644 --- a/astrid/src/com/todoroo/astrid/backup/FilePickerBuilder.java +++ b/astrid/src/com/todoroo/astrid/backup/FilePickerBuilder.java @@ -10,9 +10,10 @@ import android.content.Context; import android.content.DialogInterface; import android.util.Log; -import org.astrid.R; import com.todoroo.andlib.utility.AndroidUtilities; +import org.astrid.R; + import java.io.File; import java.io.FilenameFilter; diff --git a/astrid/src/com/todoroo/astrid/backup/TasksXmlExporter.java b/astrid/src/com/todoroo/astrid/backup/TasksXmlExporter.java index 0c0f374d0..a7ce3f362 100644 --- a/astrid/src/com/todoroo/astrid/backup/TasksXmlExporter.java +++ b/astrid/src/com/todoroo/astrid/backup/TasksXmlExporter.java @@ -13,7 +13,6 @@ import android.util.Log; import android.util.Xml; import android.widget.Toast; -import org.astrid.R; import com.todoroo.andlib.data.AbstractModel; import com.todoroo.andlib.data.Property; import com.todoroo.andlib.data.Property.PropertyVisitor; @@ -33,6 +32,7 @@ import com.todoroo.astrid.service.MetadataService; import com.todoroo.astrid.service.TaskService; import com.todoroo.astrid.utility.AstridPreferences; +import org.astrid.R; import org.xmlpull.v1.XmlSerializer; import java.io.File; diff --git a/astrid/src/com/todoroo/astrid/backup/TasksXmlImporter.java b/astrid/src/com/todoroo/astrid/backup/TasksXmlImporter.java index e608de8a8..7179f5b64 100644 --- a/astrid/src/com/todoroo/astrid/backup/TasksXmlImporter.java +++ b/astrid/src/com/todoroo/astrid/backup/TasksXmlImporter.java @@ -18,7 +18,6 @@ import android.util.Log; import android.view.WindowManager.BadTokenException; import com.google.ical.values.RRule; -import org.astrid.R; import com.todoroo.andlib.data.AbstractModel; import com.todoroo.andlib.data.Property; import com.todoroo.andlib.data.Property.PropertyVisitor; @@ -42,6 +41,7 @@ import com.todoroo.astrid.service.TaskService; import com.todoroo.astrid.service.UpgradeService; import com.todoroo.astrid.tags.TagService; +import org.astrid.R; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; import org.xmlpull.v1.XmlPullParserFactory; diff --git a/astrid/src/com/todoroo/astrid/calls/MissedCallActivity.java b/astrid/src/com/todoroo/astrid/calls/MissedCallActivity.java index 39ca1eb0d..d1a048a1f 100644 --- a/astrid/src/com/todoroo/astrid/calls/MissedCallActivity.java +++ b/astrid/src/com/todoroo/astrid/calls/MissedCallActivity.java @@ -22,7 +22,6 @@ import android.view.View.OnClickListener; import android.widget.ImageView; import android.widget.TextView; -import org.astrid.R; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.andlib.utility.AndroidUtilities; @@ -37,6 +36,8 @@ import com.todoroo.astrid.service.StartupService; import com.todoroo.astrid.service.TaskService; import com.todoroo.astrid.service.ThemeService; +import org.astrid.R; + import java.io.InputStream; public class MissedCallActivity extends Activity { diff --git a/astrid/src/com/todoroo/astrid/calls/PhoneStateChangedReceiver.java b/astrid/src/com/todoroo/astrid/calls/PhoneStateChangedReceiver.java index c51658a8b..9e3bcdcbc 100644 --- a/astrid/src/com/todoroo/astrid/calls/PhoneStateChangedReceiver.java +++ b/astrid/src/com/todoroo/astrid/calls/PhoneStateChangedReceiver.java @@ -16,11 +16,12 @@ import android.telephony.TelephonyManager; import android.text.TextUtils; import android.util.Log; -import org.astrid.R; import com.todoroo.andlib.utility.AndroidUtilities; import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.andlib.utility.Preferences; +import org.astrid.R; + import java.util.Date; diff --git a/astrid/src/com/todoroo/astrid/core/CoreFilterExposer.java b/astrid/src/com/todoroo/astrid/core/CoreFilterExposer.java index 02074eac2..8eaee44ba 100644 --- a/astrid/src/com/todoroo/astrid/core/CoreFilterExposer.java +++ b/astrid/src/com/todoroo/astrid/core/CoreFilterExposer.java @@ -12,7 +12,6 @@ import android.content.Intent; import android.content.res.Resources; import android.graphics.drawable.BitmapDrawable; -import org.astrid.R; import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.sql.Criterion; import com.todoroo.andlib.sql.Query; @@ -32,6 +31,8 @@ import com.todoroo.astrid.data.Task; import com.todoroo.astrid.service.ThemeService; import com.todoroo.astrid.tags.TaskToTagMetadata; +import org.astrid.R; + import java.util.ArrayList; import java.util.List; diff --git a/astrid/src/com/todoroo/astrid/core/CustomFilterActivity.java b/astrid/src/com/todoroo/astrid/core/CustomFilterActivity.java index 63f9027dd..4ce3e9a13 100644 --- a/astrid/src/com/todoroo/astrid/core/CustomFilterActivity.java +++ b/astrid/src/com/todoroo/astrid/core/CustomFilterActivity.java @@ -29,7 +29,6 @@ import android.widget.TextView; import com.actionbarsherlock.app.ActionBar; import com.actionbarsherlock.app.SherlockFragmentActivity; import com.actionbarsherlock.view.MenuItem; -import org.astrid.R; import com.todoroo.andlib.data.Property.CountProperty; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.ContextManager; @@ -52,6 +51,8 @@ import com.todoroo.astrid.data.Task; import com.todoroo.astrid.service.ThemeService; import com.todoroo.astrid.utility.AstridPreferences; +import org.astrid.R; + import java.util.ArrayList; import java.util.Collections; import java.util.LinkedHashMap; diff --git a/astrid/src/com/todoroo/astrid/core/CustomFilterAdapter.java b/astrid/src/com/todoroo/astrid/core/CustomFilterAdapter.java index d9270f4f2..5d8e5b459 100644 --- a/astrid/src/com/todoroo/astrid/core/CustomFilterAdapter.java +++ b/astrid/src/com/todoroo/astrid/core/CustomFilterAdapter.java @@ -20,11 +20,12 @@ import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.TextView; -import org.astrid.R; import com.todoroo.astrid.api.MultipleSelectCriterion; import com.todoroo.astrid.api.TextInputCriterion; import com.todoroo.astrid.core.CustomFilterActivity.CriterionInstance; +import org.astrid.R; + import java.util.List; public class CustomFilterAdapter extends ArrayAdapter { diff --git a/astrid/src/com/todoroo/astrid/core/CustomFilterExposer.java b/astrid/src/com/todoroo/astrid/core/CustomFilterExposer.java index d8b1fa9eb..5b2f255b6 100644 --- a/astrid/src/com/todoroo/astrid/core/CustomFilterExposer.java +++ b/astrid/src/com/todoroo/astrid/core/CustomFilterExposer.java @@ -14,7 +14,6 @@ import android.content.res.Resources; import android.graphics.drawable.BitmapDrawable; import android.os.Bundle; -import org.astrid.R; import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.ContextManager; @@ -37,6 +36,8 @@ import com.todoroo.astrid.gtasks.GtasksPreferenceService; import com.todoroo.astrid.service.TagDataService; import com.todoroo.astrid.service.ThemeService; +import org.astrid.R; + import java.util.ArrayList; /** diff --git a/astrid/src/com/todoroo/astrid/core/DefaultsPreferences.java b/astrid/src/com/todoroo/astrid/core/DefaultsPreferences.java index 292b4d0ca..8feecd27b 100644 --- a/astrid/src/com/todoroo/astrid/core/DefaultsPreferences.java +++ b/astrid/src/com/todoroo/astrid/core/DefaultsPreferences.java @@ -11,12 +11,13 @@ import android.os.Bundle; import android.preference.ListPreference; import android.preference.Preference; -import org.astrid.R; import com.todoroo.andlib.utility.AndroidUtilities; import com.todoroo.andlib.utility.Preferences; import com.todoroo.andlib.utility.TodorooPreferenceActivity; import com.todoroo.astrid.gcal.Calendars; +import org.astrid.R; + /** * Displays the preference screen for users to edit their preferences * diff --git a/astrid/src/com/todoroo/astrid/core/LinkActionExposer.java b/astrid/src/com/todoroo/astrid/core/LinkActionExposer.java index 4e665c0da..f5f1077c0 100644 --- a/astrid/src/com/todoroo/astrid/core/LinkActionExposer.java +++ b/astrid/src/com/todoroo/astrid/core/LinkActionExposer.java @@ -18,7 +18,6 @@ import android.text.Spannable; import android.text.style.URLSpan; import android.text.util.Linkify; -import org.astrid.R; import com.todoroo.andlib.utility.Preferences; import com.todoroo.astrid.api.TaskAction; import com.todoroo.astrid.api.TaskDecoration; @@ -26,6 +25,8 @@ import com.todoroo.astrid.data.Task; import com.todoroo.astrid.files.FilesAction; import com.todoroo.astrid.notes.NotesAction; +import org.astrid.R; + import java.util.HashMap; import java.util.List; diff --git a/astrid/src/com/todoroo/astrid/core/OldTaskPreferences.java b/astrid/src/com/todoroo/astrid/core/OldTaskPreferences.java index 7588e3886..87246915b 100644 --- a/astrid/src/com/todoroo/astrid/core/OldTaskPreferences.java +++ b/astrid/src/com/todoroo/astrid/core/OldTaskPreferences.java @@ -14,8 +14,6 @@ import android.preference.Preference; import android.preference.Preference.OnPreferenceClickListener; import android.preference.PreferenceScreen; -import com.timsu.astrid.GCMIntentService; -import org.astrid.R; import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.DependencyInjectionService; @@ -34,6 +32,8 @@ import com.todoroo.astrid.service.MetadataService; import com.todoroo.astrid.service.TaskService; import com.todoroo.astrid.utility.AstridPreferences; +import org.astrid.R; + /** * Displays the preference screen for users to manage their old tasks and events * @@ -135,7 +135,6 @@ public class OldTaskPreferences extends TodorooPreferenceActivity { deleteDatabase(database.getName()); AstridPreferences.setPreferenceDefaults(); - GCMIntentService.unregister(OldTaskPreferences.this); System.exit(0); } diff --git a/astrid/src/com/todoroo/astrid/dao/TaskDao.java b/astrid/src/com/todoroo/astrid/dao/TaskDao.java index 090c5c8ec..e4a12321e 100644 --- a/astrid/src/com/todoroo/astrid/dao/TaskDao.java +++ b/astrid/src/com/todoroo/astrid/dao/TaskDao.java @@ -10,7 +10,6 @@ import android.content.Context; import android.content.Intent; import android.database.sqlite.SQLiteConstraintException; -import org.astrid.R; import com.todoroo.andlib.data.Property; import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.service.Autowired; @@ -29,6 +28,8 @@ import com.todoroo.astrid.data.TaskApiDao; import com.todoroo.astrid.reminders.Notifications; import com.todoroo.astrid.reminders.ReminderService; +import org.astrid.R; + /** * Data Access layer for {@link Task}-related operations. * diff --git a/astrid/src/com/todoroo/astrid/files/AACRecordingActivity.java b/astrid/src/com/todoroo/astrid/files/AACRecordingActivity.java index 4675910e3..92b9936bb 100644 --- a/astrid/src/com/todoroo/astrid/files/AACRecordingActivity.java +++ b/astrid/src/com/todoroo/astrid/files/AACRecordingActivity.java @@ -14,12 +14,13 @@ import android.view.View.OnClickListener; import android.widget.Chronometer; import android.widget.Toast; -import org.astrid.R; import com.todoroo.aacenc.AACRecorder; import com.todoroo.aacenc.AACRecorder.AACRecorderCallbacks; import com.todoroo.aacenc.AACToM4A; import com.todoroo.andlib.utility.DialogUtilities; +import org.astrid.R; + import java.io.IOException; import java.util.concurrent.atomic.AtomicReference; diff --git a/astrid/src/com/todoroo/astrid/files/FileExplore.java b/astrid/src/com/todoroo/astrid/files/FileExplore.java index 2be266252..f465a3d98 100644 --- a/astrid/src/com/todoroo/astrid/files/FileExplore.java +++ b/astrid/src/com/todoroo/astrid/files/FileExplore.java @@ -21,9 +21,10 @@ import android.widget.ArrayAdapter; import android.widget.ListAdapter; import android.widget.TextView; -import org.astrid.R; import com.todoroo.andlib.utility.DialogUtilities; +import org.astrid.R; + import java.io.File; import java.io.FilenameFilter; import java.util.ArrayList; diff --git a/astrid/src/com/todoroo/astrid/files/FileUtilities.java b/astrid/src/com/todoroo/astrid/files/FileUtilities.java index 3acc459ff..571e52078 100644 --- a/astrid/src/com/todoroo/astrid/files/FileUtilities.java +++ b/astrid/src/com/todoroo/astrid/files/FileUtilities.java @@ -8,11 +8,12 @@ package com.todoroo.astrid.files; import android.content.Context; import android.text.TextUtils; -import org.astrid.R; import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.andlib.utility.Preferences; import com.todoroo.astrid.data.TaskAttachment; +import org.astrid.R; + import java.io.File; import java.text.SimpleDateFormat; import java.util.Date; diff --git a/astrid/src/com/todoroo/astrid/files/FilesControlSet.java b/astrid/src/com/todoroo/astrid/files/FilesControlSet.java index 7b3df8b12..68e651ef1 100644 --- a/astrid/src/com/todoroo/astrid/files/FilesControlSet.java +++ b/astrid/src/com/todoroo/astrid/files/FilesControlSet.java @@ -24,7 +24,6 @@ import android.widget.LinearLayout.LayoutParams; import android.widget.TextView; import android.widget.Toast; -import org.astrid.R; import com.todoroo.aacenc.RecognizerApi; import com.todoroo.aacenc.RecognizerApi.PlaybackExceptionHandler; import com.todoroo.andlib.data.TodorooCursor; @@ -45,6 +44,8 @@ import com.todoroo.astrid.service.ThemeService; import com.todoroo.astrid.ui.PopupControlSet; import com.todoroo.astrid.utility.Constants; +import org.astrid.R; + import java.io.File; import java.io.FileOutputStream; import java.io.InputStream; diff --git a/astrid/src/com/todoroo/astrid/gcal/CalendarAlarmListCreator.java b/astrid/src/com/todoroo/astrid/gcal/CalendarAlarmListCreator.java index e6bf8701f..e3e2f5e03 100644 --- a/astrid/src/com/todoroo/astrid/gcal/CalendarAlarmListCreator.java +++ b/astrid/src/com/todoroo/astrid/gcal/CalendarAlarmListCreator.java @@ -9,7 +9,6 @@ import android.view.View; import android.view.View.OnClickListener; import android.widget.TextView; -import org.astrid.R; import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.DependencyInjectionService; @@ -25,6 +24,7 @@ import com.todoroo.astrid.data.User; import com.todoroo.astrid.service.TagDataService; import com.todoroo.astrid.service.ThemeService; +import org.astrid.R; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; diff --git a/astrid/src/com/todoroo/astrid/gcal/CalendarAlarmReceiver.java b/astrid/src/com/todoroo/astrid/gcal/CalendarAlarmReceiver.java index 4d8683620..3422168f9 100644 --- a/astrid/src/com/todoroo/astrid/gcal/CalendarAlarmReceiver.java +++ b/astrid/src/com/todoroo/astrid/gcal/CalendarAlarmReceiver.java @@ -11,13 +11,14 @@ import android.net.Uri; import android.text.TextUtils; import android.util.Log; -import org.astrid.R; 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.utility.Constants; +import org.astrid.R; + import java.util.ArrayList; import java.util.HashSet; import java.util.Set; diff --git a/astrid/src/com/todoroo/astrid/gcal/CalendarAlarmScheduler.java b/astrid/src/com/todoroo/astrid/gcal/CalendarAlarmScheduler.java index ebc4b5338..8591ef7b8 100644 --- a/astrid/src/com/todoroo/astrid/gcal/CalendarAlarmScheduler.java +++ b/astrid/src/com/todoroo/astrid/gcal/CalendarAlarmScheduler.java @@ -9,11 +9,12 @@ import android.database.Cursor; import android.net.Uri; import android.util.Log; -import org.astrid.R; import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.andlib.utility.Preferences; import com.todoroo.astrid.utility.Constants; +import org.astrid.R; + import java.util.Date; diff --git a/astrid/src/com/todoroo/astrid/gcal/CalendarReminderActivity.java b/astrid/src/com/todoroo/astrid/gcal/CalendarReminderActivity.java index b5e1d1a77..f2c499ec4 100644 --- a/astrid/src/com/todoroo/astrid/gcal/CalendarReminderActivity.java +++ b/astrid/src/com/todoroo/astrid/gcal/CalendarReminderActivity.java @@ -13,7 +13,6 @@ import android.view.View; import android.view.View.OnClickListener; import android.widget.TextView; -import org.astrid.R; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.andlib.utility.AndroidUtilities; @@ -31,6 +30,8 @@ import com.todoroo.astrid.service.ThemeService; import com.todoroo.astrid.tags.TagFilterExposer; import com.todoroo.astrid.utility.Constants; +import org.astrid.R; + import java.util.Date; diff --git a/astrid/src/com/todoroo/astrid/gcal/CalendarStartupReceiver.java b/astrid/src/com/todoroo/astrid/gcal/CalendarStartupReceiver.java index 77c7d47fe..e939d0865 100644 --- a/astrid/src/com/todoroo/astrid/gcal/CalendarStartupReceiver.java +++ b/astrid/src/com/todoroo/astrid/gcal/CalendarStartupReceiver.java @@ -4,11 +4,12 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; -import org.astrid.R; import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.utility.Preferences; import com.todoroo.astrid.api.AstridApiConstants; +import org.astrid.R; + public class CalendarStartupReceiver extends BroadcastReceiver { public static final String BROADCAST_RESCHEDULE_CAL_ALARMS = AstridApiConstants.API_PACKAGE + ".SCHEDULE_CAL_REMINDERS"; //$NON-NLS-1$ diff --git a/astrid/src/com/todoroo/astrid/gcal/Calendars.java b/astrid/src/com/todoroo/astrid/gcal/Calendars.java index bdb6fb315..abd75dc1f 100644 --- a/astrid/src/com/todoroo/astrid/gcal/Calendars.java +++ b/astrid/src/com/todoroo/astrid/gcal/Calendars.java @@ -14,11 +14,12 @@ import android.preference.ListPreference; import android.provider.CalendarContract; import android.util.Log; -import org.astrid.R; import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.utility.AndroidUtilities; import com.todoroo.andlib.utility.Preferences; +import org.astrid.R; + import java.util.ArrayList; import java.util.Arrays; diff --git a/astrid/src/com/todoroo/astrid/gcal/GCalControlSet.java b/astrid/src/com/todoroo/astrid/gcal/GCalControlSet.java index 8becb26a7..79a6138ee 100644 --- a/astrid/src/com/todoroo/astrid/gcal/GCalControlSet.java +++ b/astrid/src/com/todoroo/astrid/gcal/GCalControlSet.java @@ -24,7 +24,6 @@ import android.widget.Spinner; import android.widget.TextView; import android.widget.Toast; -import org.astrid.R; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.andlib.service.ExceptionService; @@ -34,6 +33,8 @@ import com.todoroo.astrid.gcal.Calendars.CalendarResult; import com.todoroo.astrid.service.ThemeService; import com.todoroo.astrid.ui.PopupControlSet; +import org.astrid.R; + import java.util.ArrayList; import java.util.Collections; diff --git a/astrid/src/com/todoroo/astrid/gcal/GCalHelper.java b/astrid/src/com/todoroo/astrid/gcal/GCalHelper.java index 9617ae3d7..3927f7524 100644 --- a/astrid/src/com/todoroo/astrid/gcal/GCalHelper.java +++ b/astrid/src/com/todoroo/astrid/gcal/GCalHelper.java @@ -14,7 +14,6 @@ import android.text.TextUtils; import android.text.format.Time; import android.util.Log; -import org.astrid.R; import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.utility.AndroidUtilities; import com.todoroo.andlib.utility.DateUtilities; @@ -22,6 +21,8 @@ import com.todoroo.andlib.utility.Preferences; import com.todoroo.astrid.core.PluginServices; import com.todoroo.astrid.data.Task; +import org.astrid.R; + import java.util.TimeZone; public class GCalHelper { diff --git a/astrid/src/com/todoroo/astrid/gcal/GCalTaskCompleteListener.java b/astrid/src/com/todoroo/astrid/gcal/GCalTaskCompleteListener.java index 121730ecb..89c34cf73 100644 --- a/astrid/src/com/todoroo/astrid/gcal/GCalTaskCompleteListener.java +++ b/astrid/src/com/todoroo/astrid/gcal/GCalTaskCompleteListener.java @@ -14,12 +14,13 @@ import android.net.Uri; import android.text.TextUtils; import android.util.Log; -import org.astrid.R; import com.todoroo.andlib.service.ContextManager; import com.todoroo.astrid.api.AstridApiConstants; import com.todoroo.astrid.core.PluginServices; import com.todoroo.astrid.data.Task; +import org.astrid.R; + public class GCalTaskCompleteListener extends BroadcastReceiver { diff --git a/astrid/src/com/todoroo/astrid/gtasks/GtasksCustomFilterCriteriaExposer.java b/astrid/src/com/todoroo/astrid/gtasks/GtasksCustomFilterCriteriaExposer.java index 2f2a10ab3..97d60691f 100644 --- a/astrid/src/com/todoroo/astrid/gtasks/GtasksCustomFilterCriteriaExposer.java +++ b/astrid/src/com/todoroo/astrid/gtasks/GtasksCustomFilterCriteriaExposer.java @@ -12,7 +12,6 @@ import android.content.Intent; import android.content.res.Resources; import android.graphics.drawable.BitmapDrawable; -import org.astrid.R; import com.todoroo.andlib.data.AbstractModel; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.ContextManager; @@ -30,6 +29,8 @@ import com.todoroo.astrid.data.StoreObject; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.service.AstridDependencyInjector; +import org.astrid.R; + public class GtasksCustomFilterCriteriaExposer extends BroadcastReceiver { @Autowired private GtasksPreferenceService gtasksPreferenceService; diff --git a/astrid/src/com/todoroo/astrid/gtasks/GtasksFilterExposer.java b/astrid/src/com/todoroo/astrid/gtasks/GtasksFilterExposer.java index f28f290a4..e6c5f363c 100644 --- a/astrid/src/com/todoroo/astrid/gtasks/GtasksFilterExposer.java +++ b/astrid/src/com/todoroo/astrid/gtasks/GtasksFilterExposer.java @@ -14,7 +14,6 @@ import android.content.Intent; import android.graphics.drawable.BitmapDrawable; import android.os.Bundle; -import org.astrid.R; import com.todoroo.andlib.data.AbstractModel; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.ContextManager; @@ -39,6 +38,8 @@ import com.todoroo.astrid.data.StoreObject; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.service.AstridDependencyInjector; +import org.astrid.R; + /** * Exposes filters based on lists * diff --git a/astrid/src/com/todoroo/astrid/gtasks/GtasksListAdder.java b/astrid/src/com/todoroo/astrid/gtasks/GtasksListAdder.java index 2e18ef9b9..08ede15af 100644 --- a/astrid/src/com/todoroo/astrid/gtasks/GtasksListAdder.java +++ b/astrid/src/com/todoroo/astrid/gtasks/GtasksListAdder.java @@ -13,7 +13,6 @@ import android.text.TextUtils; import android.widget.EditText; import android.widget.FrameLayout; -import org.astrid.R; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.andlib.utility.DialogUtilities; @@ -22,6 +21,8 @@ import com.todoroo.astrid.data.StoreObject; import com.todoroo.astrid.gtasks.api.GtasksInvoker; import com.todoroo.astrid.gtasks.auth.GtasksTokenValidator; +import org.astrid.R; + import java.io.IOException; public class GtasksListAdder extends Activity { diff --git a/astrid/src/com/todoroo/astrid/gtasks/GtasksListFragment.java b/astrid/src/com/todoroo/astrid/gtasks/GtasksListFragment.java index f3d0f0915..d373440c7 100644 --- a/astrid/src/com/todoroo/astrid/gtasks/GtasksListFragment.java +++ b/astrid/src/com/todoroo/astrid/gtasks/GtasksListFragment.java @@ -12,7 +12,6 @@ import android.os.Bundle; import android.widget.TextView; import com.actionbarsherlock.view.Menu; -import org.astrid.R; import com.todoroo.andlib.data.Property; import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.service.Autowired; @@ -30,6 +29,8 @@ import com.todoroo.astrid.subtasks.OrderedListFragmentHelperInterface; import com.todoroo.astrid.subtasks.OrderedMetadataListFragmentHelper; import com.todoroo.astrid.subtasks.SubtasksListFragment; +import org.astrid.R; + public class GtasksListFragment extends SubtasksListFragment { protected static final int MENU_CLEAR_COMPLETED_ID = MENU_ADDON_INTENT_ID + 1; diff --git a/astrid/src/com/todoroo/astrid/gtasks/GtasksPreferenceService.java b/astrid/src/com/todoroo/astrid/gtasks/GtasksPreferenceService.java index 3957a49f0..823d88fe5 100644 --- a/astrid/src/com/todoroo/astrid/gtasks/GtasksPreferenceService.java +++ b/astrid/src/com/todoroo/astrid/gtasks/GtasksPreferenceService.java @@ -5,10 +5,11 @@ */ package com.todoroo.astrid.gtasks; -import org.astrid.R; import com.todoroo.andlib.utility.Preferences; import com.todoroo.astrid.sync.SyncProviderUtilities; +import org.astrid.R; + /** * Methods for working with GTasks preferences * diff --git a/astrid/src/com/todoroo/astrid/gtasks/GtasksPreferences.java b/astrid/src/com/todoroo/astrid/gtasks/GtasksPreferences.java index e0d534aa3..c0e5875d6 100644 --- a/astrid/src/com/todoroo/astrid/gtasks/GtasksPreferences.java +++ b/astrid/src/com/todoroo/astrid/gtasks/GtasksPreferences.java @@ -10,7 +10,6 @@ import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; -import org.astrid.R; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.andlib.utility.DialogUtilities; @@ -25,6 +24,8 @@ import com.todoroo.astrid.sync.SyncProviderUtilities; import com.todoroo.astrid.sync.SyncResultCallbackAdapter; import com.todoroo.astrid.tags.TagService; +import org.astrid.R; + /** * Displays synchronization preferences and an action panel so users can * initiate actions from the menu. diff --git a/astrid/src/com/todoroo/astrid/gtasks/api/GtasksInvoker.java b/astrid/src/com/todoroo/astrid/gtasks/api/GtasksInvoker.java index 4df3b67fc..8c4ec024c 100644 --- a/astrid/src/com/todoroo/astrid/gtasks/api/GtasksInvoker.java +++ b/astrid/src/com/todoroo/astrid/gtasks/api/GtasksInvoker.java @@ -15,13 +15,14 @@ import com.google.api.services.tasks.Tasks.TasksOperations.Move; import com.google.api.services.tasks.model.Task; import com.google.api.services.tasks.model.TaskList; import com.google.api.services.tasks.model.TaskLists; -import org.astrid.R; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.andlib.service.ExceptionService; import com.todoroo.astrid.gtasks.auth.GtasksTokenValidator; +import org.astrid.R; + import java.io.IOException; /** diff --git a/astrid/src/com/todoroo/astrid/gtasks/auth/GtasksLoginActivity.java b/astrid/src/com/todoroo/astrid/gtasks/auth/GtasksLoginActivity.java index 7c7f5c616..aba427768 100644 --- a/astrid/src/com/todoroo/astrid/gtasks/auth/GtasksLoginActivity.java +++ b/astrid/src/com/todoroo/astrid/gtasks/auth/GtasksLoginActivity.java @@ -23,7 +23,6 @@ import android.widget.TextView; import android.widget.Toast; import com.google.api.client.googleapis.extensions.android2.auth.GoogleAccountManager; -import org.astrid.R; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.service.DependencyInjectionService; @@ -34,6 +33,8 @@ import com.todoroo.astrid.gtasks.api.GtasksInvoker; import com.todoroo.astrid.service.AstridDependencyInjector; import com.todoroo.astrid.service.SyncV2Service; +import org.astrid.R; + import java.io.IOException; import java.util.ArrayList; import java.util.concurrent.TimeUnit; diff --git a/astrid/src/com/todoroo/astrid/gtasks/auth/GtasksTokenValidator.java b/astrid/src/com/todoroo/astrid/gtasks/auth/GtasksTokenValidator.java index 26d38cac9..1daba9e43 100644 --- a/astrid/src/com/todoroo/astrid/gtasks/auth/GtasksTokenValidator.java +++ b/astrid/src/com/todoroo/astrid/gtasks/auth/GtasksTokenValidator.java @@ -14,13 +14,14 @@ import android.content.Intent; import android.os.Bundle; import com.google.api.client.googleapis.extensions.android2.auth.GoogleAccountManager; -import org.astrid.R; import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.utility.Preferences; import com.todoroo.astrid.gtasks.GtasksPreferenceService; import com.todoroo.astrid.gtasks.api.GoogleTasksException; import com.todoroo.astrid.gtasks.api.GtasksInvoker; +import org.astrid.R; + import java.io.IOException; diff --git a/astrid/src/com/todoroo/astrid/gtasks/sync/GtasksSyncV2Provider.java b/astrid/src/com/todoroo/astrid/gtasks/sync/GtasksSyncV2Provider.java index 727bdf590..69b767931 100644 --- a/astrid/src/com/todoroo/astrid/gtasks/sync/GtasksSyncV2Provider.java +++ b/astrid/src/com/todoroo/astrid/gtasks/sync/GtasksSyncV2Provider.java @@ -9,7 +9,6 @@ import android.app.Activity; import android.text.TextUtils; import com.google.api.services.tasks.model.Tasks; -import org.astrid.R; import com.todoroo.andlib.data.AbstractModel; import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.service.Autowired; @@ -51,6 +50,7 @@ import com.todoroo.astrid.sync.SyncResultCallback; import com.todoroo.astrid.sync.SyncV2Provider; import com.todoroo.astrid.tags.TagService; +import org.astrid.R; import org.json.JSONException; import java.io.IOException; diff --git a/astrid/src/com/todoroo/astrid/helper/SyncActionHelper.java b/astrid/src/com/todoroo/astrid/helper/SyncActionHelper.java index f632bf5f6..e5410a04a 100644 --- a/astrid/src/com/todoroo/astrid/helper/SyncActionHelper.java +++ b/astrid/src/com/todoroo/astrid/helper/SyncActionHelper.java @@ -18,7 +18,6 @@ import android.os.Bundle; import android.support.v4.app.Fragment; import android.widget.ArrayAdapter; -import org.astrid.R; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.service.DependencyInjectionService; @@ -34,6 +33,8 @@ import com.todoroo.astrid.service.SyncV2Service; import com.todoroo.astrid.sync.SyncResultCallback; import com.todoroo.astrid.sync.SyncV2Provider; +import org.astrid.R; + import java.util.ArrayList; import java.util.LinkedHashSet; import java.util.List; diff --git a/astrid/src/com/todoroo/astrid/helper/TaskEditControlSet.java b/astrid/src/com/todoroo/astrid/helper/TaskEditControlSet.java index d48ac569e..5055a3478 100644 --- a/astrid/src/com/todoroo/astrid/helper/TaskEditControlSet.java +++ b/astrid/src/com/todoroo/astrid/helper/TaskEditControlSet.java @@ -13,11 +13,12 @@ import android.view.LayoutInflater; import android.view.View; import android.widget.Button; -import org.astrid.R; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.service.ThemeService; import com.todoroo.astrid.ui.EditDialogOkBackground; +import org.astrid.R; + // --- interface /** diff --git a/astrid/src/com/todoroo/astrid/locale/LocaleEditAlerts.java b/astrid/src/com/todoroo/astrid/locale/LocaleEditAlerts.java index 3d8053ac6..d74e966b4 100644 --- a/astrid/src/com/todoroo/astrid/locale/LocaleEditAlerts.java +++ b/astrid/src/com/todoroo/astrid/locale/LocaleEditAlerts.java @@ -17,7 +17,6 @@ import android.view.View; import android.widget.ListView; import android.widget.Spinner; -import org.astrid.R; import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.utility.AndroidUtilities; import com.todoroo.astrid.adapter.FilterAdapter; @@ -26,6 +25,8 @@ import com.todoroo.astrid.api.FilterCategory; import com.todoroo.astrid.api.FilterListItem; import com.twofortyfouram.SharedResources; +import org.astrid.R; + /** * Activity to edit alerts from Locale * diff --git a/astrid/src/com/todoroo/astrid/locale/LocaleReceiver.java b/astrid/src/com/todoroo/astrid/locale/LocaleReceiver.java index a0c2f33f5..aa0c34080 100644 --- a/astrid/src/com/todoroo/astrid/locale/LocaleReceiver.java +++ b/astrid/src/com/todoroo/astrid/locale/LocaleReceiver.java @@ -13,7 +13,6 @@ import android.os.Bundle; import android.text.TextUtils; import android.util.Log; -import org.astrid.R; import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.service.DependencyInjectionService; @@ -27,6 +26,8 @@ import com.todoroo.astrid.data.Task; import com.todoroo.astrid.reminders.Notifications; import com.todoroo.astrid.utility.Constants; +import org.astrid.R; + /** * Receiver is activated when Locale conditions are triggered * diff --git a/astrid/src/com/todoroo/astrid/notes/EditNoteActivity.java b/astrid/src/com/todoroo/astrid/notes/EditNoteActivity.java index 00a68f960..5901101de 100644 --- a/astrid/src/com/todoroo/astrid/notes/EditNoteActivity.java +++ b/astrid/src/com/todoroo/astrid/notes/EditNoteActivity.java @@ -33,7 +33,6 @@ import android.widget.LinearLayout; import android.widget.TextView; import android.widget.TextView.OnEditorActionListener; -import org.astrid.R; import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.ContextManager; @@ -72,6 +71,7 @@ import com.todoroo.astrid.service.TaskService; import com.todoroo.astrid.timers.TimerActionControlSet.TimerActionListener; import com.todoroo.astrid.utility.ResourceDrawableCache; +import org.astrid.R; import org.json.JSONArray; import org.json.JSONObject; diff --git a/astrid/src/com/todoroo/astrid/notes/NotesDecorationExposer.java b/astrid/src/com/todoroo/astrid/notes/NotesDecorationExposer.java index 416f21774..aac49cd62 100644 --- a/astrid/src/com/todoroo/astrid/notes/NotesDecorationExposer.java +++ b/astrid/src/com/todoroo/astrid/notes/NotesDecorationExposer.java @@ -9,13 +9,14 @@ import android.app.PendingIntent; import android.content.Intent; import android.widget.RemoteViews; -import org.astrid.R; import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.utility.Preferences; import com.todoroo.astrid.api.TaskDecoration; import com.todoroo.astrid.api.TaskDecorationExposer; import com.todoroo.astrid.data.Task; +import org.astrid.R; + /** * Exposes {@link TaskDecoration} for timers * diff --git a/astrid/src/com/todoroo/astrid/notes/NotesDetailExposer.java b/astrid/src/com/todoroo/astrid/notes/NotesDetailExposer.java index c740b12a7..f47ded710 100644 --- a/astrid/src/com/todoroo/astrid/notes/NotesDetailExposer.java +++ b/astrid/src/com/todoroo/astrid/notes/NotesDetailExposer.java @@ -11,7 +11,6 @@ import android.content.Context; import android.content.Intent; import android.text.TextUtils; -import org.astrid.R; import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.sql.Order; import com.todoroo.andlib.sql.Query; @@ -22,6 +21,8 @@ import com.todoroo.astrid.dao.MetadataDao.MetadataCriteria; import com.todoroo.astrid.data.Metadata; import com.todoroo.astrid.data.Task; +import org.astrid.R; + /** * Exposes Task Detail for notes * diff --git a/astrid/src/com/todoroo/astrid/opencrx/OpencrxControlSet.java b/astrid/src/com/todoroo/astrid/opencrx/OpencrxControlSet.java index 59ab14808..80b8947b5 100644 --- a/astrid/src/com/todoroo/astrid/opencrx/OpencrxControlSet.java +++ b/astrid/src/com/todoroo/astrid/opencrx/OpencrxControlSet.java @@ -15,7 +15,6 @@ import android.widget.AutoCompleteTextView; import android.widget.Spinner; import android.widget.TextView; -import org.astrid.R; import com.todoroo.andlib.data.Property.LongProperty; import com.todoroo.andlib.data.Property.StringProperty; import com.todoroo.andlib.data.TodorooCursor; @@ -32,6 +31,8 @@ import com.todoroo.astrid.data.Task; import com.todoroo.astrid.service.MetadataService; import com.todoroo.astrid.ui.PopupControlSet; +import org.astrid.R; + import java.util.ArrayList; /** diff --git a/astrid/src/com/todoroo/astrid/provider/Astrid2TaskProvider.java b/astrid/src/com/todoroo/astrid/provider/Astrid2TaskProvider.java index f9228ebfc..e6f103fc4 100644 --- a/astrid/src/com/todoroo/astrid/provider/Astrid2TaskProvider.java +++ b/astrid/src/com/todoroo/astrid/provider/Astrid2TaskProvider.java @@ -53,7 +53,6 @@ public class Astrid2TaskProvider extends ContentProvider { private static final boolean LOGD = false; - public static final String AUTHORITY = "com.timsu.astrid.tasksprovider"; public static final Uri CONTENT_URI = Uri.parse("content://com.timsu.astrid.tasksprovider"); diff --git a/astrid/src/com/todoroo/astrid/reminders/NotificationFragment.java b/astrid/src/com/todoroo/astrid/reminders/NotificationFragment.java index 06b7c26ec..f16753d20 100644 --- a/astrid/src/com/todoroo/astrid/reminders/NotificationFragment.java +++ b/astrid/src/com/todoroo/astrid/reminders/NotificationFragment.java @@ -19,7 +19,6 @@ import android.widget.FrameLayout; import android.widget.LinearLayout; import android.widget.Spinner; -import org.astrid.R; import com.todoroo.andlib.utility.AndroidUtilities; import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.andlib.utility.Preferences; @@ -28,6 +27,8 @@ import com.todoroo.astrid.activity.TaskListFragment; import com.todoroo.astrid.repeats.RepeatControlSet; import com.todoroo.astrid.ui.NumberPicker; +import org.astrid.R; + import java.util.Date; /** diff --git a/astrid/src/com/todoroo/astrid/reminders/Notifications.java b/astrid/src/com/todoroo/astrid/reminders/Notifications.java index 89ac07b8a..16a7eab7b 100644 --- a/astrid/src/com/todoroo/astrid/reminders/Notifications.java +++ b/astrid/src/com/todoroo/astrid/reminders/Notifications.java @@ -20,7 +20,6 @@ import android.telephony.TelephonyManager; import android.text.TextUtils; import android.util.Log; -import org.astrid.R; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.service.DependencyInjectionService; @@ -43,6 +42,8 @@ import com.todoroo.astrid.utility.Constants; import com.todoroo.astrid.utility.Flags; import com.todoroo.astrid.voice.VoiceOutputService; +import org.astrid.R; + import java.util.Date; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; diff --git a/astrid/src/com/todoroo/astrid/reminders/ReengagementFragment.java b/astrid/src/com/todoroo/astrid/reminders/ReengagementFragment.java index 8362a37c5..7c7e080dc 100644 --- a/astrid/src/com/todoroo/astrid/reminders/ReengagementFragment.java +++ b/astrid/src/com/todoroo/astrid/reminders/ReengagementFragment.java @@ -11,10 +11,11 @@ import android.view.View.OnClickListener; import android.view.ViewGroup; import android.widget.TextView; -import org.astrid.R; import com.todoroo.astrid.activity.TaskListFragment; import com.todoroo.astrid.service.ThemeService; +import org.astrid.R; + public class ReengagementFragment extends TaskListFragment { public static final String EXTRA_TEXT = "dialogText"; //$NON-NLS-1$ diff --git a/astrid/src/com/todoroo/astrid/reminders/ReengagementReceiver.java b/astrid/src/com/todoroo/astrid/reminders/ReengagementReceiver.java index 667cfd29c..4bbad1f6e 100644 --- a/astrid/src/com/todoroo/astrid/reminders/ReengagementReceiver.java +++ b/astrid/src/com/todoroo/astrid/reminders/ReengagementReceiver.java @@ -15,7 +15,6 @@ import android.graphics.Color; import android.os.Bundle; import android.text.TextUtils; -import org.astrid.R; import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.DependencyInjectionService; @@ -35,6 +34,7 @@ import com.todoroo.astrid.service.TaskService; import com.todoroo.astrid.utility.Constants; import com.todoroo.astrid.utility.Flags; +import org.astrid.R; import org.json.JSONObject; public class ReengagementReceiver extends BroadcastReceiver { diff --git a/astrid/src/com/todoroo/astrid/reminders/ReminderDialog.java b/astrid/src/com/todoroo/astrid/reminders/ReminderDialog.java index 3abe58586..18744bccd 100644 --- a/astrid/src/com/todoroo/astrid/reminders/ReminderDialog.java +++ b/astrid/src/com/todoroo/astrid/reminders/ReminderDialog.java @@ -15,7 +15,6 @@ import android.widget.TextView; import android.widget.TimePicker; import android.widget.Toast; -import org.astrid.R; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.andlib.utility.DateUtilities; @@ -28,6 +27,8 @@ import com.todoroo.astrid.data.Task; import com.todoroo.astrid.service.TaskService; import com.todoroo.astrid.tags.TagService; +import org.astrid.R; + import java.util.Date; /** diff --git a/astrid/src/com/todoroo/astrid/reminders/ReminderPreferences.java b/astrid/src/com/todoroo/astrid/reminders/ReminderPreferences.java index 20796d8c2..23d01b51a 100644 --- a/astrid/src/com/todoroo/astrid/reminders/ReminderPreferences.java +++ b/astrid/src/com/todoroo/astrid/reminders/ReminderPreferences.java @@ -8,11 +8,12 @@ package com.todoroo.astrid.reminders; import android.content.res.Resources; import android.preference.Preference; -import org.astrid.R; import com.todoroo.andlib.utility.AndroidUtilities; import com.todoroo.andlib.utility.Preferences; import com.todoroo.andlib.utility.TodorooPreferenceActivity; +import org.astrid.R; + /** * Displays the preference screen for users to edit their preferences * diff --git a/astrid/src/com/todoroo/astrid/reminders/ReminderService.java b/astrid/src/com/todoroo/astrid/reminders/ReminderService.java index ee7519f0c..012701453 100644 --- a/astrid/src/com/todoroo/astrid/reminders/ReminderService.java +++ b/astrid/src/com/todoroo/astrid/reminders/ReminderService.java @@ -14,7 +14,6 @@ import android.content.SharedPreferences.Editor; import android.content.res.Resources; import android.util.Log; -import org.astrid.R; import com.todoroo.andlib.data.Property; import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.service.Autowired; @@ -29,6 +28,8 @@ import com.todoroo.astrid.dao.TaskDao.TaskCriteria; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.utility.Constants; +import org.astrid.R; + import java.util.Date; import java.util.Random; diff --git a/astrid/src/com/todoroo/astrid/repeats/RepeatControlSet.java b/astrid/src/com/todoroo/astrid/repeats/RepeatControlSet.java index 1f80958ef..09e80c345 100644 --- a/astrid/src/com/todoroo/astrid/repeats/RepeatControlSet.java +++ b/astrid/src/com/todoroo/astrid/repeats/RepeatControlSet.java @@ -25,7 +25,6 @@ import com.google.ical.values.Frequency; import com.google.ical.values.RRule; import com.google.ical.values.Weekday; import com.google.ical.values.WeekdayNum; -import org.astrid.R; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.andlib.service.ExceptionService; @@ -40,6 +39,8 @@ import com.todoroo.astrid.ui.NumberPickerDialog; import com.todoroo.astrid.ui.NumberPickerDialog.OnNumberPickedListener; import com.todoroo.astrid.ui.PopupControlSet; +import org.astrid.R; + import java.text.DateFormatSymbols; import java.util.ArrayList; import java.util.Calendar; diff --git a/astrid/src/com/todoroo/astrid/repeats/RepeatDetailExposer.java b/astrid/src/com/todoroo/astrid/repeats/RepeatDetailExposer.java index 4556e024a..673d657e3 100644 --- a/astrid/src/com/todoroo/astrid/repeats/RepeatDetailExposer.java +++ b/astrid/src/com/todoroo/astrid/repeats/RepeatDetailExposer.java @@ -13,11 +13,12 @@ import android.content.res.Resources; import com.google.ical.values.Frequency; import com.google.ical.values.RRule; import com.google.ical.values.WeekdayNum; -import org.astrid.R; import com.todoroo.astrid.api.AstridApiConstants; import com.todoroo.astrid.core.PluginServices; import com.todoroo.astrid.data.Task; +import org.astrid.R; + import java.text.DateFormatSymbols; import java.text.ParseException; import java.util.List; diff --git a/astrid/src/com/todoroo/astrid/repeats/RepeatsPlugin.java b/astrid/src/com/todoroo/astrid/repeats/RepeatsPlugin.java index c523c13a3..c12895eb1 100644 --- a/astrid/src/com/todoroo/astrid/repeats/RepeatsPlugin.java +++ b/astrid/src/com/todoroo/astrid/repeats/RepeatsPlugin.java @@ -9,10 +9,11 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; -import org.astrid.R; import com.todoroo.astrid.api.Addon; import com.todoroo.astrid.api.AstridApiConstants; +import org.astrid.R; + public class RepeatsPlugin extends BroadcastReceiver { static final String IDENTIFIER = "repeats"; //$NON-NLS-1$ diff --git a/astrid/src/com/todoroo/astrid/service/Astrid2To3UpgradeHelper.java b/astrid/src/com/todoroo/astrid/service/Astrid2To3UpgradeHelper.java index 3338cf9e9..a55e2dc54 100644 --- a/astrid/src/com/todoroo/astrid/service/Astrid2To3UpgradeHelper.java +++ b/astrid/src/com/todoroo/astrid/service/Astrid2To3UpgradeHelper.java @@ -15,7 +15,6 @@ import android.database.sqlite.SQLiteOpenHelper; import android.util.Log; import com.google.ical.values.RRule; -import org.astrid.R; import com.timsu.astrid.utilities.LegacyTasksXmlExporter; import com.todoroo.andlib.data.AbstractModel; import com.todoroo.andlib.data.DatabaseDao; @@ -43,6 +42,8 @@ import com.todoroo.astrid.legacy.LegacyTaskModel; import com.todoroo.astrid.legacy.TransitionalAlarm; import com.todoroo.astrid.tags.TaskToTagMetadata; +import org.astrid.R; + import java.util.Date; import java.util.HashMap; import java.util.Map.Entry; diff --git a/astrid/src/com/todoroo/astrid/service/StartupService.java b/astrid/src/com/todoroo/astrid/service/StartupService.java index 3e915bb99..9d16a4138 100644 --- a/astrid/src/com/todoroo/astrid/service/StartupService.java +++ b/astrid/src/com/todoroo/astrid/service/StartupService.java @@ -22,7 +22,6 @@ import android.media.AudioManager; import android.util.Log; import android.widget.Toast; -import org.astrid.R; import com.todoroo.andlib.data.DatabaseDao.ModelUpdateListener; import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.service.Autowired; @@ -67,6 +66,8 @@ import com.todoroo.astrid.utility.AstridPreferences; import com.todoroo.astrid.utility.Constants; import com.todoroo.astrid.widget.TasksWidget.WidgetUpdateService; +import org.astrid.R; + import java.io.File; import java.util.List; diff --git a/astrid/src/com/todoroo/astrid/service/ThemeService.java b/astrid/src/com/todoroo/astrid/service/ThemeService.java index 5209f9269..35645f631 100644 --- a/astrid/src/com/todoroo/astrid/service/ThemeService.java +++ b/astrid/src/com/todoroo/astrid/service/ThemeService.java @@ -10,13 +10,14 @@ import android.graphics.PixelFormat; import android.text.TextUtils; import android.view.WindowManager; -import org.astrid.R; import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.utility.AndroidUtilities; import com.todoroo.andlib.utility.Preferences; import com.todoroo.astrid.utility.AstridPreferences; import com.todoroo.astrid.widget.TasksWidget; +import org.astrid.R; + public class ThemeService { diff --git a/astrid/src/com/todoroo/astrid/service/UpdateMessagePreference.java b/astrid/src/com/todoroo/astrid/service/UpdateMessagePreference.java index fd8f44791..e1238db5f 100644 --- a/astrid/src/com/todoroo/astrid/service/UpdateMessagePreference.java +++ b/astrid/src/com/todoroo/astrid/service/UpdateMessagePreference.java @@ -6,9 +6,9 @@ import android.preference.Preference; import android.preference.Preference.OnPreferenceChangeListener; import android.preference.PreferenceActivity; -import org.astrid.R; import com.todoroo.andlib.utility.Preferences; +import org.astrid.R; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; diff --git a/astrid/src/com/todoroo/astrid/service/UpdateMessageService.java b/astrid/src/com/todoroo/astrid/service/UpdateMessageService.java index ffe40fb26..0438e08ae 100644 --- a/astrid/src/com/todoroo/astrid/service/UpdateMessageService.java +++ b/astrid/src/com/todoroo/astrid/service/UpdateMessageService.java @@ -24,7 +24,6 @@ import android.widget.Button; import android.widget.LinearLayout; import android.widget.LinearLayout.LayoutParams; -import org.astrid.R; import com.todoroo.andlib.data.Property.StringProperty; import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.service.Autowired; @@ -40,6 +39,7 @@ import com.todoroo.astrid.data.StoreObject; import com.todoroo.astrid.gtasks.GtasksPreferenceService; import com.todoroo.astrid.utility.Constants; +import org.astrid.R; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; diff --git a/astrid/src/com/todoroo/astrid/service/UpgradeService.java b/astrid/src/com/todoroo/astrid/service/UpgradeService.java index c557e8564..5fe1e731b 100644 --- a/astrid/src/com/todoroo/astrid/service/UpgradeService.java +++ b/astrid/src/com/todoroo/astrid/service/UpgradeService.java @@ -13,8 +13,6 @@ import android.content.SharedPreferences; import android.content.SharedPreferences.Editor; import android.os.Bundle; -import com.timsu.astrid.GCMIntentService; -import org.astrid.R; import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.DependencyInjectionService; @@ -45,6 +43,8 @@ import com.todoroo.astrid.tags.TagCaseMigrator; import com.todoroo.astrid.utility.AstridPreferences; import com.todoroo.astrid.utility.Constants; +import org.astrid.R; + public final class UpgradeService { @@ -255,7 +255,6 @@ public final class UpgradeService { } } new AstridNewSyncMigrator().performMigration(); - new GCMIntentService.GCMMigration().performMigration(UpgradeActivity.this); } if (from < V4_6_2) { diff --git a/astrid/src/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java b/astrid/src/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java index 743865edb..47112c558 100644 --- a/astrid/src/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java +++ b/astrid/src/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java @@ -12,7 +12,6 @@ import android.widget.ListView; import com.commonsware.cwac.tlv.TouchListView.DropListener; import com.commonsware.cwac.tlv.TouchListView.GrabberClickListener; import com.commonsware.cwac.tlv.TouchListView.SwipeListener; -import org.astrid.R; import com.todoroo.andlib.data.Property; import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.service.Autowired; @@ -35,6 +34,8 @@ import com.todoroo.astrid.service.ThemeService; import com.todoroo.astrid.ui.DraggableListView; import com.todoroo.astrid.utility.AstridPreferences; +import org.astrid.R; + import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; diff --git a/astrid/src/com/todoroo/astrid/subtasks/OrderedMetadataListFragmentHelper.java b/astrid/src/com/todoroo/astrid/subtasks/OrderedMetadataListFragmentHelper.java index 40a2bf984..0c2cff3f0 100644 --- a/astrid/src/com/todoroo/astrid/subtasks/OrderedMetadataListFragmentHelper.java +++ b/astrid/src/com/todoroo/astrid/subtasks/OrderedMetadataListFragmentHelper.java @@ -17,7 +17,6 @@ import android.widget.ListView; import com.commonsware.cwac.tlv.TouchListView.DropListener; import com.commonsware.cwac.tlv.TouchListView.GrabberClickListener; import com.commonsware.cwac.tlv.TouchListView.SwipeListener; -import org.astrid.R; import com.todoroo.andlib.data.Property; import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.service.Autowired; @@ -39,6 +38,8 @@ import com.todoroo.astrid.subtasks.OrderedMetadataListUpdater.OrderedListNodeVis import com.todoroo.astrid.ui.DraggableListView; import com.todoroo.astrid.utility.AstridPreferences; +import org.astrid.R; + import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; diff --git a/astrid/src/com/todoroo/astrid/subtasks/SubtasksListFragment.java b/astrid/src/com/todoroo/astrid/subtasks/SubtasksListFragment.java index 89a444313..3b7506bf8 100644 --- a/astrid/src/com/todoroo/astrid/subtasks/SubtasksListFragment.java +++ b/astrid/src/com/todoroo/astrid/subtasks/SubtasksListFragment.java @@ -9,13 +9,14 @@ import android.os.Bundle; import android.view.View; import android.view.ViewGroup; -import org.astrid.R; import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.astrid.activity.TaskListFragment; import com.todoroo.astrid.adapter.TaskAdapter; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.TaskListMetadata; +import org.astrid.R; + /** * Fragment for subtasks * diff --git a/astrid/src/com/todoroo/astrid/subtasks/SubtasksTagListFragment.java b/astrid/src/com/todoroo/astrid/subtasks/SubtasksTagListFragment.java index 47df02a02..beea9e18d 100644 --- a/astrid/src/com/todoroo/astrid/subtasks/SubtasksTagListFragment.java +++ b/astrid/src/com/todoroo/astrid/subtasks/SubtasksTagListFragment.java @@ -8,13 +8,14 @@ package com.todoroo.astrid.subtasks; import android.view.View; import android.view.ViewGroup; -import org.astrid.R; import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.astrid.actfm.TagViewFragment; import com.todoroo.astrid.adapter.TaskAdapter; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.TaskListMetadata; +import org.astrid.R; + public class SubtasksTagListFragment extends TagViewFragment { private final AstridOrderedListFragmentHelper helper; diff --git a/astrid/src/com/todoroo/astrid/tags/TagCustomFilterCriteriaExposer.java b/astrid/src/com/todoroo/astrid/tags/TagCustomFilterCriteriaExposer.java index c7d7804be..519af689a 100644 --- a/astrid/src/com/todoroo/astrid/tags/TagCustomFilterCriteriaExposer.java +++ b/astrid/src/com/todoroo/astrid/tags/TagCustomFilterCriteriaExposer.java @@ -12,7 +12,6 @@ import android.content.Intent; import android.content.res.Resources; import android.graphics.drawable.BitmapDrawable; -import org.astrid.R; import com.todoroo.andlib.sql.Criterion; import com.todoroo.andlib.sql.Join; import com.todoroo.andlib.sql.Query; @@ -26,6 +25,8 @@ import com.todoroo.astrid.data.Metadata; import com.todoroo.astrid.data.RemoteModel; import com.todoroo.astrid.data.Task; +import org.astrid.R; + public class TagCustomFilterCriteriaExposer extends BroadcastReceiver { private static final String IDENTIFIER_TAG_IS = "tag_is"; //$NON-NLS-1$ private static final String IDENTIFIER_TAG_CONTAINS = "tag_contains"; //$NON-NLS-1$ diff --git a/astrid/src/com/todoroo/astrid/tags/TagFilterExposer.java b/astrid/src/com/todoroo/astrid/tags/TagFilterExposer.java index bb3797ea7..80ecbe214 100644 --- a/astrid/src/com/todoroo/astrid/tags/TagFilterExposer.java +++ b/astrid/src/com/todoroo/astrid/tags/TagFilterExposer.java @@ -19,7 +19,6 @@ import android.text.TextUtils; import android.widget.EditText; import android.widget.Toast; -import org.astrid.R; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.service.DependencyInjectionService; @@ -48,6 +47,8 @@ import com.todoroo.astrid.service.TagDataService; import com.todoroo.astrid.service.ThemeService; import com.todoroo.astrid.tags.TagService.Tag; +import org.astrid.R; + import java.util.ArrayList; import java.util.List; diff --git a/astrid/src/com/todoroo/astrid/tags/TagService.java b/astrid/src/com/todoroo/astrid/tags/TagService.java index 123522161..4e7ec3470 100644 --- a/astrid/src/com/todoroo/astrid/tags/TagService.java +++ b/astrid/src/com/todoroo/astrid/tags/TagService.java @@ -10,7 +10,6 @@ import android.content.Intent; import android.text.TextUtils; import android.widget.Toast; -import org.astrid.R; import com.todoroo.andlib.data.Property; import com.todoroo.andlib.data.Property.CountProperty; import com.todoroo.andlib.data.TodorooCursor; @@ -40,6 +39,8 @@ import com.todoroo.astrid.service.MetadataService; import com.todoroo.astrid.service.TagDataService; import com.todoroo.astrid.service.TaskService; +import org.astrid.R; + import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; diff --git a/astrid/src/com/todoroo/astrid/tags/TagsControlSet.java b/astrid/src/com/todoroo/astrid/tags/TagsControlSet.java index a6f265d2e..833fd8966 100644 --- a/astrid/src/com/todoroo/astrid/tags/TagsControlSet.java +++ b/astrid/src/com/todoroo/astrid/tags/TagsControlSet.java @@ -23,7 +23,6 @@ import android.widget.ListView; import android.widget.TextView; import android.widget.TextView.OnEditorActionListener; -import org.astrid.R; import com.todoroo.andlib.data.AbstractModel; import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.service.DependencyInjectionService; @@ -35,6 +34,8 @@ import com.todoroo.astrid.tags.TagService.Tag; import com.todoroo.astrid.ui.PopupControlSet; import com.todoroo.astrid.utility.Flags; +import org.astrid.R; + import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedHashSet; diff --git a/astrid/src/com/todoroo/astrid/tags/reusable/FeaturedListFilterMode.java b/astrid/src/com/todoroo/astrid/tags/reusable/FeaturedListFilterMode.java index fdd3e0220..df6488043 100644 --- a/astrid/src/com/todoroo/astrid/tags/reusable/FeaturedListFilterMode.java +++ b/astrid/src/com/todoroo/astrid/tags/reusable/FeaturedListFilterMode.java @@ -2,7 +2,6 @@ package com.todoroo.astrid.tags.reusable; import android.content.Context; -import org.astrid.R; import com.todoroo.astrid.activity.FilterListFragment; import com.todoroo.astrid.activity.FilterModeSpec; import com.todoroo.astrid.activity.TaskListFragment; @@ -10,6 +9,8 @@ import com.todoroo.astrid.api.Filter; import com.todoroo.astrid.core.CoreFilterExposer; import com.todoroo.astrid.ui.MainMenuPopover; +import org.astrid.R; + public class FeaturedListFilterMode implements FilterModeSpec { @Override diff --git a/astrid/src/com/todoroo/astrid/tags/reusable/FeaturedListFragment.java b/astrid/src/com/todoroo/astrid/tags/reusable/FeaturedListFragment.java index 2bbdccdfa..3403847f2 100644 --- a/astrid/src/com/todoroo/astrid/tags/reusable/FeaturedListFragment.java +++ b/astrid/src/com/todoroo/astrid/tags/reusable/FeaturedListFragment.java @@ -2,11 +2,12 @@ package com.todoroo.astrid.tags.reusable; import android.app.Activity; -import org.astrid.R; import com.todoroo.astrid.activity.FilterListFragment; import com.todoroo.astrid.adapter.FilterAdapter; import com.todoroo.astrid.utility.AstridPreferences; +import org.astrid.R; + public class FeaturedListFragment extends FilterListFragment { @Override diff --git a/astrid/src/com/todoroo/astrid/tags/reusable/FeaturedTaskListFragment.java b/astrid/src/com/todoroo/astrid/tags/reusable/FeaturedTaskListFragment.java index c13f06863..9bab8edd4 100644 --- a/astrid/src/com/todoroo/astrid/tags/reusable/FeaturedTaskListFragment.java +++ b/astrid/src/com/todoroo/astrid/tags/reusable/FeaturedTaskListFragment.java @@ -14,7 +14,6 @@ import android.widget.Toast; import com.actionbarsherlock.view.Menu; import com.actionbarsherlock.view.MenuItem; -import org.astrid.R; import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.sql.Query; @@ -34,6 +33,8 @@ import com.todoroo.astrid.tags.TagService.Tag; import com.todoroo.astrid.utility.Flags; import com.todoroo.astrid.utility.ResourceDrawableCache; +import org.astrid.R; + public class FeaturedTaskListFragment extends TagViewFragment { @Autowired diff --git a/astrid/src/com/todoroo/astrid/tags/reusable/ReusableTaskAdapter.java b/astrid/src/com/todoroo/astrid/tags/reusable/ReusableTaskAdapter.java index efef68601..2d3914b02 100644 --- a/astrid/src/com/todoroo/astrid/tags/reusable/ReusableTaskAdapter.java +++ b/astrid/src/com/todoroo/astrid/tags/reusable/ReusableTaskAdapter.java @@ -9,7 +9,6 @@ import android.widget.ImageView; import android.widget.TextView; import android.widget.Toast; -import org.astrid.R; import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.utility.Preferences; import com.todoroo.astrid.activity.TaskListFragment; @@ -18,6 +17,8 @@ import com.todoroo.astrid.data.RemoteModel; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.utility.Flags; +import org.astrid.R; + import java.util.concurrent.atomic.AtomicReference; public class ReusableTaskAdapter extends TaskAdapter { diff --git a/astrid/src/com/todoroo/astrid/timers/TimerActionControlSet.java b/astrid/src/com/todoroo/astrid/timers/TimerActionControlSet.java index 6a74ed1b6..dbb29524e 100644 --- a/astrid/src/com/todoroo/astrid/timers/TimerActionControlSet.java +++ b/astrid/src/com/todoroo/astrid/timers/TimerActionControlSet.java @@ -15,11 +15,12 @@ import android.widget.Chronometer.OnChronometerTickListener; import android.widget.ImageView; import android.widget.LinearLayout; -import org.astrid.R; import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.helper.TaskEditControlSet; +import org.astrid.R; + import java.util.LinkedList; import java.util.List; diff --git a/astrid/src/com/todoroo/astrid/timers/TimerControlSet.java b/astrid/src/com/todoroo/astrid/timers/TimerControlSet.java index b7707ed55..a18fa1165 100644 --- a/astrid/src/com/todoroo/astrid/timers/TimerControlSet.java +++ b/astrid/src/com/todoroo/astrid/timers/TimerControlSet.java @@ -12,7 +12,6 @@ import android.view.View; import android.widget.ImageView; import android.widget.TextView; -import org.astrid.R; import com.todoroo.andlib.data.Property.IntegerProperty; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.helper.TaskEditControlSet; @@ -21,6 +20,8 @@ import com.todoroo.astrid.timers.TimerActionControlSet.TimerActionListener; import com.todoroo.astrid.ui.PopupControlSet; import com.todoroo.astrid.ui.TimeDurationControlSet; +import org.astrid.R; + /** * Control Set for managing repeats * diff --git a/astrid/src/com/todoroo/astrid/timers/TimerDecorationExposer.java b/astrid/src/com/todoroo/astrid/timers/TimerDecorationExposer.java index ae7e1df0a..a59299df2 100644 --- a/astrid/src/com/todoroo/astrid/timers/TimerDecorationExposer.java +++ b/astrid/src/com/todoroo/astrid/timers/TimerDecorationExposer.java @@ -13,7 +13,6 @@ import android.text.format.DateUtils; import android.view.View; import android.widget.RemoteViews; -import org.astrid.R; import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.astrid.api.AstridApiConstants; @@ -21,6 +20,8 @@ import com.todoroo.astrid.api.TaskDecoration; import com.todoroo.astrid.api.TaskDecorationExposer; import com.todoroo.astrid.data.Task; +import org.astrid.R; + /** * Exposes {@link TaskDecoration} for timers * diff --git a/astrid/src/com/todoroo/astrid/timers/TimerFilterExposer.java b/astrid/src/com/todoroo/astrid/timers/TimerFilterExposer.java index 039e59f18..987582efd 100644 --- a/astrid/src/com/todoroo/astrid/timers/TimerFilterExposer.java +++ b/astrid/src/com/todoroo/astrid/timers/TimerFilterExposer.java @@ -12,7 +12,6 @@ import android.content.Intent; import android.content.res.Resources; import android.graphics.drawable.BitmapDrawable; -import org.astrid.R; import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.sql.Query; import com.todoroo.andlib.sql.QueryTemplate; @@ -24,6 +23,8 @@ import com.todoroo.astrid.api.FilterListItem; import com.todoroo.astrid.core.PluginServices; import com.todoroo.astrid.data.Task; +import org.astrid.R; + /** * Exposes "working on" filter to the {@link FilterListFragment} * diff --git a/astrid/src/com/todoroo/astrid/timers/TimerPlugin.java b/astrid/src/com/todoroo/astrid/timers/TimerPlugin.java index 692f28f0f..49cf64fd6 100644 --- a/astrid/src/com/todoroo/astrid/timers/TimerPlugin.java +++ b/astrid/src/com/todoroo/astrid/timers/TimerPlugin.java @@ -12,7 +12,6 @@ import android.content.Context; import android.content.Intent; import android.content.res.Resources; -import org.astrid.R; import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.service.NotificationManager; import com.todoroo.andlib.service.NotificationManager.AndroidNotificationManager; @@ -26,6 +25,8 @@ import com.todoroo.astrid.core.PluginServices; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.utility.Constants; +import org.astrid.R; + public class TimerPlugin extends BroadcastReceiver { static final String IDENTIFIER = "timer"; //$NON-NLS-1$ diff --git a/astrid/src/com/todoroo/astrid/ui/AstridDialog.java b/astrid/src/com/todoroo/astrid/ui/AstridDialog.java index 43da3d0b7..2f22dd3b7 100644 --- a/astrid/src/com/todoroo/astrid/ui/AstridDialog.java +++ b/astrid/src/com/todoroo/astrid/ui/AstridDialog.java @@ -6,9 +6,10 @@ import android.widget.Button; import android.widget.LinearLayout; import android.widget.TextView; -import org.astrid.R; import com.todoroo.astrid.activity.AstridActivity; +import org.astrid.R; + public class AstridDialog extends Dialog { private final Button[] buttons; diff --git a/astrid/src/com/todoroo/astrid/ui/AstridTimePicker.java b/astrid/src/com/todoroo/astrid/ui/AstridTimePicker.java index 7aa56bda5..4359fd626 100644 --- a/astrid/src/com/todoroo/astrid/ui/AstridTimePicker.java +++ b/astrid/src/com/todoroo/astrid/ui/AstridTimePicker.java @@ -17,10 +17,11 @@ import android.widget.CompoundButton.OnCheckedChangeListener; import android.widget.LinearLayout; import android.widget.ToggleButton; -import org.astrid.R; import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.andlib.utility.Preferences; +import org.astrid.R; + import java.util.Calendar; public class AstridTimePicker extends LinearLayout { diff --git a/astrid/src/com/todoroo/astrid/ui/ContactListAdapter.java b/astrid/src/com/todoroo/astrid/ui/ContactListAdapter.java index a3a296ab8..d77dd03a4 100644 --- a/astrid/src/com/todoroo/astrid/ui/ContactListAdapter.java +++ b/astrid/src/com/todoroo/astrid/ui/ContactListAdapter.java @@ -26,7 +26,6 @@ import android.widget.CursorAdapter; import android.widget.ImageView; import android.widget.TextView; -import org.astrid.R; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.service.DependencyInjectionService; @@ -37,6 +36,8 @@ import com.todoroo.andlib.sql.Query; import com.todoroo.astrid.data.TagData; import com.todoroo.astrid.service.TagDataService; +import org.astrid.R; + import java.io.InputStream; diff --git a/astrid/src/com/todoroo/astrid/ui/DateAndTimeDialog.java b/astrid/src/com/todoroo/astrid/ui/DateAndTimeDialog.java index cd47b1532..6c2f886a3 100644 --- a/astrid/src/com/todoroo/astrid/ui/DateAndTimeDialog.java +++ b/astrid/src/com/todoroo/astrid/ui/DateAndTimeDialog.java @@ -13,9 +13,10 @@ import android.view.Window; import android.view.WindowManager.LayoutParams; import android.widget.Button; -import org.astrid.R; import com.todoroo.astrid.service.ThemeService; +import org.astrid.R; + public class DateAndTimeDialog extends Dialog { public interface DateAndTimeDialogListener { diff --git a/astrid/src/com/todoroo/astrid/ui/DateAndTimePicker.java b/astrid/src/com/todoroo/astrid/ui/DateAndTimePicker.java index f38c506e6..48cb212d9 100644 --- a/astrid/src/com/todoroo/astrid/ui/DateAndTimePicker.java +++ b/astrid/src/com/todoroo/astrid/ui/DateAndTimePicker.java @@ -17,13 +17,14 @@ import android.view.View; import android.widget.LinearLayout; import android.widget.ToggleButton; -import org.astrid.R; import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.andlib.utility.Preferences; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.ui.AstridTimePicker.TimePickerEnabledChangedListener; import com.todoroo.astrid.ui.CalendarView.OnSelectedDateListener; +import org.astrid.R; + import java.util.ArrayList; import java.util.Date; diff --git a/astrid/src/com/todoroo/astrid/ui/DateChangedAlerts.java b/astrid/src/com/todoroo/astrid/ui/DateChangedAlerts.java index 1f3d41682..4992190ba 100644 --- a/astrid/src/com/todoroo/astrid/ui/DateChangedAlerts.java +++ b/astrid/src/com/todoroo/astrid/ui/DateChangedAlerts.java @@ -23,7 +23,6 @@ import android.widget.TextView; import com.google.ical.values.Frequency; import com.google.ical.values.RRule; -import org.astrid.R; import com.todoroo.andlib.data.Property; import com.todoroo.andlib.utility.AndroidUtilities; import com.todoroo.andlib.utility.DateUtilities; @@ -35,6 +34,8 @@ import com.todoroo.astrid.repeats.RepeatTaskCompleteListener; import com.todoroo.astrid.ui.DateAndTimeDialog.DateAndTimeDialogListener; import com.todoroo.astrid.utility.Flags; +import org.astrid.R; + import java.text.ParseException; import java.util.Date; diff --git a/astrid/src/com/todoroo/astrid/ui/DeadlineControlSet.java b/astrid/src/com/todoroo/astrid/ui/DeadlineControlSet.java index 77fb210a0..f4caedbbe 100644 --- a/astrid/src/com/todoroo/astrid/ui/DeadlineControlSet.java +++ b/astrid/src/com/todoroo/astrid/ui/DeadlineControlSet.java @@ -18,13 +18,14 @@ import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; -import org.astrid.R; import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.andlib.utility.DialogUtilities; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.repeats.RepeatControlSet; import com.todoroo.astrid.service.ThemeService; +import org.astrid.R; + public class DeadlineControlSet extends PopupControlSet { private boolean isQuickadd = false; diff --git a/astrid/src/com/todoroo/astrid/ui/DraggableListView.java b/astrid/src/com/todoroo/astrid/ui/DraggableListView.java index 2e98a14d7..b99a95f50 100644 --- a/astrid/src/com/todoroo/astrid/ui/DraggableListView.java +++ b/astrid/src/com/todoroo/astrid/ui/DraggableListView.java @@ -40,9 +40,10 @@ import com.commonsware.cwac.tlv.TouchListView.DragListener; import com.commonsware.cwac.tlv.TouchListView.DropListener; import com.commonsware.cwac.tlv.TouchListView.GrabberClickListener; import com.commonsware.cwac.tlv.TouchListView.SwipeListener; -import org.astrid.R; import com.todoroo.astrid.utility.Flags; +import org.astrid.R; + public class DraggableListView extends ListView { private static final int SWIPE_THRESHOLD = 40; diff --git a/astrid/src/com/todoroo/astrid/ui/EditNotesControlSet.java b/astrid/src/com/todoroo/astrid/ui/EditNotesControlSet.java index f1f2152c8..59b805e0c 100644 --- a/astrid/src/com/todoroo/astrid/ui/EditNotesControlSet.java +++ b/astrid/src/com/todoroo/astrid/ui/EditNotesControlSet.java @@ -16,10 +16,11 @@ import android.widget.EditText; import android.widget.ImageView; import android.widget.TextView; -import org.astrid.R; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.service.ThemeService; +import org.astrid.R; + public class EditNotesControlSet extends PopupControlSet { protected EditText editText; diff --git a/astrid/src/com/todoroo/astrid/ui/EditTitleControlSet.java b/astrid/src/com/todoroo/astrid/ui/EditTitleControlSet.java index a6a08eef0..daf31e2f1 100644 --- a/astrid/src/com/todoroo/astrid/ui/EditTitleControlSet.java +++ b/astrid/src/com/todoroo/astrid/ui/EditTitleControlSet.java @@ -16,7 +16,6 @@ import android.view.animation.Animation; import android.view.animation.ScaleAnimation; import android.widget.EditText; -import org.astrid.R; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.andlib.utility.AndroidUtilities; @@ -27,6 +26,8 @@ import com.todoroo.astrid.repeats.RepeatControlSet.RepeatChangedListener; import com.todoroo.astrid.service.TaskService; import com.todoroo.astrid.ui.ImportanceControlSet.ImportanceChangedListener; +import org.astrid.R; + /** * Control set for mapping a Property to an EditText * diff --git a/astrid/src/com/todoroo/astrid/ui/FeedbackPromptDialogs.java b/astrid/src/com/todoroo/astrid/ui/FeedbackPromptDialogs.java index 679763afc..b5c58962e 100644 --- a/astrid/src/com/todoroo/astrid/ui/FeedbackPromptDialogs.java +++ b/astrid/src/com/todoroo/astrid/ui/FeedbackPromptDialogs.java @@ -5,9 +5,10 @@ import android.net.Uri; import android.view.View; import android.widget.Toast; -import org.astrid.R; import com.todoroo.astrid.activity.AstridActivity; +import org.astrid.R; + public class FeedbackPromptDialogs { diff --git a/astrid/src/com/todoroo/astrid/ui/HideUntilControlSet.java b/astrid/src/com/todoroo/astrid/ui/HideUntilControlSet.java index 00613a868..7e63f8d90 100644 --- a/astrid/src/com/todoroo/astrid/ui/HideUntilControlSet.java +++ b/astrid/src/com/todoroo/astrid/ui/HideUntilControlSet.java @@ -16,13 +16,14 @@ import android.widget.LinearLayout; import android.widget.Spinner; import android.widget.TextView; -import org.astrid.R; import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.andlib.utility.Preferences; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.service.ThemeService; import com.todoroo.astrid.ui.DateAndTimeDialog.DateAndTimeDialogListener; +import org.astrid.R; + import java.util.Date; /** diff --git a/astrid/src/com/todoroo/astrid/ui/ImportanceControlSet.java b/astrid/src/com/todoroo/astrid/ui/ImportanceControlSet.java index b04117b87..6b79c1b6a 100644 --- a/astrid/src/com/todoroo/astrid/ui/ImportanceControlSet.java +++ b/astrid/src/com/todoroo/astrid/ui/ImportanceControlSet.java @@ -13,11 +13,12 @@ import android.widget.CompoundButton; import android.widget.LinearLayout; import android.widget.ToggleButton; -import org.astrid.R; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.helper.TaskEditControlSet; import com.todoroo.astrid.service.ThemeService; +import org.astrid.R; + import java.util.LinkedList; import java.util.List; diff --git a/astrid/src/com/todoroo/astrid/ui/MainMenuPopover.java b/astrid/src/com/todoroo/astrid/ui/MainMenuPopover.java index 9c2a4dff9..95350d17d 100644 --- a/astrid/src/com/todoroo/astrid/ui/MainMenuPopover.java +++ b/astrid/src/com/todoroo/astrid/ui/MainMenuPopover.java @@ -19,12 +19,13 @@ import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; -import org.astrid.R; import com.todoroo.andlib.utility.Preferences; import com.todoroo.astrid.service.ThemeService; import com.todoroo.astrid.ui.TouchInterceptingFrameLayout.InterceptTouchListener; import com.todoroo.astrid.utility.AstridPreferences; +import org.astrid.R; + public class MainMenuPopover extends FragmentPopover implements InterceptTouchListener { public static final int MAIN_MENU_ITEM_LISTS = R.string.TLA_menu_lists; diff --git a/astrid/src/com/todoroo/astrid/ui/NumberPicker.java b/astrid/src/com/todoroo/astrid/ui/NumberPicker.java index c11dec5d6..f0efbf311 100644 --- a/astrid/src/com/todoroo/astrid/ui/NumberPicker.java +++ b/astrid/src/com/todoroo/astrid/ui/NumberPicker.java @@ -23,9 +23,10 @@ import android.widget.EditText; import android.widget.LinearLayout; import android.widget.TextView; -import org.astrid.R; import com.todoroo.andlib.utility.AndroidUtilities; +import org.astrid.R; + public class NumberPicker extends LinearLayout implements OnClickListener, OnFocusChangeListener, OnLongClickListener { diff --git a/astrid/src/com/todoroo/astrid/ui/PopupControlSet.java b/astrid/src/com/todoroo/astrid/ui/PopupControlSet.java index 410808a06..e4445720c 100644 --- a/astrid/src/com/todoroo/astrid/ui/PopupControlSet.java +++ b/astrid/src/com/todoroo/astrid/ui/PopupControlSet.java @@ -16,13 +16,14 @@ import android.view.ViewGroup.LayoutParams; import android.view.Window; import android.widget.Button; -import org.astrid.R; import com.todoroo.andlib.utility.AndroidUtilities; import com.todoroo.andlib.utility.DialogUtilities; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.helper.TaskEditControlSet; import com.todoroo.astrid.service.ThemeService; +import org.astrid.R; + public abstract class PopupControlSet extends TaskEditControlSet { protected final View displayView; diff --git a/astrid/src/com/todoroo/astrid/ui/QuickAddBar.java b/astrid/src/com/todoroo/astrid/ui/QuickAddBar.java index 3160b6ef5..6b176f7ff 100644 --- a/astrid/src/com/todoroo/astrid/ui/QuickAddBar.java +++ b/astrid/src/com/todoroo/astrid/ui/QuickAddBar.java @@ -26,7 +26,6 @@ import android.widget.LinearLayout; import android.widget.TextView; import android.widget.TextView.OnEditorActionListener; -import org.astrid.R; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.service.DependencyInjectionService; @@ -55,6 +54,8 @@ import com.todoroo.astrid.service.TaskService; import com.todoroo.astrid.utility.Flags; import com.todoroo.astrid.voice.VoiceRecognizer; +import org.astrid.R; + import java.util.HashSet; import java.util.concurrent.atomic.AtomicReference; diff --git a/astrid/src/com/todoroo/astrid/ui/RandomReminderControlSet.java b/astrid/src/com/todoroo/astrid/ui/RandomReminderControlSet.java index ab8bd25df..9daf26798 100644 --- a/astrid/src/com/todoroo/astrid/ui/RandomReminderControlSet.java +++ b/astrid/src/com/todoroo/astrid/ui/RandomReminderControlSet.java @@ -13,11 +13,12 @@ import android.widget.ArrayAdapter; import android.widget.CheckBox; import android.widget.Spinner; -import org.astrid.R; import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.helper.TaskEditControlSet; +import org.astrid.R; + /** * Control set dealing with random reminder settings * diff --git a/astrid/src/com/todoroo/astrid/ui/ReminderControlSet.java b/astrid/src/com/todoroo/astrid/ui/ReminderControlSet.java index 70aed18de..c0f532216 100644 --- a/astrid/src/com/todoroo/astrid/ui/ReminderControlSet.java +++ b/astrid/src/com/todoroo/astrid/ui/ReminderControlSet.java @@ -17,11 +17,12 @@ import android.widget.LinearLayout; import android.widget.Spinner; import android.widget.TextView; -import org.astrid.R; import com.todoroo.astrid.alarms.AlarmControlSet; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.service.ThemeService; +import org.astrid.R; + import java.util.ArrayList; import java.util.List; diff --git a/astrid/src/com/todoroo/astrid/ui/TaskListFragmentPager.java b/astrid/src/com/todoroo/astrid/ui/TaskListFragmentPager.java index 010fd0411..13aba8d18 100644 --- a/astrid/src/com/todoroo/astrid/ui/TaskListFragmentPager.java +++ b/astrid/src/com/todoroo/astrid/ui/TaskListFragmentPager.java @@ -14,7 +14,6 @@ import android.util.AttributeSet; import android.view.MotionEvent; import android.view.View; -import org.astrid.R; import com.todoroo.andlib.utility.DialogUtilities; import com.todoroo.andlib.utility.Preferences; import com.todoroo.astrid.activity.TaskListFragment; @@ -23,6 +22,8 @@ import com.todoroo.astrid.api.Filter; import com.todoroo.astrid.service.ThemeService; import com.todoroo.astrid.utility.Flags; +import org.astrid.R; + public class TaskListFragmentPager extends ViewPager { public static final String PREF_SHOWED_SWIPE_HELPER = "showed_swipe_helper"; //$NON-NLS-1$ diff --git a/astrid/src/com/todoroo/astrid/ui/TimeDurationControlSet.java b/astrid/src/com/todoroo/astrid/ui/TimeDurationControlSet.java index dc91d9110..a4e387140 100644 --- a/astrid/src/com/todoroo/astrid/ui/TimeDurationControlSet.java +++ b/astrid/src/com/todoroo/astrid/ui/TimeDurationControlSet.java @@ -11,12 +11,13 @@ import android.text.format.DateUtils; import android.view.View; import android.widget.TextView; -import org.astrid.R; import com.todoroo.andlib.data.Property.IntegerProperty; import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.ui.NNumberPickerDialog.OnNNumberPickedListener; +import org.astrid.R; + public class TimeDurationControlSet implements OnNNumberPickedListener, View.OnClickListener { diff --git a/astrid/src/com/todoroo/astrid/utility/AstridDefaultPreferenceSpec.java b/astrid/src/com/todoroo/astrid/utility/AstridDefaultPreferenceSpec.java index 509456756..a2158562c 100644 --- a/astrid/src/com/todoroo/astrid/utility/AstridDefaultPreferenceSpec.java +++ b/astrid/src/com/todoroo/astrid/utility/AstridDefaultPreferenceSpec.java @@ -5,7 +5,6 @@ import android.content.SharedPreferences; import android.content.SharedPreferences.Editor; import android.content.res.Resources; -import org.astrid.R; import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.utility.Preferences; import com.todoroo.astrid.activity.BeastModePreferences; @@ -13,6 +12,8 @@ import com.todoroo.astrid.core.SortHelper; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.service.ThemeService; +import org.astrid.R; + public class AstridDefaultPreferenceSpec extends AstridPreferenceSpec { public static interface PreferenceExtras { diff --git a/astrid/src/com/todoroo/astrid/utility/AstridLitePreferenceSpec.java b/astrid/src/com/todoroo/astrid/utility/AstridLitePreferenceSpec.java index 7fdbe8eae..dd3367355 100644 --- a/astrid/src/com/todoroo/astrid/utility/AstridLitePreferenceSpec.java +++ b/astrid/src/com/todoroo/astrid/utility/AstridLitePreferenceSpec.java @@ -5,7 +5,6 @@ import android.content.SharedPreferences; import android.content.SharedPreferences.Editor; import android.content.res.Resources; -import org.astrid.R; import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.utility.Preferences; import com.todoroo.astrid.activity.BeastModePreferences; @@ -14,6 +13,8 @@ import com.todoroo.astrid.data.Task; import com.todoroo.astrid.service.ThemeService; import com.todoroo.astrid.utility.AstridDefaultPreferenceSpec.PreferenceExtras; +import org.astrid.R; + public class AstridLitePreferenceSpec extends AstridPreferenceSpec { @Override diff --git a/astrid/src/com/todoroo/astrid/utility/AstridPreferences.java b/astrid/src/com/todoroo/astrid/utility/AstridPreferences.java index 5b5767c57..6864f7513 100644 --- a/astrid/src/com/todoroo/astrid/utility/AstridPreferences.java +++ b/astrid/src/com/todoroo/astrid/utility/AstridPreferences.java @@ -9,7 +9,6 @@ package com.todoroo.astrid.utility; import android.content.Context; import android.content.SharedPreferences; -import org.astrid.R; import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.sql.Query; import com.todoroo.andlib.utility.AndroidUtilities; @@ -19,6 +18,8 @@ import com.todoroo.astrid.core.PluginServices; import com.todoroo.astrid.data.User; import com.todoroo.astrid.tags.reusable.FeaturedListFilterExposer; +import org.astrid.R; + public class AstridPreferences { private static final String P_CURRENT_VERSION = "cv"; //$NON-NLS-1$ diff --git a/astrid/src/com/todoroo/astrid/utility/ResourceDrawableCache.java b/astrid/src/com/todoroo/astrid/utility/ResourceDrawableCache.java index cdd956684..204c34e2d 100644 --- a/astrid/src/com/todoroo/astrid/utility/ResourceDrawableCache.java +++ b/astrid/src/com/todoroo/astrid/utility/ResourceDrawableCache.java @@ -3,9 +3,10 @@ package com.todoroo.astrid.utility; import android.content.res.Resources; import android.graphics.drawable.Drawable; -import org.astrid.R; import com.todoroo.andlib.service.ContextManager; +import org.astrid.R; + /** * This class caches common images based on resource ID to avoid * the performance hit from constantly loading them from disk diff --git a/astrid/src/com/todoroo/astrid/voice/VoiceInputAssistant.java b/astrid/src/com/todoroo/astrid/voice/VoiceInputAssistant.java index c3d1847d1..ee8422742 100644 --- a/astrid/src/com/todoroo/astrid/voice/VoiceInputAssistant.java +++ b/astrid/src/com/todoroo/astrid/voice/VoiceInputAssistant.java @@ -17,7 +17,6 @@ import android.view.View.OnClickListener; import android.widget.EditText; import android.widget.ImageButton; -import org.astrid.R; import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.utility.AndroidUtilities; import com.todoroo.andlib.utility.DialogUtilities; @@ -26,6 +25,8 @@ import com.todoroo.astrid.utility.Constants; import junit.framework.Assert; +import org.astrid.R; + import java.security.InvalidParameterException; import java.util.ArrayList; diff --git a/astrid/src/com/todoroo/astrid/voice/VoiceRecognizer.java b/astrid/src/com/todoroo/astrid/voice/VoiceRecognizer.java index 73a895a7d..4bdca1f90 100644 --- a/astrid/src/com/todoroo/astrid/voice/VoiceRecognizer.java +++ b/astrid/src/com/todoroo/astrid/voice/VoiceRecognizer.java @@ -17,7 +17,6 @@ import android.widget.EditText; import android.widget.ImageButton; import android.widget.Toast; -import org.astrid.R; import com.todoroo.aacenc.ContextManager; import com.todoroo.aacenc.RecognizerApi; import com.todoroo.aacenc.RecognizerApi.RecognizerApiListener; @@ -26,6 +25,8 @@ import com.todoroo.andlib.utility.Preferences; import com.todoroo.astrid.actfm.sync.ActFmPreferenceService; import com.todoroo.astrid.utility.Constants; +import org.astrid.R; + import java.io.IOException; import java.util.List; diff --git a/astrid/src/com/todoroo/astrid/widget/TasksWidget.java b/astrid/src/com/todoroo/astrid/widget/TasksWidget.java index 4c4fd2bcc..2336b05b8 100644 --- a/astrid/src/com/todoroo/astrid/widget/TasksWidget.java +++ b/astrid/src/com/todoroo/astrid/widget/TasksWidget.java @@ -24,7 +24,6 @@ import android.view.View; import android.view.WindowManager; import android.widget.RemoteViews; -import org.astrid.R; import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.ContextManager; @@ -54,6 +53,8 @@ import com.todoroo.astrid.tags.TagFilterExposer; import com.todoroo.astrid.utility.AstridPreferences; import com.todoroo.astrid.utility.Constants; +import org.astrid.R; + public class TasksWidget extends AppWidgetProvider { public static final int THEME_LEGACY = -1; diff --git a/astrid/src/com/todoroo/astrid/widget/WidgetConfigActivity.java b/astrid/src/com/todoroo/astrid/widget/WidgetConfigActivity.java index d51df9839..8c300211c 100644 --- a/astrid/src/com/todoroo/astrid/widget/WidgetConfigActivity.java +++ b/astrid/src/com/todoroo/astrid/widget/WidgetConfigActivity.java @@ -15,7 +15,6 @@ import android.view.View; import android.widget.Button; import android.widget.ListView; -import org.astrid.R; import com.todoroo.andlib.utility.AndroidUtilities; import com.todoroo.andlib.utility.Preferences; import com.todoroo.astrid.adapter.FilterAdapter; @@ -24,6 +23,8 @@ import com.todoroo.astrid.api.FilterListItem; import com.todoroo.astrid.api.FilterWithCustomIntent; import com.todoroo.astrid.service.ThemeService; +import org.astrid.R; + abstract public class WidgetConfigActivity extends ListActivity { diff --git a/tests-sync/AndroidManifest.xml b/tests-sync/AndroidManifest.xml index 57b476318..e92b52f5d 100644 --- a/tests-sync/AndroidManifest.xml +++ b/tests-sync/AndroidManifest.xml @@ -1,7 +1,7 @@ @@ -21,6 +21,6 @@ --> diff --git a/tests-sync/project.properties b/tests-sync/project.properties index 98e627c3d..351341fc7 100644 --- a/tests-sync/project.properties +++ b/tests-sync/project.properties @@ -9,4 +9,4 @@ # Project target. target=android-17 -android.library.reference.1=../api + diff --git a/tests-sync/tests-sync.iml b/tests-sync/tests-sync.iml index c65dd4b5a..0a72d811c 100644 --- a/tests-sync/tests-sync.iml +++ b/tests-sync/tests-sync.iml @@ -15,9 +15,9 @@ - - - + + + diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml index efb007962..717a4e88b 100644 --- a/tests/AndroidManifest.xml +++ b/tests/AndroidManifest.xml @@ -1,7 +1,7 @@ @@ -21,6 +21,6 @@ --> diff --git a/tests/project.properties b/tests/project.properties index 98e627c3d..351341fc7 100644 --- a/tests/project.properties +++ b/tests/project.properties @@ -9,4 +9,4 @@ # Project target. target=android-17 -android.library.reference.1=../api + diff --git a/tests/tests.iml b/tests/tests.iml index a0b8ce6fc..9ecc5d22b 100644 --- a/tests/tests.iml +++ b/tests/tests.iml @@ -3,6 +3,7 @@ + @@ -15,8 +16,8 @@ - - + +