diff --git a/ShareX.UploadersLib/FileUploaders/Lithiio.cs b/ShareX.UploadersLib/FileUploaders/Lithiio.cs index 719ebd3ff..d1ec43333 100644 --- a/ShareX.UploadersLib/FileUploaders/Lithiio.cs +++ b/ShareX.UploadersLib/FileUploaders/Lithiio.cs @@ -42,7 +42,7 @@ public class LithiioFileUploaderService : FileUploaderService public override bool CheckConfig(UploadersConfig config) { - return config.LithiioSettings != null; + return config.LithiioSettings != null && !string.IsNullOrEmpty(config.LithiioSettings.UserAPIKey); } public override GenericUploader CreateUploader(UploadersConfig config, TaskReferenceHelper taskInfo) @@ -62,7 +62,7 @@ public Lithiio(LithiioSettings config) Config = config; } - private const string uploadUrl = "http://api.lithi.io/v2/"; + private const string uploadUrl = "http://api.lithi.io/v3/"; public static string[] UploadURLs = new string[] { "https://i.lithi.io/", "https://lithi.io/i/", "https://i.mugi.io/", "https://mugi.io/i/" }; diff --git a/ShareX.UploadersLib/Forms/UploadersConfigForm.Designer.cs b/ShareX.UploadersLib/Forms/UploadersConfigForm.Designer.cs index 3d73b13dc..4335364e4 100644 --- a/ShareX.UploadersLib/Forms/UploadersConfigForm.Designer.cs +++ b/ShareX.UploadersLib/Forms/UploadersConfigForm.Designer.cs @@ -377,7 +377,6 @@ private void InitializeComponent() this.lblSulAPIKey = new System.Windows.Forms.Label(); this.tpLithiio = new System.Windows.Forms.TabPage(); this.btnLithiioGetAPIKey = new System.Windows.Forms.Button(); - this.lblLithiioInfo = new System.Windows.Forms.Label(); this.lblLithiioApiKey = new System.Windows.Forms.Label(); this.txtLithiioApiKey = new System.Windows.Forms.TextBox(); this.lblLithiioUploadURL = new System.Windows.Forms.Label(); @@ -436,6 +435,7 @@ private void InitializeComponent() this.lblUpasteUserKey = new System.Windows.Forms.Label(); this.txtUpasteUserKey = new System.Windows.Forms.TextBox(); this.tpHastebin = new System.Windows.Forms.TabPage(); + this.cbHastebinUseFileExtension = new System.Windows.Forms.CheckBox(); this.txtHastebinSyntaxHighlighting = new System.Windows.Forms.TextBox(); this.txtHastebinCustomDomain = new System.Windows.Forms.TextBox(); this.lblHastebinSyntaxHighlighting = new System.Windows.Forms.Label(); @@ -530,7 +530,6 @@ private void InitializeComponent() this.tcUploaders = new System.Windows.Forms.TabControl(); this.lblWidthHint = new System.Windows.Forms.Label(); this.ttlvMain = new ShareX.HelpersLib.TabToListView(); - this.cbHastebinUseFileExtension = new System.Windows.Forms.CheckBox(); this.atcImgurAccountType = new ShareX.UploadersLib.AccountTypeControl(); this.oauth2Imgur = new ShareX.UploadersLib.OAuthControl(); this.atcTinyPicAccountType = new ShareX.UploadersLib.AccountTypeControl(); @@ -3140,7 +3139,6 @@ private void InitializeComponent() // tpLithiio // this.tpLithiio.Controls.Add(this.btnLithiioGetAPIKey); - this.tpLithiio.Controls.Add(this.lblLithiioInfo); this.tpLithiio.Controls.Add(this.lblLithiioApiKey); this.tpLithiio.Controls.Add(this.txtLithiioApiKey); this.tpLithiio.Controls.Add(this.lblLithiioUploadURL); @@ -3156,11 +3154,6 @@ private void InitializeComponent() this.btnLithiioGetAPIKey.UseVisualStyleBackColor = true; this.btnLithiioGetAPIKey.Click += new System.EventHandler(this.btnLithiioGetAPIKey_Click); // - // lblLithiioInfo - // - resources.ApplyResources(this.lblLithiioInfo, "lblLithiioInfo"); - this.lblLithiioInfo.Name = "lblLithiioInfo"; - // // lblLithiioApiKey // resources.ApplyResources(this.lblLithiioApiKey, "lblLithiioApiKey"); @@ -3584,6 +3577,13 @@ private void InitializeComponent() this.tpHastebin.Name = "tpHastebin"; this.tpHastebin.UseVisualStyleBackColor = true; // + // cbHastebinUseFileExtension + // + resources.ApplyResources(this.cbHastebinUseFileExtension, "cbHastebinUseFileExtension"); + this.cbHastebinUseFileExtension.Name = "cbHastebinUseFileExtension"; + this.cbHastebinUseFileExtension.UseVisualStyleBackColor = true; + this.cbHastebinUseFileExtension.CheckedChanged += new System.EventHandler(this.cbHastebinUseFileExtension_CheckedChanged); + // // txtHastebinSyntaxHighlighting // resources.ApplyResources(this.txtHastebinSyntaxHighlighting, "txtHastebinSyntaxHighlighting"); @@ -4259,13 +4259,6 @@ private void InitializeComponent() this.ttlvMain.MainTabControl = null; this.ttlvMain.Name = "ttlvMain"; // - // cbHastebinUseFileExtension - // - resources.ApplyResources(this.cbHastebinUseFileExtension, "cbHastebinUseFileExtension"); - this.cbHastebinUseFileExtension.Name = "cbHastebinUseFileExtension"; - this.cbHastebinUseFileExtension.UseVisualStyleBackColor = true; - this.cbHastebinUseFileExtension.CheckedChanged += new System.EventHandler(this.cbHastebinUseFileExtension_CheckedChanged); - // // atcImgurAccountType // resources.ApplyResources(this.atcImgurAccountType, "atcImgurAccountType"); @@ -4908,7 +4901,6 @@ private void InitializeComponent() private System.Windows.Forms.ComboBox cbLambdaUploadURL; private System.Windows.Forms.Label lblLithiioApiKey; private System.Windows.Forms.TextBox txtLithiioApiKey; - private System.Windows.Forms.Label lblLithiioInfo; private System.Windows.Forms.Label lblLithiioUploadURL; private System.Windows.Forms.ComboBox cbLithiioUploadURL; private OAuthControl oauthTwitter; diff --git a/ShareX.UploadersLib/Forms/UploadersConfigForm.resx b/ShareX.UploadersLib/Forms/UploadersConfigForm.resx index 77cb1c79d..09d0bc2bd 100644 --- a/ShareX.UploadersLib/Forms/UploadersConfigForm.resx +++ b/ShareX.UploadersLib/Forms/UploadersConfigForm.resx @@ -486,7 +486,7 @@ For example, if your bucket is called bucket.example.com then URL will be http:/ Twitter - @Invariant + tpTwitter @@ -513,7 +513,7 @@ For example, if your bucket is called bucket.example.com then URL will be http:/ ? - @Invariant + btnCustomUploaderRegexHelp @@ -696,7 +696,7 @@ For example, if your bucket is called bucket.example.com then URL will be http:/ Regex - @Invariant + tpCustomUploaderRegexParse @@ -753,7 +753,7 @@ For example, if your bucket is called bucket.example.com then URL will be http:/ ? - @Invariant + btnCustomUploadJsonPathHelp @@ -816,7 +816,7 @@ store.book[0].title JsonPath: - @Invariant + lblCustomUploaderJsonPath @@ -864,7 +864,7 @@ store.book[0].title JSON - @Invariant + tpCustomUploaderJsonParse @@ -921,7 +921,7 @@ store.book[0].title ? - @Invariant + btnCustomUploaderXPathHelp @@ -984,7 +984,7 @@ store.book[0].title XPath: - @Invariant + lblCustomUploaderXPath @@ -1032,7 +1032,7 @@ store.book[0].title XML - @Invariant + tpCustomUploaderXmlParse @@ -2340,7 +2340,7 @@ store.book[0].title - @Invariant + txtCustomUploaderLog @@ -2502,7 +2502,7 @@ store.book[0].title URL: - @Invariant + lblCustomUploaderURL @@ -2679,7 +2679,7 @@ store.book[0].title bit.ly - @Invariant + tpBitly @@ -2748,7 +2748,7 @@ store.book[0].title Google - @Invariant + tpGoogleURLShortener @@ -2982,7 +2982,7 @@ store.book[0].title API URL: - @Invariant + lblYourlsAPIURL @@ -3009,7 +3009,7 @@ store.book[0].title YOURLS - @Invariant + tpYourls @@ -3090,7 +3090,7 @@ store.book[0].title API UID: - @Invariant + lblAdflyAPIUID @@ -3168,7 +3168,7 @@ store.book[0].title adf.ly - @Invariant + tpAdFly @@ -3219,7 +3219,7 @@ store.book[0].title UUID: - @Invariant + lblCoinURLUUID @@ -3243,7 +3243,7 @@ store.book[0].title CoinURL - @Invariant + tpCoinURL @@ -3369,7 +3369,7 @@ store.book[0].title Polr - @Invariant + tpPolr @@ -3675,7 +3675,7 @@ store.book[0].title FTP - @Invariant + tpFTP @@ -4028,7 +4028,7 @@ store.book[0].title Dropbox - @Invariant + tpDropbox @@ -4160,7 +4160,7 @@ store.book[0].title OneDrive - @Invariant + tpOneDrive @@ -4412,7 +4412,7 @@ store.book[0].title Google Drive - @Invariant + tpGoogleDrive @@ -4706,7 +4706,7 @@ store.book[0].title puush - @Invariant + tpPuush @@ -4901,7 +4901,7 @@ store.book[0].title Box - @Invariant + tpBox @@ -5009,7 +5009,7 @@ store.book[0].title ... - @Invariant + btnAmazonS3BucketNameOpen @@ -5036,7 +5036,7 @@ store.book[0].title ... - @Invariant + btnAmazonS3AccessKeyOpen @@ -5318,7 +5318,7 @@ store.book[0].title Amazon S3 - @Invariant + tpAmazonS3 @@ -5636,7 +5636,7 @@ store.book[0].title Mega - @Invariant + tpMega @@ -5957,7 +5957,7 @@ store.book[0].title ownCloud - @Invariant + tpOwnCloud @@ -6170,7 +6170,7 @@ store.book[0].title MediaFire - @Invariant + tpMediaFire @@ -6332,7 +6332,7 @@ store.book[0].title Pushbullet - @Invariant + tpPushbullet @@ -6509,7 +6509,7 @@ store.book[0].title SendSpace - @Invariant + tpSendSpace @@ -6695,7 +6695,7 @@ store.book[0].title Ge.tt - @Invariant + tpGe_tt @@ -6854,7 +6854,7 @@ store.book[0].title Hostr - @Invariant + tpHostr @@ -7304,7 +7304,7 @@ store.book[0].title Minus - @Invariant + tpMinus @@ -7328,7 +7328,7 @@ store.book[0].title PROJECT- - @Invariant + txtJiraIssuePrefix @@ -7412,7 +7412,7 @@ store.book[0].title http:// - @Invariant + txtJiraHost @@ -7511,7 +7511,7 @@ store.book[0].title Atlassian Jira - @Invariant + tpJira @@ -7670,7 +7670,7 @@ store.book[0].title Lambda - @Invariant + tpLambda @@ -7880,7 +7880,7 @@ store.book[0].title Pomf - @Invariant + tpPomf @@ -8021,7 +8021,7 @@ store.book[0].title Up1 - @Invariant + tpUp1 @@ -8036,10 +8036,10 @@ store.book[0].title https://seacloud.cc/api2/ - @Invariant + https://cloud.mein-seafile.de/api2/ - @Invariant + 16, 32 @@ -8955,7 +8955,7 @@ Using an encrypted library disables sharing. API URL: - @Invariant + lblSeafileAPIURL @@ -8982,7 +8982,7 @@ Using an encrypted library disables sharing. Seafile - @Invariant + tpSeafile @@ -9183,7 +9183,7 @@ Using an encrypted library disables sharing. Streamable - @Invariant + tpStreamable @@ -9261,7 +9261,7 @@ Using an encrypted library disables sharing. s-ul - @Invariant + tpSul @@ -9278,10 +9278,10 @@ Using an encrypted library disables sharing. NoControl - 368, 55 + 368, 28 - 152, 23 + 152, 20 7 @@ -9301,36 +9301,6 @@ Using an encrypted library disables sharing. 0 - - True - - - NoControl - - - 13, 16 - - - 231, 13 - - - 0 - - - Leave the API key blank for anonymous usage. - - - lblLithiioInfo - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tpLithiio - - - 1 - True @@ -9338,7 +9308,7 @@ Using an encrypted library disables sharing. NoControl - 13, 40 + 15, 12 47, 13 @@ -9359,10 +9329,10 @@ Using an encrypted library disables sharing. tpLithiio - 2 + 1 - 16, 56 + 18, 28 344, 20 @@ -9380,7 +9350,7 @@ Using an encrypted library disables sharing. tpLithiio - 3 + 2 True @@ -9389,7 +9359,7 @@ Using an encrypted library disables sharing. NoControl - 13, 88 + 15, 60 55, 13 @@ -9410,10 +9380,10 @@ Using an encrypted library disables sharing. tpLithiio - 4 + 3 - 16, 104 + 18, 76 344, 21 @@ -9431,7 +9401,7 @@ Using an encrypted library disables sharing. tpLithiio - 5 + 4 4, 40 @@ -9447,7 +9417,7 @@ Using an encrypted library disables sharing. Lithiio - @Invariant + tpLithiio @@ -10590,7 +10560,7 @@ Using an encrypted library disables sharing. Pastebin - @Invariant + tpPastebin @@ -10668,7 +10638,7 @@ Using an encrypted library disables sharing. Paste.ee - @Invariant + tpPaste_ee @@ -10797,7 +10767,7 @@ Using an encrypted library disables sharing. GitHub Gist - @Invariant + tpGist @@ -10905,7 +10875,7 @@ Using an encrypted library disables sharing. uPaste - @Invariant + tpUpaste @@ -11064,7 +11034,7 @@ Using an encrypted library disables sharing. Hastebin - @Invariant + tpHastebin @@ -11193,7 +11163,7 @@ Using an encrypted library disables sharing. OneTimeSecret - @Invariant + tpOneTimeSecret @@ -11391,7 +11361,7 @@ Using an encrypted library disables sharing. ID - @Invariant + Title @@ -11520,7 +11490,7 @@ Using an encrypted library disables sharing. Imgur - @Invariant + tpImgur @@ -11760,7 +11730,7 @@ Using an encrypted library disables sharing. ImageShack - @Invariant + tpImageShack @@ -11964,7 +11934,7 @@ Using an encrypted library disables sharing. TinyPic - @Invariant + tpTinyPic @@ -12144,7 +12114,7 @@ Using an encrypted library disables sharing. Flickr - @Invariant + tpFlickr @@ -12636,7 +12606,7 @@ Using an encrypted library disables sharing. Photobucket - @Invariant + tpPhotobucket @@ -12702,7 +12672,7 @@ Using an encrypted library disables sharing. ID - @Invariant + 135 @@ -12804,7 +12774,7 @@ Using an encrypted library disables sharing. Google Photos (Picasa) - @Invariant + tpPicasa @@ -13074,7 +13044,7 @@ Using an encrypted library disables sharing. Chevereto - @Invariant + tpChevereto @@ -13182,7 +13152,7 @@ Using an encrypted library disables sharing. vgy.me - @Invariant + tpVgyme @@ -13326,7 +13296,7 @@ Using an encrypted library disables sharing. SomeImage - @Invariant + tpSomeImage diff --git a/ShareX.sln b/ShareX.sln index 5305eedf2..4c5b76d18 100644 --- a/ShareX.sln +++ b/ShareX.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 -VisualStudioVersion = 14.0.25123.0 +VisualStudioVersion = 14.0.25420.1 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ShareX", "ShareX\ShareX.csproj", "{C5AE4585-E9EC-4FA3-B75A-E1210635ACB6}" EndProject