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 @@
Bottom, Right
- 216, 232
+ 136, 232
72, 24
@@ -307,7 +307,7 @@
Bottom, Right
- 136, 232
+ 216, 232
72, 24
@@ -339,6 +339,9 @@
298, 265
+
+ CenterScreen
+
ShareX - Send Email
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(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;