commit 9f3a68135ffc02675da35319389f2d4a24d27eba
Author: Leszek Koltunski <leszek@koltunski.pl>
Date:   Mon Oct 5 22:43:01 2020 +0100

    Improve Analytics reports

diff --git a/src/main/java/org/distorted/main/RubikPreRender.java b/src/main/java/org/distorted/main/RubikPreRender.java
index bc0bffe6..2cc001de 100644
--- a/src/main/java/org/distorted/main/RubikPreRender.java
+++ b/src/main/java/org/distorted/main/RubikPreRender.java
@@ -338,25 +338,26 @@ public class RubikPreRender implements EffectListener
 
   private void reportRecord()
     {
-    RubikStatePlay play = (RubikStatePlay) StateList.PLAY.getStateClass();
-    RubikScores scores = RubikScores.getInstance();
-
-    int object      = play.getObject();
-    int size        = play.getSize();
-    int level       = play.getLevel();
-    ObjectList list = ObjectList.getObject(object);
-    String name     = scores.getName();
-
-    String record = list.name()+"_"+size+" level "+level+" time "+mNewRecord+" isNew: "+mIsNewRecord+" name: "+name;
-
     final RubikActivity act = (RubikActivity)mView.getContext();
     FirebaseAnalytics analytics = act.getAnalytics();
 
     if( analytics!=null )
       {
+      RubikStatePlay play = (RubikStatePlay) StateList.PLAY.getStateClass();
+      RubikScores scores = RubikScores.getInstance();
+
+      int object      = play.getObject();
+      int size        = play.getSize();
+      int level       = play.getLevel();
+      ObjectList list = ObjectList.getObject(object);
+      String name     = scores.getName();
+
+      String record = list.name()+"_"+size+" level "+level+" time "+mNewRecord+" isNew: "+mIsNewRecord;
+
       Bundle bundle = new Bundle();
+      bundle.putString(FirebaseAnalytics.Param.CHARACTER, name);
       bundle.putString(FirebaseAnalytics.Param.LEVEL, record);
-      analytics.logEvent(FirebaseAnalytics.Event.LEVEL_END, bundle);
+      analytics.logEvent(FirebaseAnalytics.Event.LEVEL_UP, bundle);
       }
     }
 
@@ -410,7 +411,7 @@ public class RubikPreRender implements EffectListener
           else
             {
             String name = scores.getName();
-            analyticsReport(act,"Request review flow not successful", name, timeBegin);
+            analyticsReport(act,"Request Review Flow not successful", name, timeBegin);
             }
           }
         });
@@ -422,12 +423,11 @@ public class RubikPreRender implements EffectListener
   private void analyticsReport(RubikActivity act, String message, String name, long timeBegin)
     {
     long elapsed = System.currentTimeMillis() - timeBegin;
+    String msg = message+" startTime: "+timeBegin+" elapsed: "+elapsed+" name: "+name;
 
     if( BuildConfig.DEBUG )
        {
-       android.util.Log.d("pre", message);
-       android.util.Log.d("pre", name);
-       android.util.Log.d("pre", "startTime: "+timeBegin+" elapsed: "+elapsed);
+       android.util.Log.d("pre", msg);
        }
     else
       {
@@ -436,10 +436,8 @@ public class RubikPreRender implements EffectListener
       if( analytics!=null )
         {
         Bundle bundle = new Bundle();
-        bundle.putString(FirebaseAnalytics.Param.ITEM_NAME, message);
-        bundle.putString(FirebaseAnalytics.Param.CHARACTER, name);
-        bundle.putString(FirebaseAnalytics.Param.START_DATE, "startTime: "+timeBegin+" elapsed: "+elapsed);
-        analytics.logEvent(FirebaseAnalytics.Event.CAMPAIGN_DETAILS, bundle);
+        bundle.putString(FirebaseAnalytics.Param.CONTENT_TYPE, msg);
+        analytics.logEvent(FirebaseAnalytics.Event.SHARE, bundle);
         }
       }
     }