Merge pull request #9 from adjust/development

New version v3.2.0

Author: nonelse

.gitignore

@@ -32,3 +32,8 @@ Icon?
 ehthumbs.db
 Thumbs.db
 
+# ==================== #
+# Adjust SDK generated #
+# ==================== #
+*.pyc*
+AndroidManifest.xml*

Adjust.unitypackage

@@ -80,6 +80,22 @@ public static void setResponseDelegate(Action<ResponseData> responseDelegate, st
 		Adjust.instance.setResponseDelegate (sceneName);
 	}
 
+	public static void setEnabled(bool enabled) {
+		if (Adjust.instance == null) {
+			Debug.Log(Adjust.errorMessage);
+			return;
+		}
+		Adjust.instance.setEnabled(enabled);
+	}
+
+	public static bool isEnabled() {
+		if (Adjust.instance == null) {
+			Debug.Log(Adjust.errorMessage);
+			return false;
+		}
+		return Adjust.instance.isEnabled ();
+	}
+
 	public void getNativeMessage (string sResponseData) {
 		if (Adjust.instance == null) {
 			Debug.Log(Adjust.errorMessage);
@@ -93,5 +109,4 @@ public void getNativeMessage (string sResponseData) {
 		var responseData = new ResponseData (sResponseData);
 		Adjust.responseDelegate (responseData);
 	}
-
 }

Assets/Adjust.cs

@@ -6,8 +6,15 @@
 
 public class AdjustEditor : MonoBehaviour {
 
+	static string iOSBuildPath = "";
+	static bool isEnabled = true;
+
 	[PostProcessBuild]
 	public static void OnPostprocessBuild(BuildTarget target, string pathToBuiltProject) {
+		if (!isEnabled) {
+			return;
+		}
+
 		var exitCode = RunPostBuildScript (preBuild: false, pathToBuiltProject: pathToBuiltProject);
 
 		if (exitCode == -1) {
@@ -43,6 +50,32 @@ static void FixAndroidManifest() {
 		#endif
 	}
 
+	[MenuItem("Adjust/Set iOS build path")]
+	static void SetiOSBuildPath() {
+		#if UNITY_IOS
+		AdjustEditor.iOSBuildPath = EditorUtility.OpenFolderPanel(
+			title: "iOs build path",
+			folder: EditorUserBuildSettings.GetBuildLocation(BuildTarget.iPhone),
+			defaultName: "");
+		if (AdjustEditor.iOSBuildPath == "") {
+			UnityEngine.Debug.Log("iOS build path reset to default path");
+		} else {
+			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("Adjust/Change post processing status")]
+	static void ChangePostProcessingStatus() {
+		isEnabled = !isEnabled;
+		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 arguments = null;
@@ -54,7 +87,11 @@ static int RunPostBuildScript (bool preBuild, string pathToBuiltProject = "") {
 			arguments = "--pre-build " + arguments;
 		#elif UNITY_IOS
 		pathToScript = "/Editor/AdjustPostBuildiOS";
-		arguments = pathToBuiltProject;
+		if (AdjustEditor.iOSBuildPath == "") {
+			arguments = pathToBuiltProject;
+		} else {
+			arguments = AdjustEditor.iOSBuildPath;
+		}
 		#else
 		return -1;
 		#endif

Assets/Editor/AdjustEditor.cs

@@ -5,12 +5,14 @@
 
 public class ExampleGUI : MonoBehaviour {
 
-	private int nr_buttons = 4;
+	private int nr_buttons = 5;
+	private static bool isEnabled = false;
 
 	void OnGUI () {
 		if (GUI.Button (new Rect (0, Screen.height * 0 / nr_buttons, Screen.width, Screen.height / nr_buttons),
 		                "manual launch")) {
 			Adjust.appDidLaunch("querty123456", Util.Environment.Sandbox, Util.LogLevel.Verbose, false);
+			isEnabled = true;
 		}
 
 		if (GUI.Button (new Rect (0, Screen.height * 1 / nr_buttons, Screen.width, Screen.height / nr_buttons),
@@ -39,6 +41,13 @@ void OnGUI () {
 		                "callback")) {
 			Adjust.setResponseDelegate(responseDelegate);
 		}
+
+		var switch_sdk = isEnabled ? "disable sdk" : "enable sdk";
+		if (GUI.Button (new Rect (0, Screen.height * 4 / nr_buttons, Screen.width, Screen.height / nr_buttons),
+		                switch_sdk)) {
+			isEnabled = !Adjust.isEnabled();
+			Adjust.setEnabled(isEnabled);
+		}
 	}
 
 	public void responseDelegate (ResponseData responseData)

Assets/ExampleGUI/ExampleGUI.cs

@@ -1,6 +1,7 @@
 using UnityEngine;
 using System.Collections;
 using System.Collections.Generic;
+using System;
 
 namespace com.adjust.sdk {
 #if UNITY_ANDROID
@@ -51,11 +52,36 @@ public void onResume() {
 			ajcAdjust.CallStatic("onResume", ajoCurrentActivity);
 		}
 
-		public void setResponseDelegate(string sceneName) 
-		{
+		public void setResponseDelegate(string sceneName) {
 			ajcAdjustUnity.CallStatic ("setResponseDelegate", sceneName);
 		}
 
+		public void setEnabled(bool enabled) {
+			ajcAdjust.CallStatic ("setEnabled", ConvertBoolToJava(enabled));
+		}
+
+		public bool isEnabled() {
+			var ajo = ajcAdjust.CallStatic<AndroidJavaObject> ("isEnabled");
+			return ConvertBoolFromJava (ajo) ?? false;
+		}
+
+		private AndroidJavaObject ConvertBoolToJava(bool value) {
+			AndroidJavaObject javaBool = new AndroidJavaObject ("java.lang.Boolean", value.ToString ().ToLower ());
+			return javaBool;
+		}
+
+		private bool? ConvertBoolFromJava(AndroidJavaObject ajo) {
+			if (ajo == null) {
+				return null;
+			}
+			var sBool = ajo.Call<string>("toString");
+			try {
+				return Convert.ToBoolean (sBool);
+			} catch (FormatException) {
+				return null;
+			}
+		}
+
 		private AndroidJavaObject ConvertDicToJava(Dictionary<string, string> dictonary)
 		{
 			if (dictonary == null) {
@@ -65,7 +91,9 @@ private AndroidJavaObject ConvertDicToJava(Dictionary<string, string> dictonary)
 			AndroidJavaObject javaDic = new AndroidJavaObject("java.util.HashMap", dictonary.Count);
 
 			foreach (var pair in dictonary) {
-				javaDic.Call<string>("put", pair.Key, pair.Value);
+				if (pair.Value != null) {
+					javaDic.Call<string>("put", pair.Key, pair.Value);
+				}
 			}
 
 			return javaDic;

Assets/ExampleGUI/ExampleGUI.unity

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.unity3d.player"
+	android:installLocation="preferExternal"
+	android:theme="@android:style/Theme.NoTitleBar"
+    android:versionCode="1"
+    android:versionName="1.0">
+    <supports-screens
+        android:smallScreens="true"
+        android:normalScreens="true"
+        android:largeScreens="true"
+        android:xlargeScreens="true"
+        android:anyDensity="true"/>
+
+    <application
+		android:icon="@drawable/app_icon"
+        android:label="@string/app_name"
+        android:debuggable="true">
+        <receiver
+            android:name="com.adjust.sdk.ReferrerReceiver"
+            android:exported="true" >
+            <intent-filter>
+                <action android:name="com.android.vending.INSTALL_REFERRER" />
+            </intent-filter>
+        </receiver>
+        <activity android:name="com.unity3d.player.UnityPlayerNativeActivity"
+                  android:label="@string/app_name">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+            <meta-data android:name="unityplayer.UnityActivity" android:value="true" />
+            <meta-data android:name="unityplayer.ForwardNativeEventsToDalvik" android:value="false" />
+        </activity>
+    </application>
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+</manifest>

Assets/Plugins/Android/AdjustAndroid.cs

@@ -11,5 +11,7 @@ public interface IAdjust
 		void onPause ();
 		void onResume();
 		void setResponseDelegate(string sceneName);
+		void setEnabled(bool enabled);
+		bool isEnabled();
 	}
 }

Assets/Plugins/Android/AdjustAndroidManifest.xml

@@ -6,10 +6,11 @@ namespace com.adjust.sdk
 	public class ResponseData
 	{
 		public enum ActivityKind {
-			UNKNOWN, SESSION, EVENT, REVENUE
+			UNKNOWN, SESSION, EVENT, REVENUE, REATTRIBUTION
 		}
 
 		public ActivityKind activityKind { get; private set; }
+		public string activityKindString { get; private set; }
 		public bool success { get; private set; }
 		public bool willRetry { get; private set; }
 		public string error { get; private set; }
@@ -20,6 +21,7 @@ public ResponseData(string jsonString) {
 			var jsonNode = JSON.Parse (jsonString);
 
 			activityKind = ParseActivityKind(jsonNode["activityKind"].Value);
+			activityKindString = activityKind.ToString ().ToLower ();
 			success = jsonNode ["success"].AsBool;
 			willRetry = jsonNode ["willRetry"].AsBool;
 			error = jsonNode ["error"].Value;
@@ -35,6 +37,8 @@ private ActivityKind ParseActivityKind(string sActivityKind)
 				return ActivityKind.EVENT;
 			else if ("revenue" == sActivityKind)
 				return ActivityKind.REVENUE;
+			else if ("reattribution" == sActivityKind)
+				return ActivityKind.REATTRIBUTION;
 			else 
 				return ActivityKind.UNKNOWN;
 		}

Assets/Plugins/Android/AndroidManifest.xml.meta Assets/Plugins/Android/AdjustAndroidManifest.xml.meta

@@ -30,6 +30,8 @@
       withParameters:(NSDictionary *)parameters;
 
 - (void)finishedTrackingWithResponse:(AIResponseData *)response;
+- (void)setEnabled:(BOOL)enabled;
+- (BOOL)isEnabled;
 
 @end