画像アップロード時のタイムアウト秒数をSettingCommonで変更可能にする

diff --git a/OpenTween/Connection/Imgur.cs b/OpenTween/Connection/Imgur.cs
index 127c601..f29abdf 100644 (file)
--- a/OpenTween/Connection/Imgur.cs
+++ b/OpenTween/Connection/Imgur.cs
@@ -159,7 +159,7 @@ namespace OpenTween.Connection
             public ImgurApi()
             {
                 this.http = Networking.CreateHttpClient(Networking.CreateHttpClientHandler());
-                this.http.Timeout = TimeSpan.FromMinutes(1);
+                this.http.Timeout = Networking.UploadImageTimeout;
             }
 
             public async Task<XDocument> UploadFileAsync(IMediaItem item, string title)

diff --git a/OpenTween/Connection/Mobypicture.cs b/OpenTween/Connection/Mobypicture.cs
index 026d8f0..60a2fd3 100644 (file)
--- a/OpenTween/Connection/Mobypicture.cs
+++ b/OpenTween/Connection/Mobypicture.cs
@@ -178,7 +178,7 @@ namespace OpenTween.Connection
                 var handler = twitterApi.CreateOAuthEchoHandler(AuthServiceProvider, OAuthRealm);
 
                 this.http = Networking.CreateHttpClient(handler);
-                this.http.Timeout = TimeSpan.FromMinutes(1);
+                this.http.Timeout = Networking.UploadImageTimeout;
             }
 
             /// <summary>

diff --git a/OpenTween/Connection/Networking.cs b/OpenTween/Connection/Networking.cs
index 51aafd3..830bf42 100644 (file)
--- a/OpenTween/Connection/Networking.cs
+++ b/OpenTween/Connection/Networking.cs
@@ -35,6 +35,7 @@ namespace OpenTween.Connection
     public static class Networking
     {
         public static TimeSpan DefaultTimeout { get; set; }
+        public static TimeSpan UploadImageTimeout { get; set; }
 
         /// <summary>
         /// 通信に使用するプロキシの種類
@@ -93,6 +94,7 @@ namespace OpenTween.Connection
         static Networking()
         {
             DefaultTimeout = TimeSpan.FromSeconds(20);
+            UploadImageTimeout = TimeSpan.FromSeconds(60);
             globalHttpClient = CreateHttpClient(new HttpClientHandler());
         }
 

diff --git a/OpenTween/Connection/TwipplePhoto.cs b/OpenTween/Connection/TwipplePhoto.cs
index 34ce7a8..e36be2a 100644 (file)
--- a/OpenTween/Connection/TwipplePhoto.cs
+++ b/OpenTween/Connection/TwipplePhoto.cs
@@ -157,7 +157,7 @@ namespace OpenTween.Connection
                 var handler = twitterApi.CreateOAuthEchoHandler(AuthServiceProvider, OAuthRealm);
 
                 this.http = Networking.CreateHttpClient(handler);
-                this.http.Timeout = TimeSpan.FromMinutes(1);
+                this.http.Timeout = Networking.UploadImageTimeout;
             }
 
             /// <summary>

diff --git a/OpenTween/Connection/TwitterApiConnection.cs b/OpenTween/Connection/TwitterApiConnection.cs
index c08d1d2..56f0a1a 100644 (file)
--- a/OpenTween/Connection/TwitterApiConnection.cs
+++ b/OpenTween/Connection/TwitterApiConnection.cs
@@ -70,7 +70,7 @@ namespace OpenTween.Connection
             this.http = InitializeHttpClient(this.AccessToken, this.AccessSecret);
 
             this.httpUpload = InitializeHttpClient(this.AccessToken, this.AccessSecret);
-            this.httpUpload.Timeout = TimeSpan.FromMinutes(1);
+            this.httpUpload.Timeout = Networking.UploadImageTimeout;
 
             this.httpStreaming = InitializeHttpClient(this.AccessToken, this.AccessSecret, disableGzip: true);
             this.httpStreaming.Timeout = Timeout.InfiniteTimeSpan;

diff --git a/OpenTween/Connection/imgly.cs b/OpenTween/Connection/imgly.cs
index 56afe20..e5ff047 100644 (file)
--- a/OpenTween/Connection/imgly.cs
+++ b/OpenTween/Connection/imgly.cs
@@ -148,7 +148,7 @@ namespace OpenTween.Connection
                 var handler = twitterApi.CreateOAuthEchoHandler(AuthServiceProvider, OAuthRealm);
 
                 this.http = Networking.CreateHttpClient(handler);
-                this.http.Timeout = TimeSpan.FromMinutes(1);
+                this.http.Timeout = Networking.UploadImageTimeout;
             }
 
             /// <summary>

diff --git a/OpenTween/Connection/yfrog.cs b/OpenTween/Connection/yfrog.cs
index 596c45f..f457c0b 100644 (file)
--- a/OpenTween/Connection/yfrog.cs
+++ b/OpenTween/Connection/yfrog.cs
@@ -140,7 +140,7 @@ namespace OpenTween.Connection
                 var handler = twitterApi.CreateOAuthEchoHandler(AuthServiceProvider, OAuthRealm);
 
                 this.http = Networking.CreateHttpClient(handler);
-                this.http.Timeout = TimeSpan.FromMinutes(1);
+                this.http.Timeout = Networking.UploadImageTimeout;
             }
 
             /// <summary>

diff --git a/OpenTween/Setting/SettingCommon.cs b/OpenTween/Setting/SettingCommon.cs
index d61461d..1a38d49 100644 (file)
--- a/OpenTween/Setting/SettingCommon.cs
+++ b/OpenTween/Setting/SettingCommon.cs
@@ -190,6 +190,10 @@ namespace OpenTween
         public bool UseUnreadStyle = true;
         public string DateTimeFormat = "yyyy/MM/dd H:mm:ss";
         public int DefaultTimeOut = 20;
+
+        /// <summary>画像アップロードのタイムアウト設定 (秒)</summary>
+        public int UploadImageTimeout { get; set; } = 60;
+
         public bool RetweetNoConfirm = false;
         public bool LimitBalloon = false;
         public bool TabIconDisp = true;

diff --git a/OpenTween/Tween.cs b/OpenTween/Tween.cs
index 1089ffc..89574f8 100644 (file)
--- a/OpenTween/Tween.cs
+++ b/OpenTween/Tween.cs
@@ -805,6 +805,7 @@ namespace OpenTween
 
             //Twitter用通信クラス初期化
             Networking.DefaultTimeout = TimeSpan.FromSeconds(this._cfgCommon.DefaultTimeOut);
+            Networking.UploadImageTimeout = TimeSpan.FromSeconds(this._cfgCommon.UploadImageTimeout);
             Networking.SetWebProxy(this._cfgLocal.ProxyType,
                 this._cfgLocal.ProxyAddress, this._cfgLocal.ProxyPort,
                 this._cfgLocal.ProxyUser, this._cfgLocal.ProxyPassword);