Bump version, gtask analytics

build.gradle

@@ -32,8 +32,8 @@ android {
 
     defaultConfig {
         applicationId "org.tasks"
-        versionCode 408
-        versionName "4.8.17"
+        versionCode 409
+        versionName "4.8.18"
         minSdkVersion 14
         targetSdkVersion 24
         multiDexEnabled true

src/googleplay/java/com/todoroo/astrid/gtasks/GtasksPreferences.java

@@ -18,6 +18,8 @@ import com.todoroo.astrid.gtasks.auth.GtasksLoginActivity;
 import org.tasks.R;
 import org.tasks.activities.ClearGtaskDataActivity;
 import org.tasks.activities.GoogleTaskListSelectionDialog;
+import org.tasks.analytics.Tracker;
+import org.tasks.analytics.Tracking;
 import org.tasks.gtasks.GoogleTaskListSelectionHandler;
 import org.tasks.injection.ActivityComponent;
 import org.tasks.injection.InjectingPreferenceActivity;
@@ -38,6 +40,7 @@ public class GtasksPreferences extends InjectingPreferenceActivity implements Go
     @Inject BackgroundScheduler backgroundScheduler;
     @Inject ActivityPermissionRequestor permissionRequestor;
     @Inject GtasksListService gtasksListService;
+    @Inject Tracker tracker;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -56,6 +59,7 @@ public class GtasksPreferences extends InjectingPreferenceActivity implements Go
                     }
                     return false;
                 } else {
+                    tracker.reportEvent(Tracking.Events.GTASK_DISABLED);
                     gtasksPreferenceService.stopOngoing();
                     return true;
                 }
@@ -95,9 +99,14 @@ public class GtasksPreferences extends InjectingPreferenceActivity implements Go
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (requestCode == REQUEST_LOGIN) {
-            ((CheckBoxPreference) findPreference(getString(R.string.sync_gtasks))).setChecked(resultCode == RESULT_OK);
+            boolean enabled = resultCode == RESULT_OK;
+            if (enabled) {
+                tracker.reportEvent(Tracking.Events.GTASK_ENABLED);
+            }
+            ((CheckBoxPreference) findPreference(getString(R.string.sync_gtasks))).setChecked(enabled);
         } else if(requestCode == REQUEST_LOGOUT) {
             if (resultCode == RESULT_OK) {
+                tracker.reportEvent(Tracking.Events.GTASK_LOGOUT);
                 finish();
             }
         } else {
@@ -129,6 +138,7 @@ public class GtasksPreferences extends InjectingPreferenceActivity implements Go
 
     @Override
     public void selectedList(GtasksList list) {
+        tracker.reportEvent(Tracking.Events.GTASK_DEFAULT_LIST);
         String listId = list.getRemoteId();
         gtasksPreferenceService.setDefaultList(listId);
         updateDefaultGoogleTaskList();

src/googleplay/java/org/tasks/ui/GoogleTaskListFragment.java

@@ -21,6 +21,8 @@ import com.todoroo.astrid.gtasks.GtasksPreferenceService;
 
 import org.tasks.R;
 import org.tasks.activities.GoogleTaskListSelectionDialog;
+import org.tasks.analytics.Tracker;
+import org.tasks.analytics.Tracking;
 import org.tasks.injection.FragmentComponent;
 
 import javax.inject.Inject;
@@ -45,6 +47,7 @@ public class GoogleTaskListFragment extends TaskEditControlFragment {
     @Inject GtasksListService gtasksListService;
     @Inject GtasksMetadataService gtasksMetadataService;
     @Inject MetadataDao metadataDao;
+    @Inject Tracker tracker;
 
     private long taskId;
     private GtasksList originalList;
@@ -118,6 +121,7 @@ public class GoogleTaskListFragment extends TaskEditControlFragment {
         if (taskMetadata == null) {
             taskMetadata = GtasksMetadata.createEmptyMetadataWithoutList(task.getId());
         } else if (!taskMetadata.getValue(GtasksMetadata.LIST_ID).equals(selectedList.getRemoteId())) {
+            tracker.reportEvent(Tracking.Events.GTASK_MOVE);
             task.putTransitory(SyncFlags.FORCE_SYNC, true);
             taskMetadata.setDeletionDate(now());
             metadataDao.persist(taskMetadata);

src/main/java/org/tasks/analytics/Tracking.java

@@ -6,9 +6,14 @@ public class Tracking {
 
     public enum Events {
         SET_DEFAULT_LIST(R.string.tracking_category_preferences, R.string.p_default_list),
+        GTASK_DEFAULT_LIST(R.string.tracking_category_preferences, R.string.p_gtasks_default_list),
         SET_THEME(R.string.tracking_category_preferences, R.string.p_theme),
         WIDGET_ADD(R.string.tracking_category_widget, R.string.tracking_action_add),
-        TIMER_START(R.string.tracking_category_timer, R.string.tracking_action_start);
+        TIMER_START(R.string.tracking_category_timer, R.string.tracking_action_start),
+        GTASK_ENABLED(R.string.tracking_category_google_tasks, R.string.tracking_action_on),
+        GTASK_DISABLED(R.string.tracking_category_google_tasks, R.string.tracking_action_off),
+        GTASK_LOGOUT(R.string.tracking_category_google_tasks, R.string.tracking_action_clear),
+        GTASK_MOVE(R.string.tracking_category_google_tasks, R.string.tracking_action_move);
 
         public final int category;
         public final int action;

src/main/res/values/keys.xml

@@ -286,8 +286,13 @@
   <string name="tracking_category_widget">Widget</string>
   <string name="tracking_category_timer">Timer</string>
   <string name="tracking_category_iab">IAB</string>
+  <string name="tracking_category_google_tasks">Gtask</string>
   <string name="tracking_action_add">Add</string>
   <string name="tracking_action_start">Start</string>
+  <string name="tracking_action_move">Move</string>
+  <string name="tracking_action_on">On</string>
+  <string name="tracking_action_off">Off</string>
+  <string name="tracking_action_clear">Clear</string>
   <string name="p_tesla_unread_enabled">tesla_unread_enabled</string>
   <string name="p_purchased_tesla_unread">purchased_tesla_unread</string>
   <string name="p_purchased_tasker">purchased_tasker</string>