Make the web request timeout configurable from the UI

Author: shana

script

@@ -17,7 +17,7 @@ public static IApiClient Create(UriString repositoryUrl, IKeychain keychain)
             var hostAddress = HostAddress.Create(repositoryUrl);
 
             return new ApiClient(repositoryUrl, keychain,
-                new GitHubClient(AppConfiguration.ProductHeader, credentialStore, hostAddress.ApiUri));
+                new GitHubClient(ApplicationConfiguration.ProductHeader, credentialStore, hostAddress.ApiUri));
         }
 
         private static readonly ILogging logger = Logging.GetLogger<ApiClient>();

src/GitHub.Api/Application/ApiClient.cs

@@ -3,11 +3,11 @@
 
 namespace GitHub.Unity
 {
-    static class AppConfiguration
+    public static class ApplicationConfiguration
     {
-        static AppConfiguration()
+        static ApplicationConfiguration()
         {
-            var executingAssembly = typeof(AppConfiguration).Assembly;
+            var executingAssembly = typeof(ApplicationConfiguration).Assembly;
             AssemblyName = executingAssembly.GetName();
             ProductHeader = new ProductHeaderValue(ApplicationInfo.ApplicationSafeName, AssemblyName.Version.ToString());
         }
@@ -21,5 +21,12 @@ static AppConfiguration()
         /// The product header used in the user agent.
         /// </summary>
         public static ProductHeaderValue ProductHeader { get; private set; }
+
+        private static int webTimeout = 3000;
+        public static int WebTimeout
+        {
+            get { return webTimeout; }
+            set { webTimeout = value; }
+        }
     }
 }

src/GitHub.Api/Application/AppConfiguration.cs renamed to src/GitHub.Api/Application/ApplicationConfiguration.cs

@@ -98,7 +98,7 @@
   <ItemGroup>
     <Compile Include="Application\ApplicationInfo.cs" />
     <Compile Include="Application\LoginResult.cs" />
-    <Compile Include="Application\AppConfiguration.cs" />
+    <Compile Include="Application\ApplicationConfiguration.cs" />
     <Compile Include="Application\OctokitExtensions.cs" />
     <Compile Include="Application\Organization.cs" />
     <Compile Include="Cache\CacheInterfaces.cs" />

src/GitHub.Api/GitHub.Api.csproj

@@ -9,6 +9,7 @@ static class Constants
         public const string UsageFile = "usage.json";
         public const string GitInstallPathKey = "GitInstallPath";
         public const string TraceLoggingKey = "EnableTraceLogging";
+        public const string WebTimeoutKey = "WebTimeout";
         public const string Iso8601Format = "yyyy-MM-ddTHH\\:mm\\:ss.fffffffzzz";
 
         public static readonly Version MinimumGitVersion = new Version(2, 11, 0);

src/GitHub.Api/Helpers/Constants.cs

@@ -99,7 +99,7 @@ public static bool Download(ILogging logger, UriString url,
             }
 
             webRequest.Method = "GET";
-            webRequest.Timeout = 5000;
+            webRequest.Timeout = ApplicationConfiguration.WebTimeout;
 
             if (expectingResume)
                 logger.Trace($"Resuming download of {url}");

src/GitHub.Api/IO/Utils.cs

@@ -167,7 +167,7 @@ public void IncrementLaunchCount()
             usage.NumberOfStartups++;
             usage.UnityVersion = unityVersion;
             usage.Lang = CultureInfo.InstalledUICulture.IetfLanguageTag;
-            usage.AppVersion = AppConfiguration.AssemblyName.Version.ToString();
+            usage.AppVersion = ApplicationConfiguration.AssemblyName.Version.ToString();
 
             Logger.Trace("IncrementLaunchCount Date:{0} NumberOfStartups:{1}", usage.Date, usage.NumberOfStartups);
 

src/GitHub.Api/Metrics/UsageTracker.cs

@@ -2,6 +2,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text.RegularExpressions;
 using UnityEditor;
 using UnityEngine;
 
@@ -13,8 +14,10 @@ class SettingsView : Subview
         private const string GitRepositoryTitle = "Repository Configuration";
         private const string GitRepositoryRemoteLabel = "Remote";
         private const string GitRepositorySave = "Save Repository";
+        private const string GeneralSettingsTitle = "General";
         private const string DebugSettingsTitle = "Debug";
         private const string PrivacyTitle = "Privacy";
+        private const string WebTimeoutLabel = "Timeout of web requests";
         private const string EnableTraceLoggingLabel = "Enable Trace Logging";
         private const string MetricsOptInLabel = "Help us improve by sending anonymous usage data";
         private const string DefaultRepositoryRemoteName = "origin";
@@ -37,6 +40,7 @@ class SettingsView : Subview
         [SerializeField] private string repositoryRemoteUrl;
         [SerializeField] private Vector2 scroll;
         [SerializeField] private UserSettingsView userSettingsView = new UserSettingsView();
+        [SerializeField] private int webTimeout;
 
         public override void InitializeView(IView parent)
         {
@@ -106,6 +110,7 @@ public override void OnGUI()
 
                 gitPathView.OnGUI();
                 OnPrivacyGui();
+                OnGeneralSettingsGui();
                 OnLoggingSettingsGui();
             }
 
@@ -336,6 +341,27 @@ private void OnLoggingSettingsGui()
             EditorGUI.EndDisabledGroup();
         }
 
+        private void OnGeneralSettingsGui()
+        {
+            GUILayout.Label(GeneralSettingsTitle, EditorStyles.boldLabel);
+
+            EditorGUI.BeginDisabledGroup(IsBusy);
+            {
+                webTimeout = ApplicationConfiguration.WebTimeout;
+                EditorGUI.BeginChangeCheck();
+                {
+                    webTimeout = EditorGUILayout.IntField(webTimeout, WebTimeoutLabel);
+                }
+                if (EditorGUI.EndChangeCheck())
+                {
+                    ApplicationConfiguration.WebTimeout = webTimeout;
+                    Manager.UserSettings.Set(Constants.WebTimeoutKey, webTimeout);
+                }
+            }
+            EditorGUI.EndDisabledGroup();
+        }
+
+
         public override bool IsBusy
         {
             get { return isBusy || userSettingsView.IsBusy || gitPathView.IsBusy; }