From 573cb61fde0eafef7d4de87174ad8c3b466d1eb8 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Tue, 23 May 2017 13:45:31 -0500 Subject: [PATCH] Fix Amazon and generic compile --- src/amazon/java/org/tasks/analytics/Tracker.java | 10 +++++++--- .../java/org/tasks/injection/TestComponent.java | 2 +- .../java/org/tasks/injection/TestComponent.java | 2 +- src/generic/java/org/tasks/analytics/Tracker.java | 4 ++++ 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/amazon/java/org/tasks/analytics/Tracker.java b/src/amazon/java/org/tasks/analytics/Tracker.java index f79328899..285762e42 100644 --- a/src/amazon/java/org/tasks/analytics/Tracker.java +++ b/src/amazon/java/org/tasks/analytics/Tracker.java @@ -74,17 +74,21 @@ public class Tracker { } public void reportEvent(Tracking.Events event, String label) { - reportEvent(event.category, event.action, label); + reportEvent(event, event.action, label); } public void reportEvent(Tracking.Events event, int action, String label) { + reportEvent(event, context.getString(action), label); + } + + public void reportEvent(Tracking.Events event, String action, String label) { reportEvent(event.category, action, label); } - private void reportEvent(int category, int action, String label) { + private void reportEvent(int category, String action, String label) { HitBuilders.EventBuilder eventBuilder = new HitBuilders.EventBuilder() .setCategory(context.getString(category)) - .setAction(context.getString(action)); + .setAction(action); if (!Strings.isNullOrEmpty(label)) { eventBuilder.setLabel(label); } diff --git a/src/androidTestAmazon/java/org/tasks/injection/TestComponent.java b/src/androidTestAmazon/java/org/tasks/injection/TestComponent.java index 6713f0add..e7bd5b5a3 100644 --- a/src/androidTestAmazon/java/org/tasks/injection/TestComponent.java +++ b/src/androidTestAmazon/java/org/tasks/injection/TestComponent.java @@ -14,7 +14,7 @@ import com.todoroo.astrid.subtasks.SubtasksHelperTest; import com.todoroo.astrid.subtasks.SubtasksTestCase; import com.todoroo.astrid.sync.NewSyncTestCase; -import org.tasks.scheduling.BackupServiceTests; +import org.tasks.jobs.BackupServiceTests; import dagger.Component; diff --git a/src/androidTestGeneric/java/org/tasks/injection/TestComponent.java b/src/androidTestGeneric/java/org/tasks/injection/TestComponent.java index 6713f0add..e7bd5b5a3 100644 --- a/src/androidTestGeneric/java/org/tasks/injection/TestComponent.java +++ b/src/androidTestGeneric/java/org/tasks/injection/TestComponent.java @@ -14,7 +14,7 @@ import com.todoroo.astrid.subtasks.SubtasksHelperTest; import com.todoroo.astrid.subtasks.SubtasksTestCase; import com.todoroo.astrid.sync.NewSyncTestCase; -import org.tasks.scheduling.BackupServiceTests; +import org.tasks.jobs.BackupServiceTests; import dagger.Component; diff --git a/src/generic/java/org/tasks/analytics/Tracker.java b/src/generic/java/org/tasks/analytics/Tracker.java index f09115222..3337d740a 100644 --- a/src/generic/java/org/tasks/analytics/Tracker.java +++ b/src/generic/java/org/tasks/analytics/Tracker.java @@ -34,4 +34,8 @@ public class Tracker { public void reportEvent(Tracking.Events setPreference, int resId, String s) { } + + public void reportEvent(Tracking.Events category, String action, String label) { + + } }