[MOB-11904] consent logging triggered in complete user login

iterableapi/src/main/java/com/iterable/iterableapi/IterableApi.java

@@ -619,7 +619,27 @@ protected void registerDeviceToken(@Nullable String email, @Nullable String user
             IterableLogger.e(TAG, "registerDeviceToken: applicationName is null, check that pushIntegrationName is set in IterableConfig");
         }
 
-        apiClient.registerDeviceToken(email, userId, authToken, applicationName, deviceToken, dataFields, deviceAttributes, _setUserSuccessCallbackHandler, _setUserFailureCallbackHandler);
+        // Create a wrapper success handler that tracks consent before calling the original success handler
+        IterableHelper.SuccessHandler wrappedSuccessHandler = getSuccessHandler();
+
+        apiClient.registerDeviceToken(email, userId, authToken, applicationName, deviceToken, dataFields, deviceAttributes, wrappedSuccessHandler, _setUserFailureCallbackHandler);
+    }
+
+    private IterableHelper.SuccessHandler getSuccessHandler() {
+        IterableHelper.SuccessHandler wrappedSuccessHandler = null;
+        if (_setUserSuccessCallbackHandler != null || (config.enableUnknownUserActivation && getVisitorUsageTracked() && config.identityResolution.getReplayOnVisitorToKnown())) {
+            final IterableHelper.SuccessHandler originalSuccessHandler = _setUserSuccessCallbackHandler;
+            wrappedSuccessHandler = data -> {
+                // Track consent now that user has been created/updated via device registration
+                trackConsentOnDeviceRegistration();
+
+                // Call the original success handler if it exists
+                if (originalSuccessHandler != null) {
+                    originalSuccessHandler.onSuccess(data);
+                }
+            };
+        }
+        return wrappedSuccessHandler;
     }
 //endregion
 
@@ -825,6 +845,7 @@ public void setEmail(@Nullable String email, @Nullable String authToken, @Nullab
 
         if (email == null) {
             unknownUserManager.setCriteriaMatched(false);
+            setConsentLogged(false);
         }
 
         _setUserSuccessCallbackHandler = successHandler;
@@ -893,6 +914,7 @@ public void setUserId(@Nullable String userId, @Nullable String authToken, @Null
 
         if (userId == null) {
             unknownUserManager.setCriteriaMatched(false);
+            setConsentLogged(false);
         }
 
         _setUserSuccessCallbackHandler = successHandler;
@@ -919,10 +941,6 @@ private void attemptMergeAndEventReplay(@Nullable String emailOrUserId, boolean
 
             if (replay && (_userId != null || _email != null)) {
                 unknownUserManager.syncEventsAndUserUpdate();
-
-                if (_userIdUnknown == null) {
-                    trackConsentForUser(isEmail ? emailOrUserId : null, isEmail ? null : emailOrUserId, true);
-                }
             }
 
             if (!isUnknown) {
@@ -1484,6 +1502,41 @@ public boolean getVisitorUsageTracked() {
         return sharedPreferences.getBoolean(IterableConstants.SHARED_PREFS_VISITOR_USAGE_TRACKED, false);
     }
 
+    private boolean getConsentLogged() {
+        if (_applicationContext == null) {
+            return false;
+        }
+        SharedPreferences sharedPreferences = _applicationContext.getSharedPreferences(IterableConstants.SHARED_PREFS_FILE, Context.MODE_PRIVATE);
+        return sharedPreferences.getBoolean(IterableConstants.SHARED_PREFS_CONSENT_LOGGED, false);
+    }
+
+    private void setConsentLogged(boolean consentLogged) {
+        if (_applicationContext == null) {
+            return;
+        }
+        SharedPreferences sharedPref = _applicationContext.getSharedPreferences(IterableConstants.SHARED_PREFS_FILE, Context.MODE_PRIVATE);
+        SharedPreferences.Editor editor = sharedPref.edit();
+        if (consentLogged) {
+            editor.putBoolean(IterableConstants.SHARED_PREFS_CONSENT_LOGGED, true);
+        } else {
+            editor.remove(IterableConstants.SHARED_PREFS_CONSENT_LOGGED);
+        }
+        editor.apply();
+    }
+
+    /**
+     * Tracks consent during device registration if conditions are met.
+     */
+    private void trackConsentOnDeviceRegistration() {
+        if (config.enableUnknownUserActivation && getVisitorUsageTracked() && config.identityResolution.getReplayOnVisitorToKnown()) {
+            if (!getConsentLogged()) {
+                boolean isUserKnown = (_userIdUnknown == null);
+                trackConsentForUser(_email, _userId, isUserKnown);
+                setConsentLogged(true);
+            }
+        }
+    }
+
     /**
      * Tracks user consent with the timestamp from when visitor usage was first tracked.
      * This should be called when transitioning from unknown to known user.

iterableapi/src/main/java/com/iterable/iterableapi/IterableConstants.java

@@ -143,6 +143,7 @@ public final class IterableConstants {
     public static final String SHARED_PREFS_VISITOR_USAGE_TRACKED = "itbl_visitor_usage_track";
     public static final String SHARED_PREFS_VISITOR_USAGE_TRACKED_TIME = "itbl_visitor_usage_track_time";
     public static final String SHARED_PREFS_DEVICE_NOTIFICATIONS_ENABLED = "itbl_notifications_enabled";
+    public static final String SHARED_PREFS_CONSENT_LOGGED = "itbl_consent_logged";
 
     //Action buttons
     public static final String ITBL_BUTTON_IDENTIFIER        = "identifier";

iterableapi/src/main/java/com/iterable/iterableapi/UnknownUserManager.java

@@ -243,7 +243,6 @@ private void createUnknownUser(String criteriaId) {
                         IterableApi.getInstance().config.iterableUnknownUserHandler.onUnknownUserCreated(userId);
                     }
                     IterableApi.getInstance().setUnknownUser(userId);
-                    IterableApi.getInstance().trackConsentForUser(null, userId, false);
                 }, (reason, data) -> handleTrackFailure(data));
             }