Change package, remove billing and cloud messaging

pull/14/head
Alex Baker 11 years ago
parent 557c16062b
commit 6b958f5379

@ -5,7 +5,7 @@
** See the file "LICENSE" for the full license governing this code. ** See the file "LICENSE" for the full license governing this code.
--> -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.todoroo.astrid.api" package="org.astrid.api"
android:versionCode="1" android:versionCode="1"
android:versionName="1.0"> android:versionName="1.0">

@ -14,7 +14,7 @@ import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.PackageManager.NameNotFoundException;
import android.util.Log; import android.util.Log;
import com.todoroo.astrid.api.R; import org.astrid.api.R;
/** /**
* Exception handling utility class - reports and logs errors * Exception handling utility class - reports and logs errors

@ -16,7 +16,7 @@ import android.content.Context;
import android.text.format.DateFormat; import android.text.format.DateFormat;
import android.text.format.DateUtils; import android.text.format.DateUtils;
import com.todoroo.astrid.api.R; import org.astrid.api.R;
public class DateUtilities { public class DateUtilities {

@ -15,7 +15,7 @@ import android.content.DialogInterface;
import android.view.View; import android.view.View;
import android.webkit.WebView; import android.webkit.WebView;
import com.todoroo.astrid.api.R; import org.astrid.api.R;
public class DialogUtilities { public class DialogUtilities {

@ -21,12 +21,12 @@ public class AstridApiConstants {
/** /**
* Astrid broadcast base package name * Astrid broadcast base package name
*/ */
public static final String API_PACKAGE = "com.todoroo.astrid"; public static final String API_PACKAGE = "org.astrid";
/** /**
* Astrid app base package name * Astrid app base package name
*/ */
public static final String ASTRID_PACKAGE = "com.timsu.astrid"; public static final String ASTRID_PACKAGE = "org.astrid";
/** /**
* Permission for reading tasks and receiving to GET_FILTERS intent * Permission for reading tasks and receiving to GET_FILTERS intent

@ -21,7 +21,7 @@ import com.todoroo.andlib.data.Table;
import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.data.TodorooCursor;
import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.andlib.utility.DateUtilities;
import com.todoroo.astrid.api.AstridApiConstants; import com.todoroo.astrid.api.AstridApiConstants;
import com.todoroo.astrid.api.R; import org.astrid.api.R;
/** /**
* Data Model which represents a task users need to accomplish. * Data Model which represents a task users need to accomplish.

@ -24,7 +24,7 @@ import com.todoroo.andlib.service.DependencyInjectionService;
import com.todoroo.andlib.service.ExceptionService; import com.todoroo.andlib.service.ExceptionService;
import com.todoroo.andlib.service.NotificationManager; import com.todoroo.andlib.service.NotificationManager;
import com.todoroo.andlib.utility.DialogUtilities; import com.todoroo.andlib.utility.DialogUtilities;
import com.todoroo.astrid.api.R; import org.astrid.api.R;
import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.Task;
/** /**

@ -27,7 +27,7 @@ import com.todoroo.andlib.utility.AndroidUtilities;
import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.andlib.utility.DateUtilities;
import com.todoroo.andlib.utility.DialogUtilities; import com.todoroo.andlib.utility.DialogUtilities;
import com.todoroo.andlib.utility.TodorooPreferenceActivity; import com.todoroo.andlib.utility.TodorooPreferenceActivity;
import com.todoroo.astrid.api.R; import org.astrid.api.R;
/** /**
* Utility class for common synchronization action: displaying synchronization * Utility class for common synchronization action: displaying synchronization

@ -5,13 +5,12 @@
** See the file "LICENSE" for the full license governing this code. ** See the file "LICENSE" for the full license governing this code.
--> -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.timsu.astrid" package="org.astrid"
android:versionName="4.6.5" android:versionName="4.6.8"
android:versionCode="306"> android:versionCode="316">
<!-- widgets, alarms, and services will break if Astrid is installed on SD card --> <!-- widgets, alarms, and services will break if Astrid is installed on SD card -->
<!-- android:installLocation="internalOnly"> --> <!-- android:installLocation="internalOnly"> -->
<!-- ================================================== Used Permissions = --> <!-- ================================================== Used Permissions = -->
@ -33,17 +32,12 @@
<uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH" /> <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH" />
<!-- for task sharing --> <!-- for task sharing -->
<uses-permission android:name="android.permission.READ_CONTACTS" /> <uses-permission android:name="android.permission.READ_CONTACTS" />
<!-- for push notifications -->
<uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
<!-- for missed call reminders --> <!-- for missed call reminders -->
<uses-permission android:name="android.permission.READ_PHONE_STATE"/> <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
<!-- required for ics --> <!-- required for ics -->
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
<uses-permission android:name="android.permission.RECORD_AUDIO" /> <uses-permission android:name="android.permission.RECORD_AUDIO" />
<!-- required for in-app billing of premium subscriptions -->
<uses-permission android:name="com.android.vending.BILLING"/>
<!-- Required for GCM - keeps the processor from sleeping when a message is received. --> <!-- Required for GCM - keeps the processor from sleeping when a message is received. -->
<uses-permission android:name="android.permission.WAKE_LOCK" /> <uses-permission android:name="android.permission.WAKE_LOCK" />
@ -53,34 +47,30 @@
<!-- ============================================== Exported Permissions = --> <!-- ============================================== Exported Permissions = -->
<!-- for v2 tasks provider --> <!-- for v2 tasks provider -->
<permission android:name="com.timsu.astrid.permission.READ_TASKS" <permission android:name="org.astrid.permission.READ_TASKS"
android:permissionGroup="android.permission-group.MESSAGES" android:permissionGroup="android.permission-group.MESSAGES"
android:protectionLevel="normal" android:protectionLevel="normal"
android:label="@string/read_permission_label" android:label="@string/read_permission_label"
android:description="@string/read_permission_desc"/> android:description="@string/read_permission_desc"/>
<uses-permission android:name="com.timsu.astrid.permission.READ_TASKS"/> <uses-permission android:name="org.astrid.permission.READ_TASKS"/>
<!-- for reading data from add-ons or astrid via v3 content provider --> <!-- for reading data from add-ons or astrid via v3 content provider -->
<permission android:name="com.todoroo.astrid.READ" <permission android:name="org.astrid.READ"
android:description="@string/read_permission_desc" android:description="@string/read_permission_desc"
android:protectionLevel="normal" android:protectionLevel="normal"
android:label="@string/read_permission_label" /> android:label="@string/read_permission_label" />
<uses-permission android:name="com.todoroo.astrid.READ" /> <uses-permission android:name="org.astrid.READ" />
<!-- for writing data to add-ons or astrid via v3 content provider --> <!-- for writing data to add-ons or astrid via v3 content provider -->
<permission android:name="com.todoroo.astrid.WRITE" <permission android:name="org.astrid.WRITE"
android:description="@string/write_permission_desc" android:description="@string/write_permission_desc"
android:protectionLevel="normal" android:protectionLevel="normal"
android:label="@string/write_permission_label" /> android:label="@string/write_permission_label" />
<uses-permission android:name="com.todoroo.astrid.WRITE" /> <uses-permission android:name="org.astrid.WRITE" />
<!-- for receiving C2D messages-->
<permission android:name="com.timsu.astrid.permission.C2D_MESSAGE"
android:protectionLevel="signature" />
<uses-permission android:name="com.timsu.astrid.permission.C2D_MESSAGE" />
<!-- ========================================================== Metadata = --> <!-- ========================================================== Metadata = -->
<uses-sdk android:targetSdkVersion="10" <uses-sdk android:targetSdkVersion="17"
android:minSdkVersion="7"/> android:minSdkVersion="7"/>
<supports-screens android:xlargeScreens="true" android:largeScreens="true"/> <supports-screens android:xlargeScreens="true" android:largeScreens="true"/>
@ -192,7 +182,7 @@
<receiver android:name="com.todoroo.astrid.reminders.Notifications$ShowNotificationReceiver"> <receiver android:name="com.todoroo.astrid.reminders.Notifications$ShowNotificationReceiver">
<intent-filter> <intent-filter>
<action android:name="com.timsu.astrid.IN_APP_NOTIFY"/> <action android:name="org.astrid.IN_APP_NOTIFY"/>
</intent-filter> </intent-filter>
</receiver> </receiver>
@ -208,7 +198,7 @@
<receiver android:name="com.todoroo.astrid.service.GlobalEventReceiver"> <receiver android:name="com.todoroo.astrid.service.GlobalEventReceiver">
<intent-filter> <intent-filter>
<action android:name="com.todoroo.astrid.FLUSH_DETAILS" /> <action android:name="org.astrid.FLUSH_DETAILS" />
</intent-filter> </intent-filter>
</receiver> </receiver>
@ -220,7 +210,7 @@
<receiver android:name="com.todoroo.astrid.reminders.ReengagementReceiver"> <receiver android:name="com.todoroo.astrid.reminders.ReengagementReceiver">
<intent-filter> <intent-filter>
<action android:name="com.timsu.astrid.SHOW_REENGAGEMENT"/> <action android:name="org.astrid.SHOW_REENGAGEMENT"/>
</intent-filter> </intent-filter>
</receiver> </receiver>
@ -231,37 +221,37 @@
<!-- ======================================================= Providers = --> <!-- ======================================================= Providers = -->
<provider android:name="com.todoroo.astrid.provider.Astrid2TaskProvider" <provider android:name="com.todoroo.astrid.provider.Astrid2TaskProvider"
android:authorities="com.timsu.astrid.tasksprovider" android:authorities="org.astrid.tasksprovider"
android:multiprocess="true" android:multiprocess="true"
android:grantUriPermissions="true" android:grantUriPermissions="true"
android:readPermission="com.timsu.astrid.permission.READ_TASKS"/> android:readPermission="org.astrid.permission.READ_TASKS"/>
<provider android:name="com.todoroo.astrid.provider.Astrid3ContentProvider" <provider android:name="com.todoroo.astrid.provider.Astrid3ContentProvider"
android:authorities="com.todoroo.astrid" android:authorities="org.astrid"
android:multiprocess="true" android:multiprocess="true"
android:grantUriPermissions="true" android:grantUriPermissions="true"
android:readPermission="com.todoroo.astrid.READ" android:readPermission="org.astrid.READ"
android:writePermission="com.todoroo.astrid.WRITE"/> android:writePermission="org.astrid.WRITE"/>
<provider android:name="com.todoroo.astrid.provider.SqlContentProvider" <provider android:name="com.todoroo.astrid.provider.SqlContentProvider"
android:authorities="com.todoroo.astrid.private" android:authorities="org.astrid.private"
android:multiprocess="true" android:multiprocess="true"
android:grantUriPermissions="true" android:grantUriPermissions="true"
android:readPermission="com.todoroo.astrid.READ" android:readPermission="org.astrid.READ"
android:writePermission="com.todoroo.astrid.WRITE"/> android:writePermission="org.astrid.WRITE"/>
<!-- ========================================================= Plugins = --> <!-- ========================================================= Plugins = -->
<!-- core --> <!-- core -->
<receiver android:name="com.todoroo.astrid.core.CorePlugin"> <receiver android:name="com.todoroo.astrid.core.CorePlugin">
<intent-filter> <intent-filter>
<action android:name="com.todoroo.astrid.REQUEST_ADDONS" /> <action android:name="org.astrid.REQUEST_ADDONS" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
</intent-filter> </intent-filter>
</receiver> </receiver>
<receiver android:name="com.todoroo.astrid.core.CoreFilterExposer"> <receiver android:name="com.todoroo.astrid.core.CoreFilterExposer">
<intent-filter android:priority="9000"> <intent-filter android:priority="9000">
<action android:name="com.todoroo.astrid.REQUEST_FILTERS" /> <action android:name="org.astrid.REQUEST_FILTERS" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
</intent-filter> </intent-filter>
</receiver> </receiver>
@ -271,7 +261,7 @@
<meta-data android:name="summary" <meta-data android:name="summary"
android:resource="@string/EPr_defaults_summary" /> android:resource="@string/EPr_defaults_summary" />
<intent-filter> <intent-filter>
<action android:name="com.todoroo.astrid.SETTINGS" /> <action android:name="org.astrid.SETTINGS" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
</intent-filter> </intent-filter>
</activity> </activity>
@ -286,25 +276,25 @@
<!-- tags --> <!-- tags -->
<receiver android:name="com.todoroo.astrid.tags.TagsPlugin"> <receiver android:name="com.todoroo.astrid.tags.TagsPlugin">
<intent-filter> <intent-filter>
<action android:name="com.todoroo.astrid.REQUEST_ADDONS" /> <action android:name="org.astrid.REQUEST_ADDONS" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
</intent-filter> </intent-filter>
</receiver> </receiver>
<receiver android:name="com.todoroo.astrid.tags.TagFilterExposer"> <receiver android:name="com.todoroo.astrid.tags.TagFilterExposer">
<intent-filter> <intent-filter>
<action android:name="com.todoroo.astrid.REQUEST_FILTERS" /> <action android:name="org.astrid.REQUEST_FILTERS" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
</intent-filter> </intent-filter>
</receiver> </receiver>
<receiver android:name="com.todoroo.astrid.tags.TagCustomFilterCriteriaExposer"> <receiver android:name="com.todoroo.astrid.tags.TagCustomFilterCriteriaExposer">
<intent-filter> <intent-filter>
<action android:name="com.todoroo.astrid.REQUEST_CUSTOM_FILTER_CRITERIA" /> <action android:name="org.astrid.REQUEST_CUSTOM_FILTER_CRITERIA" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
</intent-filter> </intent-filter>
</receiver> </receiver>
<receiver android:name="com.todoroo.astrid.tags.TagDetailExposer"> <receiver android:name="com.todoroo.astrid.tags.TagDetailExposer">
<intent-filter> <intent-filter>
<action android:name="com.todoroo.astrid.REQUEST_DETAILS" /> <action android:name="org.astrid.REQUEST_DETAILS" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
</intent-filter> </intent-filter>
</receiver> </receiver>
@ -312,7 +302,7 @@
<!-- custom filters --> <!-- custom filters -->
<receiver android:name="com.todoroo.astrid.core.CustomFilterExposer"> <receiver android:name="com.todoroo.astrid.core.CustomFilterExposer">
<intent-filter android:priority="9000"> <intent-filter android:priority="9000">
<action android:name="com.todoroo.astrid.REQUEST_FILTERS" /> <action android:name="org.astrid.REQUEST_FILTERS" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
</intent-filter> </intent-filter>
</receiver> </receiver>
@ -324,7 +314,7 @@
<!-- People view --> <!-- People view -->
<receiver android:name="com.todoroo.astrid.people.PeopleFilterExposer"> <receiver android:name="com.todoroo.astrid.people.PeopleFilterExposer">
<intent-filter> <intent-filter>
<action android:name="com.timsu.astrid.REQUEST_PEOPLE_FILTERS"/> <action android:name="org.astrid.REQUEST_PEOPLE_FILTERS"/>
<category android:name="android.intent.category.DEFAULT"/> <category android:name="android.intent.category.DEFAULT"/>
</intent-filter> </intent-filter>
</receiver> </receiver>
@ -333,7 +323,7 @@
<!-- Featured lists --> <!-- Featured lists -->
<receiver android:name="com.todoroo.astrid.tags.reusable.FeaturedListFilterExposer"> <receiver android:name="com.todoroo.astrid.tags.reusable.FeaturedListFilterExposer">
<intent-filter> <intent-filter>
<action android:name="com.timsu.astrid.REQUEST_FEATURED_LISTS"/> <action android:name="org.astrid.REQUEST_FEATURED_LISTS"/>
<category android:name="android.intent.category.DEFAULT"/> <category android:name="android.intent.category.DEFAULT"/>
</intent-filter> </intent-filter>
</receiver> </receiver>
@ -343,13 +333,13 @@
<!-- alarms --> <!-- alarms -->
<receiver android:name="com.todoroo.astrid.alarms.AlarmTaskRepeatListener"> <receiver android:name="com.todoroo.astrid.alarms.AlarmTaskRepeatListener">
<intent-filter> <intent-filter>
<action android:name="com.todoroo.astrid.TASK_REPEATED" /> <action android:name="org.astrid.TASK_REPEATED" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
</intent-filter> </intent-filter>
</receiver> </receiver>
<receiver android:name="com.todoroo.astrid.alarms.AlarmDetailExposer"> <receiver android:name="com.todoroo.astrid.alarms.AlarmDetailExposer">
<intent-filter> <intent-filter>
<action android:name="com.todoroo.astrid.REQUEST_DETAILS" /> <action android:name="org.astrid.REQUEST_DETAILS" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
</intent-filter> </intent-filter>
</receiver> </receiver>
@ -375,17 +365,7 @@
<activity android:name="com.todoroo.astrid.actfm.CommentsActivity" <activity android:name="com.todoroo.astrid.actfm.CommentsActivity"
android:windowSoftInputMode="stateHidden"/> android:windowSoftInputMode="stateHidden"/>
<receiver android:name="com.google.android.gcm.GCMBroadcastReceiver" android:permission="com.google.android.c2dm.permission.SEND" > <receiver android:name="com.todoroo.astrid.actfm.sync.ActFmSyncThread$NetworkStateChangedReceiver">
<intent-filter>
<action android:name="com.google.android.c2dm.intent.RECEIVE" />
<action android:name="com.google.android.c2dm.intent.REGISTRATION" />
<category android:name="com.timsu.astrid" />
</intent-filter>
</receiver>
<service android:name=".GCMIntentService" />
<receiver android:name="com.todoroo.astrid.actfm.sync.ActFmSyncThread$NetworkStateChangedReceiver">
<intent-filter> <intent-filter>
<action android:name="android.net.conn.CONNECTIVITY_CHANGE" /> <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
</intent-filter> </intent-filter>
@ -405,13 +385,13 @@
android:theme="@style/Theme" android:configChanges="orientation|keyboardHidden"/> android:theme="@style/Theme" android:configChanges="orientation|keyboardHidden"/>
<receiver android:name="com.todoroo.astrid.gtasks.GtasksCustomFilterCriteriaExposer"> <receiver android:name="com.todoroo.astrid.gtasks.GtasksCustomFilterCriteriaExposer">
<intent-filter> <intent-filter>
<action android:name="com.todoroo.astrid.REQUEST_CUSTOM_FILTER_CRITERIA" /> <action android:name="org.astrid.REQUEST_CUSTOM_FILTER_CRITERIA" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
</intent-filter> </intent-filter>
</receiver> </receiver>
<receiver android:name="com.todoroo.astrid.gtasks.GtasksFilterExposer"> <receiver android:name="com.todoroo.astrid.gtasks.GtasksFilterExposer">
<intent-filter> <intent-filter>
<action android:name="com.todoroo.astrid.REQUEST_FILTERS" /> <action android:name="org.astrid.REQUEST_FILTERS" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
</intent-filter> </intent-filter>
</receiver> </receiver>
@ -419,7 +399,7 @@
android:theme="@android:style/Theme.Dialog"/> android:theme="@android:style/Theme.Dialog"/>
<receiver android:name="com.todoroo.astrid.gtasks.GtasksDetailExposer"> <receiver android:name="com.todoroo.astrid.gtasks.GtasksDetailExposer">
<intent-filter> <intent-filter>
<action android:name="com.todoroo.astrid.REQUEST_DETAILS" /> <action android:name="org.astrid.REQUEST_DETAILS" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
</intent-filter> </intent-filter>
</receiver> </receiver>
@ -432,13 +412,13 @@
<meta-data android:name="syncAction" <meta-data android:name="syncAction"
android:value="true" /> android:value="true" />
<intent-filter> <intent-filter>
<action android:name="com.todoroo.astrid.SETTINGS" /> <action android:name="org.astrid.SETTINGS" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
</intent-filter> </intent-filter>
</activity> </activity>
<service android:name="com.todoroo.astrid.gtasks.GtasksBackgroundService"> <service android:name="com.todoroo.astrid.gtasks.GtasksBackgroundService">
<intent-filter> <intent-filter>
<action android:name="com.todoroo.astrid.gtasks.SYNC" /> <action android:name="org.astrid.gtasks.SYNC" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
</intent-filter> </intent-filter>
</service> </service>
@ -452,19 +432,19 @@
<!-- repeats --> <!-- repeats -->
<receiver android:name="com.todoroo.astrid.repeats.RepeatsPlugin"> <receiver android:name="com.todoroo.astrid.repeats.RepeatsPlugin">
<intent-filter> <intent-filter>
<action android:name="com.todoroo.astrid.REQUEST_ADDONS" /> <action android:name="org.astrid.REQUEST_ADDONS" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
</intent-filter> </intent-filter>
</receiver> </receiver>
<receiver android:name="com.todoroo.astrid.repeats.RepeatTaskCompleteListener"> <receiver android:name="com.todoroo.astrid.repeats.RepeatTaskCompleteListener">
<intent-filter android:priority="1"> <intent-filter android:priority="1">
<action android:name="com.todoroo.astrid.TASK_COMPLETED" /> <action android:name="org.astrid.TASK_COMPLETED" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
</intent-filter> </intent-filter>
</receiver> </receiver>
<receiver android:name="com.todoroo.astrid.repeats.RepeatDetailExposer"> <receiver android:name="com.todoroo.astrid.repeats.RepeatDetailExposer">
<intent-filter> <intent-filter>
<action android:name="com.todoroo.astrid.REQUEST_DETAILS" /> <action android:name="org.astrid.REQUEST_DETAILS" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
</intent-filter> </intent-filter>
</receiver> </receiver>
@ -472,7 +452,7 @@
<!-- calendar --> <!-- calendar -->
<receiver android:name="com.todoroo.astrid.gcal.GCalTaskCompleteListener"> <receiver android:name="com.todoroo.astrid.gcal.GCalTaskCompleteListener">
<intent-filter android:priority="2"> <intent-filter android:priority="2">
<action android:name="com.todoroo.astrid.TASK_COMPLETED" /> <action android:name="org.astrid.TASK_COMPLETED" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
</intent-filter> </intent-filter>
</receiver> </receiver>
@ -483,7 +463,7 @@
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
</intent-filter> </intent-filter>
<intent-filter> <intent-filter>
<action android:name="com.todoroo.astrid.SCHEDULE_CAL_REMINDERS"/> <action android:name="org.astrid.SCHEDULE_CAL_REMINDERS"/>
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
</intent-filter> </intent-filter>
</receiver> </receiver>
@ -505,7 +485,7 @@
<meta-data android:name="category" <meta-data android:name="category"
android:resource="@string/SyP_label" /> android:resource="@string/SyP_label" />
<intent-filter> <intent-filter>
<action android:name="com.todoroo.astrid.SETTINGS" /> <action android:name="org.astrid.SETTINGS" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
</intent-filter> </intent-filter>
</activity> </activity>
@ -520,7 +500,7 @@
<meta-data android:name="category" <meta-data android:name="category"
android:resource="@string/SyP_label" /> android:resource="@string/SyP_label" />
<intent-filter> <intent-filter>
<action android:name="com.todoroo.astrid.SETTINGS" /> <action android:name="org.astrid.SETTINGS" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
</intent-filter> </intent-filter>
</activity> </activity>
@ -532,19 +512,6 @@
</receiver> </receiver>
<!-- premium --> <!-- premium -->
<service android:name="com.todoroo.astrid.billing.BillingService" />
<receiver android:name="com.todoroo.astrid.billing.BillingReceiver">
<intent-filter>
<action android:name="com.android.vending.billing.IN_APP_NOTIFY" />
<action android:name="com.android.vending.billing.RESPONSE_CODE" />
<action android:name="com.android.vending.billing.PURCHASE_STATE_CHANGED" />
</intent-filter>
</receiver>
<activity android:name="com.todoroo.astrid.billing.BillingActivity"
android:screenOrientation="portrait"/>
<activity android:name="com.todoroo.astrid.files.AACRecordingActivity" <activity android:name="com.todoroo.astrid.files.AACRecordingActivity"
android:configChanges="orientation|screenSize" android:configChanges="orientation|screenSize"
android:screenOrientation="portrait" android:screenOrientation="portrait"
@ -570,20 +537,20 @@
<!-- notes --> <!-- notes -->
<receiver android:name="com.todoroo.astrid.notes.NotesDetailExposer"> <receiver android:name="com.todoroo.astrid.notes.NotesDetailExposer">
<intent-filter> <intent-filter>
<action android:name="com.todoroo.astrid.REQUEST_DETAILS" /> <action android:name="org.astrid.REQUEST_DETAILS" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
</intent-filter> </intent-filter>
</receiver> </receiver>
<receiver android:name="com.todoroo.astrid.timers.TimerFilterExposer"> <receiver android:name="com.todoroo.astrid.timers.TimerFilterExposer">
<intent-filter android:priority="10000"> <intent-filter android:priority="10000">
<action android:name="com.todoroo.astrid.REQUEST_FILTERS" /> <action android:name="org.astrid.REQUEST_FILTERS" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
</intent-filter> </intent-filter>
</receiver> </receiver>
<receiver android:name="com.todoroo.astrid.timers.TimerTaskCompleteListener"> <receiver android:name="com.todoroo.astrid.timers.TimerTaskCompleteListener">
<intent-filter> <intent-filter>
<action android:name="com.todoroo.astrid.TASK_COMPLETED" /> <action android:name="org.astrid.TASK_COMPLETED" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
</intent-filter> </intent-filter>
</receiver> </receiver>
@ -595,7 +562,7 @@
<meta-data android:name="summary" <meta-data android:name="summary"
android:resource="@string/rmd_EPr_alerts_summary" /> android:resource="@string/rmd_EPr_alerts_summary" />
<intent-filter> <intent-filter>
<action android:name="com.todoroo.astrid.SETTINGS" /> <action android:name="org.astrid.SETTINGS" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
</intent-filter> </intent-filter>
</activity> </activity>
@ -615,7 +582,7 @@
<!-- other task actions --> <!-- other task actions -->
<receiver android:name="com.todoroo.astrid.core.LinkActionExposer"> <receiver android:name="com.todoroo.astrid.core.LinkActionExposer">
<intent-filter> <intent-filter>
<action android:name="com.todoroo.astrid.REQUEST_ACTIONS" /> <action android:name="org.astrid.REQUEST_ACTIONS" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
</intent-filter> </intent-filter>
</receiver> </receiver>

@ -33,7 +33,7 @@ import android.view.WindowManager;
import android.widget.AdapterView; import android.widget.AdapterView;
import android.widget.ImageView; import android.widget.ImageView;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.andlib.utility.AndroidUtilities; import com.todoroo.andlib.utility.AndroidUtilities;
import com.todoroo.astrid.ui.ErrorCatchingListView; import com.todoroo.astrid.ui.ErrorCatchingListView;

@ -1,463 +0,0 @@
package com.timsu.astrid;
import java.io.IOException;
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 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.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;
@SuppressWarnings("nls")
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")) {
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<TagData> 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>(TagData.class, uuid, pushedAt), ActFmSyncThread.DEFAULT_REFRESH_RUNNABLE);
} else if(intent.hasExtra("task_id")) {
String uuid = intent.getStringExtra("task_id");
TodorooCursor<Task> 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>(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<Task> 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>(Task.class, uuid, pushedAt), null);
Filter filter = new Filter("", task.getValue(Task.TITLE),
new QueryTemplate().where(Task.ID.eq(task.getId())),
null);
Intent launchIntent = ShortcutActivity.createIntent(filter);
return launchIntent;
} finally {
cursor.close();
}
}
private Intent createTagIntent(final Context context, final Intent intent) {
String uuid = intent.getStringExtra("tag_id");
TodorooCursor<TagData> 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>(TagData.class, uuid, pushedAt), null);
FilterWithCustomIntent filter = (FilterWithCustomIntent)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 final 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 final 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);
}
}
}
}

@ -22,7 +22,7 @@ import android.provider.MediaStore;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
import android.widget.ArrayAdapter; import android.widget.ArrayAdapter;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.andlib.utility.AndroidUtilities; import com.todoroo.andlib.utility.AndroidUtilities;
import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.andlib.utility.DateUtilities;

@ -27,7 +27,7 @@ import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
import com.google.api.client.googleapis.extensions.android2.auth.GoogleAccountManager; import com.google.api.client.googleapis.extensions.android2.auth.GoogleAccountManager;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.service.ContextManager;
import com.todoroo.andlib.utility.DialogUtilities; import com.todoroo.andlib.utility.DialogUtilities;

@ -9,7 +9,7 @@ import android.content.BroadcastReceiver;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.Autowired;
import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.service.ContextManager;
import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.andlib.service.DependencyInjectionService;

@ -12,7 +12,7 @@ import android.widget.TextView;
import com.actionbarsherlock.app.ActionBar; import com.actionbarsherlock.app.ActionBar;
import com.actionbarsherlock.view.MenuItem; import com.actionbarsherlock.view.MenuItem;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.andlib.utility.AndroidUtilities; import com.todoroo.andlib.utility.AndroidUtilities;
import com.todoroo.astrid.activity.AstridActivity; import com.todoroo.astrid.activity.AstridActivity;
import com.todoroo.astrid.service.ThemeService; import com.todoroo.astrid.service.ThemeService;

@ -40,7 +40,7 @@ import com.actionbarsherlock.app.SherlockListFragment;
import com.actionbarsherlock.view.Menu; import com.actionbarsherlock.view.Menu;
import com.actionbarsherlock.view.MenuInflater; import com.actionbarsherlock.view.MenuInflater;
import com.actionbarsherlock.view.MenuItem; import com.actionbarsherlock.view.MenuItem;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.Autowired;
import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.andlib.service.DependencyInjectionService;
import com.todoroo.astrid.actfm.ActFmCameraModule.CameraResultCallback; import com.todoroo.astrid.actfm.ActFmCameraModule.CameraResultCallback;

@ -39,7 +39,7 @@ import android.widget.ListView;
import android.widget.TextView; import android.widget.TextView;
import com.commonsware.cwac.merge.MergeAdapter; import com.commonsware.cwac.merge.MergeAdapter;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.data.TodorooCursor;
import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.Autowired;
import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.andlib.service.DependencyInjectionService;

@ -15,7 +15,7 @@ import android.view.ViewGroup;
import android.widget.ListView; import android.widget.ListView;
import android.widget.TextView; import android.widget.TextView;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.Autowired;
import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.andlib.utility.DateUtilities;
import com.todoroo.andlib.utility.Preferences; import com.todoroo.andlib.utility.Preferences;

@ -34,7 +34,7 @@ import com.actionbarsherlock.app.SherlockFragmentActivity;
import com.actionbarsherlock.view.Menu; import com.actionbarsherlock.view.Menu;
import com.actionbarsherlock.view.MenuItem; import com.actionbarsherlock.view.MenuItem;
import com.actionbarsherlock.view.Window; import com.actionbarsherlock.view.Window;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.data.TodorooCursor;
import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.Autowired;
import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.andlib.service.DependencyInjectionService;

@ -34,7 +34,7 @@ import android.widget.TextView;
import com.actionbarsherlock.view.Menu; import com.actionbarsherlock.view.Menu;
import com.actionbarsherlock.view.MenuItem; import com.actionbarsherlock.view.MenuItem;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.data.TodorooCursor;
import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.Autowired;
import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.service.ContextManager;

@ -5,7 +5,7 @@ import android.database.Cursor;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.ListView; import android.widget.ListView;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.Autowired;
import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.andlib.utility.DateUtilities;
import com.todoroo.astrid.actfm.sync.ActFmSyncThread; import com.todoroo.astrid.actfm.sync.ActFmSyncThread;

@ -25,8 +25,7 @@ import org.json.JSONObject;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import com.timsu.astrid.GCMIntentService; import org.astrid.R;
import com.timsu.astrid.R;
import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.Autowired;
import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.andlib.service.DependencyInjectionService;
import com.todoroo.andlib.service.RestClient; import com.todoroo.andlib.service.RestClient;
@ -190,22 +189,12 @@ public class ActFmInvoker {
} }
} }
public JSONObject postSync(String data, MultipartEntity entity, boolean changesHappened, String tok) throws IOException, public JSONObject postSync(String data, MultipartEntity entity, boolean changesHappened, String tok) throws IOException {
ActFmServiceException {
try { try {
String timeString = DateUtilities.timeToIso8601(DateUtilities.now(), true); String timeString = DateUtilities.timeToIso8601(DateUtilities.now(), true);
Object[] params = { "token", tok, "data", data, "time", timeString }; 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); String request = createFetchUrl("api/" + API_VERSION, "synchronize", params);
if (SYNC_DEBUG) { if (SYNC_DEBUG) {
Log.e("act-fm-post", request); Log.e("act-fm-post", request);

@ -10,13 +10,11 @@ import org.json.JSONObject;
import android.text.TextUtils; import android.text.TextUtils;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.andlib.utility.Preferences; import com.todoroo.andlib.utility.Preferences;
import com.todoroo.astrid.billing.BillingConstants;
import com.todoroo.astrid.dao.RemoteModelDao; import com.todoroo.astrid.dao.RemoteModelDao;
import com.todoroo.astrid.data.RemoteModel; import com.todoroo.astrid.data.RemoteModel;
import com.todoroo.astrid.service.PremiumUnlockService; import com.todoroo.astrid.service.PremiumUnlockService;
import com.todoroo.astrid.service.StatisticsConstants;
import com.todoroo.astrid.sync.SyncProviderUtilities; import com.todoroo.astrid.sync.SyncProviderUtilities;
import com.todoroo.astrid.utility.AstridPreferences; import com.todoroo.astrid.utility.AstridPreferences;
@ -153,20 +151,7 @@ public class ActFmPreferenceService extends SyncProviderUtilities {
} }
public static boolean isPremiumUser() { public static boolean isPremiumUser() {
if (Preferences.getBoolean(PremiumUnlockService.PREF_KILL_SWITCH, false)) { return true;
return true;
}
if (Preferences.getBoolean(BillingConstants.PREF_NEEDS_SERVER_UPDATE, false)) {
return Preferences.getBoolean(PREF_LOCAL_PREMIUM, false);
}
return Preferences.getBoolean(PREF_PREMIUM, false);
}
public static void premiumLogout() {
Preferences.setBoolean(BillingConstants.PREF_NEEDS_SERVER_UPDATE, false);
Preferences.setBoolean(PREF_LOCAL_PREMIUM, false);
Preferences.setBoolean(PREF_PREMIUM, false);
} }
@Override @Override

@ -6,21 +6,17 @@
package com.todoroo.astrid.actfm.sync; package com.todoroo.astrid.actfm.sync;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.json.JSONArray; import org.json.JSONArray;
import org.json.JSONException; import org.json.JSONException;
import org.json.JSONObject; import org.json.JSONObject;
import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import com.timsu.astrid.GCMIntentService;
import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.Autowired;
import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.andlib.service.DependencyInjectionService;
import com.todoroo.andlib.utility.Preferences; import com.todoroo.andlib.utility.Preferences;
import com.todoroo.astrid.billing.BillingConstants;
import com.todoroo.astrid.data.RemoteModel; import com.todoroo.astrid.data.RemoteModel;
import com.todoroo.astrid.data.TagData; import com.todoroo.astrid.data.TagData;
import com.todoroo.astrid.data.User; import com.todoroo.astrid.data.User;
@ -85,72 +81,6 @@ public final class ActFmSyncService {
return result.optInt("time", 0); return result.optInt("time", 0);
} }
public void updateUserSubscriptionStatus(Runnable onSuccess, Runnable onRecoverableError, Runnable onInvalidToken) {
String purchaseToken = Preferences.getStringValue(BillingConstants.PREF_PURCHASE_TOKEN);
String productId = Preferences.getStringValue(BillingConstants.PREF_PRODUCT_ID);
try {
if (!checkForToken()) {
throw new ActFmServiceException("Not logged in", null);
}
ArrayList<Object> params = new ArrayList<Object>();
params.add("purchase_token"); params.add(purchaseToken);
params.add("product_id"); params.add(productId);
addAbTestEventInfo(params);
params.add("token"); params.add(token);
actFmInvoker.invoke("premium_update_android", params.toArray(new Object[params.size()]));
Preferences.setBoolean(BillingConstants.PREF_NEEDS_SERVER_UPDATE, false);
if (onSuccess != null) {
onSuccess.run();
}
} catch (Exception e) {
if (e instanceof ActFmServiceException) {
ActFmServiceException ae = (ActFmServiceException)e;
if (ae.result != null && ae.result.optString("status").equals("error")) {
if (ae.result.optString("code").equals("invalid_purchase_token")) { // Not a valid purchase--expired or duolicate
Preferences.setBoolean(ActFmPreferenceService.PREF_LOCAL_PREMIUM, false);
Preferences.setBoolean(BillingConstants.PREF_NEEDS_SERVER_UPDATE, false);
if (onInvalidToken != null) {
onInvalidToken.run();
}
return;
}
}
}
Preferences.setBoolean(BillingConstants.PREF_NEEDS_SERVER_UPDATE, true);
if (onRecoverableError != null) {
onRecoverableError.run();
}
}
}
public void setGCMRegistration(String regId) {
try {
String deviceId = GCMIntentService.getDeviceID();
String existingC2DM = Preferences.getStringValue(GCMIntentService.PREF_C2DM_REGISTRATION);
ArrayList<Object> params = new ArrayList<Object>();
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 // --- generic invokation
/** invoke authenticated method against the server */ /** invoke authenticated method against the server */

@ -25,7 +25,7 @@ import android.net.NetworkInfo;
import android.support.v4.app.NotificationCompat; import android.support.v4.app.NotificationCompat;
import android.util.Log; import android.util.Log;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.data.TodorooCursor;
import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.Autowired;
import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.service.ContextManager;

@ -11,7 +11,7 @@ import org.json.JSONObject;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.andlib.data.AbstractModel; import com.todoroo.andlib.data.AbstractModel;
import com.todoroo.andlib.data.Property; import com.todoroo.andlib.data.Property;
import com.todoroo.andlib.data.Property.StringProperty; import com.todoroo.andlib.data.Property.StringProperty;

@ -16,7 +16,7 @@ import android.widget.ImageButton;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.TextView; import android.widget.TextView;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.data.TodorooCursor;
import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.andlib.utility.DateUtilities;
import com.todoroo.astrid.data.Metadata; import com.todoroo.astrid.data.Metadata;

@ -11,7 +11,7 @@ import android.view.View;
import android.view.View.OnClickListener; import android.view.View.OnClickListener;
import android.widget.Button; import android.widget.Button;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.service.ContextManager;
import com.todoroo.astrid.utility.Flags; import com.todoroo.astrid.utility.Flags;

@ -16,7 +16,7 @@ import android.preference.Preference.OnPreferenceClickListener;
import android.view.View; import android.view.View;
import android.view.ViewGroup.OnHierarchyChangeListener; import android.view.ViewGroup.OnHierarchyChangeListener;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.Autowired;
import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.andlib.service.DependencyInjectionService;
import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.andlib.utility.DateUtilities;

@ -18,7 +18,7 @@ import android.content.Intent;
import android.os.IBinder; import android.os.IBinder;
import android.util.Log; import android.util.Log;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.service.ContextManager;
import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.andlib.utility.DateUtilities;
import com.todoroo.andlib.utility.Preferences; import com.todoroo.andlib.utility.Preferences;

@ -13,7 +13,7 @@ import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.util.Log; import android.util.Log;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.andlib.utility.AndroidUtilities; import com.todoroo.andlib.utility.AndroidUtilities;
@SuppressWarnings("nls") @SuppressWarnings("nls")

@ -19,7 +19,7 @@ import android.util.Log;
import android.util.Xml; import android.util.Xml;
import android.widget.Toast; import android.widget.Toast;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.andlib.data.AbstractModel; import com.todoroo.andlib.data.AbstractModel;
import com.todoroo.andlib.data.Property; import com.todoroo.andlib.data.Property;
import com.todoroo.andlib.data.Property.PropertyVisitor; import com.todoroo.andlib.data.Property.PropertyVisitor;

@ -28,7 +28,7 @@ import android.util.Log;
import android.view.WindowManager.BadTokenException; import android.view.WindowManager.BadTokenException;
import com.google.ical.values.RRule; import com.google.ical.values.RRule;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.andlib.data.AbstractModel; import com.todoroo.andlib.data.AbstractModel;
import com.todoroo.andlib.data.Property; import com.todoroo.andlib.data.Property;
import com.todoroo.andlib.data.Property.PropertyVisitor; import com.todoroo.andlib.data.Property.PropertyVisitor;

@ -24,7 +24,7 @@ import android.view.View.OnClickListener;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.Autowired;
import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.andlib.service.DependencyInjectionService;
import com.todoroo.andlib.utility.AndroidUtilities; import com.todoroo.andlib.utility.AndroidUtilities;

@ -18,7 +18,7 @@ import android.telephony.TelephonyManager;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.andlib.utility.AndroidUtilities; import com.todoroo.andlib.utility.AndroidUtilities;
import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.andlib.utility.DateUtilities;
import com.todoroo.andlib.utility.Preferences; import com.todoroo.andlib.utility.Preferences;

@ -16,7 +16,7 @@ import android.content.Intent;
import android.content.res.Resources; import android.content.res.Resources;
import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.BitmapDrawable;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.service.ContextManager;
import com.todoroo.andlib.sql.Criterion; import com.todoroo.andlib.sql.Criterion;
import com.todoroo.andlib.sql.Join; import com.todoroo.andlib.sql.Join;

@ -36,7 +36,7 @@ import android.widget.TextView;
import com.actionbarsherlock.app.ActionBar; import com.actionbarsherlock.app.ActionBar;
import com.actionbarsherlock.app.SherlockFragmentActivity; import com.actionbarsherlock.app.SherlockFragmentActivity;
import com.actionbarsherlock.view.MenuItem; import com.actionbarsherlock.view.MenuItem;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.andlib.data.Property.CountProperty; import com.todoroo.andlib.data.Property.CountProperty;
import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.Autowired;
import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.service.ContextManager;

@ -22,7 +22,7 @@ import android.widget.FrameLayout;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.astrid.api.MultipleSelectCriterion; import com.todoroo.astrid.api.MultipleSelectCriterion;
import com.todoroo.astrid.api.TextInputCriterion; import com.todoroo.astrid.api.TextInputCriterion;
import com.todoroo.astrid.core.CustomFilterActivity.CriterionInstance; import com.todoroo.astrid.core.CustomFilterActivity.CriterionInstance;

@ -16,7 +16,7 @@ import android.content.res.Resources;
import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.BitmapDrawable;
import android.os.Bundle; import android.os.Bundle;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.data.TodorooCursor;
import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.Autowired;
import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.service.ContextManager;

@ -11,7 +11,7 @@ import android.os.Bundle;
import android.preference.ListPreference; import android.preference.ListPreference;
import android.preference.Preference; import android.preference.Preference;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.andlib.utility.AndroidUtilities; import com.todoroo.andlib.utility.AndroidUtilities;
import com.todoroo.andlib.utility.Preferences; import com.todoroo.andlib.utility.Preferences;
import com.todoroo.andlib.utility.TodorooPreferenceActivity; import com.todoroo.andlib.utility.TodorooPreferenceActivity;

@ -21,7 +21,7 @@ import android.text.Spannable;
import android.text.style.URLSpan; import android.text.style.URLSpan;
import android.text.util.Linkify; import android.text.util.Linkify;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.andlib.utility.Preferences; import com.todoroo.andlib.utility.Preferences;
import com.todoroo.astrid.api.TaskAction; import com.todoroo.astrid.api.TaskAction;
import com.todoroo.astrid.api.TaskDecoration; import com.todoroo.astrid.api.TaskDecoration;

@ -14,8 +14,7 @@ import android.preference.Preference;
import android.preference.Preference.OnPreferenceClickListener; import android.preference.Preference.OnPreferenceClickListener;
import android.preference.PreferenceScreen; import android.preference.PreferenceScreen;
import com.timsu.astrid.GCMIntentService; import org.astrid.R;
import com.timsu.astrid.R;
import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.data.TodorooCursor;
import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.Autowired;
import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.andlib.service.DependencyInjectionService;
@ -132,7 +131,6 @@ public class OldTaskPreferences extends TodorooPreferenceActivity {
deleteDatabase(database.getName()); deleteDatabase(database.getName());
AstridPreferences.setPreferenceDefaults(); AstridPreferences.setPreferenceDefaults();
GCMIntentService.unregister(OldTaskPreferences.this);
System.exit(0); System.exit(0);
} }

@ -17,7 +17,7 @@ import android.view.View.OnClickListener;
import android.widget.Chronometer; import android.widget.Chronometer;
import android.widget.Toast; import android.widget.Toast;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.aacenc.AACRecorder; import com.todoroo.aacenc.AACRecorder;
import com.todoroo.aacenc.AACRecorder.AACRecorderCallbacks; import com.todoroo.aacenc.AACRecorder.AACRecorderCallbacks;
import com.todoroo.aacenc.AACToM4A; import com.todoroo.aacenc.AACToM4A;

@ -25,7 +25,7 @@ import android.widget.ArrayAdapter;
import android.widget.ListAdapter; import android.widget.ListAdapter;
import android.widget.TextView; import android.widget.TextView;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.andlib.utility.DialogUtilities; import com.todoroo.andlib.utility.DialogUtilities;
/** /**

@ -13,7 +13,7 @@ import java.util.concurrent.atomic.AtomicReference;
import android.content.Context; import android.content.Context;
import android.text.TextUtils; import android.text.TextUtils;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.andlib.utility.DateUtilities;
import com.todoroo.andlib.utility.Preferences; import com.todoroo.andlib.utility.Preferences;
import com.todoroo.astrid.data.TaskAttachment; import com.todoroo.astrid.data.TaskAttachment;

@ -31,7 +31,7 @@ import android.widget.LinearLayout.LayoutParams;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.aacenc.RecognizerApi; import com.todoroo.aacenc.RecognizerApi;
import com.todoroo.aacenc.RecognizerApi.PlaybackExceptionHandler; import com.todoroo.aacenc.RecognizerApi.PlaybackExceptionHandler;
import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.data.TodorooCursor;

@ -16,7 +16,7 @@ import android.view.View;
import android.view.View.OnClickListener; import android.view.View.OnClickListener;
import android.widget.TextView; import android.widget.TextView;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.data.TodorooCursor;
import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.Autowired;
import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.andlib.service.DependencyInjectionService;

@ -15,7 +15,7 @@ import android.net.Uri;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.andlib.utility.AndroidUtilities; import com.todoroo.andlib.utility.AndroidUtilities;
import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.andlib.utility.DateUtilities;
import com.todoroo.andlib.utility.Preferences; import com.todoroo.andlib.utility.Preferences;

@ -11,7 +11,7 @@ import android.database.Cursor;
import android.net.Uri; import android.net.Uri;
import android.util.Log; import android.util.Log;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.andlib.utility.DateUtilities;
import com.todoroo.andlib.utility.Preferences; import com.todoroo.andlib.utility.Preferences;
import com.todoroo.astrid.utility.Constants; import com.todoroo.astrid.utility.Constants;

@ -15,7 +15,7 @@ import android.view.View;
import android.view.View.OnClickListener; import android.view.View.OnClickListener;
import android.widget.TextView; import android.widget.TextView;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.Autowired;
import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.andlib.service.DependencyInjectionService;
import com.todoroo.andlib.utility.AndroidUtilities; import com.todoroo.andlib.utility.AndroidUtilities;

@ -4,7 +4,7 @@ import android.content.BroadcastReceiver;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.service.ContextManager;
import com.todoroo.andlib.utility.Preferences; import com.todoroo.andlib.utility.Preferences;
import com.todoroo.astrid.api.AstridApiConstants; import com.todoroo.astrid.api.AstridApiConstants;

@ -17,7 +17,7 @@ import android.preference.ListPreference;
import android.provider.CalendarContract; import android.provider.CalendarContract;
import android.util.Log; import android.util.Log;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.service.ContextManager;
import com.todoroo.andlib.utility.AndroidUtilities; import com.todoroo.andlib.utility.AndroidUtilities;
import com.todoroo.andlib.utility.Preferences; import com.todoroo.andlib.utility.Preferences;

@ -27,7 +27,7 @@ import android.widget.Spinner;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.Autowired;
import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.andlib.service.DependencyInjectionService;
import com.todoroo.andlib.service.ExceptionService; import com.todoroo.andlib.service.ExceptionService;

@ -16,7 +16,7 @@ import android.text.TextUtils;
import android.text.format.Time; import android.text.format.Time;
import android.util.Log; import android.util.Log;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.service.ContextManager;
import com.todoroo.andlib.utility.AndroidUtilities; import com.todoroo.andlib.utility.AndroidUtilities;
import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.andlib.utility.DateUtilities;

@ -14,7 +14,7 @@ import android.net.Uri;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.service.ContextManager;
import com.todoroo.astrid.api.AstridApiConstants; import com.todoroo.astrid.api.AstridApiConstants;
import com.todoroo.astrid.core.PluginServices; import com.todoroo.astrid.core.PluginServices;

@ -12,7 +12,7 @@ import android.content.Intent;
import android.content.res.Resources; import android.content.res.Resources;
import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.BitmapDrawable;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.andlib.data.AbstractModel; import com.todoroo.andlib.data.AbstractModel;
import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.Autowired;
import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.service.ContextManager;

@ -14,7 +14,7 @@ import android.content.Intent;
import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.BitmapDrawable;
import android.os.Bundle; import android.os.Bundle;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.andlib.data.AbstractModel; import com.todoroo.andlib.data.AbstractModel;
import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.Autowired;
import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.service.ContextManager;

@ -15,7 +15,7 @@ import android.text.TextUtils;
import android.widget.EditText; import android.widget.EditText;
import android.widget.FrameLayout; import android.widget.FrameLayout;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.Autowired;
import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.andlib.service.DependencyInjectionService;
import com.todoroo.andlib.utility.DialogUtilities; import com.todoroo.andlib.utility.DialogUtilities;

@ -12,7 +12,7 @@ import android.os.Bundle;
import android.widget.TextView; import android.widget.TextView;
import com.actionbarsherlock.view.Menu; import com.actionbarsherlock.view.Menu;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.andlib.data.Property; import com.todoroo.andlib.data.Property;
import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.data.TodorooCursor;
import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.Autowired;

@ -5,7 +5,7 @@
*/ */
package com.todoroo.astrid.gtasks; package com.todoroo.astrid.gtasks;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.andlib.utility.Preferences; import com.todoroo.andlib.utility.Preferences;
import com.todoroo.astrid.service.StatisticsConstants; import com.todoroo.astrid.service.StatisticsConstants;
import com.todoroo.astrid.sync.SyncProviderUtilities; import com.todoroo.astrid.sync.SyncProviderUtilities;

@ -10,7 +10,7 @@ import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.Autowired;
import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.andlib.service.DependencyInjectionService;
import com.todoroo.andlib.utility.DialogUtilities; import com.todoroo.andlib.utility.DialogUtilities;

@ -10,7 +10,7 @@ import android.content.BroadcastReceiver;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.Autowired;
import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.service.ContextManager;
import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.andlib.service.DependencyInjectionService;

@ -17,7 +17,7 @@ import com.google.api.services.tasks.Tasks.TasksOperations.Move;
import com.google.api.services.tasks.model.Task; import com.google.api.services.tasks.model.Task;
import com.google.api.services.tasks.model.TaskList; import com.google.api.services.tasks.model.TaskList;
import com.google.api.services.tasks.model.TaskLists; import com.google.api.services.tasks.model.TaskLists;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.Autowired;
import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.service.ContextManager;
import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.andlib.service.DependencyInjectionService;

@ -27,7 +27,7 @@ import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
import com.google.api.client.googleapis.extensions.android2.auth.GoogleAccountManager; import com.google.api.client.googleapis.extensions.android2.auth.GoogleAccountManager;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.Autowired;
import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.service.ContextManager;
import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.andlib.service.DependencyInjectionService;

@ -16,7 +16,7 @@ import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import com.google.api.client.googleapis.extensions.android2.auth.GoogleAccountManager; import com.google.api.client.googleapis.extensions.android2.auth.GoogleAccountManager;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.service.ContextManager;
import com.todoroo.andlib.utility.Preferences; import com.todoroo.andlib.utility.Preferences;
import com.todoroo.astrid.gtasks.GtasksPreferenceService; import com.todoroo.astrid.gtasks.GtasksPreferenceService;

@ -18,7 +18,7 @@ import android.app.Activity;
import android.text.TextUtils; import android.text.TextUtils;
import com.google.api.services.tasks.model.Tasks; import com.google.api.services.tasks.model.Tasks;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.andlib.data.AbstractModel; import com.todoroo.andlib.data.AbstractModel;
import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.data.TodorooCursor;
import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.Autowired;

@ -18,7 +18,7 @@ import android.view.View;
import android.widget.ListView; import android.widget.ListView;
import android.widget.Spinner; import android.widget.Spinner;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.service.ContextManager;
import com.todoroo.andlib.utility.AndroidUtilities; import com.todoroo.andlib.utility.AndroidUtilities;
import com.todoroo.astrid.activity.AddOnActivity; import com.todoroo.astrid.activity.AddOnActivity;

@ -13,7 +13,7 @@ import android.os.Bundle;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.data.TodorooCursor;
import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.service.ContextManager;
import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.andlib.service.DependencyInjectionService;

@ -43,7 +43,7 @@ import android.widget.LinearLayout;
import android.widget.TextView; import android.widget.TextView;
import android.widget.TextView.OnEditorActionListener; import android.widget.TextView.OnEditorActionListener;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.data.TodorooCursor;
import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.Autowired;
import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.service.ContextManager;

@ -9,7 +9,7 @@ import android.app.PendingIntent;
import android.content.Intent; import android.content.Intent;
import android.widget.RemoteViews; import android.widget.RemoteViews;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.service.ContextManager;
import com.todoroo.andlib.utility.Preferences; import com.todoroo.andlib.utility.Preferences;
import com.todoroo.astrid.api.TaskDecoration; import com.todoroo.astrid.api.TaskDecoration;

@ -11,7 +11,7 @@ import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.text.TextUtils; import android.text.TextUtils;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.data.TodorooCursor;
import com.todoroo.andlib.sql.Order; import com.todoroo.andlib.sql.Order;
import com.todoroo.andlib.sql.Query; import com.todoroo.andlib.sql.Query;

@ -17,7 +17,7 @@ import android.widget.AutoCompleteTextView;
import android.widget.Spinner; import android.widget.Spinner;
import android.widget.TextView; import android.widget.TextView;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.andlib.data.Property.LongProperty; import com.todoroo.andlib.data.Property.LongProperty;
import com.todoroo.andlib.data.Property.StringProperty; import com.todoroo.andlib.data.Property.StringProperty;
import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.data.TodorooCursor;

@ -17,7 +17,7 @@ import android.graphics.drawable.BitmapDrawable;
import android.os.Bundle; import android.os.Bundle;
import android.text.TextUtils; import android.text.TextUtils;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.data.TodorooCursor;
import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.service.ContextManager;
import com.todoroo.andlib.sql.Criterion; import com.todoroo.andlib.sql.Criterion;

@ -2,7 +2,7 @@ package com.todoroo.astrid.people;
import android.content.Context; import android.content.Context;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.astrid.activity.FilterListFragment; import com.todoroo.astrid.activity.FilterListFragment;
import com.todoroo.astrid.activity.FilterModeSpec; import com.todoroo.astrid.activity.FilterModeSpec;
import com.todoroo.astrid.activity.TaskListFragment; import com.todoroo.astrid.activity.TaskListFragment;

@ -7,7 +7,7 @@ package com.todoroo.astrid.people;
import android.app.Activity; import android.app.Activity;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.astrid.activity.FilterListFragment; import com.todoroo.astrid.activity.FilterListFragment;
import com.todoroo.astrid.adapter.FilterAdapter; import com.todoroo.astrid.adapter.FilterAdapter;
import com.todoroo.astrid.utility.AstridPreferences; import com.todoroo.astrid.utility.AstridPreferences;

@ -18,7 +18,7 @@ import android.view.ViewGroup;
import android.widget.TextView; import android.widget.TextView;
import com.actionbarsherlock.view.Menu; import com.actionbarsherlock.view.Menu;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.data.TodorooCursor;
import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.Autowired;
import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.andlib.utility.DateUtilities;

@ -21,7 +21,7 @@ import android.widget.FrameLayout;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.Spinner; import android.widget.Spinner;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.andlib.utility.AndroidUtilities; import com.todoroo.andlib.utility.AndroidUtilities;
import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.andlib.utility.DateUtilities;
import com.todoroo.andlib.utility.Preferences; import com.todoroo.andlib.utility.Preferences;

@ -25,7 +25,7 @@ import android.telephony.TelephonyManager;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.Autowired;
import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.service.ContextManager;
import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.andlib.service.DependencyInjectionService;

@ -11,7 +11,7 @@ import android.view.View.OnClickListener;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.TextView; import android.widget.TextView;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.astrid.activity.TaskListFragment; import com.todoroo.astrid.activity.TaskListFragment;
import com.todoroo.astrid.service.ThemeService; import com.todoroo.astrid.service.ThemeService;

@ -17,7 +17,7 @@ import android.graphics.Color;
import android.os.Bundle; import android.os.Bundle;
import android.text.TextUtils; import android.text.TextUtils;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.data.TodorooCursor;
import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.Autowired;
import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.andlib.service.DependencyInjectionService;

@ -29,7 +29,7 @@ import android.widget.TextView;
import android.widget.TimePicker; import android.widget.TimePicker;
import android.widget.Toast; import android.widget.Toast;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.data.TodorooCursor;
import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.Autowired;
import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.andlib.service.DependencyInjectionService;

@ -8,7 +8,7 @@ package com.todoroo.astrid.reminders;
import android.content.res.Resources; import android.content.res.Resources;
import android.preference.Preference; import android.preference.Preference;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.andlib.utility.AndroidUtilities; import com.todoroo.andlib.utility.AndroidUtilities;
import com.todoroo.andlib.utility.Preferences; import com.todoroo.andlib.utility.Preferences;
import com.todoroo.andlib.utility.TodorooPreferenceActivity; import com.todoroo.andlib.utility.TodorooPreferenceActivity;

@ -17,7 +17,7 @@ import android.content.SharedPreferences.Editor;
import android.content.res.Resources; import android.content.res.Resources;
import android.util.Log; import android.util.Log;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.andlib.data.Property; import com.todoroo.andlib.data.Property;
import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.data.TodorooCursor;
import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.Autowired;

@ -32,7 +32,7 @@ import com.google.ical.values.Frequency;
import com.google.ical.values.RRule; import com.google.ical.values.RRule;
import com.google.ical.values.Weekday; import com.google.ical.values.Weekday;
import com.google.ical.values.WeekdayNum; import com.google.ical.values.WeekdayNum;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.Autowired;
import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.andlib.service.DependencyInjectionService;
import com.todoroo.andlib.service.ExceptionService; import com.todoroo.andlib.service.ExceptionService;

@ -17,7 +17,7 @@ import android.content.res.Resources;
import com.google.ical.values.Frequency; import com.google.ical.values.Frequency;
import com.google.ical.values.RRule; import com.google.ical.values.RRule;
import com.google.ical.values.WeekdayNum; import com.google.ical.values.WeekdayNum;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.astrid.api.AstridApiConstants; import com.todoroo.astrid.api.AstridApiConstants;
import com.todoroo.astrid.core.PluginServices; import com.todoroo.astrid.core.PluginServices;
import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.Task;

@ -9,7 +9,7 @@ import android.content.BroadcastReceiver;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.astrid.api.Addon; import com.todoroo.astrid.api.Addon;
import com.todoroo.astrid.api.AstridApiConstants; import com.todoroo.astrid.api.AstridApiConstants;

@ -18,7 +18,7 @@ import android.widget.ListView;
import com.commonsware.cwac.tlv.TouchListView.DropListener; import com.commonsware.cwac.tlv.TouchListView.DropListener;
import com.commonsware.cwac.tlv.TouchListView.GrabberClickListener; import com.commonsware.cwac.tlv.TouchListView.GrabberClickListener;
import com.commonsware.cwac.tlv.TouchListView.SwipeListener; import com.commonsware.cwac.tlv.TouchListView.SwipeListener;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.andlib.data.Property; import com.todoroo.andlib.data.Property;
import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.data.TodorooCursor;
import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.Autowired;

@ -24,7 +24,7 @@ import android.widget.ListView;
import com.commonsware.cwac.tlv.TouchListView.DropListener; import com.commonsware.cwac.tlv.TouchListView.DropListener;
import com.commonsware.cwac.tlv.TouchListView.GrabberClickListener; import com.commonsware.cwac.tlv.TouchListView.GrabberClickListener;
import com.commonsware.cwac.tlv.TouchListView.SwipeListener; import com.commonsware.cwac.tlv.TouchListView.SwipeListener;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.andlib.data.Property; import com.todoroo.andlib.data.Property;
import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.data.TodorooCursor;
import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.Autowired;

@ -9,7 +9,7 @@ import android.os.Bundle;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.data.TodorooCursor;
import com.todoroo.astrid.activity.TaskListFragment; import com.todoroo.astrid.activity.TaskListFragment;
import com.todoroo.astrid.adapter.TaskAdapter; import com.todoroo.astrid.adapter.TaskAdapter;

@ -8,7 +8,7 @@ package com.todoroo.astrid.subtasks;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.data.TodorooCursor;
import com.todoroo.astrid.actfm.TagViewFragment; import com.todoroo.astrid.actfm.TagViewFragment;
import com.todoroo.astrid.adapter.TaskAdapter; import com.todoroo.astrid.adapter.TaskAdapter;

@ -12,7 +12,7 @@ import android.content.Intent;
import android.content.res.Resources; import android.content.res.Resources;
import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.BitmapDrawable;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.andlib.sql.Criterion; import com.todoroo.andlib.sql.Criterion;
import com.todoroo.andlib.sql.Join; import com.todoroo.andlib.sql.Join;
import com.todoroo.andlib.sql.Query; import com.todoroo.andlib.sql.Query;

@ -22,7 +22,7 @@ import android.text.TextUtils;
import android.widget.EditText; import android.widget.EditText;
import android.widget.Toast; import android.widget.Toast;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.Autowired;
import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.service.ContextManager;
import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.andlib.service.DependencyInjectionService;

@ -17,7 +17,7 @@ import android.content.Intent;
import android.text.TextUtils; import android.text.TextUtils;
import android.widget.Toast; import android.widget.Toast;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.andlib.data.Property; import com.todoroo.andlib.data.Property;
import com.todoroo.andlib.data.Property.CountProperty; import com.todoroo.andlib.data.Property.CountProperty;
import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.data.TodorooCursor;

@ -27,7 +27,7 @@ import android.widget.ListView;
import android.widget.TextView; import android.widget.TextView;
import android.widget.TextView.OnEditorActionListener; import android.widget.TextView.OnEditorActionListener;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.andlib.data.AbstractModel; import com.todoroo.andlib.data.AbstractModel;
import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.data.TodorooCursor;
import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.andlib.service.DependencyInjectionService;

@ -2,7 +2,7 @@ package com.todoroo.astrid.tags.reusable;
import android.content.Context; import android.content.Context;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.astrid.activity.FilterListFragment; import com.todoroo.astrid.activity.FilterListFragment;
import com.todoroo.astrid.activity.FilterModeSpec; import com.todoroo.astrid.activity.FilterModeSpec;
import com.todoroo.astrid.activity.TaskListFragment; import com.todoroo.astrid.activity.TaskListFragment;

@ -2,7 +2,7 @@ package com.todoroo.astrid.tags.reusable;
import android.app.Activity; import android.app.Activity;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.astrid.activity.FilterListFragment; import com.todoroo.astrid.activity.FilterListFragment;
import com.todoroo.astrid.adapter.FilterAdapter; import com.todoroo.astrid.adapter.FilterAdapter;
import com.todoroo.astrid.utility.AstridPreferences; import com.todoroo.astrid.utility.AstridPreferences;

@ -14,7 +14,7 @@ import android.widget.Toast;
import com.actionbarsherlock.view.Menu; import com.actionbarsherlock.view.Menu;
import com.actionbarsherlock.view.MenuItem; import com.actionbarsherlock.view.MenuItem;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.data.TodorooCursor;
import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.Autowired;
import com.todoroo.andlib.sql.Query; import com.todoroo.andlib.sql.Query;

@ -11,7 +11,7 @@ import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.data.TodorooCursor;
import com.todoroo.andlib.utility.Preferences; import com.todoroo.andlib.utility.Preferences;
import com.todoroo.astrid.activity.TaskListFragment; import com.todoroo.astrid.activity.TaskListFragment;

@ -18,7 +18,7 @@ import android.widget.Chronometer.OnChronometerTickListener;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.andlib.utility.DateUtilities;
import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.helper.TaskEditControlSet; import com.todoroo.astrid.helper.TaskEditControlSet;

@ -12,7 +12,7 @@ import android.view.View;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;
import com.timsu.astrid.R; import org.astrid.R;
import com.todoroo.andlib.data.Property.IntegerProperty; import com.todoroo.andlib.data.Property.IntegerProperty;
import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.helper.TaskEditControlSet; import com.todoroo.astrid.helper.TaskEditControlSet;

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save