From dd8972c7b66f6202a1a05ec73a85fde44e7f083c Mon Sep 17 00:00:00 2001
From: Alex Baker <baker.alex@gmail.com>
Date: Thu, 27 Oct 2016 11:12:59 -0500
Subject: [PATCH] Update google tasks analytics

---
 .../tasks/activities/GoogleTaskListSettingsActivity.java    | 6 ++++++
 .../java/org/tasks/gtasks/GoogleTaskSyncAdapter.java        | 6 +++---
 src/main/java/org/tasks/analytics/Tracking.java             | 3 +++
 src/main/res/values/keys.xml                                | 3 +++
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/googleplay/java/org/tasks/activities/GoogleTaskListSettingsActivity.java b/src/googleplay/java/org/tasks/activities/GoogleTaskListSettingsActivity.java
index 90bd26ecb..c1c965378 100644
--- a/src/googleplay/java/org/tasks/activities/GoogleTaskListSettingsActivity.java
+++ b/src/googleplay/java/org/tasks/activities/GoogleTaskListSettingsActivity.java
@@ -19,6 +19,8 @@ import com.todoroo.astrid.gtasks.GtasksList;
 import com.todoroo.astrid.gtasks.GtasksListService;
 
 import org.tasks.R;
+import org.tasks.analytics.Tracker;
+import org.tasks.analytics.Tracking;
 import org.tasks.dialogs.DialogBuilder;
 import org.tasks.gtasks.CreateListDialog;
 import org.tasks.gtasks.DeleteListDialog;
@@ -57,6 +59,7 @@ public class GoogleTaskListSettingsActivity extends ThemedInjectingAppCompatActi
     @Inject DialogBuilder dialogBuilder;
     @Inject Preferences preferences;
     @Inject GtasksListService gtasksListService;
+    @Inject Tracker tracker;
 
     @BindView(R.id.tag_name) EditText listName;
     @BindView(R.id.toolbar) Toolbar toolbar;
@@ -189,6 +192,7 @@ public class GoogleTaskListSettingsActivity extends ThemedInjectingAppCompatActi
 
     @Override
     public void onListCreated(TaskList taskList) {
+        tracker.reportEvent(Tracking.Events.GTASK_NEW_LIST);
         GtasksList list = new GtasksList(taskList.getId());
         list.setName(taskList.getTitle());
         storeObjectDao.persist(list);
@@ -198,6 +202,7 @@ public class GoogleTaskListSettingsActivity extends ThemedInjectingAppCompatActi
 
     @Override
     public void onListDeleted() {
+        tracker.reportEvent(Tracking.Events.GTASK_DELETE_LIST);
         gtasksListService.deleteList(gtasksList);
         setResult(RESULT_OK, new Intent(ACTION_DELETED));
         finish();
@@ -205,6 +210,7 @@ public class GoogleTaskListSettingsActivity extends ThemedInjectingAppCompatActi
 
     @Override
     public void onListRenamed(TaskList taskList) {
+        tracker.reportEvent(Tracking.Events.GTASK_RENAME_LIST);
         gtasksList.setName(taskList.getTitle());
         storeObjectDao.persist(gtasksList);
         setResult(RESULT_OK, new Intent(ACTION_RENAMED).putExtra(TaskListActivity.OPEN_FILTER, new GtasksFilter(gtasksList)));
diff --git a/src/googleplay/java/org/tasks/gtasks/GoogleTaskSyncAdapter.java b/src/googleplay/java/org/tasks/gtasks/GoogleTaskSyncAdapter.java
index 466bf7b03..aeb0668bd 100644
--- a/src/googleplay/java/org/tasks/gtasks/GoogleTaskSyncAdapter.java
+++ b/src/googleplay/java/org/tasks/gtasks/GoogleTaskSyncAdapter.java
@@ -202,7 +202,7 @@ public class GoogleTaskSyncAdapter extends InjectingAbstractThreadedSyncAdapter
             } catch (UserRecoverableAuthIOException e) {
                 throw e;
             } catch (IOException e) {
-                tracker.reportException(e);
+                Timber.e(e, e.getMessage());
             }
         }
     }
@@ -286,7 +286,7 @@ public class GoogleTaskSyncAdapter extends InjectingAbstractThreadedSyncAdapter
             try {
                 invoker.updateGtask(listId, remoteModel);
             } catch(HttpNotFoundException e) {
-                tracker.reportException(e);
+                Timber.e(e, e.getMessage());
                 metadataDao.delete(gtasksMetadata.getId());
                 return;
             }
@@ -356,7 +356,7 @@ public class GoogleTaskSyncAdapter extends InjectingAbstractThreadedSyncAdapter
         } catch (UserRecoverableAuthIOException e) {
             throw e;
         } catch (IOException e) {
-            tracker.reportException(e);
+            Timber.e(e, e.getMessage());
         }
     }
 
diff --git a/src/main/java/org/tasks/analytics/Tracking.java b/src/main/java/org/tasks/analytics/Tracking.java
index eaaed5e05..e88580e63 100644
--- a/src/main/java/org/tasks/analytics/Tracking.java
+++ b/src/main/java/org/tasks/analytics/Tracking.java
@@ -17,6 +17,9 @@ public class Tracking {
         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),
+        GTASK_NEW_LIST(R.string.tracking_category_google_tasks, R.string.tracking_action_new_list),
+        GTASK_RENAME_LIST(R.string.tracking_category_google_tasks, R.string.tracking_action_rename_list),
+        GTASK_DELETE_LIST(R.string.tracking_category_google_tasks, R.string.tracking_action_delete_list),
         UPGRADE(R.string.tracking_category_event, R.string.tracking_event_upgrade),
         LEGACY_TASKER_TRIGGER(R.string.tracking_category_event, R.string.tracking_event_legacy_tasker_trigger),
         NIGHT_MODE_MISMATCH(R.string.tracking_category_event, R.string.tracking_event_night_mode_mismatch),
diff --git a/src/main/res/values/keys.xml b/src/main/res/values/keys.xml
index 4baf42e1e..8d78d02c6 100644
--- a/src/main/res/values/keys.xml
+++ b/src/main/res/values/keys.xml
@@ -286,6 +286,9 @@
   <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_new_list">New List</string>
+  <string name="tracking_action_rename_list">Rename List</string>
+  <string name="tracking_action_delete_list">Delete List</string>
   <string name="tracking_action_on">On</string>
   <string name="tracking_action_off">Off</string>
   <string name="tracking_action_clear">Clear</string>