sets up app state callback on AnonymousUserManager

Author: Evan Greer

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

@@ -7,6 +7,7 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
 import androidx.core.app.NotificationManagerCompat;
 
 import com.google.gson.Gson;
@@ -25,10 +26,25 @@
 import java.util.List;
 import java.util.UUID;
 
-public class AnonymousUserManager {
+public class AnonymousUserManager implements IterableActivityMonitor.AppStateCallback {
 
     private static final String TAG = "AnonymousUserManager";
-    private final IterableApi iterableApi = IterableApi.sharedInstance;
+    private IterableApi iterableApi = IterableApi.sharedInstance;
+
+    private final IterableActivityMonitor activityMonitor;
+
+    AnonymousUserManager(IterableApi iterableApi) {
+        this(iterableApi,
+            IterableActivityMonitor.getInstance());
+    }
+
+    @VisibleForTesting
+    AnonymousUserManager(IterableApi iterableApi,
+                         IterableActivityMonitor activityMonitor) {
+        this.iterableApi = iterableApi;
+        this.activityMonitor = activityMonitor;
+        this.activityMonitor.addCallback(this);
+    }
 
     void updateAnonSession() {
         IterableLogger.v(TAG, "updateAnonSession");
@@ -466,4 +482,27 @@ private String getPushStatus() {
             return "";
         }
     }
+
+    @Override
+    public void onSwitchToForeground() {
+        long currentTime = System.currentTimeMillis();
+
+        // fetching anonymous user criteria on foregrounding
+        if (!iterableApi.checkSDKInitialization()
+            && iterableApi._userIdAnon == null
+            && iterableApi.config.enableAnonActivation
+            && iterableApi.getVisitorUsageTracked()
+            && iterableApi.config.enableForegroundCriteriaFetch
+            && currentTime - iterableApi.lastCriteriaFetch >= IterableConstants.CRITERIA_FETCHING_COOLDOWN) {
+
+            iterableApi.lastCriteriaFetch = currentTime;
+            this.getCriteria();
+            IterableLogger.d(TAG, "Fetching anonymous user criteria - Foreground");
+        }
+    }
+
+    @Override
+    public void onSwitchToBackground() {
+
+    }
 }

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

@@ -36,7 +36,7 @@ public class IterableApi {
     private String _apiKey;
     private String _email;
     private String _userId;
-    private String _userIdAnon;
+    String _userIdAnon;
     private String _authToken;
     private boolean _debugMode;
     private Bundle _payloadData;
@@ -47,15 +47,15 @@ public class IterableApi {
     private IterableHelper.FailureHandler _setUserFailureCallbackHandler;
 
     IterableApiClient apiClient = new IterableApiClient(new IterableApiAuthProvider());
-    private static final AnonymousUserManager anonymousUserManager = new AnonymousUserManager();
     private static final AnonymousUserMerge anonymousUserMerge = new AnonymousUserMerge();
+    private @Nullable AnonymousUserManager anonymousUserManager;
     private @Nullable IterableInAppManager inAppManager;
     private @Nullable IterableEmbeddedManager embeddedManager;
     private String inboxSessionId;
     private IterableAuthManager authManager;
     private HashMap<String, String> deviceAttributes = new HashMap<>();
     private IterableKeychain keychain;
-    private long lastCriteriaFetch = 0;
+    long lastCriteriaFetch = 0;
 
     void fetchRemoteConfiguration() {
         apiClient.getRemoteConfiguration(new IterableHelper.IterableActionHandler() {
@@ -436,28 +436,13 @@ private void onForeground() {
             editor.putBoolean(IterableConstants.SHARED_PREFS_DEVICE_NOTIFICATIONS_ENABLED, systemNotificationEnabled);
             editor.apply();
         }
-
-        long currentTime = System.currentTimeMillis();
-
-        // fetching anonymous user criteria on foregrounding
-        if (!sharedInstance.checkSDKInitialization()
-            && sharedInstance._userIdAnon == null
-            && sharedInstance.config.enableAnonActivation
-            && sharedInstance.getVisitorUsageTracked()
-            && sharedInstance.config.foregroundCriteriaFetch
-            && currentTime - lastCriteriaFetch >= IterableConstants.CRITERIA_FETCHING_COOLDOWN) {
-
-            lastCriteriaFetch = currentTime;
-            anonymousUserManager.getCriteria();
-            IterableLogger.d(TAG, "Fetching anonymous user criteria - Foreground");
-        }
     }
 
     private boolean isInitialized() {
         return _apiKey != null && (_email != null || _userId != null);
     }
 
-    private boolean checkSDKInitialization() {
+    boolean checkSDKInitialization() {
         if (!isInitialized()) {
             IterableLogger.w(TAG, "Iterable SDK must be initialized with an API key and user email/userId before calling SDK methods");
             return false;
@@ -682,12 +667,21 @@ public static void initialize(@NonNull Context context, @NonNull String apiKey,
             );
         }
 
+        if (sharedInstance.anonymousUserManager == null) {
+            sharedInstance.anonymousUserManager = new AnonymousUserManager(
+                sharedInstance
+            );
+        }
+
         loadLastSavedConfiguration(context);
         IterablePushNotificationUtil.processPendingAction(context);
 
-        if (!sharedInstance.checkSDKInitialization() && sharedInstance._userIdAnon == null && sharedInstance.config.enableAnonActivation && sharedInstance.getVisitorUsageTracked()) {
-            anonymousUserManager.updateAnonSession();
-            anonymousUserManager.getCriteria();
+        if (!sharedInstance.checkSDKInitialization()
+            && sharedInstance._userIdAnon == null
+            && sharedInstance.config.enableAnonActivation
+            && sharedInstance.getVisitorUsageTracked()) {
+            sharedInstance.anonymousUserManager.updateAnonSession();
+            sharedInstance.anonymousUserManager.getCriteria();
         }
 
         if (DeviceInfoUtils.isFireTV(context.getPackageManager())) {
@@ -1599,7 +1593,10 @@ public void setVisitorUsageTracked(@NonNull Boolean isSetVisitorUsageTracked) {
         editor.putBoolean(IterableConstants.SHARED_PREFS_VISITOR_USAGE_TRACKED, isSetVisitorUsageTracked);
         editor.apply();
 
+        long currentTime = System.currentTimeMillis();
+
         if (isSetVisitorUsageTracked && config.enableAnonActivation) {
+            lastCriteriaFetch = currentTime;
             anonymousUserManager.updateAnonSession();
             anonymousUserManager.getCriteria();
         }