From 9ab2f6f206a14e946a5edf06b562e02f59393957 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Fri, 14 May 2021 16:24:16 +0200
Subject: [PATCH] Fixes #1551

---
 .../com/habitrpg/android/habitica/events/ShareEvent.java    | 2 +-
 .../habitrpg/android/habitica/interactors/LevelUpUseCase.kt | 1 +
 .../habitrpg/android/habitica/ui/activities/MainActivity.kt | 6 ++++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/ShareEvent.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/ShareEvent.java
index e47e08cfe..a813e26a8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/ShareEvent.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/events/ShareEvent.java
@@ -3,7 +3,7 @@ package com.habitrpg.android.habitica.events;
 import android.graphics.Bitmap;
 
 public class ShareEvent {
-
+    public String identifier;
     public String sharedMessage;
     public Bitmap shareImage;
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/LevelUpUseCase.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/LevelUpUseCase.kt
index 9236c4064..f560bfbb2 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/LevelUpUseCase.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/LevelUpUseCase.kt
@@ -59,6 +59,7 @@ constructor(private val soundManager: SoundManager, threadExecutor: ThreadExecut
                 }
 
                 val event = ShareEvent()
+                event.identifier = "levelup"
                 event.sharedMessage = requestValues.activity.getString(R.string.share_levelup, requestValues.newLevel)
                 val avatarView = AvatarView(requestValues.activity, showBackground = true, showMount = true, showPet = true)
                 avatarView.setAvatar(requestValues.user)
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 e84df0372..91a98f72f 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
@@ -19,6 +19,7 @@ import android.widget.TextView
 import androidx.appcompat.app.ActionBarDrawerToggle
 import androidx.core.content.FileProvider
 import androidx.core.content.edit
+import androidx.core.os.bundleOf
 import androidx.drawerlayout.widget.DrawerLayout
 import androidx.lifecycle.ViewModelProvider
 import androidx.navigation.NavDestination
@@ -551,6 +552,7 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
                         dialog.addButton(R.string.onwards, true)
                         dialog.addButton(R.string.share, false) { hatchingDialog, _ ->
                                     val event1 = ShareEvent()
+                                    event1.identifier = "raisedPet"
                                     event1.sharedMessage = getString(R.string.share_raised, pet.text)
                                     val mountImageSideLength = 99
                                     val sharedImage = Bitmap.createBitmap(mountImageSideLength, mountImageSideLength, Bitmap.Config.ARGB_8888)
@@ -638,6 +640,8 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
                             .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")
+                                FirebaseAnalytics.getInstance(this).setUserProperty("checkin_count", user1.loginIncentives.toString())
+                                FirebaseAnalytics.getInstance(this).setUserProperty("level", user1.stats?.lvl?.toString() ?: "")
                                 pushNotificationManager.setUser(user1)
                                 pushNotificationManager.addPushDeviceUsingStoredToken()
                             }
@@ -706,6 +710,7 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
 
     @Subscribe
     fun shareEvent(event: ShareEvent) {
+        analyticsManager.logEvent("shared", bundleOf(Pair("identifier", event.identifier)))
         val sharingIntent = Intent(Intent.ACTION_SEND)
         sharingIntent.type = "*/*"
         sharingIntent.putExtra(Intent.EXTRA_TEXT, event.sharedMessage)
@@ -895,6 +900,7 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
             dialog.addButton(R.string.share, false) { hatchingDialog, _ ->
                 val event1 = ShareEvent()
                 event1.sharedMessage = getString(R.string.share_hatched, potionName, eggName)
+                event1.identifier = "hatchedPet";
                 val petImageSideLength = 140
                 val sharedImage = Bitmap.createBitmap(petImageSideLength, petImageSideLength, Bitmap.Config.ARGB_8888)
                 val canvas = Canvas(sharedImage)