diff --git a/app/src/main/java/com/todoroo/astrid/provider/Astrid2TaskProvider.java b/app/src/main/java/com/todoroo/astrid/provider/Astrid2TaskProvider.java index 1f08cc546..1bb4beac6 100644 --- a/app/src/main/java/com/todoroo/astrid/provider/Astrid2TaskProvider.java +++ b/app/src/main/java/com/todoroo/astrid/provider/Astrid2TaskProvider.java @@ -24,6 +24,8 @@ import com.todoroo.astrid.data.TagData; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.tags.TagService; +import org.tasks.analytics.Tracker; +import org.tasks.analytics.Tracking; import org.tasks.injection.ContentProviderComponent; import org.tasks.injection.InjectingContentProvider; import org.tasks.ui.CheckBoxes; @@ -84,6 +86,7 @@ public class Astrid2TaskProvider extends InjectingContentProvider { @Inject Lazy tagService; @Inject Lazy checkBoxes; @Inject Lazy taskDao; + @Inject Lazy tracker; static { URI_MATCHER.addURI(AUTHORITY, "tasks", URI_TASKS); @@ -215,6 +218,7 @@ public class Astrid2TaskProvider extends InjectingContentProvider { switch (URI_MATCHER.match(uri)) { case URI_TASKS: + tracker.get().reportEvent(Tracking.Events.ASTRID_2_CP); Task task = new Task(); // map values diff --git a/app/src/main/java/com/todoroo/astrid/provider/Astrid3ContentProvider.java b/app/src/main/java/com/todoroo/astrid/provider/Astrid3ContentProvider.java index 77a6edb5b..0129a8e1a 100644 --- a/app/src/main/java/com/todoroo/astrid/provider/Astrid3ContentProvider.java +++ b/app/src/main/java/com/todoroo/astrid/provider/Astrid3ContentProvider.java @@ -29,6 +29,8 @@ import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.UserActivity; import org.tasks.BuildConfig; +import org.tasks.analytics.Tracker; +import org.tasks.analytics.Tracking; import org.tasks.injection.ContentProviderComponent; import org.tasks.injection.InjectingContentProvider; @@ -87,6 +89,7 @@ public class Astrid3ContentProvider extends InjectingContentProvider { private boolean open; @Inject Lazy database; + @Inject Lazy tracker; static { uriMatcher = new UriMatcher(UriMatcher.NO_MATCH); @@ -152,6 +155,7 @@ public class Astrid3ContentProvider extends InjectingContentProvider { } private UriHelper generateHelper(Uri uri, boolean populateModel) { + tracker.get().reportEvent(Tracking.Events.ASTRID_3_CP); final Database db = getDatabase(); if(uri.toString().startsWith(Task.CONTENT_URI.toString())) { UriHelper helper = new UriHelper<>(); diff --git a/app/src/main/java/com/todoroo/astrid/provider/SqlContentProvider.java b/app/src/main/java/com/todoroo/astrid/provider/SqlContentProvider.java index 37f0009e3..408c27825 100644 --- a/app/src/main/java/com/todoroo/astrid/provider/SqlContentProvider.java +++ b/app/src/main/java/com/todoroo/astrid/provider/SqlContentProvider.java @@ -15,6 +15,8 @@ import com.todoroo.astrid.api.AstridApiConstants; import com.todoroo.astrid.dao.Database; import org.tasks.BuildConfig; +import org.tasks.analytics.Tracker; +import org.tasks.analytics.Tracking; import org.tasks.injection.ContentProviderComponent; import org.tasks.injection.InjectingContentProvider; @@ -47,6 +49,7 @@ public class SqlContentProvider extends InjectingContentProvider { private boolean open; @Inject Lazy database; + @Inject Lazy tracker; public SqlContentProvider() { setReadPermission(AstridApiConstants.PERMISSION_READ); @@ -111,7 +114,7 @@ public class SqlContentProvider extends InjectingContentProvider { @Override public Cursor query(@NonNull Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder) { - + tracker.get().reportEvent(Tracking.Events.ASTRID_3_CP); return getDatabase().rawQuery(selection); } diff --git a/app/src/main/java/org/tasks/analytics/Tracking.java b/app/src/main/java/org/tasks/analytics/Tracking.java index f76d111f6..4a8055de2 100644 --- a/app/src/main/java/org/tasks/analytics/Tracking.java +++ b/app/src/main/java/org/tasks/analytics/Tracking.java @@ -33,7 +33,10 @@ public class Tracking { RECURRENCE_CUSTOM(R.string.tracking_category_recurrence, R.string.tracking_action_custom), RECURRENCE_PRESET(R.string.tracking_category_recurrence, R.string.tracking_action_preset), TASKER_CREATE(R.string.tracking_category_tasker, R.string.tracking_action_task_created), - TASKER_LIST_NOTIFICATION(R.string.tracking_category_tasker, R.string.tracking_action_list_notification); + TASKER_LIST_NOTIFICATION(R.string.tracking_category_tasker, R.string.tracking_action_list_notification), + ASTRID_2_CP(R.string.tracking_category_api, R.string.tracking_action_api_astrid2_update), + ASTRID_3_CP(R.string.tracking_category_api, R.string.tracking_action_api_astrid3), + ASTRID_SQL_CP(R.string.tracking_category_api, R.string.tracking_action_api_astrid_sql); public final int category; public final int action; diff --git a/app/src/main/res/values/keys.xml b/app/src/main/res/values/keys.xml index 08591c4c3..5cd0e2983 100644 --- a/app/src/main/res/values/keys.xml +++ b/app/src/main/res/values/keys.xml @@ -231,6 +231,7 @@ Gtask Event Tasker + API Add Start Move @@ -245,6 +246,10 @@ Preset Task created List Notification + 2 Update + 3 + SQL + Night Mismatch Play Services Error Upgrade