Merge pull request #584 from adjust/v4360

Version 4.36.0
adjust · Oct 19, 2023 · eaaa504 · eaaa504
2 parents 88f938f + ae4c069
commit eaaa504
Show file tree

Hide file tree

Showing 37 changed files with 600 additions and 19 deletions.
diff --git a/Adjust/build.gradle b/Adjust/build.gradle
@@ -9,7 +9,7 @@ ext {
     coreMinSdkVersion = 9
     coreCompileSdkVersion = 33
     coreTargetSdkVersion = 33
-    coreVersionName = '4.35.1'
+    coreVersionName = '4.36.0'
     defaultVersionCode = 1
     webbridgeMinSdkVersion = 17
     samsungReferrerMinSdkVersion = 18

diff --git a/Adjust/sdk-core/src/main/AndroidManifest.xml b/Adjust/sdk-core/src/main/AndroidManifest.xml
@@ -2,4 +2,10 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="com.google.android.gms.permission.AD_ID"/>
+    <queries>
+        <package android:name="com.facebook.katana" />
+    </queries>
+    <queries>
+        <package android:name="com.instagram.android" />
+    </queries>
 </manifest>
diff --git a/Adjust/sdk-core/src/main/java/com/adjust/sdk/ActivityHandler.java b/Adjust/sdk-core/src/main/java/com/adjust/sdk/ActivityHandler.java
@@ -36,6 +36,7 @@
 
 import static com.adjust.sdk.Constants.ACTIVITY_STATE_FILENAME;
 import static com.adjust.sdk.Constants.ATTRIBUTION_FILENAME;
+import static com.adjust.sdk.Constants.REFERRER_API_META;
 import static com.adjust.sdk.Constants.REFERRER_API_SAMSUNG;
 import static com.adjust.sdk.Constants.REFERRER_API_VIVO;
 import static com.adjust.sdk.Constants.REFERRER_API_XIAOMI;
@@ -79,6 +80,7 @@ public class ActivityHandler implements IActivityHandler {
     private SessionParameters sessionParameters;
     private InstallReferrer installReferrer;
     private InstallReferrerHuawei installReferrerHuawei;
+    private InstallReferrerMeta installReferrerMeta;
 
     @Override
     public void teardown() {
@@ -1013,6 +1015,13 @@ public void onInstallReferrerRead(ReferrerDetails referrerDetails, String referr
             }
         });
 
+        installReferrerMeta = new InstallReferrerMeta(adjustConfig.context, adjustConfig.fbAppId,
+                new InstallReferrerReadListener() {
+                    @Override
+                    public void onInstallReferrerRead(ReferrerDetails referrerDetails, String referrerApi) {
+                        sendInstallReferrer(referrerDetails, referrerApi);
+                    }
+                });
         preLaunchActionsI(adjustConfig.preLaunchActions.preLaunchActionsArray);
         sendReftagReferrerI();
     }
@@ -1310,6 +1319,7 @@ private void processSessionI() {
             // Try to check if there's new referrer information.
             installReferrer.startConnection();
             installReferrerHuawei.readReferrer();
+            installReferrerMeta.readReferrer();
             readInstallReferrerSamsung();
             readInstallReferrerXiaomi();
             readInstallReferrerVivo();
@@ -1811,6 +1821,7 @@ private void checkAfterNewStartI(SharedPreferencesManager sharedPreferencesManag
         // try to read and send the install referrer
         installReferrer.startConnection();
         installReferrerHuawei.readReferrer();
+        installReferrerMeta.readReferrer();
         readInstallReferrerSamsung();
         readInstallReferrerXiaomi();
         readInstallReferrerVivo();
@@ -2786,6 +2797,19 @@ private void checkForInstallReferrerInfo(final SdkClickResponseData responseData
             return;
         }
 
+        boolean isInstallReferrerMeta =
+                responseData.referrerApi != null &&
+                        (responseData.referrerApi.equalsIgnoreCase(REFERRER_API_META));
+
+        if (isInstallReferrerMeta) {
+            activityState.clickTimeMeta = responseData.clickTime;
+            activityState.installReferrerMeta = responseData.installReferrer;
+            activityState.isClickMeta = responseData.isClick;
+
+            writeActivityStateI();
+            return;
+        }
+
         boolean isInstallReferrerSamsung =
                 responseData.referrerApi != null &&
                 (responseData.referrerApi.equalsIgnoreCase(REFERRER_API_SAMSUNG));

diff --git a/Adjust/sdk-core/src/main/java/com/adjust/sdk/ActivityPackage.java b/Adjust/sdk-core/src/main/java/com/adjust/sdk/ActivityPackage.java
@@ -59,6 +59,7 @@ public class ActivityPackage implements Serializable {
     private long installBeginTimeServerInSeconds;
     private String installVersion;
     private Boolean googlePlayInstant;
+    private Boolean isClick;
 
     public String getPath() {
         return path;
@@ -168,6 +169,14 @@ public void setGooglePlayInstant(Boolean googlePlayInstant) {
         this.googlePlayInstant = googlePlayInstant;
     }
 
+    public Boolean getIsClick() {
+        return this.isClick;
+    }
+
+    public void setIsClick(Boolean isClick) {
+        this.isClick = isClick;
+    }
+
     public OnPurchaseVerificationFinishedListener getPurchaseVerificationCallback() {
         return this.purchaseVerificationCallback;
     }

diff --git a/Adjust/sdk-core/src/main/java/com/adjust/sdk/ActivityState.java b/Adjust/sdk-core/src/main/java/com/adjust/sdk/ActivityState.java
@@ -64,6 +64,9 @@ public class ActivityState implements Serializable, Cloneable {
             new ObjectStreamField("installBeginVivo", long.class),
             new ObjectStreamField("installReferrerVivo", String.class),
             new ObjectStreamField("installVersionVivo", String.class),
+            new ObjectStreamField("installReferrerMeta", String.class),
+            new ObjectStreamField("clickTimeMeta", long.class),
+            new ObjectStreamField("isClickMeta", Boolean.class),
     };
 
     // persistent data
@@ -122,6 +125,10 @@ public class ActivityState implements Serializable, Cloneable {
     protected String installReferrerVivo;
     protected String installVersionVivo;
 
+    protected String installReferrerMeta;
+    protected long clickTimeMeta;
+    protected Boolean isClickMeta;
+
     protected ActivityState() {
         logger = AdjustFactory.getLogger();
         // create UUID for new devices
@@ -166,6 +173,9 @@ protected ActivityState() {
         installBeginVivo = 0;
         installReferrerVivo = null;
         installVersionVivo = null;
+        installReferrerMeta = null;
+        clickTimeMeta = 0;
+        isClickMeta = null;
     }
 
     protected void resetSessionAttributes(long now) {
@@ -249,6 +259,9 @@ public boolean equals(Object other) {
         if (!Util.equalLong(installBeginVivo, otherActivityState.installBeginVivo)) return false;
         if (!Util.equalString(installReferrerVivo, otherActivityState.installReferrerVivo)) return false;
         if (!Util.equalString(installVersionVivo, otherActivityState.installVersionVivo)) return false;
+        if (!Util.equalString(installReferrerMeta, otherActivityState.installReferrerMeta)) return false;
+        if (!Util.equalLong(clickTimeMeta, otherActivityState.clickTimeMeta)) return false;
+        if (!Util.equalBoolean(isClickMeta, otherActivityState.isClickMeta)) return false;
         return true;
     }
 
@@ -295,6 +308,9 @@ public int hashCode() {
         hashCode = Util.hashLong(installBeginVivo, hashCode);
         hashCode = Util.hashString(installReferrerVivo, hashCode);
         hashCode = Util.hashString(installVersionVivo, hashCode);
+        hashCode = Util.hashString(installReferrerMeta, hashCode);
+        hashCode = Util.hashLong(clickTimeMeta, hashCode);
+        hashCode = Util.hashBoolean(isClickMeta, hashCode);
         return hashCode;
     }
 
@@ -351,6 +367,10 @@ private void readObject(ObjectInputStream stream) throws IOException, ClassNotFo
         installReferrerVivo = Util.readStringField(fields, "installReferrerVivo", null);
         installVersionVivo = Util.readStringField(fields, "installVersionVivo", null);
 
+        installReferrerMeta = Util.readStringField(fields, "installReferrerMeta", null);
+        clickTimeMeta = Util.readLongField(fields, "clickTimeMeta", -1l);
+        isClickMeta = Util.readObjectField(fields, "isClickMeta", null);
+
         // create UUID for migrating devices
         if (uuid == null) {
             uuid = Util.createUuid();

diff --git a/Adjust/sdk-core/src/main/java/com/adjust/sdk/Adjust.java b/Adjust/sdk-core/src/main/java/com/adjust/sdk/Adjust.java
@@ -34,7 +34,7 @@ private Adjust() {
      */
     public static synchronized AdjustInstance getDefaultInstance() {
         @SuppressWarnings("unused")
-        String VERSION = "!SDK-VERSION-STRING!:com.adjust.sdk:adjust-android:4.35.1";
+        String VERSION = "!SDK-VERSION-STRING!:com.adjust.sdk:adjust-android:4.36.0";
 
         if (defaultInstance == null) {
             defaultInstance = new AdjustInstance();

diff --git a/Adjust/sdk-core/src/main/java/com/adjust/sdk/AdjustAdRevenue.java b/Adjust/sdk-core/src/main/java/com/adjust/sdk/AdjustAdRevenue.java
@@ -79,6 +79,42 @@ public boolean isValid() {
         return isValidSource(this.source);
     }
 
+    public String getSource() {
+        return source;
+    }
+
+    public Double getRevenue() {
+        return revenue;
+    }
+
+    public String getCurrency() {
+        return currency;
+    }
+
+    public Integer getAdImpressionsCount() {
+        return adImpressionsCount;
+    }
+
+    public String getAdRevenueNetwork() {
+        return adRevenueNetwork;
+    }
+
+    public String getAdRevenueUnit() {
+        return adRevenueUnit;
+    }
+
+    public String getAdRevenuePlacement() {
+        return adRevenuePlacement;
+    }
+
+    public Map<String, String> getCallbackParameters() {
+        return callbackParameters;
+    }
+
+    public Map<String, String> getPartnerParameters() {
+        return partnerParameters;
+    }
+
     private boolean isValidSource(final String param) {
         if (param == null) {
             logger.error("Missing source");