From 291c0210d278c129fe514e2fcabf412f81413946 Mon Sep 17 00:00:00 2001 From: Jaex Date: Mon, 4 Apr 2016 17:53:11 +0300 Subject: [PATCH] Check config for URL shortener and URL sharing service too --- ShareX/WorkerTask.cs | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/ShareX/WorkerTask.cs b/ShareX/WorkerTask.cs index a0ff0d893..b0694fed9 100644 --- a/ShareX/WorkerTask.cs +++ b/ShareX/WorkerTask.cs @@ -861,22 +861,35 @@ public UploadResult UploadData(IGenericUploaderService service, Stream stream, s public UploadResult UploadImage(Stream stream, string fileName) { - return UploadData(UploaderFactory.GetImageUploaderService(Info.TaskSettings.ImageDestination), stream, fileName); + ImageUploaderService service = UploaderFactory.GetImageUploaderService(Info.TaskSettings.ImageDestination); + + return UploadData(service, stream, fileName); } public UploadResult UploadText(Stream stream, string fileName) { - return UploadData(UploaderFactory.GetTextUploaderService(Info.TaskSettings.TextDestination), stream, fileName); + TextUploaderService service = UploaderFactory.GetTextUploaderService(Info.TaskSettings.TextDestination); + + return UploadData(service, stream, fileName); } public UploadResult UploadFile(Stream stream, string fileName) { - return UploadData(UploaderFactory.GetFileUploaderService(Info.TaskSettings.GetFileDestinationByDataType(Info.DataType)), stream, fileName); + FileUploaderService service = UploaderFactory.GetFileUploaderService(Info.TaskSettings.GetFileDestinationByDataType(Info.DataType)); + + return UploadData(service, stream, fileName); } public UploadResult ShortenURL(string url) { - URLShortener urlShortener = UploaderFactory.GetURLShortenerService(Info.TaskSettings.URLShortenerDestination).CreateShortener(Program.UploadersConfig, taskReferenceHelper); + URLShortenerService service = UploaderFactory.GetURLShortenerService(Info.TaskSettings.URLShortenerDestination); + + if (!service.CheckConfig(Program.UploadersConfig)) + { + return GetInvalidConfigResult(service); + } + + URLShortener urlShortener = service.CreateShortener(Program.UploadersConfig, taskReferenceHelper); if (urlShortener != null) { @@ -890,7 +903,12 @@ public void ShareURL(string url) { if (!string.IsNullOrEmpty(url)) { - UploaderFactory.GetURLSharingService(Info.TaskSettings.URLSharingServiceDestination).ShareURL(url, Program.UploadersConfig); + URLSharingService service = UploaderFactory.GetURLSharingService(Info.TaskSettings.URLSharingServiceDestination); + + if (service.CheckConfig(Program.UploadersConfig)) + { + service.ShareURL(url, Program.UploadersConfig); + } } }