Merge pull request #49 from mixpanel/gdpr-support-latest

Gdpr support latest

Author: zihejia

.gitignore

@@ -36,7 +36,6 @@ MixpanelSDK.bundle.meta
 *.userprefs
 *.a
 *.apk
-*.dll
 *.ipa
 *.lib
 *.pyc
@@ -46,6 +45,9 @@ Android.meta
 armeabi-v7a.meta
 Assets.meta
 deployments/combined
+deployments/UnityMixpanel/Library
+deployments/UnityMixpanel/ProjectSettings
+deployments/UnityMixpanel/Assets/Mixpanel/Editor/Mixpanel/PBX.meta
 deployments/UnityMixpanel/Assets/Mixpanel/detail/Mixpanel.cs.meta
 deployments/UnityMixpanel/Assets/Mixpanel/detail/MixpanelSDKPINVOKE.cs.meta
 deployments/UnityMixpanel/Assets/Mixpanel/detail/Value.cs.meta
@@ -84,21 +86,3 @@ native/tests/.idea
 post_process.py.meta
 Sample.unity.meta
 x86.meta
-deployments/UnityMixpanel/Assets/Mixpanel/Editor/Mixpanel/AssetCatalog.cs.meta
-deployments/UnityMixpanel/Assets/Mixpanel/Editor/Mixpanel/JsonParser.cs.meta
-deployments/UnityMixpanel/Assets/Mixpanel/Editor/Mixpanel/PBX.meta
-deployments/UnityMixpanel/Assets/Mixpanel/Editor/Mixpanel/PBXProject.cs.meta
-deployments/UnityMixpanel/Assets/Mixpanel/Editor/Mixpanel/jectData.cs.meta
-deployments/UnityMixpanel/Assets/Mixpanel/Editor/Mixpanel/PlistParser.cs.meta
-deployments/UnityMixpanel/Assets/Mixpanel/detail/SWIGTYPE_p_Value.cs.meta
-deployments/UnityMixpanel/Assets/Mixpanel/detail/PE_p_std__wstring.cs.meta
-deployments/UnityMixpanel/ProjectSettings/*.asset
-deployments/UnityMixpanel/Assets/Mixpanel/detail/SWIGTYPE_p_std__wstring.cs.meta
-deployments/UnityMixpanel/Assets/Mixpanel/Editor/Mixpanel/PBX/Elements.cs.meta
-deployments/UnityMixpanel/Assets/Mixpanel/Editor/Mixpanel/PBX/Lexer.cs.meta
-deployments/UnityMixpanel/Assets/Mixpanel/Editor/Mixpanel/PBX/Objects.cs.meta
-deployments/UnityMixpanel/Assets/Mixpanel/Editor/Mixpanel/PBX/Parser.cs.meta
-deployments/UnityMixpanel/Assets/Mixpanel/Editor/Mixpanel/PBX/Sections.cs.meta
-deployments/UnityMixpanel/Assets/Mixpanel/Editor/Mixpanel/PBX/Serializer.cs.meta
-deployments/UnityMixpanel/Assets/Mixpanel/Editor/Mixpanel/PBX/Utils.cs.meta
-deployments/UnityMixpanel/Assets/Mixpanel/Editor/Mixpanel/PBXProjectData.cs.meta

deployments/UnityMixpanel/Assets/Mixpanel/Editor/Mixpanel/PBX/Elements.cs.meta

@@ -200,6 +200,66 @@ public static bool StartTimedEventOnce(string eventName)
             return false;
         }
 
+        /// <summary>
+        /// Opt out tracking.
+        /// </summary>
+        public static void OptOutTracking()
+        {
+            #if !DISABLE_MIXPANEL
+            if (tracking_enabled)
+                instance.opt_out_tracking();
+            #endif
+        }
+
+        /// <summary>
+        /// Opt in tracking.
+        /// </summary>
+        public static void OptInTracking()
+        {
+            #if !DISABLE_MIXPANEL
+            if (tracking_enabled)
+                instance.opt_in_tracking("", new Value());
+            #endif
+        }
+
+        /// <summary>
+        /// Opt in tracking.
+        /// </summary>
+        /// <param name="distinct_id">the distinct id for events. Behind the scenes,
+        /// <code>Identify</code> will be called by using this distinct id.</param>
+        public static void OptInTracking(string distinct_id)
+        {
+            #if !DISABLE_MIXPANEL
+            if (tracking_enabled)
+                instance.opt_in_tracking(distinct_id, new Value());
+            #endif
+        }
+
+        /// <summary>
+        /// Opt in tracking.
+        /// </summary>
+        /// <param name="distinct_id">the distinct id for events. Behind the scenes,
+        /// <code>Identify</code> will be called by using this distinct id.</param>
+        /// <param name="properties">A JSONObject containing the key value pairs of the properties
+        /// to include in $opt_in event. Pass null if no extra properties exist.
+        /// </param>
+        public static void OptInTracking(string distinct_id, Value properties)
+        {
+            #if !DISABLE_MIXPANEL
+            if (tracking_enabled)
+                instance.opt_in_tracking(distinct_id, properties);
+            #endif
+        }
+
+        /// <summary>
+        /// Return true if the current device has opted out tracking, false if the current device has opted in tracking.
+        /// </summary>
+        public static bool hasOptedOut() {
+            if (tracking_enabled)
+                return instance.has_opted_out();
+            return false;
+        }
+
         /// <summary>
         /// Tracks an event.
         /// </summary>
@@ -302,6 +362,13 @@ public void Increment(string property,  Value by)
                 #endif
             }
 
+            private void SetAutomaticPeopleProperties()
+            {
+                #if UNITY_ANDROID && !UNITY_EDITOR
+                mixpanel.people.set("$android_app_version_string", (detail.Value)platform.MixpanelUnityPlatform.get_android_version_name());
+                mixpanel.people.set("$android_app_build_number", (detail.Value)platform.MixpanelUnityPlatform.get_android_version_code());
+                #endif
+            }
 
             /// <summary>
             /// Set a collection of properties on the identified user all at once.
@@ -314,7 +381,10 @@ public void Set(Value properties)
             {
                 #if !DISABLE_MIXPANEL
                 if (tracking_enabled)
+                {
                     mixpanel.people.set_properties(properties);
+                    SetAutomaticPeopleProperties();
+                }
                 #endif
             }
 
@@ -327,7 +397,10 @@ public void Set(string property,  Value to)
             {
                 #if !DISABLE_MIXPANEL
                 if (tracking_enabled)
+                {
                     mixpanel.people.set(property, (detail.Value)to);
+                    SetAutomaticPeopleProperties();
+                }
                 #endif
             }
 
@@ -340,7 +413,10 @@ public void SetOnce(string property,  Value to)
             {
                 #if !DISABLE_MIXPANEL
                 if (tracking_enabled)
+                {
                     mixpanel.people.set_once(property, to);
+                    SetAutomaticPeopleProperties();
+                }
                 #endif
             }
 
@@ -352,7 +428,10 @@ public void SetOnce(Value properties)
             {
                 #if !DISABLE_MIXPANEL
                 if (tracking_enabled)
+                {
                     mixpanel.people.set_once_properties(properties);
+                    SetAutomaticPeopleProperties();
+                }
                 #endif
             }
 
@@ -598,7 +677,8 @@ void Awake()
                     #endif
                     distinct_id:mixpanel.platform.MixpanelUnityPlatform.get_distinct_id(),
                     storage_directory:mixpanel.platform.MixpanelUnityPlatform.get_storage_directory(),
-                    enable_log_queue:true
+                    enable_log_queue:true,
+                    opt_out:false
                 );
                 mp_interface.set_minimum_log_level(minLogLevel);
                 mp_interface.set_maximum_queue_size((uint)(maxQueueSizeInMB * 1024 * 1024));
@@ -611,9 +691,6 @@ void Awake()
                 #if UNITY_ANDROID && !UNITY_EDITOR
                 Register("$app_build_number", platform.MixpanelUnityPlatform.get_android_version_code());
                 Register("$app_version_string", platform.MixpanelUnityPlatform.get_android_version_name());
-
-                people.Set("$android_app_version_string", platform.MixpanelUnityPlatform.get_android_version_name());
-                people.Set("$android_app_build_number", platform.MixpanelUnityPlatform.get_android_version_code());
                 #endif
 
                 #if UNITY_IOS
@@ -646,7 +723,7 @@ void Awake()
                 }
 
                 mp_interface.set_flush_interval((uint)flushInterval);
-                
+
                 TrackIntegrationEvent();
             }
         }
@@ -659,13 +736,12 @@ void OnDestroy()
             }
         }
 
+        detail.Mixpanel.LogEntry le = new mixpanel.detail.Mixpanel.LogEntry();
         NetworkReachability reachability = NetworkReachability.ReachableViaLocalAreaNetwork;
         void Update()
         {
             if (tracking_enabled)
             {
-                detail.Mixpanel.LogEntry le = new mixpanel.detail.Mixpanel.LogEntry();
-
                 while (mp_interface.get_next_log_entry(le))
                 {
                     string msg = string.Format("Mixpanel[{0}]: {1}", le.level, le.message);

deployments/UnityMixpanel/Assets/Mixpanel/Editor/Mixpanel/PBX/Lexer.cs.meta

@@ -27,13 +27,32 @@ void Update () {
     void OnGUI() {
         GUI.skin = this.skin;
 
-        GUILayout.BeginArea(new Rect(Screen.width * 0.3f, Screen.height * 0.45f, Screen.width * 0.4f, Screen.height * 0.5f));
+        GUILayout.BeginArea(new Rect(Screen.width * 0.3f, Screen.height * 0.35f, Screen.width * 0.4f, Screen.height * 2.5f));
 
-        if (GUILayout.Button("Track")) // a simple tracking call
+        if (GUILayout.Button("Track"))
+        {
+            // a simple tracking call
             Mixpanel.Track("The Button Was Clicked");
+        }
 
         if (GUILayout.Button("Engage")) // an engage call
+        {
             Mixpanel.people.Increment("clicks", 1);
+        }
+
+        if (GUILayout.Button("Opt Out Tracking")) // an engage call
+        {
+            Mixpanel.OptOutTracking();
+        }
+
+        if (GUILayout.Button("Opt In Tracking")) // an engage call
+        {
+            Mixpanel.OptInTracking();
+            // var args1 = new Value();
+            // args1["test"] = 100;
+            // args1["me"] = 101;
+            // Mixpanel.OptInTracking("newDisctinctId2", args1);
+        }
 
         GUILayout.EndArea();
     }