Merge pull request #93 from Leanplum/sdk-341-fcu

Fix FCU Inbox

Author: nzagorchev

Leanplum-Unity-SDK/Assets/LeanplumSDK/LeanplumUnityHelper.cs

@@ -117,7 +117,7 @@ private void Update()
             // This is called by Unity on every frame.
             if (VarCache.VarsNeedUpdate && developerModeEnabled && Leanplum.HasStarted)
             {
-                VarCache.CheckVarsUpdate();
+                Leanplum.ForceContentUpdate();
             }
 
             // Run deferred actions.

Leanplum-Unity-SDK/Assets/LeanplumSDK/Native/LeanplumNative.cs

@@ -999,7 +999,54 @@ public override void ForceContentUpdate()
         ///
         public override void ForceContentUpdate(Action callback)
         {
-            VarCache.CheckVarsUpdate(callback);
+            IDictionary<string, string> updateVarsParams = new Dictionary<string, string>();
+
+            if (Leanplum.IsDeveloperModeEnabled)
+            {
+                updateVarsParams[Constants.Params.INCLUDE_DEFAULTS] = Leanplum.IncludeDefaults.ToString();
+            }
+            else
+            {
+                updateVarsParams[Constants.Params.INCLUDE_DEFAULTS] = false.ToString();
+            }
+            // The Inbox is loaded on Start
+            updateVarsParams[Constants.Keys.INBOX_MESSAGES] = Json.Serialize(Inbox.MessageIds);
+
+            LeanplumRequest updateVarsReq = LeanplumRequest.Post(Constants.Methods.GET_VARS, updateVarsParams);
+            updateVarsReq.Response += delegate (object varsUpdate)
+            {
+                var getVariablesResponse = Util.GetLastResponse(varsUpdate) as IDictionary<string, object>;
+                var newVarValues = Util.GetValueOrDefault(getVariablesResponse, Constants.Keys.VARS) as IDictionary<string, object>;
+                var newMessages = Util.GetValueOrDefault(getVariablesResponse, Constants.Keys.MESSAGES) as IDictionary<string, object>;
+                var newVarFileAttributes = Util.GetValueOrDefault(getVariablesResponse, Constants.Keys.FILE_ATTRIBUTES) as IDictionary<string, object>;
+                var newVariants = Util.GetValueOrDefault(getVariablesResponse, Constants.Keys.VARIANTS) as List<object> ?? new List<object>();
+                bool syncInbox = (bool)Util.GetValueOrDefault(getVariablesResponse, Constants.Keys.SYNC_INBOX, false);
+
+                VarCache.ApplyVariableDiffs(newVarValues, newMessages, newVarFileAttributes, newVariants);
+
+                // Download inbox messages
+                if (syncInbox)
+                {
+                    if (Inbox is LeanplumInboxNative nativeInbox)
+                    {
+                        nativeInbox.DownloadMessages();
+                    }
+                }
+
+                if (callback != null)
+                {
+                    callback();
+                }
+            };
+            updateVarsReq.Error += delegate
+            {
+                if (callback != null)
+                {
+                    callback();
+                }
+            };
+            updateVarsReq.SendNow();
+            VarCache.VarsNeedUpdate = false;
         }
 
         #endregion

Leanplum-Unity-SDK/Assets/LeanplumSDK/Native/VarCache.cs

@@ -428,52 +428,6 @@ internal static IDictionary<string, object> MergeMessage(IDictionary<string, obj
             return messageConfig;
         }
 
-        internal static void CheckVarsUpdate()
-        {
-            CheckVarsUpdate (null);
-        }
-
-        internal static void CheckVarsUpdate(Action callback)
-        {
-            IDictionary<string, string> updateVarsParams = new Dictionary<string, string>();
-
-            if (Leanplum.IsDeveloperModeEnabled)
-            {
-                updateVarsParams[Constants.Params.INCLUDE_DEFAULTS] = Leanplum.IncludeDefaults.ToString();
-            }
-            else
-            {
-                updateVarsParams[Constants.Params.INCLUDE_DEFAULTS] = false.ToString();
-            }
-            updateVarsParams[Constants.Params.INCLUDE_DEFAULTS] = false.ToString();
-
-            LeanplumRequest updateVarsReq = LeanplumRequest.Post(Constants.Methods.GET_VARS, updateVarsParams);
-            updateVarsReq.Response += delegate(object varsUpdate)
-            {
-                var getVariablesResponse = Util.GetLastResponse(varsUpdate) as IDictionary<string, object>;
-                var newVarValues = Util.GetValueOrDefault(getVariablesResponse, Constants.Keys.VARS) as IDictionary<string, object>;
-                var newMessages = Util.GetValueOrDefault(getVariablesResponse, Constants.Keys.MESSAGES) as IDictionary<string, object>;
-                var newVarFileAttributes = Util.GetValueOrDefault(getVariablesResponse, Constants.Keys.FILE_ATTRIBUTES) as IDictionary<string, object>;
-                var newVariants = Util.GetValueOrDefault(getVariablesResponse, Constants.Keys.VARIANTS) as List<object> ?? new List<object>();
-				
-                ApplyVariableDiffs(newVarValues, newMessages, newVarFileAttributes, newVariants);
-
-                if (callback != null)
-                {
-                    callback();
-                }
-            };
-            updateVarsReq.Error += delegate
-            {
-                if (callback != null)
-                {
-                    callback();
-                }
-            };
-            updateVarsReq.SendNow();
-            VarsNeedUpdate = false;
-        }
-
         internal static bool SendVariablesIfChanged()
         {
             if (devModeValuesFromServer != null && valuesFromClient != devModeValuesFromServer)