From ed90f2eb43cacc9ac13d85f46c35e3f0afe9776a Mon Sep 17 00:00:00 2001 From: Robin Date: Thu, 9 Aug 2018 22:44:34 +0200 Subject: [PATCH] Renamed INetworkConfiguration to IHttpConfiguration --- src/Greenshot.Addon.Box/BoxDestination.cs | 8 +++---- .../DropboxDestination.cs | 4 ++-- .../FlickrDestination.cs | 4 ++-- .../GooglePhotosDestination.cs | 8 +++---- src/Greenshot.Addon.Imgur/ImgurApi.cs | 4 ++-- src/Greenshot.Addon.Jira/JiraConnector.cs | 4 ++-- .../OneDriveDestination.cs | 4 ++-- .../PhotobucketDestination.cs | 14 ++++++------ src/Greenshot.Addon.Tfs/TfsClient.cs | 4 ++-- src/Greenshot.Addons/AddonsModule.cs | 4 ++-- ...Configuration.cs => IHttpConfiguration.cs} | 2 +- src/Greenshot.Addons/Greenshot.Addons.csproj | 2 +- .../ViewModels/NetworkConfigViewModel.cs | 8 +++---- .../Views/NetworkConfigView.xaml | 22 +++++++++---------- 14 files changed, 46 insertions(+), 46 deletions(-) rename src/Greenshot.Addons/Core/{INetworkConfiguration.cs => IHttpConfiguration.cs} (86%) diff --git a/src/Greenshot.Addon.Box/BoxDestination.cs b/src/Greenshot.Addon.Box/BoxDestination.cs index 1e8f0bfc5..a5059f906 100644 --- a/src/Greenshot.Addon.Box/BoxDestination.cs +++ b/src/Greenshot.Addon.Box/BoxDestination.cs @@ -60,7 +60,7 @@ namespace Greenshot.Addon.Box private readonly IBoxConfiguration _boxConfiguration; private readonly IBoxLanguage _boxLanguage; private readonly Func> _pleaseWaitFormFactory; - private readonly INetworkConfiguration _networkConfiguration; + private readonly IHttpConfiguration _httpConfiguration; private readonly IResourceProvider _resourceProvider; private readonly OAuth2Settings _oauth2Settings; private static readonly Uri UploadFileUri = new Uri("https://upload.box.com/api/2.0/files/content"); @@ -73,14 +73,14 @@ namespace Greenshot.Addon.Box IBoxConfiguration boxConfiguration, IBoxLanguage boxLanguage, Func> pleaseWaitFormFactory, - INetworkConfiguration networkConfiguration, + IHttpConfiguration httpConfiguration, IResourceProvider resourceProvider) : base(coreConfiguration, greenshotLanguage) { _exportNotification = exportNotification; _boxConfiguration = boxConfiguration; _boxLanguage = boxLanguage; _pleaseWaitFormFactory = pleaseWaitFormFactory; - _networkConfiguration = networkConfiguration; + _httpConfiguration = httpConfiguration; _resourceProvider = resourceProvider; _oauth2Settings = new OAuth2Settings @@ -187,7 +187,7 @@ namespace Greenshot.Addon.Box var oauthHttpBehaviour = HttpBehaviour.Current.ShallowClone(); // Use the network settings - oauthHttpBehaviour.HttpSettings = _networkConfiguration; + oauthHttpBehaviour.HttpSettings = _httpConfiguration; // Use UploadProgress if (progress != null) { diff --git a/src/Greenshot.Addon.Dropbox/DropboxDestination.cs b/src/Greenshot.Addon.Dropbox/DropboxDestination.cs index dd5cb9b89..9620084f7 100644 --- a/src/Greenshot.Addon.Dropbox/DropboxDestination.cs +++ b/src/Greenshot.Addon.Dropbox/DropboxDestination.cs @@ -71,7 +71,7 @@ namespace Greenshot.Addon.Dropbox public DropboxDestination( IDropboxConfiguration dropboxPluginConfiguration, IDropboxLanguage dropboxLanguage, - INetworkConfiguration networkConfiguration, + IHttpConfiguration httpConfiguration, IResourceProvider resourceProvider, ICoreConfiguration coreConfiguration, IGreenshotLanguage greenshotLanguage, @@ -108,7 +108,7 @@ namespace Greenshot.Addon.Dropbox _oAuthHttpBehaviour = httpBehaviour; // Use the default network settings - httpBehaviour.HttpSettings = networkConfiguration; + httpBehaviour.HttpSettings = httpConfiguration; } public override Bitmap DisplayIcon diff --git a/src/Greenshot.Addon.Flickr/FlickrDestination.cs b/src/Greenshot.Addon.Flickr/FlickrDestination.cs index 7285d85f6..b3b6da9eb 100644 --- a/src/Greenshot.Addon.Flickr/FlickrDestination.cs +++ b/src/Greenshot.Addon.Flickr/FlickrDestination.cs @@ -83,7 +83,7 @@ namespace Greenshot.Addon.Flickr public FlickrDestination( IFlickrConfiguration flickrConfiguration, IFlickrLanguage flickrLanguage, - INetworkConfiguration networkConfiguration, + IHttpConfiguration httpConfiguration, IResourceProvider resourceProvider, ICoreConfiguration coreConfiguration, IGreenshotLanguage greenshotLanguage, @@ -123,7 +123,7 @@ namespace Greenshot.Addon.Flickr _oAuthHttpBehaviour = OAuth1HttpBehaviourFactory.Create(_oAuthSettings); _oAuthHttpBehaviour.ValidateResponseContentType = false; // Use the default network settings - _oAuthHttpBehaviour.HttpSettings = networkConfiguration; + _oAuthHttpBehaviour.HttpSettings = httpConfiguration; } public override string Description => _flickrLanguage.UploadMenuItem; diff --git a/src/Greenshot.Addon.GooglePhotos/GooglePhotosDestination.cs b/src/Greenshot.Addon.GooglePhotos/GooglePhotosDestination.cs index a2da655c9..369e5b552 100644 --- a/src/Greenshot.Addon.GooglePhotos/GooglePhotosDestination.cs +++ b/src/Greenshot.Addon.GooglePhotos/GooglePhotosDestination.cs @@ -57,7 +57,7 @@ namespace Greenshot.Addon.GooglePhotos private static readonly LogSource Log = new LogSource(); private readonly IGooglePhotosConfiguration _googlePhotosConfiguration; private readonly IGooglePhotosLanguage _googlePhotosLanguage; - private readonly INetworkConfiguration _networkConfiguration; + private readonly IHttpConfiguration _httpConfiguration; private readonly IResourceProvider _resourceProvider; private readonly ExportNotification _exportNotification; private readonly Func> _pleaseWaitFormFactory; @@ -66,7 +66,7 @@ namespace Greenshot.Addon.GooglePhotos public GooglePhotosDestination( IGooglePhotosConfiguration googlePhotosConfiguration, IGooglePhotosLanguage googlePhotosLanguage, - INetworkConfiguration networkConfiguration, + IHttpConfiguration httpConfiguration, IResourceProvider resourceProvider, ICoreConfiguration coreConfiguration, IGreenshotLanguage greenshotLanguage, @@ -76,7 +76,7 @@ namespace Greenshot.Addon.GooglePhotos { _googlePhotosConfiguration = googlePhotosConfiguration; _googlePhotosLanguage = googlePhotosLanguage; - _networkConfiguration = networkConfiguration; + _httpConfiguration = httpConfiguration; _resourceProvider = resourceProvider; _exportNotification = exportNotification; _pleaseWaitFormFactory = pleaseWaitFormFactory; @@ -178,7 +178,7 @@ namespace Greenshot.Addon.GooglePhotos string filename = surface.GenerateFilename(CoreConfiguration, _googlePhotosConfiguration); var oAuthHttpBehaviour = HttpBehaviour.Current.ShallowClone(); - oAuthHttpBehaviour.HttpSettings = _networkConfiguration; + oAuthHttpBehaviour.HttpSettings = _httpConfiguration; // Use UploadProgress if (progress != null) { diff --git a/src/Greenshot.Addon.Imgur/ImgurApi.cs b/src/Greenshot.Addon.Imgur/ImgurApi.cs index b3e212b6d..c9f9d0066 100644 --- a/src/Greenshot.Addon.Imgur/ImgurApi.cs +++ b/src/Greenshot.Addon.Imgur/ImgurApi.cs @@ -61,7 +61,7 @@ namespace Greenshot.Addon.Imgur public ImgurApi( IImgurConfiguration imgurConfiguration, ICoreConfiguration coreConfiguration, - INetworkConfiguration networkConfiguration) + IHttpConfiguration httpConfiguration) { _imgurConfiguration = imgurConfiguration; _coreConfiguration = coreConfiguration; @@ -88,7 +88,7 @@ namespace Greenshot.Addon.Imgur Behaviour = new HttpBehaviour { - HttpSettings = networkConfiguration, + HttpSettings = httpConfiguration, JsonSerializer = new JsonNetJsonSerializer(), OnHttpClientCreated = httpClient => { diff --git a/src/Greenshot.Addon.Jira/JiraConnector.cs b/src/Greenshot.Addon.Jira/JiraConnector.cs index 0e8cce686..a1da3b5c6 100644 --- a/src/Greenshot.Addon.Jira/JiraConnector.cs +++ b/src/Greenshot.Addon.Jira/JiraConnector.cs @@ -66,13 +66,13 @@ namespace Greenshot.Addon.Jira IJiraConfiguration jiraConfiguration, JiraMonitor jiraMonitor, ICoreConfiguration coreConfiguration, - INetworkConfiguration networkConfiguration) + IHttpConfiguration httpConfiguration) { jiraConfiguration.Url = jiraConfiguration.Url.Replace(DefaultPostfix, ""); _jiraConfiguration = jiraConfiguration; _jiraMonitor = jiraMonitor; _coreConfiguration = coreConfiguration; - _jiraClient = JiraClient.Create(new Uri(jiraConfiguration.Url), networkConfiguration); + _jiraClient = JiraClient.Create(new Uri(jiraConfiguration.Url), httpConfiguration); } public Bitmap FavIcon { get; private set; } diff --git a/src/Greenshot.Addon.OneDrive/OneDriveDestination.cs b/src/Greenshot.Addon.OneDrive/OneDriveDestination.cs index 6e5822927..9efe97a1d 100644 --- a/src/Greenshot.Addon.OneDrive/OneDriveDestination.cs +++ b/src/Greenshot.Addon.OneDrive/OneDriveDestination.cs @@ -74,7 +74,7 @@ namespace Greenshot.Addon.OneDrive public OneDriveDestination( IOneDriveConfiguration oneDriveConfiguration, IOneDriveLanguage oneDriveLanguage, - INetworkConfiguration networkConfiguration, + IHttpConfiguration httpConfiguration, IResourceProvider resourceProvider, Func> pleaseWaitFormFactory, ICoreConfiguration coreConfiguration, @@ -109,7 +109,7 @@ namespace Greenshot.Addon.OneDrive }; _oneDriveHttpBehaviour = new HttpBehaviour { - HttpSettings = networkConfiguration, + HttpSettings = httpConfiguration, JsonSerializer = new JsonNetJsonSerializer() }; } diff --git a/src/Greenshot.Addon.Photobucket/PhotobucketDestination.cs b/src/Greenshot.Addon.Photobucket/PhotobucketDestination.cs index cb1544f27..f64bea526 100644 --- a/src/Greenshot.Addon.Photobucket/PhotobucketDestination.cs +++ b/src/Greenshot.Addon.Photobucket/PhotobucketDestination.cs @@ -59,7 +59,7 @@ namespace Greenshot.Addon.Photobucket private readonly string _albumPath; private readonly IPhotobucketConfiguration _photobucketConfiguration; private readonly IPhotobucketLanguage _photobucketLanguage; - private readonly INetworkConfiguration _networkConfiguration; + private readonly IHttpConfiguration _httpConfiguration; private readonly IResourceProvider _resourceProvider; private readonly ExportNotification _exportNotification; private readonly OAuth1Settings _oAuthSettings; @@ -69,7 +69,7 @@ namespace Greenshot.Addon.Photobucket public PhotobucketDestination( IPhotobucketConfiguration photobucketConfiguration, IPhotobucketLanguage photobucketLanguage, - INetworkConfiguration networkConfiguration, + IHttpConfiguration httpConfiguration, IResourceProvider resourceProvider, ICoreConfiguration coreConfiguration, IGreenshotLanguage greenshotLanguage, @@ -78,7 +78,7 @@ namespace Greenshot.Addon.Photobucket { _photobucketConfiguration = photobucketConfiguration; _photobucketLanguage = photobucketLanguage; - _networkConfiguration = networkConfiguration; + _httpConfiguration = httpConfiguration; _resourceProvider = resourceProvider; _exportNotification = exportNotification; @@ -105,7 +105,7 @@ namespace Greenshot.Addon.Photobucket CheckVerifier = false }; var oAuthHttpBehaviour = OAuth1HttpBehaviourFactory.Create(_oAuthSettings); - oAuthHttpBehaviour.HttpSettings = networkConfiguration; + oAuthHttpBehaviour.HttpSettings = httpConfiguration; // Store the leftover values oAuthHttpBehaviour.OnAccessTokenValues = values => { @@ -144,12 +144,12 @@ namespace Greenshot.Addon.Photobucket protected PhotobucketDestination( IPhotobucketConfiguration photobucketConfiguration, IPhotobucketLanguage photobucketLanguage, - INetworkConfiguration networkConfiguration, + IHttpConfiguration httpConfiguration, IResourceProvider resourceProvider, string albumPath, ICoreConfiguration coreConfiguration, IGreenshotLanguage greenshotLanguage, - ExportNotification exportNotification) : this(photobucketConfiguration, photobucketLanguage, networkConfiguration, resourceProvider, coreConfiguration, greenshotLanguage, exportNotification) + ExportNotification exportNotification) : this(photobucketConfiguration, photobucketLanguage, httpConfiguration, resourceProvider, coreConfiguration, greenshotLanguage, exportNotification) { _photobucketConfiguration = photobucketConfiguration; _albumPath = albumPath; @@ -204,7 +204,7 @@ namespace Greenshot.Addon.Photobucket yield return new PhotobucketDestination( _photobucketConfiguration, _photobucketLanguage, - _networkConfiguration, + _httpConfiguration, _resourceProvider, album, CoreConfiguration, diff --git a/src/Greenshot.Addon.Tfs/TfsClient.cs b/src/Greenshot.Addon.Tfs/TfsClient.cs index 68fdbfedd..89d3524a7 100644 --- a/src/Greenshot.Addon.Tfs/TfsClient.cs +++ b/src/Greenshot.Addon.Tfs/TfsClient.cs @@ -51,14 +51,14 @@ namespace Greenshot.Addon.Tfs public TfsClient( ICoreConfiguration coreConfiguration, ITfsConfiguration tfsConfiguration, - INetworkConfiguration networkConfiguration) + IHttpConfiguration httpConfiguration) { _coreConfiguration = coreConfiguration; _tfsConfiguration = tfsConfiguration; _tfsHttpBehaviour = new HttpBehaviour { - HttpSettings = networkConfiguration, + HttpSettings = httpConfiguration, JsonSerializer = new JsonNetJsonSerializer() }; diff --git a/src/Greenshot.Addons/AddonsModule.cs b/src/Greenshot.Addons/AddonsModule.cs index bbef3bb4c..34e964617 100644 --- a/src/Greenshot.Addons/AddonsModule.cs +++ b/src/Greenshot.Addons/AddonsModule.cs @@ -54,8 +54,8 @@ namespace Greenshot.Addons .SingleInstance(); builder - .Register(context => IniConfig.Current.Get()) - .As() + .Register(context => IniConfig.Current.Get()) + .As() .SingleInstance(); builder diff --git a/src/Greenshot.Addons/Core/INetworkConfiguration.cs b/src/Greenshot.Addons/Core/IHttpConfiguration.cs similarity index 86% rename from src/Greenshot.Addons/Core/INetworkConfiguration.cs rename to src/Greenshot.Addons/Core/IHttpConfiguration.cs index f19da36a4..9efd1d60e 100644 --- a/src/Greenshot.Addons/Core/INetworkConfiguration.cs +++ b/src/Greenshot.Addons/Core/IHttpConfiguration.cs @@ -37,7 +37,7 @@ namespace Greenshot.Addons.Core /// [IniSection("Network")] [Description("Greenshot network configuration")] - public interface INetworkConfiguration : IIniSection, IHttpSettings, INotifyPropertyChanged, IWriteProtectProperties, IDefaultValue, ITransactionalProperties + public interface IHttpConfiguration : IIniSection, IHttpSettings, INotifyPropertyChanged, IWriteProtectProperties, IDefaultValue, ITransactionalProperties { } } \ No newline at end of file diff --git a/src/Greenshot.Addons/Greenshot.Addons.csproj b/src/Greenshot.Addons/Greenshot.Addons.csproj index 58b8e622e..04856b990 100644 --- a/src/Greenshot.Addons/Greenshot.Addons.csproj +++ b/src/Greenshot.Addons/Greenshot.Addons.csproj @@ -223,7 +223,7 @@ - + diff --git a/src/Greenshot/Ui/Configuration/ViewModels/NetworkConfigViewModel.cs b/src/Greenshot/Ui/Configuration/ViewModels/NetworkConfigViewModel.cs index fc53cecdf..ca1c1f954 100644 --- a/src/Greenshot/Ui/Configuration/ViewModels/NetworkConfigViewModel.cs +++ b/src/Greenshot/Ui/Configuration/ViewModels/NetworkConfigViewModel.cs @@ -38,16 +38,16 @@ namespace Greenshot.Ui.Configuration.ViewModels /// private CompositeDisposable _disposables; - public INetworkConfiguration NetworkConfiguration { get; } + public IHttpConfiguration HttpConfiguration { get; } public IGreenshotLanguage GreenshotLanguage { get; } public NetworkConfigViewModel( - INetworkConfiguration networkConfiguration, + IHttpConfiguration httpConfiguration, IGreenshotLanguage greenshotLanguage ) { - NetworkConfiguration = networkConfiguration; + HttpConfiguration = httpConfiguration; GreenshotLanguage = greenshotLanguage; } @@ -57,7 +57,7 @@ namespace Greenshot.Ui.Configuration.ViewModels _disposables?.Dispose(); // Make sure Commit/Rollback is called on the IUiConfiguration - config.Register(NetworkConfiguration); + config.Register(HttpConfiguration); this.VisibleOnPermissions("Expert"); diff --git a/src/Greenshot/Ui/Configuration/Views/NetworkConfigView.xaml b/src/Greenshot/Ui/Configuration/Views/NetworkConfigView.xaml index 8c64da25d..0de8530dd 100644 --- a/src/Greenshot/Ui/Configuration/Views/NetworkConfigView.xaml +++ b/src/Greenshot/Ui/Configuration/Views/NetworkConfigView.xaml @@ -8,19 +8,19 @@ d:DataContext="{d:DesignInstance viewModels:NetworkConfigViewModel,IsDesignTimeCreatable=False}" > - - - - - - - - - - + + + + + + + + + +