diff --git a/ShareX.UploadersLib/Forms/UploadersConfigForm.Designer.cs b/ShareX.UploadersLib/Forms/UploadersConfigForm.Designer.cs index ffef3e011..81e244aff 100644 --- a/ShareX.UploadersLib/Forms/UploadersConfigForm.Designer.cs +++ b/ShareX.UploadersLib/Forms/UploadersConfigForm.Designer.cs @@ -540,7 +540,6 @@ private void InitializeComponent() this.tpImageUploaders = new System.Windows.Forms.TabPage(); this.tcImageUploaders = new System.Windows.Forms.TabControl(); this.tpImgur = new System.Windows.Forms.TabPage(); - this.cbImgurUseHTTPS = new System.Windows.Forms.CheckBox(); this.cbImgurUseGIFV = new System.Windows.Forms.CheckBox(); this.cbImgurUploadSelectedAlbum = new System.Windows.Forms.CheckBox(); this.cbImgurDirectLink = new System.Windows.Forms.CheckBox(); @@ -4468,7 +4467,6 @@ private void InitializeComponent() // // tpImgur // - this.tpImgur.Controls.Add(this.cbImgurUseHTTPS); this.tpImgur.Controls.Add(this.cbImgurUseGIFV); this.tpImgur.Controls.Add(this.cbImgurUploadSelectedAlbum); this.tpImgur.Controls.Add(this.cbImgurDirectLink); @@ -4482,13 +4480,6 @@ private void InitializeComponent() this.tpImgur.Name = "tpImgur"; this.tpImgur.UseVisualStyleBackColor = true; // - // cbImgurUseHTTPS - // - resources.ApplyResources(this.cbImgurUseHTTPS, "cbImgurUseHTTPS"); - this.cbImgurUseHTTPS.Name = "cbImgurUseHTTPS"; - this.cbImgurUseHTTPS.UseVisualStyleBackColor = true; - this.cbImgurUseHTTPS.CheckedChanged += new System.EventHandler(this.cbImgurUseHTTPS_CheckedChanged); - // // cbImgurUseGIFV // resources.ApplyResources(this.cbImgurUseGIFV, "cbImgurUseGIFV"); @@ -5693,7 +5684,6 @@ private void InitializeComponent() private System.Windows.Forms.PictureBox pbPuush; private System.Windows.Forms.CheckBox cbHastebinUseFileExtension; private System.Windows.Forms.Label lblOwnCloudHostExample; - private System.Windows.Forms.CheckBox cbImgurUseHTTPS; internal System.Windows.Forms.TabPage tpPastie; private System.Windows.Forms.CheckBox cbPastieIsPublic; private System.Windows.Forms.CheckBox cbPolrUseAPIv1; diff --git a/ShareX.UploadersLib/Forms/UploadersConfigForm.cs b/ShareX.UploadersLib/Forms/UploadersConfigForm.cs index bd69ffbbf..083acbe3a 100644 --- a/ShareX.UploadersLib/Forms/UploadersConfigForm.cs +++ b/ShareX.UploadersLib/Forms/UploadersConfigForm.cs @@ -187,7 +187,6 @@ public void LoadSettings() cbImgurThumbnailType.Items.Clear(); cbImgurThumbnailType.Items.AddRange(Helpers.GetLocalizedEnumDescriptions()); cbImgurThumbnailType.SelectedIndex = (int)Config.ImgurThumbnailType; - cbImgurUseHTTPS.Checked = Config.ImgurUseHTTPS; cbImgurUseGIFV.Checked = Config.ImgurUseGIFV; cbImgurUploadSelectedAlbum.Checked = Config.ImgurUploadSelectedAlbum; ImgurFillAlbumList(); @@ -845,11 +844,6 @@ private void cbImgurThumbnailType_SelectedIndexChanged(object sender, EventArgs Config.ImgurThumbnailType = (ImgurThumbnailType)cbImgurThumbnailType.SelectedIndex; } - private void cbImgurUseHTTPS_CheckedChanged(object sender, EventArgs e) - { - Config.ImgurUseHTTPS = cbImgurUseHTTPS.Checked; - } - private void cbImgurUseGIFV_CheckedChanged(object sender, EventArgs e) { Config.ImgurUseGIFV = cbImgurUseGIFV.Checked; diff --git a/ShareX.UploadersLib/Forms/UploadersConfigForm.resx b/ShareX.UploadersLib/Forms/UploadersConfigForm.resx index b6f13a490..736b97354 100644 --- a/ShareX.UploadersLib/Forms/UploadersConfigForm.resx +++ b/ShareX.UploadersLib/Forms/UploadersConfigForm.resx @@ -13274,36 +13274,6 @@ Using an encrypted library disables sharing. 1 - - True - - - NoControl - - - 16, 376 - - - 118, 17 - - - 11 - - - Use "https://" links - - - cbImgurUseHTTPS - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpImgur - - - 0 - True @@ -13311,7 +13281,7 @@ Using an encrypted library disables sharing. NoControl - 16, 400 + 16, 376 160, 17 @@ -13332,7 +13302,7 @@ Using an encrypted library disables sharing. tpImgur - 1 + 0 True @@ -13362,7 +13332,7 @@ Using an encrypted library disables sharing. tpImgur - 2 + 1 True @@ -13392,7 +13362,7 @@ Using an encrypted library disables sharing. tpImgur - 3 + 2 16, 16 @@ -13413,7 +13383,7 @@ Using an encrypted library disables sharing. tpImgur - 4 + 3 16, 64 @@ -13434,7 +13404,7 @@ Using an encrypted library disables sharing. tpImgur - 5 + 4 ID @@ -13470,7 +13440,7 @@ Using an encrypted library disables sharing. tpImgur - 6 + 5 False @@ -13500,7 +13470,7 @@ Using an encrypted library disables sharing. tpImgur - 7 + 6 16, 344 @@ -13521,7 +13491,7 @@ Using an encrypted library disables sharing. tpImgur - 8 + 7 True @@ -13551,7 +13521,7 @@ Using an encrypted library disables sharing. tpImgur - 9 + 8 4, 22 diff --git a/ShareX.UploadersLib/ImageUploaders/Imgur.cs b/ShareX.UploadersLib/ImageUploaders/Imgur.cs index fbf5c43ea..60a71af1c 100644 --- a/ShareX.UploadersLib/ImageUploaders/Imgur.cs +++ b/ShareX.UploadersLib/ImageUploaders/Imgur.cs @@ -77,7 +77,6 @@ public override GenericUploader CreateUploader(UploadersConfig config, TaskRefer UploadMethod = config.ImgurAccountType, DirectLink = config.ImgurDirectLink, ThumbnailType = config.ImgurThumbnailType, - UseHTTPS = config.ImgurUseHTTPS, UseGIFV = config.ImgurUseGIFV, UploadAlbumID = albumID }; @@ -93,7 +92,6 @@ public sealed class Imgur : ImageUploader, IOAuth2 public ImgurThumbnailType ThumbnailType { get; set; } public string UploadAlbumID { get; set; } public bool DirectLink { get; set; } - public bool UseHTTPS { get; set; } public bool UseGIFV { get; set; } public Imgur(OAuth2Info oauth) @@ -295,7 +293,7 @@ private UploadResult InternalUpload(Stream stream, string fileName, bool refresh } else { - result.URL = $"http://imgur.com/{imageData.id}"; + result.URL = $"https://imgur.com/{imageData.id}"; } string thumbnail = ""; @@ -322,13 +320,8 @@ private UploadResult InternalUpload(Stream stream, string fileName, bool refresh break; } - result.ThumbnailURL = $"http://i.imgur.com/{imageData.id}{thumbnail}.jpg"; // Imgur thumbnails always jpg - result.DeletionURL = $"http://imgur.com/delete/{imageData.deletehash}"; - - if (UseHTTPS) - { - result.ForceHTTPS(); - } + result.ThumbnailURL = $"https://i.imgur.com/{imageData.id}{thumbnail}.jpg"; // Imgur thumbnails always jpg + result.DeletionURL = $"https://imgur.com/delete/{imageData.deletehash}"; } } else diff --git a/ShareX.UploadersLib/UploadersConfig.cs b/ShareX.UploadersLib/UploadersConfig.cs index 5d2032f15..f14eb28c2 100644 --- a/ShareX.UploadersLib/UploadersConfig.cs +++ b/ShareX.UploadersLib/UploadersConfig.cs @@ -41,7 +41,6 @@ public class UploadersConfig : SettingsBase public AccountType ImgurAccountType = AccountType.Anonymous; public bool ImgurDirectLink = true; public ImgurThumbnailType ImgurThumbnailType = ImgurThumbnailType.Medium_Thumbnail; - public bool ImgurUseHTTPS = false; public bool ImgurUseGIFV = true; public OAuth2Info ImgurOAuth2Info = null; public bool ImgurUploadSelectedAlbum = false;