dimagi · shubham1g5 · Oct 2, 2025 · Sep 9, 2025 · Sep 9, 2025 · Sep 10, 2025
diff --git a/app/src/org/commcare/android/database/connect/models/ConnectJobRecord.java b/app/src/org/commcare/android/database/connect/models/ConnectJobRecord.java
@@ -487,6 +487,12 @@ public int getLearningCompletePercentage() {
         return numLearning > 0 ? (100 * getCompletedLearningModules() / numLearning) : 100;
     }
 
+    public int getDeliveryProgressPercentage() {
+        int completed = getCompletedVisits();
+        int total = getMaxVisits();
+        return total > 0 ? (100 * completed / total) : 100;
+    }
+
     public boolean attemptedAssessment() {
         return getLearningCompletePercentage() >= 100 && assessments != null && !assessments.isEmpty();
     }

diff --git a/app/src/org/commcare/android/database/connect/models/ConnectLinkedAppRecord.java b/app/src/org/commcare/android/database/connect/models/ConnectLinkedAppRecord.java
@@ -176,6 +176,10 @@ public void setLastAccessed(Date date) {
         lastAccessed = date;
     }
 
+    public String getAppId() {
+        return appId;
+    }
+
     public static ConnectLinkedAppRecord fromV9(ConnectLinkedAppRecordV9 oldRecord) {
         ConnectLinkedAppRecord newRecord = new ConnectLinkedAppRecord();
 

diff --git a/app/src/org/commcare/connect/ConnectJobHelper.kt b/app/src/org/commcare/connect/ConnectJobHelper.kt
@@ -3,9 +3,6 @@ package org.commcare.connect
 import android.content.Context
 import android.widget.Toast
 import org.commcare.CommCareApplication
-import org.commcare.android.database.connect.models.ConnectJobAssessmentRecord
-import org.commcare.android.database.connect.models.ConnectJobDeliveryRecord
-import org.commcare.android.database.connect.models.ConnectJobLearningRecord
 import org.commcare.android.database.connect.models.ConnectJobPaymentRecord
 import org.commcare.android.database.connect.models.ConnectJobRecord
 import org.commcare.connect.database.ConnectJobUtils
@@ -14,6 +11,9 @@ import org.commcare.connect.network.connect.ConnectApiHandler
 import org.commcare.connect.network.connect.models.DeliveryAppProgressResponseModel
 import org.commcare.connect.network.connect.models.LearningAppProgressResponseModel
 import org.commcare.connect.network.connectId.PersonalIdApiErrorHandler
+import org.commcare.google.services.analytics.AnalyticsParamValue.FINISH_DELIVERY
+import org.commcare.google.services.analytics.AnalyticsParamValue.PAID_DELIVERY
+import org.commcare.google.services.analytics.AnalyticsParamValue.START_DELIVERY
 import org.commcare.google.services.analytics.FirebaseAnalyticsUtil
 
 object ConnectJobHelper {
@@ -65,7 +65,9 @@ object ConnectJobHelper {
                     learningAppProgressResponseModel.connectJobLearningRecords.size
                 job.assessments = learningAppProgressResponseModel.connectJobAssessmentRecords
                 ConnectJobUtils.updateJobLearnProgress(context, job)
-                FirebaseAnalyticsUtil.reportCccApiLearnProgress(true)
+                if (job.passedAssessment()){
+                    FirebaseAnalyticsUtil.reportCccApiLearnProgress(true)
+                }
                 listener.connectActivityComplete(true)
             }
 
@@ -84,24 +86,36 @@ object ConnectJobHelper {
         val user = ConnectUserDatabaseUtil.getUser(context)
         object : ConnectApiHandler<DeliveryAppProgressResponseModel>() {
             override fun onSuccess(deliveryAppProgressResponseModel: DeliveryAppProgressResponseModel) {
+                val events = mutableSetOf<String?>()
+
                 if (deliveryAppProgressResponseModel.updatedJob) {
+                    events.add(START_DELIVERY)
                     ConnectJobUtils.upsertJob(context, job)
                 }
 
                 if (deliveryAppProgressResponseModel.hasDeliveries) {
+                    if (job.getDeliveryProgressPercentage() == 100) {
+                        events.add(FINISH_DELIVERY)
+                    }
                     ConnectJobUtils.storeDeliveries(context, job.deliveries, job.jobId, true)
                 }
 
                 if (deliveryAppProgressResponseModel.hasPayment) {
+                    if (job.payments.isNotEmpty()){
+                        events.add(PAID_DELIVERY)
+                    }
                     ConnectJobUtils.storePayments(context, job.payments, job.jobId, true)
                 }
 
-                FirebaseAnalyticsUtil.reportCccApiDeliveryProgress(true)
+                events.forEach { event ->
+                    FirebaseAnalyticsUtil.reportCccApiDeliveryProgress(true, event)
+                }
+
                 listener.connectActivityComplete(true)
             }
 
             override fun onFailure(errorCode: PersonalIdOrConnectApiErrorCodes, t: Throwable?) {
-                FirebaseAnalyticsUtil.reportCccApiDeliveryProgress(false)
+                FirebaseAnalyticsUtil.reportCccApiDeliveryProgress(false,null)
                 listener.connectActivityComplete(false)
             }
         }.getDeliveries(context, user, job)

diff --git a/app/src/org/commcare/connect/PersonalIdManager.java b/app/src/org/commcare/connect/PersonalIdManager.java
@@ -1,5 +1,9 @@
 package org.commcare.connect;
 
+import static org.commcare.google.services.analytics.AnalyticsParamValue.FAILURE_UNLOCK_FAILED;
+import static org.commcare.google.services.analytics.AnalyticsParamValue.FAILURE_USER_DENIED;
+import static org.commcare.google.services.analytics.AnalyticsParamValue.SYNC_SUCCESS;
+
 import android.content.Context;
 import android.content.Intent;
 import android.os.Build;
@@ -343,6 +347,7 @@ private void showLinkDialog(CommCareActivity<?> activity, ConnectLinkedAppRecord
         dialog.setNegativeButton(activity.getString(R.string.login_link_connectid_no), (d, w) -> {
             activity.dismissAlertDialog();
             ConnectAppDatabaseUtil.storeApp(activity, linkedApp);
+            FirebaseAnalyticsUtil.reportPersonalIDLinking(linkedApp.getAppId(),FAILURE_USER_DENIED);
             callback.connectActivityComplete(false);
         });
 
@@ -353,10 +358,12 @@ private void unlockAndLinkConnect(CommCareActivity<?> activity, ConnectLinkedApp
         unlockConnect(activity, success -> {
             if (!success) {
                 callback.connectActivityComplete(false);
+                FirebaseAnalyticsUtil.reportPersonalIDLinking(linkedApp.getAppId(),FAILURE_UNLOCK_FAILED);
                 return;
             }
 
             linkedApp.linkToPersonalId(password);
+            FirebaseAnalyticsUtil.reportPersonalIDLinking(linkedApp.getAppId(),SYNC_SUCCESS);
             ConnectAppDatabaseUtil.storeApp(activity, linkedApp);
 
             ConnectUserRecord user = ConnectUserDatabaseUtil.getUser(activity);

diff --git a/app/src/org/commcare/fragments/connectMessaging/ConnectMessageFragment.java b/app/src/org/commcare/fragments/connectMessaging/ConnectMessageFragment.java
@@ -27,6 +27,7 @@
 import org.commcare.dalvik.R;
 import org.commcare.dalvik.databinding.FragmentConnectMessageBinding;
 
+import org.commcare.google.services.analytics.FirebaseAnalyticsUtil;
 import org.commcare.utils.FirebaseMessagingUtil;
 
 import java.util.ArrayList;
@@ -176,6 +177,7 @@ private void sendMessage() {
                 chat.setMessageRead(success);
                 adapter.updateMessageReadStatus(chat);
                 scrollToLatestMessage();
+                FirebaseAnalyticsUtil.reportPersonalIDMessageSent();
             }
         });
     }

diff --git a/app/src/org/commcare/fragments/personalId/PersonalIdBackupCodeFragment.java b/app/src/org/commcare/fragments/personalId/PersonalIdBackupCodeFragment.java
@@ -183,6 +183,7 @@ private void enableContinueButton(boolean isEnable) {
     }
 
     private void handleBackupCodeSubmission() {
+        FirebaseAnalyticsUtil.reportPersonalIDContinueClicked(this.getClass().getSimpleName(),null);
         if (isRecovery) {
             confirmBackupCode();
         } else {

diff --git a/app/src/org/commcare/fragments/personalId/PersonalIdBiometricConfigFragment.java b/app/src/org/commcare/fragments/personalId/PersonalIdBiometricConfigFragment.java
@@ -38,6 +38,8 @@
 import static org.commcare.android.database.connect.models.PersonalIdSessionData.BIOMETRIC_TYPE;
 import static org.commcare.android.database.connect.models.PersonalIdSessionData.PIN;
 import static org.commcare.connect.PersonalIdManager.BIOMETRIC_INVALIDATION_KEY;
+import static org.commcare.google.services.analytics.AnalyticsParamValue.CONTINUE_WITH_FINGERPRINT;
+import static org.commcare.google.services.analytics.AnalyticsParamValue.CONTINUE_WITH_PIN;
 import static org.commcare.utils.ViewUtils.showSnackBarWithOk;
 
 /**
@@ -189,6 +191,7 @@ private void updatePinSection(String buttonText) {
     }
 
     private void onFingerprintButtonClicked() {
+        FirebaseAnalyticsUtil.reportPersonalIDContinueClicked(this.getClass().getSimpleName(),CONTINUE_WITH_FINGERPRINT);
         BiometricsHelper.ConfigurationStatus status = BiometricsHelper.checkFingerprintStatus(getActivity(),
                 biometricManager);
 
@@ -237,6 +240,7 @@ private void initiateBiometricAuthentication() {
     }
 
     private void onPinButtonClicked() {
+        FirebaseAnalyticsUtil.reportPersonalIDContinueClicked(this.getClass().getSimpleName(),CONTINUE_WITH_PIN);
         BiometricsHelper.ConfigurationStatus status = BiometricsHelper.checkPinStatus(getActivity(),
                 biometricManager);
 

diff --git a/app/src/org/commcare/fragments/personalId/PersonalIdNameFragment.java b/app/src/org/commcare/fragments/personalId/PersonalIdNameFragment.java
@@ -21,6 +21,7 @@
 import org.commcare.connect.network.connectId.PersonalIdApiErrorHandler;
 import org.commcare.connect.network.connectId.PersonalIdApiHandler;
 import org.commcare.dalvik.databinding.ScreenPersonalidNameBinding;
+import org.commcare.google.services.analytics.FirebaseAnalyticsUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -77,6 +78,7 @@ private void enableContinueButton(boolean isEnabled) {
     }
 
     private void verifyOrAddName() {
+        FirebaseAnalyticsUtil.reportPersonalIDContinueClicked(this.getClass().getSimpleName(),null);
         clearError();
         enableContinueButton(false);
         new PersonalIdApiHandler<PersonalIdSessionData>() {

diff --git a/app/src/org/commcare/fragments/personalId/PersonalIdPhoneFragment.java b/app/src/org/commcare/fragments/personalId/PersonalIdPhoneFragment.java
@@ -61,7 +61,6 @@
 
 import static android.app.ProgressDialog.show;
 import static com.google.android.play.core.integrity.model.IntegrityDialogResponseCode.DIALOG_SUCCESSFUL;
-import static org.commcare.fragments.personalId.PersonalIdPhoneFragmentDirections.*;
 import static org.commcare.utils.Permissions.shouldShowPermissionRationale;
 
 public class PersonalIdPhoneFragment extends BasePersonalIdFragment implements CommCareLocationListener {
@@ -236,6 +235,7 @@ private void displayPhoneNumber(String fullPhoneNumber) {
     }
 
     private void onContinueClicked() {
+        FirebaseAnalyticsUtil.reportPersonalIDContinueClicked(this.getClass().getSimpleName(),null);
         enableContinueButton(false);
         startConfigurationRequest();
     }

diff --git a/app/src/org/commcare/google/services/analytics/AnalyticsParamValue.java b/app/src/org/commcare/google/services/analytics/AnalyticsParamValue.java
@@ -184,4 +184,11 @@ public class AnalyticsParamValue {
     public static final String MIN_BIOMETRIC_HARDWARE_UNAVAILABLE = "min_biometric_hardware_unavailable";
     public static final String MIN_BIOMETRIC_NEEDS_UPDATE = "min_biometric_needs_update";
     public static final String MIN_BIOMETRIC_PIN_NEEDS_UPDATE = "min_biometric_pin_needs_update";
+    public static final String START_DELIVERY = "start_delivery";
+    public static final String FINISH_DELIVERY = "finish_delivery";
+    public static final String PAID_DELIVERY = "paid_delivery";
+    public static final String FAILURE_USER_DENIED = "failure_user_denied";
+    public static final String FAILURE_UNLOCK_FAILED = "failure_unlock_failed";
+    public static final String CONTINUE_WITH_FINGERPRINT = "continue_with_fingerprint";
+    public static final String CONTINUE_WITH_PIN = "continue_with_pin";
 }
diff --git a/app/src/org/commcare/google/services/analytics/CCAnalyticsEvent.java b/app/src/org/commcare/google/services/analytics/CCAnalyticsEvent.java
@@ -55,5 +55,8 @@ public class CCAnalyticsEvent {
     static final String PERSONAL_ID_CONFIGURATION_FAILURE = "personal_id_configuration_failure";
     static final String NAV_DRAWER_OPEN = "nav_drawer_open";
     static final String NAV_DRAWER_ITEM_SELECTED = "nav_drawer_item_selected";
+    static final String PERSONAL_ID_CONTINUE_CLICKED = "personal_id_continue_clicked";
+    static final String PERSONAL_ID_MESSAGE_SENT = "personal_id_message_sent";
+    static final String PERSONAL_ID_LINKING = "personal_id_linking";
 
 }
diff --git a/app/src/org/commcare/google/services/analytics/CCAnalyticsParam.java b/app/src/org/commcare/google/services/analytics/CCAnalyticsParam.java
@@ -38,6 +38,9 @@ public class CCAnalyticsParam {
     static final String PARAM_CCC_LAUNCH_APP_TYPE = "ccc_launch_app_type";
     static final String PARAM_CCC_APP_NAME = "ccc_app_name";
     static final String PARAM_API_SUCCESS = "ccc_api_success";
+    static final String PARAM_API_SUCCESS_DELIVERY_INFO = "ccc_api_success_delivery_info";
     static final String PARAM_API_TOTAL_JOBS = "ccc_api_total_jobs";
     static final String PARAM_API_NEW_JOBS = "ccc_api_new_jobs";
+    public static final String PERSONAL_ID_CONTINUE_CLICKED_INFO = "personal_id_continue_button_clicked_info";
+
 }
diff --git a/app/src/org/commcare/google/services/analytics/FirebaseAnalyticsUtil.java b/app/src/org/commcare/google/services/analytics/FirebaseAnalyticsUtil.java
@@ -8,10 +8,8 @@
 
 import org.commcare.CommCareApplication;
 import org.commcare.DiskUtils;
-import org.commcare.android.database.connect.models.ConnectUserRecord;
 import org.commcare.android.logging.ReportingUtils;
 import org.commcare.connect.PersonalIdManager;
-import org.commcare.connect.database.ConnectUserDatabaseUtil;
 import org.commcare.dalvik.BuildConfig;
 import org.commcare.preferences.MainConfigurablePreferences;
 import org.commcare.suite.model.OfflineUserRestore;
@@ -20,6 +18,7 @@
 import org.javarosa.core.services.Logger;
 
 import java.util.Date;
+import java.util.Objects;
 
 import androidx.navigation.NavController;
 import androidx.navigation.NavDestination;
@@ -36,6 +35,8 @@
 import static org.commcare.google.services.analytics.AnalyticsParamValue.VIDEO_USAGE_OTHER;
 import static org.commcare.google.services.analytics.AnalyticsParamValue.VIDEO_USAGE_PARTIAL;
 
+import javax.annotation.Nullable;
+
 /**
  * Created by amstone326 on 10/13/17.
  */
@@ -493,9 +494,12 @@ public static void reportCccApiClaimJob(boolean success) {
         reportEvent(CCAnalyticsEvent.CCC_API_CLAIM_JOB, b);
     }
 
-    public static void reportCccApiDeliveryProgress(boolean success) {
+    public static void reportCccApiDeliveryProgress(boolean success, @Nullable String deliveryInfo) {
         Bundle b = new Bundle();
         b.putLong(CCAnalyticsParam.PARAM_API_SUCCESS, success ? 1 : 0);
+        if (deliveryInfo != null){
+            b.putString(CCAnalyticsParam.PARAM_API_SUCCESS_DELIVERY_INFO,deliveryInfo);
+        }
         reportEvent(CCAnalyticsEvent.CCC_API_DELIVERY_PROGRESS, b);
     }
 
@@ -533,6 +537,25 @@ public static void reportLoginClicks() {
         reportEvent(CCAnalyticsEvent.LOGIN_CLICK);
     }
 
+    public static void reportPersonalIDContinueClicked(String screenName,@Nullable String info) {
+        Bundle params = new Bundle();
+        params.putString(FirebaseAnalytics.Param.SCREEN_NAME, screenName);
+        if (info != null) {
+            params.putString(CCAnalyticsParam.PERSONAL_ID_CONTINUE_CLICKED_INFO,info);
+        }
+        reportEvent(CCAnalyticsEvent.PERSONAL_ID_CONTINUE_CLICKED, params);
+    }
+    public static void reportPersonalIDMessageSent() {
+        reportEvent(CCAnalyticsEvent.PERSONAL_ID_MESSAGE_SENT);
+    }
+
+    public static void reportPersonalIDLinking(String appId, String result) {
+        Bundle bundle = new Bundle();
+        bundle.putString(CCAnalyticsParam.CC_APP_ID, appId);
+        bundle.putString(CCAnalyticsParam.RESULT, result);
+        reportEvent(CCAnalyticsEvent.PERSONAL_ID_LINKING, bundle);
+    }
+
     // logs screen view events when set to a navigation controller
     public static NavController.OnDestinationChangedListener getNavControllerPageChangeLoggingListener() {
         return (navController, navDestination, args) -> {