Merge pull request #58 from adjust/wack_fix

WACK fix

Author: uerceg

Assets/Adjust/Adjust.cs

@@ -12,9 +12,9 @@ public class Adjust : MonoBehaviour
 		private static IAdjust instance = null;
 		private static Action<AdjustAttribution> attributionChangedDelegate = null;
 
-		public bool startManually = false;
+		public bool startManually = true;
 		public bool eventBuffering = false;
-		public bool printAttribution = false;
+		public bool printAttribution = true;
 
 		public string appToken = "{Your App Token}";
 
@@ -25,6 +25,10 @@ public class Adjust : MonoBehaviour
 
 		void Awake ()
 		{
+			if (Adjust.instance != null) {
+  				return;
+  			}
+  			
 			DontDestroyOnLoad (transform.gameObject);
 
 			if (!this.startManually) {

Assets/Adjust/AdjustUnityWP.dll

@@ -10,7 +10,7 @@ namespace com.adjust.sdk
 #if UNITY_ANDROID
 	public class AdjustAndroid : IAdjust
 	{
-		private const string sdkPrefix = "unity4.1.0";
+		private const string sdkPrefix = "unity4.1.1";
 		private AndroidJavaClass ajcAdjust;
 		private AndroidJavaObject ajoCurrentActivity;
 		private AttributionChangeListener onAttributionChangedListener;

Assets/Adjust/AdjustUnityWS.dll

@@ -9,7 +9,7 @@ namespace com.adjust.sdk
 {
 	public class AdjustMetro : IAdjust
 	{
-		private const string sdkPrefix = "unity4.1.0";
+		private const string sdkPrefix = "unity4.1.1";
 
 		public bool isEnabled()
 		{
@@ -52,7 +52,8 @@ public void start(AdjustConfig adjustConfig)
 				defaultTracker: adjustConfig.defaultTracker,
 				eventBufferingEnabled: adjustConfig.eventBufferingEnabled,
 				sdkPrefix: sdkPrefix,
-				attributionChangedDic: attributionChangedDictionary
+				attributionChangedDic: attributionChangedDictionary,
+                logDelegate: adjustConfig.logDelegate
 			);
 		}
 		public void trackEvent (AdjustEvent adjustEvent)

Assets/Adjust/Android/AdjustAndroid.cs

@@ -20,7 +20,10 @@ public class AdjustConfig
 		// Android specific members
 		internal string processName;
 
-		public AdjustConfig (string appToken, AdjustEnvironment environment)
+        // Windows specific members
+        internal Action<String> logDelegate;
+
+        public AdjustConfig (string appToken, AdjustEnvironment environment)
 		{
 			this.sceneName = "";
 			this.appToken = appToken;
@@ -66,5 +69,10 @@ public void setProcessName (string processName)
 		{
 			this.processName = processName;
 		}
+
+        public void setLogDelegate(Action<String> logDelegate)
+        {
+            this.logDelegate = logDelegate;
+        }
 	}
 }

Assets/Adjust/Android/adjust-android.jar

@@ -9,7 +9,7 @@ namespace com.adjust.sdk
 {
 	public class AdjustWP8 : IAdjust
 	{
-		private const string sdkPrefix = "unity4.1.0";
+		private const string sdkPrefix = "unity4.1.1";
 
 		public bool isEnabled()
 		{
@@ -52,7 +52,8 @@ public void start(AdjustConfig adjustConfig)
 				defaultTracker: adjustConfig.defaultTracker,
 				eventBufferingEnabled: adjustConfig.eventBufferingEnabled,
 				sdkPrefix: sdkPrefix,
-				attributionChangedDic: attributionChangedDictionary
+				attributionChangedDic: attributionChangedDictionary,
+                logDelegate: adjustConfig.logDelegate
 			);
 		}
 		public void trackEvent (AdjustEvent adjustEvent)

Assets/Adjust/Android/adjust-android.jar.meta

@@ -10,7 +10,7 @@ namespace com.adjust.sdk
 #if UNITY_IOS
 	public class AdjustiOS : IAdjust
 	{
-		private const string sdkPrefix = "unity4.1.0";
+		private const string sdkPrefix = "unity4.1.1";
 
 		#region External methods
 

Assets/Adjust/Metro/AdjustMetro.cs

@@ -1,15 +1,17 @@
-using System.Collections;
+using System;
+using System.IO;
+using System.Collections;
 using System.Diagnostics;
+using System.Text.RegularExpressions;
 
 using UnityEngine;
 using UnityEditor;
 using UnityEditor.Callbacks;
 
 public class AdjustEditor : MonoBehaviour
 {
-	static string iOSBuildPath = "";
 	static bool isEnabled = true;
-	static bool isAdjusted = false;
+	static string iOSBuildPath = "";
 
 	[PostProcessBuild]
 	public static void OnPostprocessBuild (BuildTarget target, string pathToBuiltProject)
@@ -31,84 +33,110 @@ public static void OnPostprocessBuild (BuildTarget target, string pathToBuiltPro
 		}
 	}
 
-	[MenuItem("Assets/Adjust/Fix AndroidManifest.xml")]
+	[MenuItem ("Assets/Adjust/Fix AndroidManifest.xml")]
 	static void FixAndroidManifest ()
 	{
 		#if UNITY_ANDROID
 		var exitCode = RunPostBuildScript (preBuild: true);
 
 		if (exitCode == 1) {
 			EditorUtility.DisplayDialog("Adjust", 
-			                            string.Format("AndroidManifest.xml changed or created at {0}/Plugins/Android/ .",Application.dataPath),
+			                            string.Format("AndroidManifest.xml changed or created at {0}/Plugins/Android/ .", Application.dataPath),
 			                            "OK");
 		} else if (exitCode == 0) {
-			EditorUtility.DisplayDialog("Adjust", 
-			                            "AndroidManifest.xml did not needed to be changed.",
-			                            "OK");
+			EditorUtility.DisplayDialog("Adjust", "AndroidManifest.xml did not needed to be changed.", "OK");
 		} else {
-			EditorUtility.DisplayDialog("Adjust", 
-			                            GenerateErrorScriptMessage(exitCode),
-			                            "OK");
+			EditorUtility.DisplayDialog("Adjust", GenerateErrorScriptMessage(exitCode), "OK");
 
 		}
 		#else
 		EditorUtility.DisplayDialog ("Adjust", "Option only valid for the Android platform.", "OK");
 		#endif
 	}
 
-	[MenuItem("Assets/Adjust/Set iOS build path")]
+	[MenuItem ("Assets/Adjust/Set iOS build path")]
 	static void SetiOSBuildPath ()
 	{
 		#if UNITY_IOS
-		AdjustEditor.iOSBuildPath = EditorUtility.OpenFolderPanel(
+		AdjustEditor.iOSBuildPath = EditorUtility.OpenFolderPanel (
 			title: "iOs build path",
-			folder: EditorUserBuildSettings.GetBuildLocation(BuildTarget.iOS),
+			folder: EditorUserBuildSettings.GetBuildLocation (BuildTarget.iOS),
 			defaultName: "");
 
 		if (AdjustEditor.iOSBuildPath == "") {
-			UnityEngine.Debug.Log("iOS build path reset to default path");
+			UnityEngine.Debug.Log ("iOS build path reset to default path");
 		} else {
-			UnityEngine.Debug.Log(string.Format("iOS build path: {0}", AdjustEditor.iOSBuildPath));
+			UnityEngine.Debug.Log (string.Format ("iOS build path: {0}", AdjustEditor.iOSBuildPath));
 		}
 		#else
 		EditorUtility.DisplayDialog ("Adjust", "Option only valid for the Android platform.", "OK");
 		#endif
 	}
 
-	[MenuItem("Assets/Adjust/Change post processing status")]
+	[MenuItem ("Assets/Adjust/Change post processing status")]
 	static void ChangePostProcessingStatus ()
 	{
 		isEnabled = !isEnabled;
 
-		EditorUtility.DisplayDialog ("Adjust",
-		                            "The post processing for adjust is now " +
-			(isEnabled ? "enabled." : "disabled."),
-		                            "OK");
+		EditorUtility.DisplayDialog ("Adjust", "The post processing for adjust is now " +
+			(isEnabled ? "enabled." : "disabled."), "OK");
 	}
 
 	static int RunPostBuildScript (bool preBuild, string pathToBuiltProject = "")
 	{
-		string pathToScript = null;
+		string resultContent;
 		string arguments = null;
+		string pathToScript = null;
 
-		#if UNITY_ANDROID
+		string filePath = System.IO.Path.Combine (Environment.CurrentDirectory, 
+			                  @"Assets/Editor/PostprocessBuildPlayer_AdjustPostBuildiOS.py");
+
+        // Check if Unity is running on Windows operating system.
+        // If yes - fix line endings in python scripts.
+        if (Application.platform == RuntimePlatform.WindowsEditor) {
+			UnityEngine.Debug.Log ("Windows platform");
+
+			using (System.IO.StreamReader streamReader = new System.IO.StreamReader (filePath)) {
+				string fileContent = streamReader.ReadToEnd ();
+				resultContent = Regex.Replace (fileContent, @"\r\n|\n\r|\n|\r", "\r\n");
+			}
+
+			if (File.Exists (filePath)) {
+				File.WriteAllText (filePath, resultContent);
+			}
+		} else {
+			UnityEngine.Debug.Log ("Unix platform");
+
+			using (System.IO.StreamReader streamReader = new System.IO.StreamReader (filePath)) {
+				string replaceWith = "\n";
+				string fileContent = streamReader.ReadToEnd ();
+				
+				resultContent = fileContent.Replace ("\r\n", replaceWith);
+			}
+
+			if (File.Exists (filePath)) {
+				File.WriteAllText (filePath, resultContent);
+			}
+		}
+
+#if UNITY_ANDROID
 		pathToScript = "/Editor/PostprocessBuildPlayer_AdjustPostBuildAndroid.py";
 		arguments = "\"" + Application.dataPath + "\"";
 
 		if (preBuild) {
 			arguments = "--pre-build " + arguments;
 		}
-		#elif UNITY_IOS
+#elif UNITY_IOS
 		pathToScript = "/Editor/PostprocessBuildPlayer_AdjustPostBuildiOS.py";
 
 		if (AdjustEditor.iOSBuildPath == "") {
 			arguments = "\"" + pathToBuiltProject + "\"";
 		} else {
 			arguments = "\"" + AdjustEditor.iOSBuildPath + "\"";
 		}
-		#else
+#else
 		return -1;
-		#endif
+#endif
 
 		Process proc = new Process ();
 		proc.EnableRaisingEvents = false; 
@@ -122,26 +150,26 @@ static int RunPostBuildScript (bool preBuild, string pathToBuiltProject = "")
 
 	static string GenerateErrorScriptMessage (int exitCode)
 	{
-		#if UNITY_ANDROID
+#if UNITY_ANDROID
 		if (exitCode == 1) {
 			return "The AndroidManifest.xml file was only changed or created after building the package. " +
           		"PLease build again the Android Unity package so it can use the new file";
 		}  
-		#endif
+#endif
 
 		if (exitCode != 0) {
 			var message = "Build script exited with error." +
-				" Please check the Adjust log file for more information at {0}";
+			              " Please check the Adjust log file for more information at {0}";
 			string projectPath = Application.dataPath.Substring (0, Application.dataPath.Length - 7);
 			string logFile = null;
 
-			#if UNITY_ANDROID
+#if UNITY_ANDROID
 			logFile = projectPath + "/AdjustPostBuildAndroidLog.txt";
-			#elif UNITY_IOS
+#elif UNITY_IOS
 			logFile = projectPath + "/AdjustPostBuildiOSLog.txt";
-			#else
+#else
 			return null;
-			#endif
+#endif
 			return string.Format (message, logFile);
 		}