Merge remote-tracking branch 'origin/dev/v3.17.x.x'

Author: witcher112

Assets/PatchKit Patcher/Scripts/AppData/Remote/RemoteMetaData.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using JetBrains.Annotations;
 using PatchKit.Api;
 using PatchKit.Api.Models.Main;
@@ -17,6 +18,9 @@ public class RemoteMetaData : IRemoteMetaData
         private readonly MainApiConnection _mainApiConnection;
         private readonly KeysApiConnection _keysApiConnection;
 
+        public Dictionary<int, AppContentSummary> _cacheAppContentSummary = new Dictionary<int, AppContentSummary>();
+        public Dictionary<int, AppDiffSummary> _cacheAppDiffSummary = new Dictionary<int, AppDiffSummary>();
+
         public RemoteMetaData([NotNull] string appSecret, [NotNull] IRequestTimeoutCalculator requestTimeoutCalculator)
         {
             if (string.IsNullOrEmpty(appSecret))
@@ -77,16 +81,33 @@ public AppContentSummary GetContentSummary(int versionId, CancellationToken canc
         {
             Checks.ArgumentValidVersionId(versionId, "versionId");
             DebugLogger.Log(string.Format("Getting content summary of version with id {0}.", versionId));
+            AppContentSummary appContentSummary;
+            if (_cacheAppContentSummary.TryGetValue(versionId, out appContentSummary))
+            {
+                return appContentSummary;
+            }
 
-            return _mainApiConnection.GetAppVersionContentSummary(_appSecret, versionId, cancellationToken);
+            appContentSummary =
+                _mainApiConnection.GetAppVersionContentSummary(_appSecret, versionId, cancellationToken);
+            _cacheAppContentSummary.Add(versionId, appContentSummary);
+            return appContentSummary;
         }
 
         public AppDiffSummary GetDiffSummary(int versionId, CancellationToken cancellationToken)
         {
             Checks.ArgumentValidVersionId(versionId, "versionId");
             DebugLogger.Log(string.Format("Getting diff summary of version with id {0}.", versionId));
 
-            return _mainApiConnection.GetAppVersionDiffSummary(_appSecret, versionId, cancellationToken);
+            AppDiffSummary appDiffSummary;
+            if (_cacheAppDiffSummary.TryGetValue(versionId, out appDiffSummary))
+            {
+                return appDiffSummary;
+            }
+
+            appDiffSummary =
+                _mainApiConnection.GetAppVersionDiffSummary(_appSecret, versionId, cancellationToken);
+            _cacheAppDiffSummary.Add(versionId, appDiffSummary);
+            return appDiffSummary;
         }
 
         public string GetKeySecret(string key, string cachedKeySecret, CancellationToken cancellationToken)

Assets/PatchKit Patcher/Scripts/UI/Dialogs/ErrorDialog.cs

@@ -1,5 +1,7 @@
-using PatchKit.Unity.Patcher.Cancellation;
+using System.Collections;
+using PatchKit.Unity.Patcher.Cancellation;
 using PatchKit.Unity.Utilities;
+using UnityEngine;
 using UnityEngine.UI;
 
 namespace PatchKit.Unity.Patcher.UI.Dialogs
@@ -11,6 +13,16 @@ public class ErrorDialog : Dialog<ErrorDialog>
         public void Confirm()
         {
             OnDisplayed();
+            StartCoroutine(Retry());
+        }
+
+        public IEnumerator Retry()
+        {
+            while (Patcher.Instance.State.Value != PatcherState.WaitingForUserDecision)
+            {
+                yield return new WaitForSeconds(1);
+            }
+            Patcher.Instance.SetUserDecision(Patcher.UserDecision.InstallApp);
         }
 
         public void Display(PatcherError error, CancellationToken cancellationToken)

Assets/PatchKit Patcher/Scripts/Version.cs

@@ -4,7 +4,7 @@ public static class Version
     {
         public const int Major = 3;
         public const int Minor = 17;
-        public const int Patch = 9;
+        public const int Patch = 10;
         public const int Hotfix = 0;
 
         public static string Value

CHANGELOG.md

@@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [3.17.10.0]
+### Changed
+- Improve speed of getting API data by caching it
+
+### Fixed
+- Retrying the failed operation from error dialog
+
 ## [3.17.9.0]
 ### Added
 - Support HDPI for debug menu