Fix #2

Author: witcher112

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

@@ -79,13 +79,15 @@ public RemoteMetaData([NotNull] string appSecret, [NotNull] IRequestTimeoutCalcu
         public int GetLatestVersionId(bool retryRequests = true)
         {
             DebugLogger.Log("Getting latest version id.");
+            DebugLogger.Log("retryRequests = " + retryRequests);
             var m = retryRequests ? _mainApiConnection : _mainApiConnectionWithoutRetry;
             return m.GetAppLatestAppVersionId(_appSecret).Id;
         }
 
         public Api.Models.Main.App GetAppInfo(bool retryRequests = true)
         {
             DebugLogger.Log("Getting app info.");
+            DebugLogger.Log("retryRequests = " + retryRequests);
             var m = retryRequests ? _mainApiConnection : _mainApiConnectionWithoutRetry;
             return m.GetApplicationInfo(_appSecret);
         }

Assets/PatchKit Patcher/Scripts/AppData/Remote/WebRequestWraps/UnityHttpClient.cs

@@ -92,7 +92,7 @@ private HttpStatusCode ReadStatusCode(WWWResult result)
         {
             _logger.LogDebug("Reading status code...");
 
-            if (!result.ResponseHeaders.ContainsKey("STATUS"))
+            if (result.ResponseHeaders == null || !result.ResponseHeaders.ContainsKey("STATUS"))
             {
                 // Based on tests, if response doesn't contain status it has probably timed out.
                 _logger.LogWarning("Response is missing STATUS header. Marking it as timed out.");

Assets/PatchKit Patcher/Scripts/Patcher.cs

@@ -641,17 +641,17 @@ private void ThreadExecuteUserDecision(CancellationToken cancellationToken)
                         break;
                     case UserDecision.InstallAppAutomatically:
                         displayWarningInsteadOfError = _app.IsInstalled();
-                        ThreadUpdateApp(cancellationToken);
+                        ThreadUpdateApp(true, cancellationToken);
                         break;
                     case UserDecision.InstallApp:
-                        ThreadUpdateApp(cancellationToken);
+                        ThreadUpdateApp(false, cancellationToken);
                         break;
                     case UserDecision.CheckForAppUpdatesAutomatically:
                         displayWarningInsteadOfError = _app.IsInstalled();
-                        ThreadUpdateApp(cancellationToken);
+                        ThreadUpdateApp(true, cancellationToken);
                         break;
                     case UserDecision.CheckForAppUpdates:
-                        ThreadUpdateApp(cancellationToken);
+                        ThreadUpdateApp(false, cancellationToken);
                         break;
                 }
 
@@ -679,7 +679,15 @@ private void ThreadExecuteUserDecision(CancellationToken cancellationToken)
             catch (ApiConnectionException e)
             {
                 DebugLogger.LogException(e);
-                ThreadDisplayError(PatcherError.NoInternetConnection, cancellationToken);
+                
+                if (displayWarningInsteadOfError)
+                {
+                    _warning.Value = "Unable to check for updates. Please check your internet connection.";
+                }
+                else
+                {
+                    ThreadDisplayError(PatcherError.NoInternetConnection, cancellationToken);
+                }
             }
             catch (NotEnoughtDiskSpaceException e)
             {
@@ -759,12 +767,12 @@ private void ThreadStartApp()
             UnityDispatcher.Invoke(Quit);
         }
 
-        private void ThreadUpdateApp(CancellationToken cancellationToken)
+        private void ThreadUpdateApp(bool automatically, CancellationToken cancellationToken)
         {
             _state.Value = PatcherState.UpdatingApp;
 
-            _appInfo.Value = _app.RemoteMetaData.GetAppInfo();
-            _remoteVersionId.Value = _app.GetLatestVersionId(false);
+            _appInfo.Value = _app.RemoteMetaData.GetAppInfo(!automatically);
+            _remoteVersionId.Value = _app.GetLatestVersionId(!automatically);
             if (_app.IsInstalled())
             {
                 _localVersionId.Value = _app.GetInstalledVersionId();