Add caldav tracking events

pull/699/head
Alex Baker 8 years ago
parent e91a102868
commit cdfd2b31a5

@ -28,7 +28,7 @@ public class Tracking {
MULTISELECT_DELETE( MULTISELECT_DELETE(
R.string.tracking_category_event, R.string.tracking_event_multiselect_delete), R.string.tracking_category_event, R.string.tracking_event_multiselect_delete),
MULTISELECT_CLONE(R.string.tracking_category_event, R.string.tracking_event_multiselect_clone), MULTISELECT_CLONE(R.string.tracking_category_event, R.string.tracking_event_multiselect_clone),
MULTISELECT_MOVE(R.string.tracking_category_event, R.string.tracking_event_multiselect_clone), MULTISELECT_MOVE(R.string.tracking_category_event, R.string.tracking_event_multiselect_move),
CLEAR_COMPLETED(R.string.tracking_category_event, R.string.tracking_action_clear_completed), CLEAR_COMPLETED(R.string.tracking_category_event, R.string.tracking_action_clear_completed),
UPGRADE(R.string.tracking_category_event, R.string.tracking_event_upgrade), UPGRADE(R.string.tracking_category_event, R.string.tracking_event_upgrade),
DB_OPEN_FAILED(R.string.tracking_category_error, R.string.tracking_event_db_open), DB_OPEN_FAILED(R.string.tracking_category_error, R.string.tracking_event_db_open),
@ -45,7 +45,11 @@ public class Tracking {
R.string.tracking_category_tasker, R.string.tracking_action_list_notification), R.string.tracking_category_tasker, R.string.tracking_action_list_notification),
IMPORT_XML(R.string.tracking_category_backup, R.string.tracking_action_import_xml), IMPORT_XML(R.string.tracking_category_backup, R.string.tracking_action_import_xml),
IMPORT_JSON(R.string.tracking_category_backup, R.string.tracking_action_import_json), IMPORT_JSON(R.string.tracking_category_backup, R.string.tracking_action_import_json),
EXPORT(R.string.tracking_category_backup, R.string.tracking_action_export); EXPORT(R.string.tracking_category_backup, R.string.tracking_action_export),
CALDAV_ACCOUNT_ADDED(R.string.tracking_category_caldav, R.string.tracking_action_add_account),
CALDAV_ACCOUNT_REMOVED(R.string.tracking_category_caldav, R.string.tracking_action_remove_account),
CALDAV_LIST_ADDED(R.string.tracking_category_caldav, R.string.tracking_action_new_list),
CALDAV_LIST_DELETED(R.string.tracking_category_caldav, R.string.tracking_action_delete_list);
public final int category; public final int category;
public final int action; public final int action;

@ -29,6 +29,7 @@ import java.net.URISyntaxException;
import javax.inject.Inject; import javax.inject.Inject;
import org.tasks.R; import org.tasks.R;
import org.tasks.analytics.Tracker; import org.tasks.analytics.Tracker;
import org.tasks.analytics.Tracking.Events;
import org.tasks.data.CaldavAccount; import org.tasks.data.CaldavAccount;
import org.tasks.data.CaldavCalendar; import org.tasks.data.CaldavCalendar;
import org.tasks.data.CaldavDao; import org.tasks.data.CaldavDao;
@ -295,6 +296,8 @@ public class CaldavAccountSettingsActivity extends ThemedInjectingAppCompatActiv
newAccount.setUuid(UUIDHelper.newUUID()); newAccount.setUuid(UUIDHelper.newUUID());
newAccount.setId(caldavDao.insert(newAccount)); newAccount.setId(caldavDao.insert(newAccount));
tracker.reportEvent(Events.CALDAV_ACCOUNT_ADDED);
setResult(RESULT_OK); setResult(RESULT_OK);
finish(); finish();
} }
@ -387,6 +390,7 @@ public class CaldavAccountSettingsActivity extends ThemedInjectingAppCompatActiv
} }
caldavDao.deleteCalendarsForAccount(caldavAccount.getUuid()); caldavDao.deleteCalendarsForAccount(caldavAccount.getUuid());
caldavDao.delete(caldavAccount); caldavDao.delete(caldavAccount);
tracker.reportEvent(Events.CALDAV_ACCOUNT_REMOVED);
setResult(RESULT_OK); setResult(RESULT_OK);
finish(); finish();
}) })

@ -33,6 +33,7 @@ import org.tasks.R;
import org.tasks.activities.ColorPickerActivity; import org.tasks.activities.ColorPickerActivity;
import org.tasks.analytics.Tracker; import org.tasks.analytics.Tracker;
import org.tasks.analytics.Tracking; import org.tasks.analytics.Tracking;
import org.tasks.analytics.Tracking.Events;
import org.tasks.data.CaldavAccount; import org.tasks.data.CaldavAccount;
import org.tasks.data.CaldavCalendar; import org.tasks.data.CaldavCalendar;
import org.tasks.data.CaldavDao; import org.tasks.data.CaldavDao;
@ -255,6 +256,7 @@ public class CaldavCalendarSettingsActivity extends ThemedInjectingAppCompatActi
caldavCalendar.setName(getNewName()); caldavCalendar.setName(getNewName());
caldavCalendar.setColor(selectedTheme); caldavCalendar.setColor(selectedTheme);
caldavCalendar.setId(caldavDao.insert(caldavCalendar)); caldavCalendar.setId(caldavDao.insert(caldavCalendar));
tracker.reportEvent(Events.CALDAV_LIST_ADDED);
setResult( setResult(
RESULT_OK, RESULT_OK,
new Intent().putExtra(TaskListActivity.OPEN_FILTER, new CaldavFilter(caldavCalendar))); new Intent().putExtra(TaskListActivity.OPEN_FILTER, new CaldavFilter(caldavCalendar)));
@ -372,6 +374,7 @@ public class CaldavCalendarSettingsActivity extends ThemedInjectingAppCompatActi
taskDeleter.markDeleted(caldavDao.getTasksByCalendar(caldavCalendar.getUuid())); taskDeleter.markDeleted(caldavDao.getTasksByCalendar(caldavCalendar.getUuid()));
caldavDao.deleteTasksForCalendar(caldavCalendar.getUuid()); caldavDao.deleteTasksForCalendar(caldavCalendar.getUuid());
caldavDao.delete(caldavCalendar); caldavDao.delete(caldavCalendar);
tracker.reportEvent(Events.CALDAV_LIST_DELETED);
setResult(RESULT_OK, new Intent(ACTION_DELETED)); setResult(RESULT_OK, new Intent(ACTION_DELETED));
finish(); finish();
} }

@ -232,9 +232,12 @@
<string name="tracking_category_error">Error</string> <string name="tracking_category_error">Error</string>
<string name="tracking_category_tasker">Tasker</string> <string name="tracking_category_tasker">Tasker</string>
<string name="tracking_category_backup">Backup</string> <string name="tracking_category_backup">Backup</string>
<string name="tracking_category_caldav">Caldav</string>
<string name="tracking_action_add">Add</string> <string name="tracking_action_add">Add</string>
<string name="tracking_action_start">Start</string> <string name="tracking_action_start">Start</string>
<string name="tracking_action_new_list">New List</string> <string name="tracking_action_new_list">New List</string>
<string name="tracking_action_add_account">Add Account</string>
<string name="tracking_action_remove_account">Remove Account</string>
<string name="tracking_action_rename_list">Rename List</string> <string name="tracking_action_rename_list">Rename List</string>
<string name="tracking_action_delete_list">Delete List</string> <string name="tracking_action_delete_list">Delete List</string>
<string name="tracking_action_on">On</string> <string name="tracking_action_on">On</string>

Loading…
Cancel
Save