refac: use AdjustDeeplink throughout instead of separate Uri instances

Author: uerceg

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

@@ -443,22 +443,24 @@ private boolean isEnabledI() {
     }
 
     @Override
-    public void processDeeplink(final Uri url, Uri referrer, final long clickTime) {
+    public void processDeeplink(final AdjustDeeplink deeplink, final long clickTime) {
         executor.submit(new Runnable() {
             @Override
             public void run() {
-                processDeeplinkI(url, referrer, clickTime);
+                processDeeplinkI(deeplink, clickTime);
             }
         });
     }
 
     @Override
-    public void processAndResolveDeeplink(final Uri url, final Uri referrer, final long clickTime, final OnDeeplinkResolvedListener callback) {
+    public void processAndResolveDeeplink(final AdjustDeeplink deeplink,
+                                          final long clickTime,
+                                          final OnDeeplinkResolvedListener callback) {
         this.cachedDeeplinkResolutionCallback = callback;
         executor.submit(new Runnable() {
             @Override
             public void run() {
-                processDeeplinkI(url, referrer, clickTime);
+                processDeeplinkI(deeplink, clickTime);
             }
         });
     }
@@ -1550,7 +1552,9 @@ private void processCachedDeeplinkI() {
             return;
         }
 
-        processDeeplink(Uri.parse(cachedDeeplinkUrl), Uri.parse(cachedDeeplinkReferrer), cachedDeeplinkClickTime);
+        AdjustDeeplink deeplink = new AdjustDeeplink(Uri.parse(cachedDeeplinkUrl));
+        deeplink.setReferrer(Uri.parse(cachedDeeplinkReferrer));
+        processDeeplink(deeplink, cachedDeeplinkClickTime);
 
         sharedPreferencesManager.removeDeeplink();
     }
@@ -2111,19 +2115,24 @@ private boolean isValidReferrerDetails(final ReferrerDetails referrerDetails) {
         return referrerDetails.installReferrer.length() != 0;
     }
 
-    private void processDeeplinkI(Uri url, Uri referrer, long clickTime) {
+    private void processDeeplinkI(AdjustDeeplink deeplink, long clickTime) {
         if (!isEnabledI()) {
             return;
         }
+        if (deeplink == null) {
+            return;
+        }
 
-        if (Util.isUrlFilteredOut(url)) {
-            logger.debug("Deeplink (" + url.toString() + ") processing skipped");
+        if (Util.isUrlFilteredOut(deeplink.getUrl())) {
+            if (deeplink.getUrl() != null) {
+                logger.debug("Deeplink (" + deeplink.getUrl().toString() + ") processing skipped");
+            }
             return;
         }
 
         ActivityPackage sdkClickPackage = PackageFactory.buildDeeplinkSdkClickPackage(
-                url,
-                referrer,
+                deeplink.getUrl(),
+                deeplink.getReferrer(),
                 clickTime,
                 activityState,
                 adjustConfig,

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

@@ -213,7 +213,7 @@ public void processDeeplink(final AdjustDeeplink adjustDeeplink, final Context c
             return;
         }
 
-        activityHandler.processDeeplink(adjustDeeplink.url, adjustDeeplink.referrer, clickTime);
+        activityHandler.processDeeplink(adjustDeeplink, clickTime);
     }
 
     /**
@@ -248,7 +248,7 @@ public void processAndResolveDeeplink(AdjustDeeplink adjustDeeplink, Context con
         }
 
         // if deeplink processing was triggered with SDK being initialized
-        activityHandler.processAndResolveDeeplink(adjustDeeplink.url, adjustDeeplink.referrer, clickTime, callback);
+        activityHandler.processAndResolveDeeplink(adjustDeeplink, clickTime, callback);
     }
 
     /**

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

@@ -22,9 +22,9 @@ public interface IActivityHandler {
     boolean isEnabled();
     void isEnabled(OnIsEnabledListener onIsEnabledListener);
 
-    void processDeeplink(Uri url, Uri referrer, long clickTime);
+    void processDeeplink(AdjustDeeplink deeplink, long clickTime);
 
-    void processAndResolveDeeplink(Uri url, Uri referrer, long clickTime, OnDeeplinkResolvedListener callback);
+    void processAndResolveDeeplink(AdjustDeeplink deeplink, long clickTime, OnDeeplinkResolvedListener callback);
 
     boolean updateAttributionI(AdjustAttribution attribution);