From 726a9016271b20f7967a26b607c2ba4e29ec8455 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Thu, 5 May 2016 22:37:57 +0900
Subject: [PATCH] =?utf8?q?TwitterApiConnection.RestApiBase=E3=82=92static?=
 =?utf8?q?=E3=83=97=E3=83=AD=E3=83=91=E3=83=86=E3=82=A3=E3=81=AB=E5=A4=89?=
 =?utf8?q?=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 OpenTween/AppendSettingDialog.cs             |  2 +-
 OpenTween/Connection/TwitterApiConnection.cs | 12 ++++++------
 OpenTween/Tween.cs                           |  6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/OpenTween/AppendSettingDialog.cs b/OpenTween/AppendSettingDialog.cs
index ecfb5aba..de1a8279 100644
--- a/OpenTween/AppendSettingDialog.cs
+++ b/OpenTween/AppendSettingDialog.cs
@@ -312,7 +312,7 @@ namespace OpenTween
 
             Networking.ForceIPv4 = this.ConnectionPanel.checkBoxForceIPv4.Checked;
 
-            HttpTwitter.TwitterUrl = this.ConnectionPanel.TwitterAPIText.Text.Trim();
+            TwitterApiConnection.RestApiBase = new Uri(this.ConnectionPanel.TwitterAPIText.Text.Trim());
         }
 
         private async Task<UserAccount> PinAuth()
diff --git a/OpenTween/Connection/TwitterApiConnection.cs b/OpenTween/Connection/TwitterApiConnection.cs
index 4fc601b8..a16c9be1 100644
--- a/OpenTween/Connection/TwitterApiConnection.cs
+++ b/OpenTween/Connection/TwitterApiConnection.cs
@@ -37,7 +37,7 @@ namespace OpenTween.Connection
 {
     public class TwitterApiConnection : IApiConnection, IDisposable
     {
-        public Uri RestApiBase { get; set; } = new Uri("https://api.twitter.com/1.1/");
+        public static Uri RestApiBase { get; set; } = new Uri("https://api.twitter.com/1.1/");
 
         public bool IsDisposed { get; private set; } = false;
 
@@ -60,7 +60,7 @@ namespace OpenTween.Connection
 
         public async Task<T> GetAsync<T>(Uri uri, IDictionary<string, string> param, string endpointName)
         {
-            var requestUri = new Uri(this.RestApiBase, uri);
+            var requestUri = new Uri(RestApiBase, uri);
 
             if (param != null)
                 requestUri = new Uri(requestUri, "?" + MyCommon.BuildQueryString(param));
@@ -102,7 +102,7 @@ namespace OpenTween.Connection
 
         public async Task<Stream> GetStreamAsync(Uri uri, IDictionary<string, string> param)
         {
-            var requestUri = new Uri(this.RestApiBase, uri);
+            var requestUri = new Uri(RestApiBase, uri);
 
             if (param != null)
                 requestUri = new Uri(requestUri, "?" + MyCommon.BuildQueryString(param));
@@ -120,7 +120,7 @@ namespace OpenTween.Connection
 
         public async Task<LazyJson<T>> PostLazyAsync<T>(Uri uri, IDictionary<string, string> param)
         {
-            var requestUri = new Uri(this.RestApiBase, uri);
+            var requestUri = new Uri(RestApiBase, uri);
             var request = new HttpRequestMessage(HttpMethod.Post, requestUri);
 
             using (var postContent = new FormUrlEncodedContent(param))
@@ -154,7 +154,7 @@ namespace OpenTween.Connection
 
         public async Task<LazyJson<T>> PostLazyAsync<T>(Uri uri, IDictionary<string, string> param, IDictionary<string, IMediaItem> media)
         {
-            var requestUri = new Uri(this.RestApiBase, uri);
+            var requestUri = new Uri(RestApiBase, uri);
             var request = new HttpRequestMessage(HttpMethod.Post, requestUri);
 
             using (var postContent = new MultipartFormDataContent())
@@ -239,7 +239,7 @@ namespace OpenTween.Connection
 
         public OAuthEchoHandler CreateOAuthEchoHandler(Uri authServiceProvider, Uri realm = null)
         {
-            var uri = new Uri(this.RestApiBase, authServiceProvider);
+            var uri = new Uri(RestApiBase, authServiceProvider);
 
             return OAuthEchoHandler.CreateHandler(Networking.CreateHttpClientHandler(), uri,
                 ApplicationSettings.TwitterConsumerKey, ApplicationSettings.TwitterConsumerSecret,
diff --git a/OpenTween/Tween.cs b/OpenTween/Tween.cs
index 8f68012f..bb95d6ac 100644
--- a/OpenTween/Tween.cs
+++ b/OpenTween/Tween.cs
@@ -776,7 +776,7 @@ namespace OpenTween
             if (this._cfgCommon.AutoShortUrlFirst < 0)
                 this._cfgCommon.AutoShortUrlFirst = MyCommon.UrlConverter.Uxnu;
 
-            HttpTwitter.TwitterUrl = this._cfgCommon.TwitterUrl;
+            TwitterApiConnection.RestApiBase = new Uri(this._cfgCommon.TwitterUrl);
             this.tw = new Twitter(this.twitterApi);
 
             //認証関連
@@ -812,7 +812,7 @@ namespace OpenTween
                 this._cfgLocal.ProxyUser, this._cfgLocal.ProxyPassword);
             Networking.ForceIPv4 = this._cfgCommon.ForceIPv4;
 
-            HttpTwitter.TwitterUrl = this._cfgCommon.TwitterUrl;
+            TwitterApiConnection.RestApiBase = new Uri(this._cfgCommon.TwitterUrl);
             tw.RestrictFavCheck = this._cfgCommon.RestrictFavCheck;
             tw.ReadOwnPost = this._cfgCommon.ReadOwnPost;
             tw.TrackWord = this._cfgCommon.TrackWord;
@@ -4174,7 +4174,7 @@ namespace OpenTween
                     ShortUrl.Instance.DisableExpanding = !this._cfgCommon.TinyUrlResolve;
                     ShortUrl.Instance.BitlyId = this._cfgCommon.BilyUser;
                     ShortUrl.Instance.BitlyKey = this._cfgCommon.BitlyPwd;
-                    HttpTwitter.TwitterUrl = _cfgCommon.TwitterUrl;
+                    TwitterApiConnection.RestApiBase = new Uri(this._cfgCommon.TwitterUrl);
 
                     Networking.DefaultTimeout = TimeSpan.FromSeconds(this._cfgCommon.DefaultTimeOut);
                     Networking.SetWebProxy(this._cfgLocal.ProxyType,
-- 
2.11.0