Merge pull request #100 from adjust/v4111

Version 4.11.1

Author: uerceg

Assets/Adjust.meta

@@ -312,6 +312,23 @@ public static void getGoogleAdId(Action<string> onDeviceIdsRead) {
         #endregion
 
         #region Attribution callback
+
+        public static void runAttributionChangedDictionary(Dictionary<string, string> dicAttributionData)
+        {
+            if (instance == null)
+            {
+                Debug.Log(Adjust.errorMessage);
+                return;
+            }
+            if (Adjust.attributionChangedDelegate == null)
+            {
+                Debug.Log("adjust: Attribution changed delegate was not set.");
+                return;
+            }
+            var attribution = new AdjustAttribution(dicAttributionData);
+            Adjust.attributionChangedDelegate(attribution);
+        }
+
         public void GetNativeAttribution(string attributionData) {
             if (instance == null) {
                 Debug.Log(Adjust.errorMessage);

Assets/Adjust/Adjust.cs

@@ -8,7 +8,7 @@ namespace com.adjust.sdk {
 #if UNITY_ANDROID
     public class AdjustAndroid : IAdjust {
         #region Fields
-        private const string sdkPrefix = "unity4.11.0";
+        private const string sdkPrefix = "unity4.11.1";
 
         private static bool launchDeferredDeeplink = true;
 

Assets/Adjust/AdjustUnityWS10.dll

@@ -4,14 +4,21 @@
 using System.Collections.Generic;
 
 using UnityEngine;
-using AdjustUnityWS;
-
+#if UNITY_WSA_10_0
+using AdjustUnityWS10;
+#elif UNITY_WINRT_8_1
+using AdjustUnityWS81;
+#endif
 namespace com.adjust.sdk {
     public class AdjustMetro : IAdjust {
         private const string sdkPrefix = "unity4.11.0";
 
         public bool isEnabled() {
-            return AdjustWS.IsEnabled();
+#if UNITY_WSA_10_0
+            return AdjustWS10.IsEnabled();
+#elif UNITY_WINRT_8_1
+            return AdjustWS81.IsEnabled();
+#endif
         }
 
         public string getAdid() {
@@ -23,35 +30,54 @@ public AdjustAttribution getAttribution() {
         }
 
         public void onPause() {
-            AdjustWS.ApplicationDeactivated();
+#if UNITY_WSA_10_0
+            AdjustWS10.ApplicationDeactivated();
+#elif UNITY_WINRT_8_1
+            AdjustWS81.ApplicationDeactivated();
+#endif
         }
 
         public void onResume() {
-            AdjustWS.ApplicationActivated();
+#if UNITY_WSA_10_0
+            AdjustWS10.ApplicationActivated();
+#elif UNITY_WINRT_8_1
+            AdjustWS81.ApplicationActivated();
+#endif
         }
 
         public void setEnabled(bool enabled) {
-            AdjustWS.SetEnabled(enabled);
+#if UNITY_WSA_10_0
+            AdjustWS10.SetEnabled(enabled);
+#elif UNITY_WINRT_8_1
+            AdjustWS81.SetEnabled(enabled);
+#endif
         }
 
         public void setOfflineMode(bool offlineMode) {
-            AdjustWS.SetOfflineMode(offlineMode);
+#if UNITY_WSA_10_0
+            AdjustWS10.SetOfflineMode(offlineMode);
+#elif UNITY_WINRT_8_1
+            AdjustWS81.SetOfflineMode(offlineMode);
+#endif
         }
 
         public void start(AdjustConfig adjustConfig) {
             string logLevelString = null;
-            string environment = adjustConfig.environment.lowercaseToString();
+            string environment = lowercaseToString(adjustConfig.environment);
             Action<Dictionary<string, string>> attributionChangedDictionary = null;
 
-            if (adjustConfig.logLevel != null) {
-                logLevelString = adjustConfig.lowercaseToString();
+            if (adjustConfig.logLevel.HasValue) {
+                logLevelString = lowercaseToString(adjustConfig.logLevel.Value);
             }
 
             if (adjustConfig.attributionChangedDelegate != null) {
                 attributionChangedDictionary = (attributionDictionary) => Adjust.runAttributionChangedDictionary(attributionDictionary);
             }
-
-            AdjustWS.ApplicationLaunching(
+#if UNITY_WSA_10_0
+            AdjustWS10.ApplicationLaunching(
+#elif UNITY_WINRT_8_1
+            AdjustWS81.ApplicationLaunching(
+#endif
                 appToken:adjustConfig.appToken,
                 logLevelString:logLevelString,
                 environment:environment,
@@ -63,8 +89,48 @@ public void start(AdjustConfig adjustConfig) {
             );
         }
 
+        public static string lowercaseToString(AdjustLogLevel AdjustLogLevel)
+        {
+            switch (AdjustLogLevel)
+            {
+                case AdjustLogLevel.Verbose:
+                    return "verbose";
+                case AdjustLogLevel.Debug:
+                    return "debug";
+                case AdjustLogLevel.Info:
+                    return "info";
+                case AdjustLogLevel.Warn:
+                    return "warn";
+                case AdjustLogLevel.Error:
+                    return "error";
+                case AdjustLogLevel.Assert:
+                    return "assert";
+                case AdjustLogLevel.Suppress:
+                    return "suppress";
+                default:
+                    return "unknown";
+            }
+        }
+
+        public static string lowercaseToString(AdjustEnvironment adjustEnvironment)
+        {
+            switch (adjustEnvironment)
+            {
+                case AdjustEnvironment.Sandbox:
+                    return "sandbox";
+                case AdjustEnvironment.Production:
+                    return "production";
+                default:
+                    return "unknown";
+            }
+        }
+
         public void trackEvent(AdjustEvent adjustEvent) {
-            AdjustWS.TrackEvent(
+#if UNITY_WSA_10_0
+            AdjustWS10.TrackEvent(
+#elif UNITY_WINRT_8_1
+            AdjustWS81.TrackEvent(
+#endif
                 eventToken:adjustEvent.eventToken,
                 revenue:adjustEvent.revenue,
                 currency:adjustEvent.currency,