refac: change deep link resolution callback caching logic

Author: uerceg

Adjust/sdk-core/src/main/java/com/adjust/sdk/ActivityHandler.java

@@ -432,11 +432,21 @@ private boolean isEnabledI() {
     }
 
     @Override
-    public void readOpenUrl(final Uri url, final OnDeeplinkResolvedListener callback, final long clickTime) {
+    public void readOpenUrl(final Uri url, final long clickTime) {
         executor.submit(new Runnable() {
             @Override
             public void run() {
-                readOpenUrlI(url, callback, clickTime);
+                readOpenUrlI(url, clickTime);
+            }
+        });
+    }
+
+    public void readOpenUrl(final Uri url, final long clickTime, final OnDeeplinkResolvedListener callback) {
+        this.cachedDeeplinkResolutionCallback = callback;
+        executor.submit(new Runnable() {
+            @Override
+            public void run() {
+                readOpenUrlI(url, clickTime);
             }
         });
     }
@@ -862,6 +872,7 @@ public void run(ActivityHandler activityHandler) {
             logger.info("Default tracker: '%s'", adjustConfig.defaultTracker);
         }
 
+        // push token
         if (adjustConfig.pushToken != null) {
             logger.info("Push token: '%s'", adjustConfig.pushToken);
             if (internalState.hasFirstSdkStartOcurred()) {
@@ -880,6 +891,11 @@ public void run(ActivityHandler activityHandler) {
             }
         }
 
+        // cached deep link resolution callback
+        if (this.cachedDeeplinkResolutionCallback == null) {
+            this.cachedDeeplinkResolutionCallback = adjustConfig.cachedDeeplinkResolutionCallback;
+        }
+
         // GDPR
         if (internalState.hasFirstSdkStartOcurred()) {
             SharedPreferencesManager sharedPreferencesManager = SharedPreferencesManager.getDefaultInstance(getContext());
@@ -1405,7 +1421,6 @@ private void processCachedDeeplinkI() {
 
         SharedPreferencesManager sharedPreferencesManager = SharedPreferencesManager.getDefaultInstance(getContext());
         String cachedDeeplinkUrl = sharedPreferencesManager.getDeeplinkUrl();
-        OnDeeplinkResolvedListener callback = sharedPreferencesManager.getCachedDeeplinkResolutionCallback();
         long cachedDeeplinkClickTime = sharedPreferencesManager.getDeeplinkClickTime();
 
         if (cachedDeeplinkUrl == null) {
@@ -1415,7 +1430,7 @@ private void processCachedDeeplinkI() {
             return;
         }
 
-        readOpenUrl(Uri.parse(cachedDeeplinkUrl), callback, cachedDeeplinkClickTime);
+        readOpenUrl(Uri.parse(cachedDeeplinkUrl), cachedDeeplinkClickTime);
 
         sharedPreferencesManager.removeDeeplink();
     }
@@ -1526,7 +1541,14 @@ private void launchSdkClickResponseTasksI(SdkClickResponseData sdkClickResponseD
 
         if (!TextUtils.isEmpty(sdkClickResponseData.resolvedDeeplink)) {
             if (cachedDeeplinkResolutionCallback != null) {
-                cachedDeeplinkResolutionCallback.onDeeplinkResolved(sdkClickResponseData.resolvedDeeplink);
+                Runnable runnable = new Runnable() {
+                    @Override
+                    public void run() {
+                        cachedDeeplinkResolutionCallback.onDeeplinkResolved(sdkClickResponseData.resolvedDeeplink);
+                        cachedDeeplinkResolutionCallback = null;
+                    }
+                };
+                handler.post(runnable);
             }
         }
     }
@@ -1972,7 +1994,7 @@ private boolean isValidReferrerDetails(final ReferrerDetails referrerDetails) {
         return referrerDetails.installReferrer.length() != 0;
     }
 
-    private void readOpenUrlI(Uri url, OnDeeplinkResolvedListener callback, long clickTime) {
+    private void readOpenUrlI(Uri url, long clickTime) {
         if (!isEnabledI()) {
             return;
         }
@@ -1994,8 +2016,6 @@ private void readOpenUrlI(Uri url, OnDeeplinkResolvedListener callback, long cli
             return;
         }
 
-        cachedDeeplinkResolutionCallback = callback;
-
         sdkClickHandler.sendSdkClick(sdkClickPackage);
     }
 

Adjust/sdk-core/src/main/java/com/adjust/sdk/Adjust.java

@@ -128,7 +128,7 @@ public static void appWillOpenUrl(Uri url) {
      */
     public static void appWillOpenUrl(Uri url, Context context) {
         AdjustInstance adjustInstance = Adjust.getDefaultInstance();
-        adjustInstance.appWillOpenUrl(url, null, extractApplicationContext(context));
+        adjustInstance.appWillOpenUrl(url, extractApplicationContext(context));
     }
 
     /**
@@ -140,7 +140,7 @@ public static void appWillOpenUrl(Uri url, Context context) {
      */
     public static void processDeeplink(Uri url, Context context, OnDeeplinkResolvedListener callback) {
         AdjustInstance adjustInstance = Adjust.getDefaultInstance();
-        adjustInstance.appWillOpenUrl(url, callback, extractApplicationContext(context));
+        adjustInstance.processDeeplink(url, extractApplicationContext(context), callback);
     }
 
     /**

Adjust/sdk-core/src/main/java/com/adjust/sdk/AdjustConfig.java

@@ -47,6 +47,7 @@ public class AdjustConfig {
     boolean finalAttributionEnabled;
     String fbAppId;
     boolean readDeviceInfoOnceEnabled;
+    OnDeeplinkResolvedListener cachedDeeplinkResolutionCallback;
 
     public static final String ENVIRONMENT_SANDBOX = "sandbox";
     public static final String ENVIRONMENT_PRODUCTION = "production";

Adjust/sdk-core/src/main/java/com/adjust/sdk/AdjustInstance.java

@@ -49,6 +49,8 @@ public PreLaunchActions() {
 
     private PreLaunchActions preLaunchActions = new PreLaunchActions();
 
+    private OnDeeplinkResolvedListener cachedDeeplinkResolutionCallback;
+
     /**
      * Base path for Adjust packages.
      */
@@ -96,6 +98,7 @@ public void onCreate(final AdjustConfig adjustConfig) {
         adjustConfig.gdprPath = this.gdprPath;
         adjustConfig.subscriptionPath = this.subscriptionPath;
         adjustConfig.purchaseVerificationPath = this.purchaseVerificationPath;
+        adjustConfig.cachedDeeplinkResolutionCallback = cachedDeeplinkResolutionCallback;
 
         activityHandler = AdjustFactory.getActivityHandler(adjustConfig);
         setSendingReferrersAsNotSent(adjustConfig.context);
@@ -167,17 +170,16 @@ public void appWillOpenUrl(final Uri url) {
             return;
         }
         long clickTime = System.currentTimeMillis();
-        activityHandler.readOpenUrl(url, null, clickTime);
+        activityHandler.readOpenUrl(url, clickTime);
     }
 
     /**
-     * Process the deep link that has opened an app and potentially get a resolved link.
+     * Called to process deep link.
      *
-     * @param url Deep link URL to process
-     * @param callback  Callback where either resolved or echoed deep link will be sent.
+     * @param url     Deep link URL to process
      * @param context Application context
      */
-    public void appWillOpenUrl(final Uri url, final OnDeeplinkResolvedListener callback, final Context context) {
+    public void appWillOpenUrl(final Uri url, final Context context) {
         // Check for deep link validity. If invalid, return.
         if (url == null || url.toString().length() == 0) {
             AdjustFactory.getLogger().warn(
@@ -187,11 +189,37 @@ public void appWillOpenUrl(final Uri url, final OnDeeplinkResolvedListener callb
 
         long clickTime = System.currentTimeMillis();
         if (!checkActivityHandler("appWillOpenUrl", true)) {
-            saveDeeplink(url, callback, clickTime, context);
+            saveDeeplink(url, clickTime, context);
+            return;
+        }
+
+        activityHandler.readOpenUrl(url, clickTime);
+    }
+
+    /**
+     * Process the deep link that has opened an app and potentially get a resolved link.
+     *
+     * @param url Deep link URL to process
+     * @param callback  Callback where either resolved or echoed deep link will be sent.
+     * @param context Application context
+     */
+    public void processDeeplink(Uri url, Context context, OnDeeplinkResolvedListener callback) {
+        // if resolution result is not wanted, fallback to default method
+        if (callback == null) {
+            appWillOpenUrl(url, context);
+            return;
+        }
+
+        // if deep link processing is triggered prior to SDK being initialized
+        long clickTime = System.currentTimeMillis();
+        if (!checkActivityHandler("processDeeplink", true)) {
+            saveDeeplink(url, clickTime, context);
+            this.cachedDeeplinkResolutionCallback = callback;
             return;
         }
 
-        activityHandler.readOpenUrl(url, callback, clickTime);
+        // if deep link processing was triggered with SDK being initialized
+        activityHandler.readOpenUrl(url, clickTime, callback);
     }
 
     /**
@@ -633,13 +661,11 @@ private void saveDisableThirdPartySharing(final Context context) {
      * Save deep link to shared preferences.
      *
      * @param deeplink  Deeplink Uri object
-     * @param callback  Callback to obtain link resolution result
      * @param clickTime Time when appWillOpenUrl(Uri, Context) method was called
      * @param context   Application context
      */
-    private void saveDeeplink(final Uri deeplink, final OnDeeplinkResolvedListener callback,
-                              final long clickTime, final Context context) {
-        SharedPreferencesManager.getDefaultInstance(context).saveDeeplink(deeplink, callback, clickTime);
+    private void saveDeeplink(final Uri deeplink, final long clickTime, final Context context) {
+        SharedPreferencesManager.getDefaultInstance(context).saveDeeplink(deeplink, clickTime);
     }
 
     /**

Adjust/sdk-core/src/main/java/com/adjust/sdk/IActivityHandler.java

@@ -23,7 +23,9 @@ public interface IActivityHandler {
 
     boolean isEnabled();
 
-    void readOpenUrl(Uri url, OnDeeplinkResolvedListener callback, long clickTime);
+    void readOpenUrl(Uri url, long clickTime);
+
+    void readOpenUrl(Uri url, long clickTime, OnDeeplinkResolvedListener callback);
 
     boolean updateAttributionI(AdjustAttribution attribution);
 

Adjust/sdk-core/src/main/java/com/adjust/sdk/SharedPreferencesManager.java

@@ -85,11 +85,6 @@ public class SharedPreferencesManager {
      */
     private static SharedPreferencesManager defaultInstance;
 
-    /**
-     * Deeplink resolution callback instance.
-     */
-    private static OnDeeplinkResolvedListener cachedDeeplinkResolutionCallback;
-
     /**
      * Default constructor.
      *
@@ -389,33 +384,26 @@ public synchronized void removeDisableThirdPartySharing() {
         remove(PREFS_KEY_DISABLE_THIRD_PARTY_SHARING);
     }
 
-    public synchronized void saveDeeplink(final Uri deeplink, final OnDeeplinkResolvedListener deeplinkResolutionCallback, final long clickTime) {
+    public synchronized void saveDeeplink(final Uri deeplink, final long clickTime) {
         if (deeplink == null) {
             return;
         }
 
         saveString(PREFS_KEY_DEEPLINK_URL, deeplink.toString());
         saveLong(PREFS_KEY_DEEPLINK_CLICK_TIME, clickTime);
-
-        cachedDeeplinkResolutionCallback = deeplinkResolutionCallback;
     }
 
     public synchronized String getDeeplinkUrl() {
         return getString(PREFS_KEY_DEEPLINK_URL);
     }
 
-    public synchronized OnDeeplinkResolvedListener getCachedDeeplinkResolutionCallback() {
-        return cachedDeeplinkResolutionCallback;
-    }
-
     public synchronized long getDeeplinkClickTime() {
         return getLong(PREFS_KEY_DEEPLINK_CLICK_TIME, -1);
     }
 
     public synchronized void removeDeeplink() {
         remove(PREFS_KEY_DEEPLINK_URL);
         remove(PREFS_KEY_DEEPLINK_CLICK_TIME);
-        cachedDeeplinkResolutionCallback = null;
     }
 
     /**