From 47cda1eb291fe920d32aafcdc4c28658fc8dcd59 Mon Sep 17 00:00:00 2001
From: Jaex <Jaex@users.noreply.github.com>
Date: Tue, 22 Mar 2016 21:24:26 +0200
Subject: [PATCH] No need to null check uploader service anymore

---
 .../Forms/EmailForm.Designer.cs               |  1 +
 ShareX.UploadersLib/Forms/EmailForm.resx      |  7 ++-
 ShareX.UploadersLib/UploadersConfig.cs        | 28 +++--------
 ShareX/WorkerTask.cs                          | 50 ++++++-------------
 4 files changed, 27 insertions(+), 59 deletions(-)

diff --git a/ShareX.UploadersLib/Forms/EmailForm.Designer.cs b/ShareX.UploadersLib/Forms/EmailForm.Designer.cs
index e225aa0ad..75b7eece9 100644
--- a/ShareX.UploadersLib/Forms/EmailForm.Designer.cs
+++ b/ShareX.UploadersLib/Forms/EmailForm.Designer.cs
@@ -86,6 +86,7 @@ private void InitializeComponent()
             // 
             // EmailForm
             // 
+            this.AcceptButton = this.btnSend;
             resources.ApplyResources(this, "$this");
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.CancelButton = this.btnCancel;
diff --git a/ShareX.UploadersLib/Forms/EmailForm.resx b/ShareX.UploadersLib/Forms/EmailForm.resx
index c2b82a614..d30fcefc3 100644
--- a/ShareX.UploadersLib/Forms/EmailForm.resx
+++ b/ShareX.UploadersLib/Forms/EmailForm.resx
@@ -280,7 +280,7 @@
     <value>Bottom, Right</value>
   </data>
   <data name="btnSend.Location" type="System.Drawing.Point, System.Drawing">
-    <value>216, 232</value>
+    <value>136, 232</value>
   </data>
   <data name="btnSend.Size" type="System.Drawing.Size, System.Drawing">
     <value>72, 24</value>
@@ -307,7 +307,7 @@
     <value>Bottom, Right</value>
   </data>
   <data name="btnCancel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>136, 232</value>
+    <value>216, 232</value>
   </data>
   <data name="btnCancel.Size" type="System.Drawing.Size, System.Drawing">
     <value>72, 24</value>
@@ -339,6 +339,9 @@
   <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
     <value>298, 265</value>
   </data>
+  <data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
+    <value>CenterScreen</value>
+  </data>
   <data name="$this.Text" xml:space="preserve">
     <value>ShareX - Send Email</value>
   </data>
diff --git a/ShareX.UploadersLib/UploadersConfig.cs b/ShareX.UploadersLib/UploadersConfig.cs
index 7e28058bb..96b646f43 100644
--- a/ShareX.UploadersLib/UploadersConfig.cs
+++ b/ShareX.UploadersLib/UploadersConfig.cs
@@ -389,40 +389,24 @@ public bool IsValid<T>(int index)
 
         public bool IsValid(ImageDestination destination)
         {
-            if (destination != ImageDestination.FileUploader)
-            {
-                ImageUploaderService service = UploaderFactory.GetImageUploaderServiceByEnum(destination);
-                if (service != null) return service.CheckConfig(this);
-            }
-
-            return true;
+            if (destination == ImageDestination.FileUploader) return true;
+            return UploaderFactory.GetImageUploaderServiceByEnum(destination).CheckConfig(this);
         }
 
         public bool IsValid(TextDestination destination)
         {
-            if (destination != TextDestination.FileUploader)
-            {
-                TextUploaderService service = UploaderFactory.GetTextUploaderServiceByEnum(destination);
-                if (service != null) return service.CheckConfig(this);
-            }
-
-            return true;
+            if (destination == TextDestination.FileUploader) return true;
+            return UploaderFactory.GetTextUploaderServiceByEnum(destination).CheckConfig(this);
         }
 
         public bool IsValid(FileDestination destination)
         {
-            FileUploaderService service = UploaderFactory.GetFileUploaderServiceByEnum(destination);
-            if (service != null) return service.CheckConfig(this);
-
-            return true;
+            return UploaderFactory.GetFileUploaderServiceByEnum(destination).CheckConfig(this);
         }
 
         public bool IsValid(UrlShortenerType destination)
         {
-            URLShortenerService service = UploaderFactory.GetURLShortenerServiceByEnum(destination);
-            if (service != null) return service.CheckConfig(this);
-
-            return true;
+            return UploaderFactory.GetURLShortenerServiceByEnum(destination).CheckConfig(this);
         }
 
         public bool IsValid(URLSharingServices destination)
diff --git a/ShareX/WorkerTask.cs b/ShareX/WorkerTask.cs
index 5e07982fd..532bb38df 100644
--- a/ShareX/WorkerTask.cs
+++ b/ShareX/WorkerTask.cs
@@ -806,18 +806,13 @@ private void DoAfterUploadJobs()
 
         public UploadResult UploadImage(Stream stream, string fileName)
         {
-            ImageUploaderService service = UploaderFactory.GetImageUploaderServiceByEnum(Info.TaskSettings.ImageDestination);
+            ImageUploader imageUploader = UploaderFactory.GetImageUploaderServiceByEnum(Info.TaskSettings.ImageDestination).CreateUploader(Program.UploadersConfig);
 
-            if (service != null)
+            if (imageUploader != null)
             {
-                ImageUploader imageUploader = service.CreateUploader(Program.UploadersConfig);
+                PrepareUploader(imageUploader);
 
-                if (imageUploader != null)
-                {
-                    PrepareUploader(imageUploader);
-
-                    return imageUploader.Upload(stream, fileName);
-                }
+                return imageUploader.Upload(stream, fileName);
             }
 
             return null;
@@ -827,18 +822,13 @@ public UploadResult UploadText(Stream stream, string fileName)
         {
             Program.UploadersConfig.TextFormat = Info.TaskSettings.AdvancedSettings.TextFormat;
 
-            TextUploaderService service = UploaderFactory.GetTextUploaderServiceByEnum(Info.TaskSettings.TextDestination);
+            TextUploader textUploader = UploaderFactory.GetTextUploaderServiceByEnum(Info.TaskSettings.TextDestination).CreateUploader(Program.UploadersConfig);
 
-            if (service != null)
+            if (textUploader != null)
             {
-                TextUploader textUploader = service.CreateUploader(Program.UploadersConfig);
+                PrepareUploader(textUploader);
 
-                if (textUploader != null)
-                {
-                    PrepareUploader(textUploader);
-
-                    return textUploader.UploadText(stream, fileName);
-                }
+                return textUploader.UploadText(stream, fileName);
             }
 
             return null;
@@ -862,18 +852,13 @@ public UploadResult UploadFile(Stream stream, string fileName)
                     break;
             }
 
-            FileUploaderService service = UploaderFactory.GetFileUploaderServiceByEnum(fileDestination);
+            FileUploader fileUploader = UploaderFactory.GetFileUploaderServiceByEnum(fileDestination).CreateUploader(Program.UploadersConfig);
 
-            if (service != null)
+            if (fileUploader != null)
             {
-                FileUploader fileUploader = service.CreateUploader(Program.UploadersConfig);
+                PrepareUploader(fileUploader);
 
-                if (fileUploader != null)
-                {
-                    PrepareUploader(fileUploader);
-
-                    return fileUploader.Upload(stream, fileName);
-                }
+                return fileUploader.Upload(stream, fileName);
             }
 
             return null;
@@ -881,16 +866,11 @@ public UploadResult UploadFile(Stream stream, string fileName)
 
         public UploadResult ShortenURL(string url)
         {
-            URLShortenerService service = UploaderFactory.GetURLShortenerServiceByEnum(Info.TaskSettings.URLShortenerDestination);
+            URLShortener urlShortener = UploaderFactory.GetURLShortenerServiceByEnum(Info.TaskSettings.URLShortenerDestination).CreateShortener(Program.UploadersConfig);
 
-            if (service != null)
+            if (urlShortener != null)
             {
-                URLShortener urlShortener = service.CreateShortener(Program.UploadersConfig);
-
-                if (urlShortener != null)
-                {
-                    return urlShortener.ShortenURL(url);
-                }
+                return urlShortener.ShortenURL(url);
             }
 
             return null;