Merge pull request #168 from adjust/v4201

Version 4.20.1

Author: uerceg

Assets/Adjust/Android/AdjustAndroid.cs

@@ -8,7 +8,7 @@ namespace com.adjust.sdk
 #if UNITY_ANDROID
     public class AdjustAndroid
     {
-        private const string sdkPrefix = "unity4.20.0";
+        private const string sdkPrefix = "unity4.20.1";
         private static bool launchDeferredDeeplink = true;
         private static AndroidJavaClass ajcAdjust = new AndroidJavaClass("com.adjust.sdk.Adjust");
         private static AndroidJavaObject ajoCurrentActivity = new AndroidJavaClass("com.unity3d.player.UnityPlayer").GetStatic<AndroidJavaObject>("currentActivity");

Assets/Adjust/Android/Test/adjust-test.jar

@@ -135,7 +135,11 @@ private static void RunPostBuildScript(BuildTarget target, bool preBuild, string
             // - AdSupport.framework
             // - iAd.framework
 
+#if UNITY_2019_3_OR_NEWER
+            string xcodeTarget = xcodeProject.GetUnityFrameworkTargetGuid();
+#else
             string xcodeTarget = xcodeProject.TargetGuidByName("Unity-iPhone");
+#endif
 
             UnityEngine.Debug.Log("[Adjust]: Adding AdSupport.framework to Xcode project.");
             xcodeProject.AddFrameworkToProject(xcodeTarget, "AdSupport.framework", true);
@@ -212,25 +216,35 @@ private static void RunPostProcessTasksAndroid()
             XmlDocument manifestFile = new XmlDocument();
             manifestFile.Load(appManifestPath);
 
+            bool manifestHasChanged = false;
+            
             // Add needed permissions if they are missing.
-            AddPermissions(manifestFile);
+            manifestHasChanged |= AddPermissions(manifestFile);
 
             // Add intent filter to main activity if it is missing.
-            AddBroadcastReceiver(manifestFile);
+            manifestHasChanged |= AddBroadcastReceiver(manifestFile);
 
-            // Save the changes.
-            manifestFile.Save(appManifestPath);
+            if (manifestHasChanged)
+            {
+                // Save the changes.
+                manifestFile.Save(appManifestPath);
 
-            // Clean the manifest file.
-            CleanManifestFile(appManifestPath);
+                // Clean the manifest file.
+                CleanManifestFile(appManifestPath);
 
-            UnityEngine.Debug.Log("[Adjust]: App's AndroidManifest.xml file check and potential modification completed.");
-            UnityEngine.Debug.Log("[Adjust]: Please check if any error message was displayed during this process " 
-                + "and make sure to fix all issues in order to properly use the Adjust SDK in your app.");
+                UnityEngine.Debug.Log("[Adjust]: App's AndroidManifest.xml file check and potential modification completed.");
+                UnityEngine.Debug.Log("[Adjust]: Please check if any error message was displayed during this process " 
+                                      + "and make sure to fix all issues in order to properly use the Adjust SDK in your app.");                
+            }
+            else
+            {
+                UnityEngine.Debug.Log("[Adjust]: App's AndroidManifest.xml file check completed.");
+                UnityEngine.Debug.Log("[Adjust]: No modifications performed due to app's AndroidManifest.xml file compatibility.");
+            }
         }
     }
 
-    private static void AddPermissions(XmlDocument manifest)
+    private static bool AddPermissions(XmlDocument manifest)
     {
         // The Adjust SDK needs two permissions to be added to you app's manifest file:
         // <uses-permission android:name="android.permission.INTERNET" />
@@ -274,13 +288,16 @@ private static void AddPermissions(XmlDocument manifest)
             }
         }
 
+        bool manifestHasChanged = false;
+
         // If android.permission.INTERNET permission is missing, add it.
         if (!hasInternetPermission)
         {
             XmlElement element = manifest.CreateElement("uses-permission");
             element.SetAttribute("android__name", "android.permission.INTERNET");
             manifestRoot.AppendChild(element);
             UnityEngine.Debug.Log("[Adjust]: android.permission.INTERNET permission successfully added to your app's AndroidManifest.xml file.");
+            manifestHasChanged = true;
         }
         else
         {
@@ -294,6 +311,7 @@ private static void AddPermissions(XmlDocument manifest)
             element.SetAttribute("android__name", "android.permission.ACCESS_WIFI_STATE");
             manifestRoot.AppendChild(element);
             UnityEngine.Debug.Log("[Adjust]: android.permission.ACCESS_WIFI_STATE permission successfully added to your app's AndroidManifest.xml file.");
+            manifestHasChanged = true;
         }
         else
         {
@@ -307,6 +325,7 @@ private static void AddPermissions(XmlDocument manifest)
             element.SetAttribute("android__name", "android.permission.ACCESS_NETWORK_STATE");
             manifestRoot.AppendChild(element);
             UnityEngine.Debug.Log("[Adjust]: android.permission.ACCESS_NETWORK_STATE permission successfully added to your app's AndroidManifest.xml file.");
+            manifestHasChanged = true;
         }
         else
         {
@@ -320,14 +339,17 @@ private static void AddPermissions(XmlDocument manifest)
             element.SetAttribute("android__name", "com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE");
             manifestRoot.AppendChild(element);
             UnityEngine.Debug.Log("[Adjust]: com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE permission successfully added to your app's AndroidManifest.xml file.");
+            manifestHasChanged = true;
         }
         else
         {
             UnityEngine.Debug.Log("[Adjust]: Your app's AndroidManifest.xml file already contains com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE permission.");
         }
+
+        return manifestHasChanged;
     }
 
-    private static void AddBroadcastReceiver(XmlDocument manifest)
+    private static bool AddBroadcastReceiver(XmlDocument manifest)
     {
         // We're looking for existance of broadcast receiver in the AndroidManifest.xml
         // Check out the example below how that usually looks like:
@@ -379,7 +401,7 @@ private static void AddBroadcastReceiver(XmlDocument manifest)
         {
             UnityEngine.Debug.LogError("[Adjust]: Your app's AndroidManifest.xml file does not contain \"<application>\" node.");
             UnityEngine.Debug.LogError("[Adjust]: Unable to add the Adjust broadcast receiver to AndroidManifest.xml.");
-            return;
+            return false;
         }
 
         // Okay, there's an application node in the AndroidManifest.xml file.
@@ -411,6 +433,8 @@ private static void AddBroadcastReceiver(XmlDocument manifest)
             {
                 UnityEngine.Debug.Log("[Adjust]: It seems like you are already using Adjust broadcast receiver. Yay.");
             }
+
+            return false;
         }
         else
         {
@@ -429,6 +453,8 @@ private static void AddBroadcastReceiver(XmlDocument manifest)
             applicationNode.AppendChild(receiverElement);
 
             UnityEngine.Debug.Log("[Adjust]: Adjust broadcast receiver successfully added to your app's AndroidManifest.xml file.");
+
+            return true;
         }
     }
 

Assets/Adjust/Android/adjust-android.jar

@@ -17,7 +17,7 @@ namespace com.adjust.sdk
 {
     public class AdjustWindows
     {
-        private const string sdkPrefix = "unity4.20.0";
+        private const string sdkPrefix = "unity4.20.1";
         private static bool appLaunched = false;
 
         public static void Start(AdjustConfig adjustConfig)

Assets/Adjust/Editor/AdjustEditor.cs

@@ -8,7 +8,7 @@ namespace com.adjust.sdk
 #if UNITY_IOS
     public class AdjustiOS
     {
-        private const string sdkPrefix = "unity4.20.0";
+        private const string sdkPrefix = "unity4.20.1";
 
         [DllImport("__Internal")]
         private static extern void _AdjustLaunchApp(

Assets/Adjust/Windows/AdjustWindows.cs

@@ -58,7 +58,7 @@ static void AutorunPostBuildTasks()
         }
         else
         {
-            EditorUtility.DisplayDialog("Adjust IMEI Plugin", "Adjust IMEI plugin post build tasks from now on WON'T be performed each time you build your app."
+            EditorUtility.DisplayDialog("Adjust IMEI Plugin", "Adjust IMEI plugin post build tasks from now on WON’T be performed each time you build your app."
                 + "\n\nPlease, make sure that your app is compatible for usage of the Adjust IMEI plugin by selecting \"Is my app properly configured?\" option from menu.", "OK");
         }
     }
@@ -122,34 +122,44 @@ private static void RunPostProcessTasksAndroid()
             UnityEngine.Debug.Log("[AdjustImei]: User defined AndroidManifest.xml file located in Plugins/Android folder.");
         }
 
-        // Seems like you already have your own AndroidManifest.xml, we'll now run
+        // Seems like you already have your own AndroidManifest.xml, we’ll now run
         // some checks on it and tweak it a bit if needed to add some stuff which
         // our native Android IMEI plugin needs so that it can run properly.
 
-        // Let's open the app's AndroidManifest.xml file.
+        // Let’s open the app’s AndroidManifest.xml file.
         XmlDocument manifestFile = new XmlDocument();
         manifestFile.Load(appManifestPath);
-        
+
+        bool manifestHasChanged = false;
+
         // Add needed permissions if they are missing.
-        AddPermissions(manifestFile);
+        manifestHasChanged |= AddPermissions(manifestFile);
 
-        // Save the changes.
-        manifestFile.Save(appManifestPath);
+        if (manifestHasChanged)
+        {
+            // Save the changes.
+            manifestFile.Save(appManifestPath);
 
-        // Clean the manifest file.
-        CleanManifestFile(appManifestPath);
+            // Clean the manifest file.
+            CleanManifestFile(appManifestPath);
 
-        UnityEngine.Debug.Log("[AdjustImei]: App's AndroidManifest.xml file check and potential modification completed.");
-        UnityEngine.Debug.Log("[AdjustImei]: Please check if any error message was displayed during this process " 
-            + "and make sure to fix all issues in order to properly use the Adjust IMEI plugin in your app.");
+            UnityEngine.Debug.Log("[AdjustImei]: App’s AndroidManifest.xml file check and potential modification completed.");
+            UnityEngine.Debug.Log("[AdjustImei]: Please check if any error message was displayed during this process "
+                + "and make sure to fix all issues in order to properly use the Adjust IMEI plugin in your app.");
+        }
+        else
+        {
+            UnityEngine.Debug.Log("[AdjustImei]: App’s AndroidManifest.xml file check completed.");
+            UnityEngine.Debug.Log("[AdjustImei]: No modifications performed due to app’s AndroidManifest.xml file compatibility.");
+        }
     }
 
-    private static void AddPermissions(XmlDocument manifest)
+    private static bool AddPermissions(XmlDocument manifest)
     {
-        // The Adjust IMEI plugin needs following permissions to be added to you app's manifest file:
+        // The Adjust IMEI plugin needs following permissions to be added to you app’s manifest file:
         // <uses-permission android:name="android.permission.READ_PHONE_STATE" />
 
-        UnityEngine.Debug.Log("[AdjustImei]: Checking if all permissions needed for the Adjust IMEI plugin are present in the app's AndroidManifest.xml file.");
+        UnityEngine.Debug.Log("[AdjustImei]: Checking if all permissions needed for the Adjust IMEI plugin are present in the app’s AndroidManifest.xml file.");
 
         bool hasReadPhoneStatePermission = false;
         XmlElement manifestRoot = manifest.DocumentElement;
@@ -169,19 +179,24 @@ private static void AddPermissions(XmlDocument manifest)
             }
         }
 
+        bool manifestHasChanged = false;
+
         // If android.permission.READ_PHONE_STATE permission is missing, add it.
         if (!hasReadPhoneStatePermission)
         {
             XmlElement element = manifest.CreateElement("uses-permission");
             element.SetAttribute("android__name", "android.permission.READ_PHONE_STATE");
             manifestRoot.AppendChild(element);
-            UnityEngine.Debug.Log("[AdjustImei]: android.permission.READ_PHONE_STATE permission successfully added to your app's AndroidManifest.xml file.");
+            UnityEngine.Debug.Log("[AdjustImei]: android.permission.READ_PHONE_STATE permission successfully added to your app’s AndroidManifest.xml file.");
+            manifestHasChanged = true;
         }
         else
         {
-            UnityEngine.Debug.Log("[AdjustImei]: Your app's AndroidManifest.xml file already contains android.permission.READ_PHONE_STATE permission.");
+            UnityEngine.Debug.Log("[AdjustImei]: Your app’s AndroidManifest.xml file already contains android.permission.READ_PHONE_STATE permission.");
             UnityEngine.Debug.Log("[AdjustImei]: All good.");
         }
+
+        return manifestHasChanged;
     }
 
     private static void CleanManifestFile(String manifestPath)
@@ -214,9 +229,9 @@ private static bool DoesAppHaveAllThePermissions()
         }
 
         // Seems like you already have your own AndroidManifest.xml.
-        // We'll now check if all the permissions needed by the plugin are added.
+        // We’ll now check if all the permissions needed by the plugin are added.
 
-        // Let's open the app's AndroidManifest.xml file.
+        // Let’s open the app’s AndroidManifest.xml file.
         XmlDocument manifestFile = new XmlDocument();
         manifestFile.Load(appManifestPath);
 
@@ -238,4 +253,4 @@ private static bool DoesAppHaveAllThePermissions()
 
         return false;
     }
-}
+}

Assets/Adjust/iOS/AdjustSdk.a

@@ -1,3 +1,15 @@
+### Version 4.20.1 (21st February 2020)
+#### Fixed
+- Fixed usage of deprecated `TargetGuidByName` API as of Unity 2019.3.0 (thanks to @epsmarkh).
+- Fixed unnecessary saving of `AndroidManifest.xml` file whose content was not changed during post build process (thanks to @nanasi880).
+
+#### Native SDKs
+- [[email protected]][ios_sdk_v4.20.0]
+- [[email protected]][android_sdk_v4.20.0]
+- [[email protected]][windows_sdk_v4.17.0]
+
+---
+
 ### Version 4.20.0 (16th January 2020)
 #### Added
 - Added external device ID support.

Assets/Adjust/iOS/AdjustiOS.cs

@@ -1 +1 @@
-4.20.0
+4.20.1

Assets/Adjust/iOS/Test/AdjustTestLibrary.a

@@ -1,4 +1,4 @@
-## Migrate your Adjust SDK for Unity3d to 4.20.0 from 3.4.4
+## Migrate your Adjust SDK for Unity3d to 4.20.1 from 3.4.4
 
 ### Migration procedure