From 83c7e2ffa872b9b91f56c387a1c760fc58936287 Mon Sep 17 00:00:00 2001 From: Rashad Cureton Date: Tue, 27 Nov 2018 16:50:45 -0500 Subject: [PATCH 01/12] added event attributes and sending default properties with each event to koala --- .../com/kickstarter/extensions/AnswersExt.kt | 4 ++ .../main/java/com/kickstarter/libs/Koala.java | 38 +++++++++---------- .../kickstarter/libs/KoalaTrackingClient.java | 10 +++++ .../kickstarter/libs/TrackingClientType.java | 1 + .../viewmodels/AccountViewModel.kt | 2 +- 5 files changed, 35 insertions(+), 20 deletions(-) diff --git a/app/src/main/java/com/kickstarter/extensions/AnswersExt.kt b/app/src/main/java/com/kickstarter/extensions/AnswersExt.kt index 4f069d8ab9..2bb1426702 100644 --- a/app/src/main/java/com/kickstarter/extensions/AnswersExt.kt +++ b/app/src/main/java/com/kickstarter/extensions/AnswersExt.kt @@ -6,3 +6,7 @@ import com.crashlytics.android.answers.CustomEvent fun fabricLogCustomEvent(customEvent: String) { Answers.getInstance().logCustom(CustomEvent(customEvent)) } + +fun fabricLogCustomEventWithAttributes(customEvent: String, key: String, attribute: String) { + Answers.getInstance().logCustom(CustomEvent(customEvent).putCustomAttribute(key, attribute)) +} diff --git a/app/src/main/java/com/kickstarter/libs/Koala.java b/app/src/main/java/com/kickstarter/libs/Koala.java index e0825d0d57..3f574a6d06 100644 --- a/app/src/main/java/com/kickstarter/libs/Koala.java +++ b/app/src/main/java/com/kickstarter/libs/Koala.java @@ -299,12 +299,12 @@ public void trackSignupNewsletterToggle(final boolean sendNewsletters) { // SETTINGS public void trackChangedEmail() { - this.client.track(KoalaEvent.CHANGED_EMAIL); + this.client.track(KoalaEvent.CHANGED_EMAIL, this.client.defaultProperties()); AnswersExtKt.fabricLogCustomEvent(KoalaEvent.CHANGED_EMAIL); } public void trackChangedPassword() { - this.client.track(KoalaEvent.CHANGED_PASSWORD); + this.client.track(KoalaEvent.CHANGED_PASSWORD, this.client.defaultProperties()); AnswersExtKt.fabricLogCustomEvent(KoalaEvent.CHANGED_PASSWORD); } public void trackContactEmailClicked() { @@ -312,17 +312,17 @@ public void trackContactEmailClicked() { } public void trackDeletePaymentMethod() { - this.client.track(KoalaEvent.DELETED_PAYMENT_METHOD); + this.client.track(KoalaEvent.DELETED_PAYMENT_METHOD, this.client.defaultProperties()); AnswersExtKt.fabricLogCustomEvent(KoalaEvent.DELETED_PAYMENT_METHOD); } public void trackErroredDeletePaymentMethod() { - this.client.track(KoalaEvent.ERRORED_DELETE_PAYMENT_METHOD); + this.client.track(KoalaEvent.ERRORED_DELETE_PAYMENT_METHOD, this.client.defaultProperties()); AnswersExtKt.fabricLogCustomEvent(KoalaEvent.ERRORED_DELETE_PAYMENT_METHOD); } public void trackFailedPaymentMethodCreation() { - this.client.track(KoalaEvent.FAILED_PAYMENT_METHOD_CREATION); + this.client.track(KoalaEvent.FAILED_PAYMENT_METHOD_CREATION, this.client.defaultProperties()); AnswersExtKt.fabricLogCustomEvent(KoalaEvent.FAILED_PAYMENT_METHOD_CREATION); } @@ -335,62 +335,62 @@ public void trackNewsletterToggle(final boolean sendNewsletter) { } public void trackResentVerificationEmail() { - this.client.track(KoalaEvent.RESENT_VERIFICATION_EMAIL); + this.client.track(KoalaEvent.RESENT_VERIFICATION_EMAIL, this.client.defaultProperties()); AnswersExtKt.fabricLogCustomEvent(KoalaEvent.RESENT_VERIFICATION_EMAIL); } public void trackSavedPaymentMethod() { - this.client.track(KoalaEvent.SAVED_PAYMENT_METHOD); + this.client.track(KoalaEvent.SAVED_PAYMENT_METHOD, this.client.defaultProperties()); AnswersExtKt.fabricLogCustomEvent(KoalaEvent.SAVED_PAYMENT_METHOD); } - public void trackSelectedChosenCurrency() { - this.client.track(KoalaEvent.SELECTED_CHOSEN_CURRENCY); - AnswersExtKt.fabricLogCustomEvent(KoalaEvent.SELECTED_CHOSEN_CURRENCY); + public void trackSelectedChosenCurrency(String selectedCurrency) { + this.client.trackEventType(KoalaEvent.SELECTED_CHOSEN_CURRENCY, this.client.defaultProperties(), selectedCurrency); + AnswersExtKt.fabricLogCustomEventWithAttributes(KoalaEvent.SELECTED_CHOSEN_CURRENCY, "currency", selectedCurrency); } public void trackSettingsView() { - this.client.track("Settings View"); + this.client.track("Settings View",this.client.defaultProperties()); AnswersExtKt.fabricLogCustomEvent(KoalaEvent.VIEWED_SETTINGS); } public void trackViewedAccount() { - this.client.track(KoalaEvent.VIEWED_ACCOUNT); + this.client.track(KoalaEvent.VIEWED_ACCOUNT, this.client.defaultProperties()); AnswersExtKt.fabricLogCustomEvent(KoalaEvent.VIEWED_ACCOUNT); } public void trackViewedAddNewCard() { - this.client.track(KoalaEvent.VIEWED_ADD_NEW_CARD); + this.client.track(KoalaEvent.VIEWED_ADD_NEW_CARD, this.client.defaultProperties()); AnswersExtKt.fabricLogCustomEvent(KoalaEvent.VIEWED_ADD_NEW_CARD); } public void trackViewedChangedEmail() { - this.client.track(KoalaEvent.VIEWED_CHANGE_EMAIL); + this.client.track(KoalaEvent.VIEWED_CHANGE_EMAIL, this.client.defaultProperties()); AnswersExtKt.fabricLogCustomEvent(KoalaEvent.VIEWED_CHANGE_EMAIL); } public void trackViewedChangedPassword() { - this.client.track(KoalaEvent.VIEWED_CHANGE_PASSWORD); + this.client.track(KoalaEvent.VIEWED_CHANGE_PASSWORD, this.client.defaultProperties()); AnswersExtKt.fabricLogCustomEvent(KoalaEvent.VIEWED_CHANGE_PASSWORD); } public void trackViewedNotifications() { - this.client.track(KoalaEvent.VIEWED_NOTIFICATIONS); + this.client.track(KoalaEvent.VIEWED_NOTIFICATIONS, this.client.defaultProperties()); AnswersExtKt.fabricLogCustomEvent(KoalaEvent.VIEWED_NOTIFICATIONS); } public void trackViewedNewsletter() { - this.client.track(KoalaEvent.VIEWED_NEWSLETTER); + this.client.track(KoalaEvent.VIEWED_NEWSLETTER, this.client.defaultProperties()); AnswersExtKt.fabricLogCustomEvent(KoalaEvent.VIEWED_NEWSLETTER); } public void trackViewedPaymentMethods() { - this.client.track(KoalaEvent.VIEWED_PAYMENT_METHODS); + this.client.track(KoalaEvent.VIEWED_PAYMENT_METHODS, this.client.defaultProperties()); AnswersExtKt.fabricLogCustomEvent(KoalaEvent.VIEWED_PAYMENT_METHODS); } public void trackViewedPrivacy() { - this.client.track(KoalaEvent.VIEWED_PRIVACY); + this.client.track(KoalaEvent.VIEWED_PRIVACY, this.client.defaultProperties()); AnswersExtKt.fabricLogCustomEvent(KoalaEvent.VIEWED_PRIVACY); } diff --git a/app/src/main/java/com/kickstarter/libs/KoalaTrackingClient.java b/app/src/main/java/com/kickstarter/libs/KoalaTrackingClient.java index a46f0f1539..1784a793f1 100644 --- a/app/src/main/java/com/kickstarter/libs/KoalaTrackingClient.java +++ b/app/src/main/java/com/kickstarter/libs/KoalaTrackingClient.java @@ -2,6 +2,7 @@ import android.content.Context; import android.content.res.Configuration; +import android.os.Build; import android.support.annotation.NonNull; import android.support.annotation.Nullable; @@ -71,6 +72,15 @@ public Map defaultProperties() { hashMap.put("device_fingerprint", this.mixpanel.getDistinctId()); hashMap.put("android_uuid", this.mixpanel.getDistinctId()); hashMap.put("android_pay_capable", this.androidPayCapability.isCapable()); + hashMap.put("manufacturer", android.os.Build.MANUFACTURER); + hashMap.put("app_version", android.os.Build.VERSION.RELEASE); + hashMap.put("model", android.os.Build.MODEL); + hashMap.put("brand", android.os.Build.BRAND); + hashMap.put("product", android.os.Build.PRODUCT); + hashMap.put("os_version", android.os.Build.VERSION.SDK_INT); + hashMap.put("mp_lib", "kickstarter_android"); + hashMap.put("koala_lib", "kickstarter_android"); + hashMap.put("time", Build.TIME); return hashMap; } diff --git a/app/src/main/java/com/kickstarter/libs/TrackingClientType.java b/app/src/main/java/com/kickstarter/libs/TrackingClientType.java index 3b293402e7..f60a8e2b0e 100644 --- a/app/src/main/java/com/kickstarter/libs/TrackingClientType.java +++ b/app/src/main/java/com/kickstarter/libs/TrackingClientType.java @@ -7,6 +7,7 @@ public abstract class TrackingClientType { public abstract void track(final String eventName, final Map properties); + public abstract void trackEventType(final String eventName, final Map properties, final String eventType); public final void track(final String eventName) { track(eventName, new HashMap<>()); diff --git a/app/src/main/java/com/kickstarter/viewmodels/AccountViewModel.kt b/app/src/main/java/com/kickstarter/viewmodels/AccountViewModel.kt index e0766a3828..ef06395ee7 100644 --- a/app/src/main/java/com/kickstarter/viewmodels/AccountViewModel.kt +++ b/app/src/main/java/com/kickstarter/viewmodels/AccountViewModel.kt @@ -85,7 +85,7 @@ interface AccountViewModel { .subscribe { this.chosenCurrency.onNext(it) this.success.onNext(it) - this.koala.trackSelectedChosenCurrency() + this.koala.trackSelectedChosenCurrency(it) } updateCurrencyNotification From 12d64ab6bbd714d5b0bbc46806a1f388aca3eab4 Mon Sep 17 00:00:00 2001 From: Rashad Cureton Date: Tue, 27 Nov 2018 17:12:36 -0500 Subject: [PATCH 02/12] remvoed methods and only track fabric custom attr for currency --- .../main/java/com/kickstarter/libs/Koala.java | 34 +++++++++---------- .../kickstarter/libs/KoalaTrackingClient.java | 9 ----- .../kickstarter/libs/TrackingClientType.java | 1 - 3 files changed, 17 insertions(+), 27 deletions(-) diff --git a/app/src/main/java/com/kickstarter/libs/Koala.java b/app/src/main/java/com/kickstarter/libs/Koala.java index 3f574a6d06..ae125c31f1 100644 --- a/app/src/main/java/com/kickstarter/libs/Koala.java +++ b/app/src/main/java/com/kickstarter/libs/Koala.java @@ -299,12 +299,12 @@ public void trackSignupNewsletterToggle(final boolean sendNewsletters) { // SETTINGS public void trackChangedEmail() { - this.client.track(KoalaEvent.CHANGED_EMAIL, this.client.defaultProperties()); + this.client.track(KoalaEvent.CHANGED_EMAIL); AnswersExtKt.fabricLogCustomEvent(KoalaEvent.CHANGED_EMAIL); } public void trackChangedPassword() { - this.client.track(KoalaEvent.CHANGED_PASSWORD, this.client.defaultProperties()); + this.client.track(KoalaEvent.CHANGED_PASSWORD); AnswersExtKt.fabricLogCustomEvent(KoalaEvent.CHANGED_PASSWORD); } public void trackContactEmailClicked() { @@ -312,17 +312,17 @@ public void trackContactEmailClicked() { } public void trackDeletePaymentMethod() { - this.client.track(KoalaEvent.DELETED_PAYMENT_METHOD, this.client.defaultProperties()); + this.client.track(KoalaEvent.DELETED_PAYMENT_METHOD); AnswersExtKt.fabricLogCustomEvent(KoalaEvent.DELETED_PAYMENT_METHOD); } public void trackErroredDeletePaymentMethod() { - this.client.track(KoalaEvent.ERRORED_DELETE_PAYMENT_METHOD, this.client.defaultProperties()); + this.client.track(KoalaEvent.ERRORED_DELETE_PAYMENT_METHOD); AnswersExtKt.fabricLogCustomEvent(KoalaEvent.ERRORED_DELETE_PAYMENT_METHOD); } public void trackFailedPaymentMethodCreation() { - this.client.track(KoalaEvent.FAILED_PAYMENT_METHOD_CREATION, this.client.defaultProperties()); + this.client.track(KoalaEvent.FAILED_PAYMENT_METHOD_CREATION); AnswersExtKt.fabricLogCustomEvent(KoalaEvent.FAILED_PAYMENT_METHOD_CREATION); } @@ -335,62 +335,62 @@ public void trackNewsletterToggle(final boolean sendNewsletter) { } public void trackResentVerificationEmail() { - this.client.track(KoalaEvent.RESENT_VERIFICATION_EMAIL, this.client.defaultProperties()); + this.client.track(KoalaEvent.RESENT_VERIFICATION_EMAIL); AnswersExtKt.fabricLogCustomEvent(KoalaEvent.RESENT_VERIFICATION_EMAIL); } public void trackSavedPaymentMethod() { - this.client.track(KoalaEvent.SAVED_PAYMENT_METHOD, this.client.defaultProperties()); + this.client.track(KoalaEvent.SAVED_PAYMENT_METHOD); AnswersExtKt.fabricLogCustomEvent(KoalaEvent.SAVED_PAYMENT_METHOD); } public void trackSelectedChosenCurrency(String selectedCurrency) { - this.client.trackEventType(KoalaEvent.SELECTED_CHOSEN_CURRENCY, this.client.defaultProperties(), selectedCurrency); + this.client.track(KoalaEvent.SELECTED_CHOSEN_CURRENCY); AnswersExtKt.fabricLogCustomEventWithAttributes(KoalaEvent.SELECTED_CHOSEN_CURRENCY, "currency", selectedCurrency); } public void trackSettingsView() { - this.client.track("Settings View",this.client.defaultProperties()); + this.client.track("Settings View"); AnswersExtKt.fabricLogCustomEvent(KoalaEvent.VIEWED_SETTINGS); } public void trackViewedAccount() { - this.client.track(KoalaEvent.VIEWED_ACCOUNT, this.client.defaultProperties()); + this.client.track(KoalaEvent.VIEWED_ACCOUNT); AnswersExtKt.fabricLogCustomEvent(KoalaEvent.VIEWED_ACCOUNT); } public void trackViewedAddNewCard() { - this.client.track(KoalaEvent.VIEWED_ADD_NEW_CARD, this.client.defaultProperties()); + this.client.track(KoalaEvent.VIEWED_ADD_NEW_CARD); AnswersExtKt.fabricLogCustomEvent(KoalaEvent.VIEWED_ADD_NEW_CARD); } public void trackViewedChangedEmail() { - this.client.track(KoalaEvent.VIEWED_CHANGE_EMAIL, this.client.defaultProperties()); + this.client.track(KoalaEvent.VIEWED_CHANGE_EMAIL); AnswersExtKt.fabricLogCustomEvent(KoalaEvent.VIEWED_CHANGE_EMAIL); } public void trackViewedChangedPassword() { - this.client.track(KoalaEvent.VIEWED_CHANGE_PASSWORD, this.client.defaultProperties()); + this.client.track(KoalaEvent.VIEWED_CHANGE_PASSWORD); AnswersExtKt.fabricLogCustomEvent(KoalaEvent.VIEWED_CHANGE_PASSWORD); } public void trackViewedNotifications() { - this.client.track(KoalaEvent.VIEWED_NOTIFICATIONS, this.client.defaultProperties()); + this.client.track(KoalaEvent.VIEWED_NOTIFICATIONS); AnswersExtKt.fabricLogCustomEvent(KoalaEvent.VIEWED_NOTIFICATIONS); } public void trackViewedNewsletter() { - this.client.track(KoalaEvent.VIEWED_NEWSLETTER, this.client.defaultProperties()); + this.client.track(KoalaEvent.VIEWED_NEWSLETTER); AnswersExtKt.fabricLogCustomEvent(KoalaEvent.VIEWED_NEWSLETTER); } public void trackViewedPaymentMethods() { - this.client.track(KoalaEvent.VIEWED_PAYMENT_METHODS, this.client.defaultProperties()); + this.client.track(KoalaEvent.VIEWED_PAYMENT_METHODS); AnswersExtKt.fabricLogCustomEvent(KoalaEvent.VIEWED_PAYMENT_METHODS); } public void trackViewedPrivacy() { - this.client.track(KoalaEvent.VIEWED_PRIVACY, this.client.defaultProperties()); + this.client.track(KoalaEvent.VIEWED_PRIVACY); AnswersExtKt.fabricLogCustomEvent(KoalaEvent.VIEWED_PRIVACY); } diff --git a/app/src/main/java/com/kickstarter/libs/KoalaTrackingClient.java b/app/src/main/java/com/kickstarter/libs/KoalaTrackingClient.java index 1784a793f1..5c8b12872a 100644 --- a/app/src/main/java/com/kickstarter/libs/KoalaTrackingClient.java +++ b/app/src/main/java/com/kickstarter/libs/KoalaTrackingClient.java @@ -72,15 +72,6 @@ public Map defaultProperties() { hashMap.put("device_fingerprint", this.mixpanel.getDistinctId()); hashMap.put("android_uuid", this.mixpanel.getDistinctId()); hashMap.put("android_pay_capable", this.androidPayCapability.isCapable()); - hashMap.put("manufacturer", android.os.Build.MANUFACTURER); - hashMap.put("app_version", android.os.Build.VERSION.RELEASE); - hashMap.put("model", android.os.Build.MODEL); - hashMap.put("brand", android.os.Build.BRAND); - hashMap.put("product", android.os.Build.PRODUCT); - hashMap.put("os_version", android.os.Build.VERSION.SDK_INT); - hashMap.put("mp_lib", "kickstarter_android"); - hashMap.put("koala_lib", "kickstarter_android"); - hashMap.put("time", Build.TIME); return hashMap; } diff --git a/app/src/main/java/com/kickstarter/libs/TrackingClientType.java b/app/src/main/java/com/kickstarter/libs/TrackingClientType.java index f60a8e2b0e..3b293402e7 100644 --- a/app/src/main/java/com/kickstarter/libs/TrackingClientType.java +++ b/app/src/main/java/com/kickstarter/libs/TrackingClientType.java @@ -7,7 +7,6 @@ public abstract class TrackingClientType { public abstract void track(final String eventName, final Map properties); - public abstract void trackEventType(final String eventName, final Map properties, final String eventType); public final void track(final String eventName) { track(eventName, new HashMap<>()); From 689ae33aecb3d56609da8702704cafd35bf738a7 Mon Sep 17 00:00:00 2001 From: Rashad Cureton Date: Tue, 27 Nov 2018 17:13:51 -0500 Subject: [PATCH 03/12] removed unused import --- app/src/main/java/com/kickstarter/libs/KoalaTrackingClient.java | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/java/com/kickstarter/libs/KoalaTrackingClient.java b/app/src/main/java/com/kickstarter/libs/KoalaTrackingClient.java index 5c8b12872a..a46f0f1539 100644 --- a/app/src/main/java/com/kickstarter/libs/KoalaTrackingClient.java +++ b/app/src/main/java/com/kickstarter/libs/KoalaTrackingClient.java @@ -2,7 +2,6 @@ import android.content.Context; import android.content.res.Configuration; -import android.os.Build; import android.support.annotation.NonNull; import android.support.annotation.Nullable; From 787be988013c34ced2956b7dcb7f69cf6d272c34 Mon Sep 17 00:00:00 2001 From: Rashad Cureton Date: Tue, 27 Nov 2018 17:17:41 -0500 Subject: [PATCH 04/12] fixed checkstyle error --- app/src/main/java/com/kickstarter/libs/Koala.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/kickstarter/libs/Koala.java b/app/src/main/java/com/kickstarter/libs/Koala.java index ae125c31f1..9224f27251 100644 --- a/app/src/main/java/com/kickstarter/libs/Koala.java +++ b/app/src/main/java/com/kickstarter/libs/Koala.java @@ -344,7 +344,7 @@ public void trackSavedPaymentMethod() { AnswersExtKt.fabricLogCustomEvent(KoalaEvent.SAVED_PAYMENT_METHOD); } - public void trackSelectedChosenCurrency(String selectedCurrency) { + public void trackSelectedChosenCurrency(final String selectedCurrency) { this.client.track(KoalaEvent.SELECTED_CHOSEN_CURRENCY); AnswersExtKt.fabricLogCustomEventWithAttributes(KoalaEvent.SELECTED_CHOSEN_CURRENCY, "currency", selectedCurrency); } From 78782edda9469e9477379becec0e731c9c32b7e6 Mon Sep 17 00:00:00 2001 From: Rashad Cureton Date: Wed, 28 Nov 2018 11:14:51 -0500 Subject: [PATCH 05/12] added content for firebase method --- .../java/com/kickstarter/ApplicationModule.java | 2 +- .../java/com/kickstarter/extensions/AnswersExt.kt | 14 ++++++++++++++ app/src/main/java/com/kickstarter/libs/Koala.java | 7 ++++++- 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/kickstarter/ApplicationModule.java b/app/src/main/java/com/kickstarter/ApplicationModule.java index 1a9c5ceb5b..ebcef1682c 100644 --- a/app/src/main/java/com/kickstarter/ApplicationModule.java +++ b/app/src/main/java/com/kickstarter/ApplicationModule.java @@ -363,7 +363,7 @@ Application provideApplication() { @Singleton static Koala provideKoala(final @ApplicationContext @NonNull Context context, final @NonNull CurrentUserType currentUser, final @NonNull AndroidPayCapability androidPayCapability) { - return new Koala(new KoalaTrackingClient(context, currentUser, androidPayCapability)); + return new Koala(new KoalaTrackingClient(context, currentUser, androidPayCapability), context); } @Provides diff --git a/app/src/main/java/com/kickstarter/extensions/AnswersExt.kt b/app/src/main/java/com/kickstarter/extensions/AnswersExt.kt index 2bb1426702..109c7a1c53 100644 --- a/app/src/main/java/com/kickstarter/extensions/AnswersExt.kt +++ b/app/src/main/java/com/kickstarter/extensions/AnswersExt.kt @@ -1,7 +1,10 @@ package com.kickstarter.extensions +import android.content.Context +import android.os.Bundle import com.crashlytics.android.answers.Answers import com.crashlytics.android.answers.CustomEvent +import com.google.firebase.analytics.FirebaseAnalytics fun fabricLogCustomEvent(customEvent: String) { Answers.getInstance().logCustom(CustomEvent(customEvent)) @@ -10,3 +13,14 @@ fun fabricLogCustomEvent(customEvent: String) { fun fabricLogCustomEventWithAttributes(customEvent: String, key: String, attribute: String) { Answers.getInstance().logCustom(CustomEvent(customEvent).putCustomAttribute(key, attribute)) } + +fun firebaseCustomEvent(context: Context, eventName: String) { + val bundle = Bundle() + FirebaseAnalytics.getInstance(context).logEvent(eventName, bundle) +} + +fun firebaseCustomEventWithParams(context: Context, eventName: String, key: String, eventAttribute: String) { + val bundle = Bundle() + bundle.putString(key, eventAttribute) + FirebaseAnalytics.getInstance(context).logEvent(eventName, bundle) +} diff --git a/app/src/main/java/com/kickstarter/libs/Koala.java b/app/src/main/java/com/kickstarter/libs/Koala.java index 9224f27251..e51225dcfd 100644 --- a/app/src/main/java/com/kickstarter/libs/Koala.java +++ b/app/src/main/java/com/kickstarter/libs/Koala.java @@ -1,9 +1,11 @@ package com.kickstarter.libs; +import android.content.Context; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import com.kickstarter.extensions.AnswersExtKt; +import com.kickstarter.libs.qualifiers.ApplicationContext; import com.kickstarter.libs.utils.KoalaUtils; import com.kickstarter.models.Activity; import com.kickstarter.models.Project; @@ -19,9 +21,11 @@ public final class Koala { private final @NonNull TrackingClientType client; + private final @NonNull Context context; - public Koala(final @NonNull TrackingClientType client) { + public Koala(final @NonNull TrackingClientType client, final @ApplicationContext @NonNull Context context ) { this.client = client; + this.context = context; } public @NonNull TrackingClientType client() { @@ -347,6 +351,7 @@ public void trackSavedPaymentMethod() { public void trackSelectedChosenCurrency(final String selectedCurrency) { this.client.track(KoalaEvent.SELECTED_CHOSEN_CURRENCY); AnswersExtKt.fabricLogCustomEventWithAttributes(KoalaEvent.SELECTED_CHOSEN_CURRENCY, "currency", selectedCurrency); + AnswersExtKt.firebaseCustomEventWithParams(this.context,KoalaEvent.SELECTED_CHOSEN_CURRENCY, "currency", selectedCurrency ); } public void trackSettingsView() { From 938a224ac81e52940c590872d412c2f262317b0e Mon Sep 17 00:00:00 2001 From: Rashad Cureton Date: Wed, 28 Nov 2018 13:56:48 -0500 Subject: [PATCH 06/12] added tracking for firebase and fabric --- .../main/java/com/kickstarter/libs/Koala.java | 24 ++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/kickstarter/libs/Koala.java b/app/src/main/java/com/kickstarter/libs/Koala.java index e51225dcfd..c2ac63cb3a 100644 --- a/app/src/main/java/com/kickstarter/libs/Koala.java +++ b/app/src/main/java/com/kickstarter/libs/Koala.java @@ -23,12 +23,13 @@ public final class Koala { private final @NonNull TrackingClientType client; private final @NonNull Context context; - public Koala(final @NonNull TrackingClientType client, final @ApplicationContext @NonNull Context context ) { + public Koala(final @NonNull TrackingClientType client, final @ApplicationContext @NonNull Context context) { this.client = client; this.context = context; } - public @NonNull TrackingClientType client() { + public @NonNull + TrackingClientType client() { return this.client; } @@ -88,6 +89,7 @@ public void trackDiscoveryFilterSelected(final @NonNull DiscoveryParams params) /** * Tracks a project show event. + * * @param intentRefTag (nullable) The ref tag present in the activity upon displaying the project. * @param cookieRefTag (nullable) The ref tag extracted from the cookie store upon viewing the project. */ @@ -305,11 +307,13 @@ public void trackSignupNewsletterToggle(final boolean sendNewsletters) { public void trackChangedEmail() { this.client.track(KoalaEvent.CHANGED_EMAIL); AnswersExtKt.fabricLogCustomEvent(KoalaEvent.CHANGED_EMAIL); + AnswersExtKt.firebaseCustomEvent(this.context, KoalaEvent.CHANGED_EMAIL); } public void trackChangedPassword() { this.client.track(KoalaEvent.CHANGED_PASSWORD); AnswersExtKt.fabricLogCustomEvent(KoalaEvent.CHANGED_PASSWORD); + AnswersExtKt.firebaseCustomEvent(this.context, KoalaEvent.CHANGED_PASSWORD); } public void trackContactEmailClicked() { this.client.track("Contact Email Clicked"); @@ -318,16 +322,19 @@ public void trackContactEmailClicked() { public void trackDeletePaymentMethod() { this.client.track(KoalaEvent.DELETED_PAYMENT_METHOD); AnswersExtKt.fabricLogCustomEvent(KoalaEvent.DELETED_PAYMENT_METHOD); + AnswersExtKt.firebaseCustomEvent(this.context, KoalaEvent.DELETED_PAYMENT_METHOD); } public void trackErroredDeletePaymentMethod() { this.client.track(KoalaEvent.ERRORED_DELETE_PAYMENT_METHOD); AnswersExtKt.fabricLogCustomEvent(KoalaEvent.ERRORED_DELETE_PAYMENT_METHOD); + AnswersExtKt.firebaseCustomEvent(this.context, KoalaEvent.ERRORED_DELETE_PAYMENT_METHOD); } public void trackFailedPaymentMethodCreation() { this.client.track(KoalaEvent.FAILED_PAYMENT_METHOD_CREATION); AnswersExtKt.fabricLogCustomEvent(KoalaEvent.FAILED_PAYMENT_METHOD_CREATION); + AnswersExtKt.firebaseCustomEvent(this.context, KoalaEvent.FAILED_PAYMENT_METHOD_CREATION); } public void trackNewsletterToggle(final boolean sendNewsletter) { @@ -341,62 +348,73 @@ public void trackNewsletterToggle(final boolean sendNewsletter) { public void trackResentVerificationEmail() { this.client.track(KoalaEvent.RESENT_VERIFICATION_EMAIL); AnswersExtKt.fabricLogCustomEvent(KoalaEvent.RESENT_VERIFICATION_EMAIL); + AnswersExtKt.firebaseCustomEvent(this.context, KoalaEvent.RESENT_VERIFICATION_EMAIL); } public void trackSavedPaymentMethod() { this.client.track(KoalaEvent.SAVED_PAYMENT_METHOD); AnswersExtKt.fabricLogCustomEvent(KoalaEvent.SAVED_PAYMENT_METHOD); + AnswersExtKt.firebaseCustomEvent(this.context, KoalaEvent.SAVED_PAYMENT_METHOD); } public void trackSelectedChosenCurrency(final String selectedCurrency) { this.client.track(KoalaEvent.SELECTED_CHOSEN_CURRENCY); AnswersExtKt.fabricLogCustomEventWithAttributes(KoalaEvent.SELECTED_CHOSEN_CURRENCY, "currency", selectedCurrency); - AnswersExtKt.firebaseCustomEventWithParams(this.context,KoalaEvent.SELECTED_CHOSEN_CURRENCY, "currency", selectedCurrency ); + AnswersExtKt.firebaseCustomEventWithParams(this.context, KoalaEvent.SELECTED_CHOSEN_CURRENCY, "currency", selectedCurrency); } public void trackSettingsView() { this.client.track("Settings View"); AnswersExtKt.fabricLogCustomEvent(KoalaEvent.VIEWED_SETTINGS); + AnswersExtKt.firebaseCustomEvent(this.context, KoalaEvent.VIEWED_SETTINGS); } public void trackViewedAccount() { this.client.track(KoalaEvent.VIEWED_ACCOUNT); AnswersExtKt.fabricLogCustomEvent(KoalaEvent.VIEWED_ACCOUNT); + AnswersExtKt.firebaseCustomEvent(this.context, KoalaEvent.VIEWED_ACCOUNT); } public void trackViewedAddNewCard() { this.client.track(KoalaEvent.VIEWED_ADD_NEW_CARD); AnswersExtKt.fabricLogCustomEvent(KoalaEvent.VIEWED_ADD_NEW_CARD); + AnswersExtKt.firebaseCustomEvent(this.context, KoalaEvent.VIEWED_ADD_NEW_CARD); } public void trackViewedChangedEmail() { this.client.track(KoalaEvent.VIEWED_CHANGE_EMAIL); AnswersExtKt.fabricLogCustomEvent(KoalaEvent.VIEWED_CHANGE_EMAIL); + AnswersExtKt.firebaseCustomEvent(this.context, KoalaEvent.VIEWED_CHANGE_EMAIL); } public void trackViewedChangedPassword() { this.client.track(KoalaEvent.VIEWED_CHANGE_PASSWORD); AnswersExtKt.fabricLogCustomEvent(KoalaEvent.VIEWED_CHANGE_PASSWORD); + AnswersExtKt.firebaseCustomEvent(this.context, KoalaEvent.VIEWED_CHANGE_PASSWORD); } public void trackViewedNotifications() { this.client.track(KoalaEvent.VIEWED_NOTIFICATIONS); AnswersExtKt.fabricLogCustomEvent(KoalaEvent.VIEWED_NOTIFICATIONS); + AnswersExtKt.firebaseCustomEvent(this.context, KoalaEvent.VIEWED_NOTIFICATIONS); } public void trackViewedNewsletter() { this.client.track(KoalaEvent.VIEWED_NEWSLETTER); AnswersExtKt.fabricLogCustomEvent(KoalaEvent.VIEWED_NEWSLETTER); + AnswersExtKt.firebaseCustomEvent(this.context, KoalaEvent.VIEWED_NEWSLETTER); } public void trackViewedPaymentMethods() { this.client.track(KoalaEvent.VIEWED_PAYMENT_METHODS); AnswersExtKt.fabricLogCustomEvent(KoalaEvent.VIEWED_PAYMENT_METHODS); + AnswersExtKt.firebaseCustomEvent(this.context, KoalaEvent.VIEWED_PAYMENT_METHODS); } public void trackViewedPrivacy() { this.client.track(KoalaEvent.VIEWED_PRIVACY); AnswersExtKt.fabricLogCustomEvent(KoalaEvent.VIEWED_PRIVACY); + AnswersExtKt.firebaseCustomEvent(this.context, KoalaEvent.VIEWED_PRIVACY); } // CHECKOUT From c9ad639852d2fa51ac4448ac99f4dfc2b0077631 Mon Sep 17 00:00:00 2001 From: Rashad Cureton Date: Wed, 28 Nov 2018 13:59:25 -0500 Subject: [PATCH 07/12] fixed indentation --- app/src/main/java/com/kickstarter/libs/Koala.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/src/main/java/com/kickstarter/libs/Koala.java b/app/src/main/java/com/kickstarter/libs/Koala.java index c2ac63cb3a..d7c45e61bf 100644 --- a/app/src/main/java/com/kickstarter/libs/Koala.java +++ b/app/src/main/java/com/kickstarter/libs/Koala.java @@ -28,8 +28,7 @@ public Koala(final @NonNull TrackingClientType client, final @ApplicationContext this.context = context; } - public @NonNull - TrackingClientType client() { + public @NonNull TrackingClientType client() { return this.client; } From ec6408dc65aad45a9e2c4b40d090815c7b7ecfa0 Mon Sep 17 00:00:00 2001 From: Rashad Cureton Date: Wed, 28 Nov 2018 18:33:42 -0500 Subject: [PATCH 08/12] placed temp string for firebase --- app/src/main/java/com/kickstarter/libs/Koala.java | 11 ++++++++--- .../main/java/com/kickstarter/libs/KoalaEvent.java | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/kickstarter/libs/Koala.java b/app/src/main/java/com/kickstarter/libs/Koala.java index d7c45e61bf..b83425cb3e 100644 --- a/app/src/main/java/com/kickstarter/libs/Koala.java +++ b/app/src/main/java/com/kickstarter/libs/Koala.java @@ -357,7 +357,12 @@ public void trackSavedPaymentMethod() { } public void trackSelectedChosenCurrency(final String selectedCurrency) { - this.client.track(KoalaEvent.SELECTED_CHOSEN_CURRENCY); + this.client.track(KoalaEvent.SELECTED_CHOSEN_CURRENCY, new HashMap() { + { + put("user_chosen_currency", selectedCurrency); + } + }); + AnswersExtKt.fabricLogCustomEventWithAttributes(KoalaEvent.SELECTED_CHOSEN_CURRENCY, "currency", selectedCurrency); AnswersExtKt.firebaseCustomEventWithParams(this.context, KoalaEvent.SELECTED_CHOSEN_CURRENCY, "currency", selectedCurrency); } @@ -371,7 +376,7 @@ public void trackSettingsView() { public void trackViewedAccount() { this.client.track(KoalaEvent.VIEWED_ACCOUNT); AnswersExtKt.fabricLogCustomEvent(KoalaEvent.VIEWED_ACCOUNT); - AnswersExtKt.firebaseCustomEvent(this.context, KoalaEvent.VIEWED_ACCOUNT); + AnswersExtKt.firebaseCustomEvent(this.context, "Viewed_Account"); } public void trackViewedAddNewCard() { @@ -383,7 +388,7 @@ public void trackViewedAddNewCard() { public void trackViewedChangedEmail() { this.client.track(KoalaEvent.VIEWED_CHANGE_EMAIL); AnswersExtKt.fabricLogCustomEvent(KoalaEvent.VIEWED_CHANGE_EMAIL); - AnswersExtKt.firebaseCustomEvent(this.context, KoalaEvent.VIEWED_CHANGE_EMAIL); + AnswersExtKt.firebaseCustomEvent(this.context, "Viewed_Change_Email"); } public void trackViewedChangedPassword() { diff --git a/app/src/main/java/com/kickstarter/libs/KoalaEvent.java b/app/src/main/java/com/kickstarter/libs/KoalaEvent.java index fa29150a26..27732bc3a2 100644 --- a/app/src/main/java/com/kickstarter/libs/KoalaEvent.java +++ b/app/src/main/java/com/kickstarter/libs/KoalaEvent.java @@ -40,7 +40,7 @@ private KoalaEvent() {} public static final String PROJECT_UNSTAR = "Project Unstar"; public static final String RESENT_VERIFICATION_EMAIL = "Resent Verification Email"; public static final String SAVED_PAYMENT_METHOD = "Saved Payment Method"; - public static final String SELECTED_CHOSEN_CURRENCY = "Selected Chosen Currency"; + public static final String SELECTED_CHOSEN_CURRENCY = "Selected_Chosen_Currency"; public static final String SENT_MESSAGE = "Sent Message"; public static final String SHOWED_SHARE_SHEET = "Showed Share Sheet"; public static final String SIGNUP_NEWSLETTER_TOGGLE = "Signup Newsletter Toggle"; From e70b368c8dab8bc89cfe0008ef9f37156a384bdf Mon Sep 17 00:00:00 2001 From: Rashad Cureton Date: Thu, 29 Nov 2018 12:52:20 -0500 Subject: [PATCH 09/12] removed firebase tracking --- .../com/kickstarter/ApplicationModule.java | 2 +- .../com/kickstarter/extensions/AnswersExt.kt | 11 ---------- .../main/java/com/kickstarter/libs/Koala.java | 21 +------------------ .../java/com/kickstarter/libs/KoalaEvent.java | 2 +- 4 files changed, 3 insertions(+), 33 deletions(-) diff --git a/app/src/main/java/com/kickstarter/ApplicationModule.java b/app/src/main/java/com/kickstarter/ApplicationModule.java index ebcef1682c..1a9c5ceb5b 100644 --- a/app/src/main/java/com/kickstarter/ApplicationModule.java +++ b/app/src/main/java/com/kickstarter/ApplicationModule.java @@ -363,7 +363,7 @@ Application provideApplication() { @Singleton static Koala provideKoala(final @ApplicationContext @NonNull Context context, final @NonNull CurrentUserType currentUser, final @NonNull AndroidPayCapability androidPayCapability) { - return new Koala(new KoalaTrackingClient(context, currentUser, androidPayCapability), context); + return new Koala(new KoalaTrackingClient(context, currentUser, androidPayCapability)); } @Provides diff --git a/app/src/main/java/com/kickstarter/extensions/AnswersExt.kt b/app/src/main/java/com/kickstarter/extensions/AnswersExt.kt index 109c7a1c53..e43bd5a73e 100644 --- a/app/src/main/java/com/kickstarter/extensions/AnswersExt.kt +++ b/app/src/main/java/com/kickstarter/extensions/AnswersExt.kt @@ -13,14 +13,3 @@ fun fabricLogCustomEvent(customEvent: String) { fun fabricLogCustomEventWithAttributes(customEvent: String, key: String, attribute: String) { Answers.getInstance().logCustom(CustomEvent(customEvent).putCustomAttribute(key, attribute)) } - -fun firebaseCustomEvent(context: Context, eventName: String) { - val bundle = Bundle() - FirebaseAnalytics.getInstance(context).logEvent(eventName, bundle) -} - -fun firebaseCustomEventWithParams(context: Context, eventName: String, key: String, eventAttribute: String) { - val bundle = Bundle() - bundle.putString(key, eventAttribute) - FirebaseAnalytics.getInstance(context).logEvent(eventName, bundle) -} diff --git a/app/src/main/java/com/kickstarter/libs/Koala.java b/app/src/main/java/com/kickstarter/libs/Koala.java index b83425cb3e..fc56d5209a 100644 --- a/app/src/main/java/com/kickstarter/libs/Koala.java +++ b/app/src/main/java/com/kickstarter/libs/Koala.java @@ -21,11 +21,9 @@ public final class Koala { private final @NonNull TrackingClientType client; - private final @NonNull Context context; - public Koala(final @NonNull TrackingClientType client, final @ApplicationContext @NonNull Context context) { + public Koala(final @NonNull TrackingClientType client) { this.client = client; - this.context = context; } public @NonNull TrackingClientType client() { @@ -306,13 +304,11 @@ public void trackSignupNewsletterToggle(final boolean sendNewsletters) { public void trackChangedEmail() { this.client.track(KoalaEvent.CHANGED_EMAIL); AnswersExtKt.fabricLogCustomEvent(KoalaEvent.CHANGED_EMAIL); - AnswersExtKt.firebaseCustomEvent(this.context, KoalaEvent.CHANGED_EMAIL); } public void trackChangedPassword() { this.client.track(KoalaEvent.CHANGED_PASSWORD); AnswersExtKt.fabricLogCustomEvent(KoalaEvent.CHANGED_PASSWORD); - AnswersExtKt.firebaseCustomEvent(this.context, KoalaEvent.CHANGED_PASSWORD); } public void trackContactEmailClicked() { this.client.track("Contact Email Clicked"); @@ -321,19 +317,16 @@ public void trackContactEmailClicked() { public void trackDeletePaymentMethod() { this.client.track(KoalaEvent.DELETED_PAYMENT_METHOD); AnswersExtKt.fabricLogCustomEvent(KoalaEvent.DELETED_PAYMENT_METHOD); - AnswersExtKt.firebaseCustomEvent(this.context, KoalaEvent.DELETED_PAYMENT_METHOD); } public void trackErroredDeletePaymentMethod() { this.client.track(KoalaEvent.ERRORED_DELETE_PAYMENT_METHOD); AnswersExtKt.fabricLogCustomEvent(KoalaEvent.ERRORED_DELETE_PAYMENT_METHOD); - AnswersExtKt.firebaseCustomEvent(this.context, KoalaEvent.ERRORED_DELETE_PAYMENT_METHOD); } public void trackFailedPaymentMethodCreation() { this.client.track(KoalaEvent.FAILED_PAYMENT_METHOD_CREATION); AnswersExtKt.fabricLogCustomEvent(KoalaEvent.FAILED_PAYMENT_METHOD_CREATION); - AnswersExtKt.firebaseCustomEvent(this.context, KoalaEvent.FAILED_PAYMENT_METHOD_CREATION); } public void trackNewsletterToggle(final boolean sendNewsletter) { @@ -347,13 +340,11 @@ public void trackNewsletterToggle(final boolean sendNewsletter) { public void trackResentVerificationEmail() { this.client.track(KoalaEvent.RESENT_VERIFICATION_EMAIL); AnswersExtKt.fabricLogCustomEvent(KoalaEvent.RESENT_VERIFICATION_EMAIL); - AnswersExtKt.firebaseCustomEvent(this.context, KoalaEvent.RESENT_VERIFICATION_EMAIL); } public void trackSavedPaymentMethod() { this.client.track(KoalaEvent.SAVED_PAYMENT_METHOD); AnswersExtKt.fabricLogCustomEvent(KoalaEvent.SAVED_PAYMENT_METHOD); - AnswersExtKt.firebaseCustomEvent(this.context, KoalaEvent.SAVED_PAYMENT_METHOD); } public void trackSelectedChosenCurrency(final String selectedCurrency) { @@ -364,61 +355,51 @@ public void trackSelectedChosenCurrency(final String selectedCurrency) { }); AnswersExtKt.fabricLogCustomEventWithAttributes(KoalaEvent.SELECTED_CHOSEN_CURRENCY, "currency", selectedCurrency); - AnswersExtKt.firebaseCustomEventWithParams(this.context, KoalaEvent.SELECTED_CHOSEN_CURRENCY, "currency", selectedCurrency); } public void trackSettingsView() { this.client.track("Settings View"); AnswersExtKt.fabricLogCustomEvent(KoalaEvent.VIEWED_SETTINGS); - AnswersExtKt.firebaseCustomEvent(this.context, KoalaEvent.VIEWED_SETTINGS); } public void trackViewedAccount() { this.client.track(KoalaEvent.VIEWED_ACCOUNT); AnswersExtKt.fabricLogCustomEvent(KoalaEvent.VIEWED_ACCOUNT); - AnswersExtKt.firebaseCustomEvent(this.context, "Viewed_Account"); } public void trackViewedAddNewCard() { this.client.track(KoalaEvent.VIEWED_ADD_NEW_CARD); AnswersExtKt.fabricLogCustomEvent(KoalaEvent.VIEWED_ADD_NEW_CARD); - AnswersExtKt.firebaseCustomEvent(this.context, KoalaEvent.VIEWED_ADD_NEW_CARD); } public void trackViewedChangedEmail() { this.client.track(KoalaEvent.VIEWED_CHANGE_EMAIL); AnswersExtKt.fabricLogCustomEvent(KoalaEvent.VIEWED_CHANGE_EMAIL); - AnswersExtKt.firebaseCustomEvent(this.context, "Viewed_Change_Email"); } public void trackViewedChangedPassword() { this.client.track(KoalaEvent.VIEWED_CHANGE_PASSWORD); AnswersExtKt.fabricLogCustomEvent(KoalaEvent.VIEWED_CHANGE_PASSWORD); - AnswersExtKt.firebaseCustomEvent(this.context, KoalaEvent.VIEWED_CHANGE_PASSWORD); } public void trackViewedNotifications() { this.client.track(KoalaEvent.VIEWED_NOTIFICATIONS); AnswersExtKt.fabricLogCustomEvent(KoalaEvent.VIEWED_NOTIFICATIONS); - AnswersExtKt.firebaseCustomEvent(this.context, KoalaEvent.VIEWED_NOTIFICATIONS); } public void trackViewedNewsletter() { this.client.track(KoalaEvent.VIEWED_NEWSLETTER); AnswersExtKt.fabricLogCustomEvent(KoalaEvent.VIEWED_NEWSLETTER); - AnswersExtKt.firebaseCustomEvent(this.context, KoalaEvent.VIEWED_NEWSLETTER); } public void trackViewedPaymentMethods() { this.client.track(KoalaEvent.VIEWED_PAYMENT_METHODS); AnswersExtKt.fabricLogCustomEvent(KoalaEvent.VIEWED_PAYMENT_METHODS); - AnswersExtKt.firebaseCustomEvent(this.context, KoalaEvent.VIEWED_PAYMENT_METHODS); } public void trackViewedPrivacy() { this.client.track(KoalaEvent.VIEWED_PRIVACY); AnswersExtKt.fabricLogCustomEvent(KoalaEvent.VIEWED_PRIVACY); - AnswersExtKt.firebaseCustomEvent(this.context, KoalaEvent.VIEWED_PRIVACY); } // CHECKOUT diff --git a/app/src/main/java/com/kickstarter/libs/KoalaEvent.java b/app/src/main/java/com/kickstarter/libs/KoalaEvent.java index 27732bc3a2..fa29150a26 100644 --- a/app/src/main/java/com/kickstarter/libs/KoalaEvent.java +++ b/app/src/main/java/com/kickstarter/libs/KoalaEvent.java @@ -40,7 +40,7 @@ private KoalaEvent() {} public static final String PROJECT_UNSTAR = "Project Unstar"; public static final String RESENT_VERIFICATION_EMAIL = "Resent Verification Email"; public static final String SAVED_PAYMENT_METHOD = "Saved Payment Method"; - public static final String SELECTED_CHOSEN_CURRENCY = "Selected_Chosen_Currency"; + public static final String SELECTED_CHOSEN_CURRENCY = "Selected Chosen Currency"; public static final String SENT_MESSAGE = "Sent Message"; public static final String SHOWED_SHARE_SHEET = "Showed Share Sheet"; public static final String SIGNUP_NEWSLETTER_TOGGLE = "Signup Newsletter Toggle"; From e800155af4a11d987c4ca5a89f7a574b412c3f4d Mon Sep 17 00:00:00 2001 From: Rashad Cureton Date: Thu, 29 Nov 2018 12:54:01 -0500 Subject: [PATCH 10/12] removed unused imports --- app/src/main/java/com/kickstarter/libs/Koala.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/src/main/java/com/kickstarter/libs/Koala.java b/app/src/main/java/com/kickstarter/libs/Koala.java index fc56d5209a..ac3ec9e70c 100644 --- a/app/src/main/java/com/kickstarter/libs/Koala.java +++ b/app/src/main/java/com/kickstarter/libs/Koala.java @@ -1,11 +1,9 @@ package com.kickstarter.libs; -import android.content.Context; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import com.kickstarter.extensions.AnswersExtKt; -import com.kickstarter.libs.qualifiers.ApplicationContext; import com.kickstarter.libs.utils.KoalaUtils; import com.kickstarter.models.Activity; import com.kickstarter.models.Project; From e3e9c73feb5569a493c8db95b3a72632438afb85 Mon Sep 17 00:00:00 2001 From: Rashad Cureton Date: Thu, 29 Nov 2018 12:54:59 -0500 Subject: [PATCH 11/12] removed unused imports in extension file --- app/src/main/java/com/kickstarter/extensions/AnswersExt.kt | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/src/main/java/com/kickstarter/extensions/AnswersExt.kt b/app/src/main/java/com/kickstarter/extensions/AnswersExt.kt index e43bd5a73e..2bb1426702 100644 --- a/app/src/main/java/com/kickstarter/extensions/AnswersExt.kt +++ b/app/src/main/java/com/kickstarter/extensions/AnswersExt.kt @@ -1,10 +1,7 @@ package com.kickstarter.extensions -import android.content.Context -import android.os.Bundle import com.crashlytics.android.answers.Answers import com.crashlytics.android.answers.CustomEvent -import com.google.firebase.analytics.FirebaseAnalytics fun fabricLogCustomEvent(customEvent: String) { Answers.getInstance().logCustom(CustomEvent(customEvent)) From d6a715c45d4776c9fc01c60fbcaf3d2dbcdbfaa8 Mon Sep 17 00:00:00 2001 From: Rashad Cureton Date: Thu, 29 Nov 2018 15:26:53 -0500 Subject: [PATCH 12/12] removed fabric events --- .../com/kickstarter/extensions/AnswersExt.kt | 12 ------------ .../main/java/com/kickstarter/libs/Koala.java | 19 ------------------- 2 files changed, 31 deletions(-) delete mode 100644 app/src/main/java/com/kickstarter/extensions/AnswersExt.kt diff --git a/app/src/main/java/com/kickstarter/extensions/AnswersExt.kt b/app/src/main/java/com/kickstarter/extensions/AnswersExt.kt deleted file mode 100644 index 2bb1426702..0000000000 --- a/app/src/main/java/com/kickstarter/extensions/AnswersExt.kt +++ /dev/null @@ -1,12 +0,0 @@ -package com.kickstarter.extensions - -import com.crashlytics.android.answers.Answers -import com.crashlytics.android.answers.CustomEvent - -fun fabricLogCustomEvent(customEvent: String) { - Answers.getInstance().logCustom(CustomEvent(customEvent)) -} - -fun fabricLogCustomEventWithAttributes(customEvent: String, key: String, attribute: String) { - Answers.getInstance().logCustom(CustomEvent(customEvent).putCustomAttribute(key, attribute)) -} diff --git a/app/src/main/java/com/kickstarter/libs/Koala.java b/app/src/main/java/com/kickstarter/libs/Koala.java index ac3ec9e70c..9bedd42e8e 100644 --- a/app/src/main/java/com/kickstarter/libs/Koala.java +++ b/app/src/main/java/com/kickstarter/libs/Koala.java @@ -3,7 +3,6 @@ import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import com.kickstarter.extensions.AnswersExtKt; import com.kickstarter.libs.utils.KoalaUtils; import com.kickstarter.models.Activity; import com.kickstarter.models.Project; @@ -301,12 +300,10 @@ public void trackSignupNewsletterToggle(final boolean sendNewsletters) { // SETTINGS public void trackChangedEmail() { this.client.track(KoalaEvent.CHANGED_EMAIL); - AnswersExtKt.fabricLogCustomEvent(KoalaEvent.CHANGED_EMAIL); } public void trackChangedPassword() { this.client.track(KoalaEvent.CHANGED_PASSWORD); - AnswersExtKt.fabricLogCustomEvent(KoalaEvent.CHANGED_PASSWORD); } public void trackContactEmailClicked() { this.client.track("Contact Email Clicked"); @@ -314,17 +311,14 @@ public void trackContactEmailClicked() { public void trackDeletePaymentMethod() { this.client.track(KoalaEvent.DELETED_PAYMENT_METHOD); - AnswersExtKt.fabricLogCustomEvent(KoalaEvent.DELETED_PAYMENT_METHOD); } public void trackErroredDeletePaymentMethod() { this.client.track(KoalaEvent.ERRORED_DELETE_PAYMENT_METHOD); - AnswersExtKt.fabricLogCustomEvent(KoalaEvent.ERRORED_DELETE_PAYMENT_METHOD); } public void trackFailedPaymentMethodCreation() { this.client.track(KoalaEvent.FAILED_PAYMENT_METHOD_CREATION); - AnswersExtKt.fabricLogCustomEvent(KoalaEvent.FAILED_PAYMENT_METHOD_CREATION); } public void trackNewsletterToggle(final boolean sendNewsletter) { @@ -337,12 +331,10 @@ public void trackNewsletterToggle(final boolean sendNewsletter) { public void trackResentVerificationEmail() { this.client.track(KoalaEvent.RESENT_VERIFICATION_EMAIL); - AnswersExtKt.fabricLogCustomEvent(KoalaEvent.RESENT_VERIFICATION_EMAIL); } public void trackSavedPaymentMethod() { this.client.track(KoalaEvent.SAVED_PAYMENT_METHOD); - AnswersExtKt.fabricLogCustomEvent(KoalaEvent.SAVED_PAYMENT_METHOD); } public void trackSelectedChosenCurrency(final String selectedCurrency) { @@ -351,53 +343,42 @@ public void trackSelectedChosenCurrency(final String selectedCurrency) { put("user_chosen_currency", selectedCurrency); } }); - - AnswersExtKt.fabricLogCustomEventWithAttributes(KoalaEvent.SELECTED_CHOSEN_CURRENCY, "currency", selectedCurrency); } public void trackSettingsView() { this.client.track("Settings View"); - AnswersExtKt.fabricLogCustomEvent(KoalaEvent.VIEWED_SETTINGS); } public void trackViewedAccount() { this.client.track(KoalaEvent.VIEWED_ACCOUNT); - AnswersExtKt.fabricLogCustomEvent(KoalaEvent.VIEWED_ACCOUNT); } public void trackViewedAddNewCard() { this.client.track(KoalaEvent.VIEWED_ADD_NEW_CARD); - AnswersExtKt.fabricLogCustomEvent(KoalaEvent.VIEWED_ADD_NEW_CARD); } public void trackViewedChangedEmail() { this.client.track(KoalaEvent.VIEWED_CHANGE_EMAIL); - AnswersExtKt.fabricLogCustomEvent(KoalaEvent.VIEWED_CHANGE_EMAIL); } public void trackViewedChangedPassword() { this.client.track(KoalaEvent.VIEWED_CHANGE_PASSWORD); - AnswersExtKt.fabricLogCustomEvent(KoalaEvent.VIEWED_CHANGE_PASSWORD); } public void trackViewedNotifications() { this.client.track(KoalaEvent.VIEWED_NOTIFICATIONS); - AnswersExtKt.fabricLogCustomEvent(KoalaEvent.VIEWED_NOTIFICATIONS); } public void trackViewedNewsletter() { this.client.track(KoalaEvent.VIEWED_NEWSLETTER); - AnswersExtKt.fabricLogCustomEvent(KoalaEvent.VIEWED_NEWSLETTER); } public void trackViewedPaymentMethods() { this.client.track(KoalaEvent.VIEWED_PAYMENT_METHODS); - AnswersExtKt.fabricLogCustomEvent(KoalaEvent.VIEWED_PAYMENT_METHODS); } public void trackViewedPrivacy() { this.client.track(KoalaEvent.VIEWED_PRIVACY); - AnswersExtKt.fabricLogCustomEvent(KoalaEvent.VIEWED_PRIVACY); } // CHECKOUT