Merge pull request #165 from AppsFlyerSDK/releases/6.x.x/6.8.x/6.8.1

af-do · web-flow · commit f96ea687181d · 2022-08-14T11:03:07.000+03:00
Releases/6.x.x/6.8.x/6.8.1
diff --git a/Assets/AppsFlyer/AppsFlyer.cs b/Assets/AppsFlyer/AppsFlyer.cs
@@ -7,7 +7,7 @@ namespace AppsFlyerSDK
     public class AppsFlyer : MonoBehaviour
     {
 
-        public static readonly string kAppsFlyerPluginVersion = "6.6.1";
+        public static readonly string kAppsFlyerPluginVersion = "6.8.1";
         public static string CallBackObjectName = null;
         private static EventHandler onRequestResponse;
         private static EventHandler onInAppResponse;
@@ -845,6 +845,16 @@ public static void setPartnerData(string partnerId, Dictionary<string, string> p
 
         }
 
+        /// <summary>
+        /// Use to opt-out of collecting the network operator name (carrier) and sim operator name from the device.
+        /// </summary>
+        public static void setDisableNetworkData(bool disable) {
+            if (instance != null && instance is IAppsFlyerAndroidBridge) {
+                IAppsFlyerAndroidBridge appsFlyerAndroidInstance = (IAppsFlyerAndroidBridge)instance;
+                appsFlyerAndroidInstance.setDisableNetworkData(disable);
+            }
+        }
+
         /// <summary>
         /// Start callback event.
         /// </summary>
diff --git a/Assets/AppsFlyer/AppsFlyerAndroid.cs b/Assets/AppsFlyer/AppsFlyerAndroid.cs
@@ -671,6 +671,15 @@ public void setPartnerData(string partnerId, Dictionary<string, string> partnerI
 #endif
         }
 
+        /// <summary>
+        /// Use to opt-out of collecting the network operator name (carrier) and sim operator name from the device.
+        /// </summary>
+        public void setDisableNetworkData(bool disable) {
+#if !UNITY_EDITOR
+                appsFlyerAndroid.CallStatic("setDisableNetworkData", disable);
+#endif
+        }
+
         /// <summary>
         /// Internal Helper Method.
         /// </summary>
diff --git a/Assets/AppsFlyer/Editor/AppsFlyerDependencies.xml b/Assets/AppsFlyer/Editor/AppsFlyerDependencies.xml
@@ -2,16 +2,16 @@
 <dependencies>
 
   <androidPackages>
-    <androidPackage spec="com.appsflyer:af-android-sdk:6.6.0">
+    <androidPackage spec="com.appsflyer:af-android-sdk:6.8.0">
     </androidPackage>
-    <androidPackage spec="com.appsflyer:unity-wrapper:6.6.0">
+    <androidPackage spec="com.appsflyer:unity-wrapper:6.8.1">
     </androidPackage>
     <androidPackage spec="com.android.installreferrer:installreferrer:2.1">
     </androidPackage>
   </androidPackages>
 
   <iosPods>
-    <iosPod name="AppsFlyerFramework" version="6.6.0" minTargetSdk="9.0">
+    <iosPod name="AppsFlyerFramework" version="6.8.1" minTargetSdk="9.0">
     </iosPod>
   </iosPods>
 
diff --git a/Assets/AppsFlyer/IAppsFlyerAndroidBridge.cs b/Assets/AppsFlyer/IAppsFlyerAndroidBridge.cs
@@ -24,6 +24,7 @@ public interface IAppsFlyerAndroidBridge : IAppsFlyerNativeBridge
         void validateAndSendInAppPurchase(string publicKey, string signature, string purchaseData, string price, string currency, Dictionary<string, string> additionalParameters, MonoBehaviour gameObject);
         void setCollectOaid(bool isCollect);
         void setDisableAdvertisingIdentifiers(bool disable);
+        void setDisableNetworkData(bool disable);
 
     }
 }
diff --git a/Assets/AppsFlyer/Tests/Tests_Suite.cs b/Assets/AppsFlyer/Tests/Tests_Suite.cs
@@ -587,6 +587,15 @@ public void setDisableAdvertisingIdentifiers_called()
             AppsFlyerMOCKInterface.Received().setDisableAdvertisingIdentifiers(true);
 
         }
+
+        [Test]
+        public void setDisableNetworkData_called() {
+            var AppsFlyerMOCKInterface = Substitute.For<IAppsFlyerAndroidBridge>();
+
+            AppsFlyer.instance = AppsFlyerMOCKInterface;
+            AppsFlyer.setDisableNetworkData(true);
+            AppsFlyerMOCKInterface.Received().setDisableNetworkData(true);
+        }
 #elif UNITY_IOS
 
         [Test]
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Versions
 
+## v6.8.1
+* Update iOS SDK version - 6.8.1
+* Update Android SDK version - 6.8.0
+* Added new Android API `setDisableNetworkData`
+
 ## v6.6.0
 * Update iOS SDK version - 6.6.0
 * Update Android SDK version - 6.6.0
diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 2019.4.26f1
-m_EditorVersionWithRevision: 2019.4.26f1 (e0392c6b2363)
+m_EditorVersion: 2020.3.15f2
+m_EditorVersionWithRevision: 2020.3.15f2 (6cf78cb77498)
diff --git a/ProjectSettings/VersionControlSettings.asset b/ProjectSettings/VersionControlSettings.asset
@@ -0,0 +1,8 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!890905787 &1
+VersionControlSettings:
+  m_ObjectHideFlags: 0
+  m_Mode: Visible Meta Files
+  m_CollabEditorSettings:
+    inProgressEnabled: 1
diff --git a/README.md b/README.md
@@ -16,11 +16,17 @@
 
 ### <a id="plugin-build-for"> This plugin is built for
 
-- Android AppsFlyer SDK **v6.6.0** 
-- iOS AppsFlyer SDK **v6.6.0**
+- Android AppsFlyer SDK **v6.8.0** 
+- iOS AppsFlyer SDK **v6.8.1**
+
+## AD_ID permission for Android
+In v6.8.0 of the AppsFlyer SDK, we added the normal permission `com.google.android.gms.permission.AD_ID` to the SDK's AndroidManifest, 
+to allow the SDK to collect the Android Advertising ID on apps targeting API 33.
+If your app is targeting children, you need to revoke this permission to comply with Google's Data policy.
+You can read more about it [here](https://dev.appsflyer.com/hc/docs/install-android-sdk#the-ad_id-permission).
 
 ## <a id="breaking-changes"> 	❗❗ Breaking changes when updating to 6.6.0 ❗❗
-- Starting version 6.6.0, there is no more need to differiencate between iOS and Android API. All API must be called with `AppsFlyer` class (even if the API is only iOS or Android).
+- Starting version 6.6.0, there is no more need to differentiate between iOS and Android APIs. All APIs must be called with `AppsFlyer` class (even if the API is only iOS or Android).
 
 Example:
 
diff --git a/android-unity-wrapper/build.gradle b/android-unity-wrapper/build.gradle
@@ -4,7 +4,7 @@ buildscript {
     
     repositories {
         google()
-        jcenter()
+        mavenCentral()
         
     }
     dependencies {
@@ -26,7 +26,7 @@ nexusStaging {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
         
     }
 }
diff --git a/android-unity-wrapper/gradle.properties b/android-unity-wrapper/gradle.properties
@@ -20,8 +20,8 @@ android.enableJetifier=true
 
 GROUP=com.appsflyer
 
-VERSION_CODE=21
-VERSION_NAME=6.5.4
+VERSION_CODE=22
+VERSION_NAME=6.8.1
 
 POM_ARTIFACT_ID=unity-wrapper
 POM_PACKAGING=aar
diff --git a/android-unity-wrapper/unitywrapper/build.gradle b/android-unity-wrapper/unitywrapper/build.gradle
@@ -31,7 +31,7 @@ repositories {
 dependencies {
     compileOnly fileTree(dir: 'libs', include: ['*.jar'])
     compileOnly 'androidx.appcompat:appcompat:1.1.0'
-    compileOnly 'com.appsflyer:af-android-sdk:6.5.4'
+    compileOnly 'com.appsflyer:af-android-sdk:6.8.0'
 
 }
 
diff --git a/android-unity-wrapper/unitywrapper/src/main/java/com/appsflyer/unity/AppsFlyerAndroidWrapper.java b/android-unity-wrapper/unitywrapper/src/main/java/com/appsflyer/unity/AppsFlyerAndroidWrapper.java
@@ -407,4 +407,8 @@ public static void setDisableAdvertisingIdentifiers(boolean disable){
     public static void setSharingFilterForPartners(java.lang.String... partners){
         AppsFlyerLib.getInstance().setSharingFilterForPartners(partners);
     }
+
+    public static void setDisableNetworkData(boolean disable){
+        AppsFlyerLib.getInstance().setDisableNetworkData(disable);
+    }
 }
diff --git a/appsflyer-unity-plugin-6.6.1.unitypackage b/appsflyer-unity-plugin-6.6.1.unitypackage
diff --git a/appsflyer-unity-plugin-6.8.1.unitypackage b/appsflyer-unity-plugin-6.8.1.unitypackage
diff --git a/deploy/build_unity_package.sh b/deploy/build_unity_package.sh
@@ -4,15 +4,15 @@ echo "Start Build for appsflyer-unity-plugin.unitypackage"
 
 DEPLOY_PATH=outputs
 UNITY_PATH="/Applications/Unity/Unity.app/Contents/MacOS/Unity"
-PACKAGE_NAME="appsflyer-unity-plugin-6.6.1.unitypackage"
+PACKAGE_NAME="appsflyer-unity-plugin-6.8.1.unitypackage"
 mkdir -p $DEPLOY_PATH
 
 #move external dependency manager
 echo "moving the external dependency manager to root"
 mv external-dependency-manager-1.2.144.unitypackage ..
 
 # Build the .unitypackage
-/Applications/Unity/Hub/Editor/2019.4.26f1/Unity.app/Contents/MacOS/Unity \
+/Applications/Unity/Hub/Editor/2020.3.15f2/Unity.app/Contents/MacOS/Unity \
 -gvh_disable \
 -batchmode \
 -importPackage external-dependency-manager-1.2.144.unitypackage \
@@ -23,7 +23,7 @@ mv external-dependency-manager-1.2.144.unitypackage ..
 Assets \
 $PWD/$DEPLOY_PATH/$PACKAGE_NAME \
 -quit \
-&& echo "package exported successfully to outputs/appsflyer-unity-plugin-6.6.1.unitypackage" \
+&& echo "package exported successfully to outputs/appsflyer-unity-plugin-6.8.1.unitypackage" \
 || echo "Failed to export package. See create_unity_core.log for more info."
 
 
diff --git a/deploy/strict_mode_build_package.sh b/deploy/strict_mode_build_package.sh
@@ -5,7 +5,7 @@ echo "Start Build for appsflyer-unity-plugin.unitypackage. Strict Mode."
 
  DEPLOY_PATH=outputs
  UNITY_PATH="/Applications/Unity/Unity.app/Contents/MacOS/Unity"
- PACKAGE_NAME="appsflyer-unity-plugin-strict-mode-6.6.1.unitypackage"
+ PACKAGE_NAME="appsflyer-unity-plugin-strict-mode-6.8.1.unitypackage"
  mkdir -p $DEPLOY_PATH
 
 #move external dependency manager
@@ -26,7 +26,7 @@ echo "Commenting out functions. Done."
 
 
  # Build the .unitypackage
- /Applications/Unity/Hub/Editor/2019.4.26f1/Unity.app/Contents/MacOS/Unity \
+ /Applications/Unity/Hub/Editor/2020.3.15f2/Unity.app/Contents/MacOS/Unity \
  -gvh_disable \
  -batchmode \
  -importPackage external-dependency-manager-1.2.144.unitypackage \
@@ -37,7 +37,7 @@ echo "Commenting out functions. Done."
  Assets \
  $PWD/$DEPLOY_PATH/$PACKAGE_NAME \
  -quit \
- && echo "package exported successfully to outputs/appsflyer-unity-plugin-strict-mode-6.6.1.unitypackage" \
+ && echo "package exported successfully to outputs/appsflyer-unity-plugin-strict-mode-6.8.1.unitypackage" \
  || echo "Failed to export package. See create_unity_core.log for more info."
 
 
diff --git a/docs/API.md b/docs/API.md
@@ -51,6 +51,7 @@ The list of available methods for this plugin is described below.
     - [validateAndSendInAppPurchase](#validateAndSendInAppPurchase)
     - [setCollectOaid](#setCollectOaid)
     - [setDisableAdvertisingIdentifiers](#setDisableAdvertisingIdentifiers)
+    - [setDisableNetworkData](#setDisableNetworkData)
 - [iOS Only API](#iOSOnly)
     - [setShouldCollectDeviceName](#deprecated)
     - [setDisableCollectIAd](#setDisableCollectIAd)
@@ -925,6 +926,28 @@ An af_purchase event with the relevant values will be automatically sent if the
 
 ---
 
+---
+    
+##### <a id="setDisableNetworkData"> **`void setDisableNetworkData(boolean disable)`**
+
+    setDisableNetworkData
+
+    Use to opt-out of collecting the network operator name (carrier) and sim operator name from the device.
+
+| parameter   | type    | description             |
+| ----------- |-------- |-------------------------|
+| `disable` | `bool`  | true to opt-out|
+
+*Example:*
+
+```c#
+#if UNITY_ANDROID && !UNITY_EDITOR
+        AppsFlyer.setDisableNetworkData(true);
+#endif
+```
+
+---
+
 ## <a id="iOSOnly"> iOS Only API
  
            
diff --git a/strict-mode-sdk/appsflyer-unity-plugin-strict-mode-6.6.1.unitypackage b/strict-mode-sdk/appsflyer-unity-plugin-strict-mode-6.6.1.unitypackage
diff --git a/strict-mode-sdk/appsflyer-unity-plugin-strict-mode-6.8.1.unitypackage b/strict-mode-sdk/appsflyer-unity-plugin-strict-mode-6.8.1.unitypackage

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ public interface IAppsFlyerAndroidBridge : IAppsFlyerNativeBridge`
`24`	`24`	`void validateAndSendInAppPurchase(string publicKey, string signature, string purchaseData, string price, string currency, Dictionary<string, string> additionalParameters, MonoBehaviour gameObject);`
`25`	`25`	`void setCollectOaid(bool isCollect);`
`26`	`26`	`void setDisableAdvertisingIdentifiers(bool disable);`
	`27`	`+ void setDisableNetworkData(bool disable);`
`27`	`28`
`28`	`29`	`}`
`29`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ buildscript {`
`4`	`4`
`5`	`5`	`repositories {`
`6`	`6`	`google()`
`7`		`- jcenter()`
	`7`	`+ mavenCentral()`
`8`	`8`
`9`	`9`	`}`
`10`	`10`	`dependencies {`
`@@ -26,7 +26,7 @@ nexusStaging {`
`26`	`26`	`allprojects {`
`27`	`27`	`repositories {`
`28`	`28`	`google()`
`29`		`- jcenter()`
	`29`	`+ mavenCentral()`
`30`	`30`
`31`	`31`	`}`
`32`	`32`	`}`