From 776d597e62bc90a539ecaee62de3466ad44ac2a4 Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Tue, 12 Nov 2019 16:13:43 +0100 Subject: [PATCH] improve firebase logging --- .../android/habitica/HabiticaPurchaseVerifier.java | 7 +++++-- .../android/habitica/ui/activities/MainActivity.kt | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaPurchaseVerifier.java b/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaPurchaseVerifier.java index 6cc9d868f..48d5b161a 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaPurchaseVerifier.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaPurchaseVerifier.java @@ -2,10 +2,11 @@ package com.habitrpg.android.habitica; import android.content.Context; import android.content.SharedPreferences; -import androidx.preference.PreferenceManager; import androidx.annotation.NonNull; +import androidx.preference.PreferenceManager; +import com.google.firebase.analytics.FirebaseAnalytics; import com.habitrpg.android.habitica.data.ApiClient; import com.habitrpg.android.habitica.events.ConsumablePurchasedEvent; import com.habitrpg.android.habitica.events.UserSubscribedEvent; @@ -44,9 +45,11 @@ public class HabiticaPurchaseVerifier extends BasePurchaseVerifier { private Set purchasedOrderList = new HashSet<>(); public static Map pendingGifts = new HashMap<>(); private SharedPreferences preferences; + private Context context; public HabiticaPurchaseVerifier(Context context, ApiClient apiClient) { preferences = PreferenceManager.getDefaultSharedPreferences(context); + this.context = context; preferences.getStringSet(PURCHASED_PRODUCTS_KEY, purchasedOrderList); pendingGifts = loadPendingGifts(); @@ -142,7 +145,7 @@ public class HabiticaPurchaseVerifier extends BasePurchaseVerifier { verifiedPurchases.add(purchase); requestListener.onSuccess(verifiedPurchases); - + FirebaseAnalytics.getInstance(context).logEvent("user_subscribed", null); EventBus.getDefault().post(new UserSubscribedEvent()); }, throwable -> { if (throwable.getClass().equals(retrofit2.adapter.rxjava2.HttpException.class)) { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt index a15439fe6..26195c241 100755 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt @@ -505,6 +505,7 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction { compositeSubscription.add(this.userRepository.retrieveUser(true) .doOnNext { user1 -> FirebaseAnalytics.getInstance(this).setUserProperty("has_party", if (user1.party?.id?.isNotEmpty() == true) "true" else "false") + FirebaseAnalytics.getInstance(this).setUserProperty("is_subscribed", if (user1.isSubscribed) "true" else "false") pushNotificationManager.setUser(user1) pushNotificationManager.addPushDeviceUsingStoredToken() }