Being sure InvalidateData if LastUpdatedAt or LastVerifiedAt is called

Author: StanleyGoldman

src/UnityExtension/Assets/Editor/GitHub.Unity/ApplicationCache.cs

@@ -132,8 +132,23 @@ protected ManagedCacheBase(bool invalidOnFirstRun)
 
         public void ValidateData()
         {
-            if (ApplicationCache.Instance.FirstRunAt > InitializedAt)
+            var initialized = ValidateInitialized();
+            if (!initialized)
             {
+                if (DateTimeOffset.Now - LastUpdatedAt > DataTimeout)
+                {
+                    Logger.Trace("Timeout Invalidation");
+                    InvalidateData();
+                }
+            }
+        }
+
+        private bool ValidateInitialized()
+        {
+            var notInitialized = ApplicationCache.Instance.FirstRunAt > InitializedAt;
+            if (notInitialized)
+            {
+                Logger.Trace("Initialized");
                 InitializedAt = DateTimeOffset.Now;
                 Save(true);
 
@@ -143,11 +158,8 @@ public void ValidateData()
                     InvalidateData();
                 }
             }
-            else if (DateTimeOffset.Now - LastUpdatedAt > DataTimeout)
-            {
-                Logger.Trace("Timeout Invalidation");
-                InvalidateData();
-            }
+
+            return notInitialized;
         }
 
         public void InvalidateData()
@@ -189,6 +201,8 @@ public DateTimeOffset LastUpdatedAt
             {
                 if (!lastUpdatedAtValue.HasValue)
                 {
+                    ValidateInitialized();
+
                     DateTimeOffset result;
                     if (DateTimeOffset.TryParseExact(LastUpdatedAtString, Constants.Iso8601Format, CultureInfo.InvariantCulture, DateTimeStyles.None, out result))
                     {
@@ -215,6 +229,8 @@ public DateTimeOffset LastVerifiedAt
             {
                 if (!lastVerifiedAtValue.HasValue)
                 {
+                    ValidateInitialized();
+
                     DateTimeOffset result;
                     if (DateTimeOffset.TryParseExact(LastVerifiedAtString, Constants.Iso8601Format, CultureInfo.InvariantCulture, DateTimeStyles.None, out result))
                     {