Merge pull request #152 from adjust/v4182

Version 4.18.2

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.18.1";
+        private const string sdkPrefix = "unity4.18.2";
         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/adjust-android.jar

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

Assets/Adjust/Windows/AdjustWindows.cs

@@ -2,7 +2,7 @@
 //  Adjust.h
 //  Adjust
 //
-//  V4.18.0
+//  V4.18.3
 //  Created by Christian Wellenbrock (wellle) on 23rd July 2013.
 //  Copyright © 2012-2017 Adjust GmbH. All rights reserved.
 //

Assets/Adjust/Windows/Newtonsoft.Json.dll.meta

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

Assets/Adjust/Windows/Stubs/TestLibraryInterface.dll

@@ -13,7 +13,7 @@ public static void ReadImei()
         {
             if (ajcAdjustImei == null)
             {
-                ajcAdjustImei = new AndroidJavaClass("com.adjust.sdk.Adjust");
+                ajcAdjustImei = new AndroidJavaClass("com.adjust.sdk.imei.AdjustImei");
             }
             ajcAdjustImei.CallStatic("readImei");
         }
@@ -22,7 +22,7 @@ public static void DoNotReadImei()
         {
             if (ajcAdjustImei == null)
             {
-                ajcAdjustImei = new AndroidJavaClass("com.adjust.sdk.Adjust");
+                ajcAdjustImei = new AndroidJavaClass("com.adjust.sdk.imei.AdjustImei");
             }
             ajcAdjustImei.CallStatic("doNotReadImei");
         }

Assets/Adjust/iOS/Adjust.h

@@ -0,0 +1,31 @@
+using System;
+using System.Runtime.InteropServices;
+using UnityEngine;
+
+namespace com.adjust.sdk.oaid
+{
+#if UNITY_ANDROID
+    public class AdjustOaidAndroid
+    {
+        private static AndroidJavaClass ajcAdjustOaid = new AndroidJavaClass("com.adjust.sdk.oaid.AdjustOaid");
+
+        public static void ReadOaid()
+        {
+            if (ajcAdjustOaid == null)
+            {
+                ajcAdjustOaid = new AndroidJavaClass("com.adjust.sdk.oaid.AdjustOaid");
+            }
+            ajcAdjustOaid.CallStatic("readOaid");
+        }
+
+        public static void DoNotReadOaid()
+        {
+            if (ajcAdjustOaid == null)
+            {
+                ajcAdjustOaid = new AndroidJavaClass("com.adjust.sdk.oaid.AdjustOaid");
+            }
+            ajcAdjustOaid.CallStatic("doNotReadOaid");
+        }
+    }
+#endif
+}

Assets/Adjust/iOS/AdjustSdk.a

@@ -0,0 +1,64 @@
+using System;
+using System.IO;
+using System.Xml;
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Text.RegularExpressions;
+using UnityEngine;
+using UnityEditor;
+using UnityEditor.Callbacks;
+
+public class AdjustOaidEditor
+{
+    private const string MenuItem0 = "Assets/AdjustOaid/Autorun post-build tasks";
+    private const string MenuItem1 = "Assets/AdjustOaid/Export Unity package";
+
+    private static bool shouldAutorun = true;
+
+    static AdjustOaidEditor()
+    {
+        EditorApplication.delayCall += () =>
+        {
+            shouldAutorun = EditorPrefs.GetBool(MenuItem0, true);
+            Menu.SetChecked(MenuItem0, shouldAutorun);
+        };
+    }
+
+    [MenuItem(MenuItem0)]
+    static void AutorunPostBuildTasks()
+    {
+        shouldAutorun = !shouldAutorun;
+        Menu.SetChecked(MenuItem0, shouldAutorun);
+        EditorPrefs.SetBool(MenuItem0, shouldAutorun);
+
+        if (shouldAutorun)
+        {
+            EditorUtility.DisplayDialog("Adjust OAID Plugin", "Adjust OAID plugin post build tasks will from now on be performed each time you build your app.", "OK");
+        }
+        else
+        {
+            EditorUtility.DisplayDialog("Adjust OAID Plugin", "Adjust OAID 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 OAID plugin by selecting \"Is my app properly configured?\" option from menu.", "OK");
+        }
+    }
+
+    [MenuItem(MenuItem1)]
+    static void ExportAdjustUnityPackage()
+    {
+        string exportedFileName = "AdjustOaid.unitypackage";
+        string assetsPath = "Assets/AdjustOaid";
+        List<string> assetsToExport = new List<string>();
+
+        assetsToExport.Add(assetsPath + "/Android/adjust-android-oaid.jar");
+        assetsToExport.Add(assetsPath + "/Android/AdjustOaidAndroid.cs");
+        assetsToExport.Add(assetsPath + "/Editor/AdjustOaidEditor.cs");
+        assetsToExport.Add(assetsPath + "/Prefab/AdjustOaid.prefab");
+        assetsToExport.Add(assetsPath + "/Unity/AdjustOaid.cs");
+
+        AssetDatabase.ExportPackage(
+            assetsToExport.ToArray(),
+            exportedFileName,
+            ExportPackageOptions.IncludeDependencies | ExportPackageOptions.Interactive);
+    }
+}