CI-423 Categorize Demo Users In Analytics

app/src/org/commcare/android/database/connect/models/ConnectUserRecord.java

@@ -12,7 +12,7 @@
 import javax.annotation.Nullable;
 
 /**
- * DB model for a ConnectID user and their info
+ * DB model for a Personal ID user and their info
  *
  * @author dviggiano
  */
@@ -236,4 +236,7 @@ public void setHasConnectAccess(boolean hasConnectAccess) {
         this.hasConnectAccess = hasConnectAccess;
     }
 
+    public boolean getIsDemo() {
+        return isDemo;
+    }
 }

app/src/org/commcare/android/logging/ReportingUtils.java

@@ -10,6 +10,7 @@
 import org.commcare.session.CommCareSession;
 import org.commcare.suite.model.Profile;
 import org.commcare.utils.SessionStateUninitException;
+import org.javarosa.core.services.Logger;
 
 import java.net.URL;
 
@@ -158,4 +159,16 @@ public static String getPersonalID() {
         }
         return null;
     }
+
+    public static Boolean getIsPersonalIDDemoUser() {
+        try {
+            PersonalIdManager manager = PersonalIdManager.getInstance();
+            if (manager.isloggedIn()) {
+                return manager.getUser(CommCareApplication.instance()).getIsDemo();
+            }
+        } catch (Exception e) {
+            Logger.exception("Error checking if Personal ID user is a demo user", e);
+        }
+        return null;
+    }
 }

app/src/org/commcare/google/services/analytics/CCAnalyticsParam.java

@@ -47,4 +47,5 @@ public class CCAnalyticsParam {
     static final String NOTIFICATION_ACTION = "action";
     static final String NOTIFICATION_ID = "notification_id";
     static final String NOTIFICATION_CLICK_METHOD = "click_method";
+    static final String IS_PERSONAL_ID_DEMO_USER = "is_personal_id_demo_user";
 }

app/src/org/commcare/google/services/analytics/FirebaseAnalyticsUtil.java

@@ -1,7 +1,5 @@
 package org.commcare.google.services.analytics;
 
-import static com.google.firebase.analytics.FirebaseAnalytics.Param.METHOD;
-
 import android.os.Bundle;
 import android.os.Environment;
 import android.text.TextUtils;
@@ -27,6 +25,7 @@
 
 import javax.annotation.Nullable;
 
+import static com.google.firebase.analytics.FirebaseAnalytics.Param.METHOD;
 import static org.commcare.google.services.analytics.AnalyticsParamValue.CORRUPT_APP_STATE;
 import static org.commcare.google.services.analytics.AnalyticsParamValue.RSA_KEYSTORE_KEY_RETRIEVAL;
 import static org.commcare.google.services.analytics.AnalyticsParamValue.STAGE_UPDATE_FAILURE;
@@ -124,6 +123,11 @@ private static void setUserProperties(FirebaseAnalytics analyticsInstance) {
         }
 
         analyticsInstance.setUserProperty(CCAnalyticsParam.BUILD_NUMBER, String.valueOf(BuildConfig.VERSION_CODE));
+
+        Boolean isPersonalIDDemoUser = ReportingUtils.getIsPersonalIDDemoUser();
+        if (isPersonalIDDemoUser != null) {
+            analyticsInstance.setUserProperty(CCAnalyticsParam.IS_PERSONAL_ID_DEMO_USER, String.valueOf(isPersonalIDDemoUser));
+        }
     }
 
     private static String getFreeDiskBucket() {