Merge pull request #48 from adjust/receipt_validation

Receipt validation

Author: Uglješa Erceg

Assets/Adjust/Adjust.cs

@@ -25,29 +25,31 @@ public class Adjust : MonoBehaviour
 
 		void Awake ()
 		{
+			DontDestroyOnLoad (transform.gameObject);
+
 			if (!this.startManually) {
 				AdjustConfig adjustConfig = new AdjustConfig (this.appToken, this.environment);
 				adjustConfig.setLogLevel (this.logLevel);
 				adjustConfig.setEventBufferingEnabled (eventBuffering);
 
 				if (printAttribution) {
-					adjustConfig.setAttributionChangedDelegate(responseDelegate);
+					adjustConfig.setAttributionChangedDelegate (responseDelegate);
 				}
 
 				Adjust.start (adjustConfig);
 			}
 		}
 
-		void OnApplicationPause(bool pauseStatus) 
+		void OnApplicationPause (bool pauseStatus) 
 		{
 			if (Adjust.instance == null) {
 				return;
 			}
 
 			if (pauseStatus) {
-				Adjust.instance.onPause();
+				Adjust.instance.onPause ();
 			} else {
-				Adjust.instance.onResume();
+				Adjust.instance.onResume ();
 			}
 		}
 
@@ -70,9 +72,9 @@ public static void start (AdjustConfig adjustConfig)
 			#if UNITY_EDITOR
 				Adjust.instance = null;
 			#elif UNITY_IOS
-				Adjust.instance = new AdjustiOS();
+				Adjust.instance = new AdjustiOS ();
 			#elif UNITY_ANDROID
-				Adjust.instance = new AdjustAndroid();
+				Adjust.instance = new AdjustAndroid ();
 			#else
 				Adjust.instance = null;
 			#endif
@@ -102,34 +104,54 @@ public static void trackEvent (AdjustEvent adjustEvent)
 			Adjust.instance.trackEvent (adjustEvent);
 		}
 
-		public static void setEnabled(bool enabled) 
+		public static void setEnabled (bool enabled) 
 		{
 			if (Adjust.instance == null) {
-				Debug.Log(Adjust.errorMessage);
+				Debug.Log (Adjust.errorMessage);
 				return;
 			}
 
-			Adjust.instance.setEnabled(enabled);
+			Adjust.instance.setEnabled (enabled);
 		}
 
-		public static bool isEnabled() 
+		public static bool isEnabled () 
 		{
 			if (Adjust.instance == null) {
-				Debug.Log(Adjust.errorMessage);
+				Debug.Log (Adjust.errorMessage);
 				return false;
 			}
 
-			return Adjust.instance.isEnabled();
+			return Adjust.instance.isEnabled ();
 		}
 
-		public static void setOfflineMode(bool enabled) 
+		public static void setOfflineMode (bool enabled) 
+		{
+			if (Adjust.instance == null) {
+				Debug.Log (Adjust.errorMessage);
+				return;
+			}
+
+			Adjust.instance.setOfflineMode (enabled);
+		}
+
+		public static void setDeviceToken (string deviceToken)
 		{
 			if (Adjust.instance == null) {
-				Debug.Log(Adjust.errorMessage);
+				Debug.Log (Adjust.errorMessage);
 				return;
 			}
 
-			Adjust.instance.setOfflineMode(enabled);
+			Adjust.instance.setDeviceToken (deviceToken);
+		}
+
+		public static void setReferrer (string referrer)
+		{
+			if (Adjust.instance == null) {
+				Debug.Log (Adjust.errorMessage);
+				return;
+			}
+
+			Adjust.instance.setReferrer (referrer);
 		}
 
 		#endregion
@@ -147,6 +169,7 @@ public static void runAttributionChangedDelegate (string stringAttributionData)
 				Debug.Log (Adjust.errorMessage);
 				return;
 			}
+
 			if (Adjust.attributionChangedDelegate == null) {
 				Debug.Log ("adjust: Attribution changed delegate was not set.");
 				return;
@@ -161,7 +184,7 @@ public static void runAttributionChangedDelegate (string stringAttributionData)
 		#region Private & helper methods
 
 		// Our delegate for detecting attribution changes if choosen not to start manually.
-		private void responseDelegate(AdjustAttribution responseData)
+		private void responseDelegate (AdjustAttribution responseData)
 		{
 			Debug.Log ("Attribution changed!");
 
@@ -188,6 +211,10 @@ private void responseDelegate(AdjustAttribution responseData)
 			if (responseData.creative != null) {
 				Debug.Log ("creative " + responseData.creative);
 			}
+
+			if (responseData.clickLabel != null) {
+				Debug.Log ("clickLabel" + responseData.clickLabel);
+			}
 		}
 
 		#endregion

Assets/Adjust/Android/AdjustAndroid.cs

@@ -10,7 +10,7 @@ namespace com.adjust.sdk
 #if UNITY_ANDROID
 	public class AdjustAndroid : IAdjust
 	{
-		private const string sdkPrefix = "unity4.0.2";
+		private const string sdkPrefix = "unity4.0.3";
 		private AndroidJavaClass ajcAdjust;
 		private AndroidJavaObject ajoCurrentActivity;
 		private AttributionChangeListener onAttributionChangedListener;
@@ -34,6 +34,7 @@ public void onAttributionChanged (AndroidJavaObject attribution)
 				adjustAttribution.campaign = attribution.Get<string> ("campaign");
 				adjustAttribution.adgroup = attribution.Get<string> ("adgroup");
 				adjustAttribution.creative = attribution.Get<string> ("creative");
+				adjustAttribution.clickLabel = attribution.Get<string> ("clickLabel");
 
 				if (callback != null) {
 					callback (adjustAttribution);
@@ -134,6 +135,16 @@ public void setOfflineMode (bool enabled)
 			ajcAdjust.CallStatic ("setOfflineMode", enabled);
 		}
 
+		public void setReferrer(string referrer)
+		{
+			ajcAdjust.CallStatic ("setReferrer", referrer);
+		}
+
+		public void setDeviceToken(string deviceToken)
+		{
+
+		}
+
 		#endregion
 	}
 #endif

Assets/Adjust/Android/adjust-android.jar

@@ -18,6 +18,8 @@ public class AdjustAttribution
 
 		public string creative { get; set; }
 
+		public string clickLabel { get; set; }
+
 		public AdjustAttribution ()
 		{
 		}
@@ -36,6 +38,7 @@ public AdjustAttribution (string jsonString)
 			campaign = getJsonString (jsonNode, "campaign");
 			adgroup = getJsonString (jsonNode, "adgroup");
 			creative = getJsonString (jsonNode, "creative");
+			clickLabel = getJsonString (jsonNode, "clickLabel");
 		}
 
 		private String getJsonString (JSONNode node, string key)

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

@@ -15,12 +15,20 @@ public class AdjustConfig
 		internal AdjustEnvironment environment;
 		internal Action<AdjustAttribution> attributionChangedDelegate;
 
+		// iOS specific members
+		internal bool macMd5TrackingEnabled;
+
+		// Android specific members
+		internal string processName;
+
 		public AdjustConfig (string appToken, AdjustEnvironment environment)
 		{
 			this.sceneName = "";
 			this.appToken = appToken;
 			this.environment = environment;
 			this.startAutomatically = false;
+			this.macMd5TrackingEnabled = false;
+			this.processName = "";
 		}
 
 		public void setLogLevel (AdjustLogLevel logLevel)
@@ -43,15 +51,27 @@ public void setEventBufferingEnabled (bool eventBufferingEnabled)
 			this.eventBufferingEnabled = eventBufferingEnabled;
 		}
 
-		public void setAttributionChangedDelegate(Action<AdjustAttribution> attributionChangedDelegate, string sceneName = "Adjust")
+		public void setAttributionChangedDelegate (Action<AdjustAttribution> attributionChangedDelegate, string sceneName = "Adjust")
 		{
 			this.attributionChangedDelegate = attributionChangedDelegate;
 			this.sceneName = sceneName;
 		}
 
-		public Action<AdjustAttribution> getAttributionChangedDelegate()
+		public Action<AdjustAttribution> getAttributionChangedDelegate ()
 		{
 			return this.attributionChangedDelegate;
 		}
+
+		// iOS specific methods
+		public void setMacMd5TrackingEnabled (bool macMd5TrackingEnabled)
+		{
+			this.macMd5TrackingEnabled = macMd5TrackingEnabled;
+		}
+
+		// Android specific methods
+		public void setProcessName (string processName)
+		{
+			this.processName = processName;
+		}
 	}
 }

Assets/Adjust/Unity/AdjustAttribution.cs

@@ -13,9 +13,17 @@ public class AdjustEvent
 		internal List<string> partnerList;
 		internal List<string> callbackList;
 
+		// iOS specific members
+		internal string receipt;
+		internal string transactionId;
+
+		internal bool isReceiptSet;
+
 		public AdjustEvent(string eventToken)
 		{
 			this.eventToken = eventToken;
+
+			this.isReceiptSet = false;
 		}
 
 		public void setRevenue(double amount, string currency)
@@ -43,5 +51,18 @@ public void addPartnerParameter(string key, string value)
 			partnerList.Add(key);
 			partnerList.Add(value);
 		}
+
+		// iOS specific methods
+		public void setTransactionId(string transactionId)
+		{
+			this.transactionId = transactionId;
+		}
+
+		public void setReceipt(string receipt, string transactionId)
+		{
+			this.receipt = receipt;
+			this.transactionId = transactionId;
+			this.isReceiptSet = true;
+		}
 	}
 }

Assets/Adjust/Unity/AdjustConfig.cs

@@ -8,10 +8,16 @@ public interface IAdjust
 		bool isEnabled();
 
 		void onPause ();
-		void onResume();
-		void setEnabled(bool enabled);
-		void setOfflineMode(bool enabled);
-		void start(AdjustConfig adjustConfig);
+		void onResume ();
+		void setEnabled (bool enabled);
+		void setOfflineMode (bool enabled);
+		void start (AdjustConfig adjustConfig);
 		void trackEvent (AdjustEvent adjustEvent);
+
+		// iOS specific methods
+		void setDeviceToken (string deviceToken);
+
+		// Android specific methods
+		void setReferrer (string referrer);
 	}
 }

Assets/Adjust/Unity/AdjustEvent.cs

@@ -28,7 +28,6 @@
 @interface ADJConfig : NSObject<NSCopying>
 
 @property (nonatomic, copy, readonly) NSString *appToken;
-@property (nonatomic, assign) ADJLogLevel logLevel;
 @property (nonatomic, copy, readonly) NSString *environment;
 @property (nonatomic, copy) NSString *sdkPrefix;
 @property (nonatomic, copy) NSString *defaultTracker;
@@ -47,6 +46,23 @@
 + (ADJConfig*)configWithAppToken:(NSString *)appToken environment:(NSString *)environment;
 - (id)initWithAppToken:(NSString *)appToken environment:(NSString *)environment;
 
+/**
+ * Change the verbosity of Adjust's logs.
+ *
+ * You can increase or reduce the amount of logs from Adjust by passing
+ * one of the following parameters. Use Log.ASSERT to disable all logging.
+ *
+ * @param logLevel The desired minimum log level (default: info)
+ *     Must be one of the following:
+ *      - ADJLogLevelVerbose (enable all logging)
+ *      - ADJLogLevelDebug   (enable more logging)
+ *      - ADJLogLevelInfo    (the default)
+ *      - ADJLogLevelWarn    (disable info logging)
+ *      - ADJLogLevelError   (disable warnings as well)
+ *      - ADJLogLevelAssert  (disable errors as well)
+ */
+@property (nonatomic, assign) ADJLogLevel logLevel;
+
 /**
  * Enable event buffering if your app triggers a lot of events.
  * When enabled, events get buffered and only get tracked each