mirror of
https://github.com/ShareX/ShareX.git
synced 2024-07-02 21:20:28 +12:00
Some fixes
This commit is contained in:
Matthew Burnett
parent
e55a2f2c1c
commit
0afee54b55
|
|
@ -172,10 +172,10 @@ private void InitializeComponent()
|
|||
this.lblPolrAPIHostname = new System.Windows.Forms.Label();
|
||||
this.tpFirebaseDynamicLinks = new System.Windows.Forms.TabPage();
|
||||
this.txtFirebaseWebAPIKey = new System.Windows.Forms.TextBox();
|
||||
this.label1 = new System.Windows.Forms.Label();
|
||||
this.lbFirebaseDomain = new System.Windows.Forms.Label();
|
||||
this.lblFirebaseDynamicDomain = new System.Windows.Forms.Label();
|
||||
this.lblFirebaseDomain = new System.Windows.Forms.Label();
|
||||
this.txtFirebaseDomain = new System.Windows.Forms.TextBox();
|
||||
this.lbFirebaseWebAPIKey = new System.Windows.Forms.Label();
|
||||
this.lblFirebaseWebAPIKey = new System.Windows.Forms.Label();
|
||||
this.cbFirebaseIsShort = new System.Windows.Forms.CheckBox();
|
||||
this.tpFileUploaders = new System.Windows.Forms.TabPage();
|
||||
this.tcFileUploaders = new System.Windows.Forms.TabControl();
|
||||
|
|
@ -1779,10 +1779,10 @@ private void InitializeComponent()
|
|||
// tpFirebaseDynamicLinks
|
||||
//
|
||||
this.tpFirebaseDynamicLinks.Controls.Add(this.txtFirebaseWebAPIKey);
|
||||
this.tpFirebaseDynamicLinks.Controls.Add(this.label1);
|
||||
this.tpFirebaseDynamicLinks.Controls.Add(this.lbFirebaseDomain);
|
||||
this.tpFirebaseDynamicLinks.Controls.Add(this.lblFirebaseDynamicDomain);
|
||||
this.tpFirebaseDynamicLinks.Controls.Add(this.lblFirebaseDomain);
|
||||
this.tpFirebaseDynamicLinks.Controls.Add(this.txtFirebaseDomain);
|
||||
this.tpFirebaseDynamicLinks.Controls.Add(this.lbFirebaseWebAPIKey);
|
||||
this.tpFirebaseDynamicLinks.Controls.Add(this.lblFirebaseWebAPIKey);
|
||||
this.tpFirebaseDynamicLinks.Controls.Add(this.cbFirebaseIsShort);
|
||||
resources.ApplyResources(this.tpFirebaseDynamicLinks, "tpFirebaseDynamicLinks");
|
||||
this.tpFirebaseDynamicLinks.Name = "tpFirebaseDynamicLinks";
|
||||
|
|
@ -1795,15 +1795,15 @@ private void InitializeComponent()
|
|||
this.txtFirebaseWebAPIKey.UseSystemPasswordChar = true;
|
||||
this.txtFirebaseWebAPIKey.TextChanged += new System.EventHandler(this.txtFirebaseWebAPIKey_TextChanged);
|
||||
//
|
||||
// label1
|
||||
// lblFirebaseDynamicDomain
|
||||
//
|
||||
resources.ApplyResources(this.label1, "label1");
|
||||
this.label1.Name = "label1";
|
||||
resources.ApplyResources(this.lblFirebaseDynamicDomain, "lblFirebaseDynamicDomain");
|
||||
this.lblFirebaseDynamicDomain.Name = "lblFirebaseDynamicDomain";
|
||||
//
|
||||
// lbFirebaseDomain
|
||||
// lblFirebaseDomain
|
||||
//
|
||||
resources.ApplyResources(this.lbFirebaseDomain, "lbFirebaseDomain");
|
||||
this.lbFirebaseDomain.Name = "lbFirebaseDomain";
|
||||
resources.ApplyResources(this.lblFirebaseDomain, "lblFirebaseDomain");
|
||||
this.lblFirebaseDomain.Name = "lblFirebaseDomain";
|
||||
//
|
||||
// txtFirebaseDomain
|
||||
//
|
||||
|
|
@ -1811,10 +1811,10 @@ private void InitializeComponent()
|
|||
this.txtFirebaseDomain.Name = "txtFirebaseDomain";
|
||||
this.txtFirebaseDomain.TextChanged += new System.EventHandler(this.txtFirebaseDomain_TextChanged);
|
||||
//
|
||||
// lbFirebaseWebAPIKey
|
||||
// lblFirebaseWebAPIKey
|
||||
//
|
||||
resources.ApplyResources(this.lbFirebaseWebAPIKey, "lbFirebaseWebAPIKey");
|
||||
this.lbFirebaseWebAPIKey.Name = "lbFirebaseWebAPIKey";
|
||||
resources.ApplyResources(this.lblFirebaseWebAPIKey, "lblFirebaseWebAPIKey");
|
||||
this.lblFirebaseWebAPIKey.Name = "lblFirebaseWebAPIKey";
|
||||
//
|
||||
// cbFirebaseIsShort
|
||||
//
|
||||
|
|
@ -5972,10 +5972,10 @@ private void InitializeComponent()
|
|||
private System.Windows.Forms.CheckBox cbOwnCloudUsePreviewLinks;
|
||||
internal System.Windows.Forms.TabPage tpFirebaseDynamicLinks;
|
||||
private System.Windows.Forms.CheckBox cbFirebaseIsShort;
|
||||
private System.Windows.Forms.Label lbFirebaseWebAPIKey;
|
||||
private System.Windows.Forms.Label lblFirebaseWebAPIKey;
|
||||
private System.Windows.Forms.TextBox txtFirebaseDomain;
|
||||
private System.Windows.Forms.Label label1;
|
||||
private System.Windows.Forms.Label lbFirebaseDomain;
|
||||
private System.Windows.Forms.Label lblFirebaseDynamicDomain;
|
||||
private System.Windows.Forms.Label lblFirebaseDomain;
|
||||
private System.Windows.Forms.TextBox txtFirebaseWebAPIKey;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3566,58 +3566,61 @@ store.book[0].title</value>
|
|||
<data name=">>txtFirebaseWebAPIKey.ZOrder" xml:space="preserve">
|
||||
<value>0</value>
|
||||
</data>
|
||||
<data name="label1.AutoSize" type="System.Boolean, mscorlib">
|
||||
<data name="lblFirebaseDynamicDomain.AutoSize" type="System.Boolean, mscorlib">
|
||||
<value>True</value>
|
||||
</data>
|
||||
<data name="label1.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<data name="lblFirebaseDynamicDomain.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
|
||||
<value>NoControl</value>
|
||||
</data>
|
||||
<data name="lblFirebaseDynamicDomain.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>69, 83</value>
|
||||
</data>
|
||||
<data name="label1.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<data name="lblFirebaseDynamicDomain.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>60, 13</value>
|
||||
</data>
|
||||
<data name="label1.TabIndex" type="System.Int32, mscorlib">
|
||||
<data name="lblFirebaseDynamicDomain.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>5</value>
|
||||
</data>
|
||||
<data name="label1.Text" xml:space="preserve">
|
||||
<data name="lblFirebaseDynamicDomain.Text" xml:space="preserve">
|
||||
<value>.app.goo.gl</value>
|
||||
</data>
|
||||
<data name=">>label1.Name" xml:space="preserve">
|
||||
<value>label1</value>
|
||||
<data name=">>lblFirebaseDynamicDomain.Name" xml:space="preserve">
|
||||
<value>lblFirebaseDynamicDomain</value>
|
||||
</data>
|
||||
<data name=">>label1.Type" xml:space="preserve">
|
||||
<data name=">>lblFirebaseDynamicDomain.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>label1.Parent" xml:space="preserve">
|
||||
<data name=">>lblFirebaseDynamicDomain.Parent" xml:space="preserve">
|
||||
<value>tpFirebaseDynamicLinks</value>
|
||||
</data>
|
||||
<data name=">>label1.ZOrder" xml:space="preserve">
|
||||
<data name=">>lblFirebaseDynamicDomain.ZOrder" xml:space="preserve">
|
||||
<value>1</value>
|
||||
</data>
|
||||
<data name="lbFirebaseDomain.AutoSize" type="System.Boolean, mscorlib">
|
||||
<data name="lblFirebaseDomain.AutoSize" type="System.Boolean, mscorlib">
|
||||
<value>True</value>
|
||||
</data>
|
||||
<data name="lbFirebaseDomain.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<data name="lblFirebaseDomain.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>15, 64</value>
|
||||
</data>
|
||||
<data name="lbFirebaseDomain.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<data name="lblFirebaseDomain.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>107, 13</value>
|
||||
</data>
|
||||
<data name="lbFirebaseDomain.TabIndex" type="System.Int32, mscorlib">
|
||||
<data name="lblFirebaseDomain.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>4</value>
|
||||
</data>
|
||||
<data name="lbFirebaseDomain.Text" xml:space="preserve">
|
||||
<data name="lblFirebaseDomain.Text" xml:space="preserve">
|
||||
<value>Dynamic link domain:</value>
|
||||
</data>
|
||||
<data name=">>lbFirebaseDomain.Name" xml:space="preserve">
|
||||
<value>lbFirebaseDomain</value>
|
||||
<data name=">>lblFirebaseDomain.Name" xml:space="preserve">
|
||||
<value>lblFirebaseDomain</value>
|
||||
</data>
|
||||
<data name=">>lbFirebaseDomain.Type" xml:space="preserve">
|
||||
<data name=">>lblFirebaseDomain.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>lbFirebaseDomain.Parent" xml:space="preserve">
|
||||
<data name=">>lblFirebaseDomain.Parent" xml:space="preserve">
|
||||
<value>tpFirebaseDynamicLinks</value>
|
||||
</data>
|
||||
<data name=">>lbFirebaseDomain.ZOrder" xml:space="preserve">
|
||||
<data name=">>lblFirebaseDomain.ZOrder" xml:space="preserve">
|
||||
<value>2</value>
|
||||
</data>
|
||||
<data name="txtFirebaseDomain.Location" type="System.Drawing.Point, System.Drawing">
|
||||
|
|
@ -3641,34 +3644,34 @@ store.book[0].title</value>
|
|||
<data name=">>txtFirebaseDomain.ZOrder" xml:space="preserve">
|
||||
<value>3</value>
|
||||
</data>
|
||||
<data name="lbFirebaseWebAPIKey.AutoSize" type="System.Boolean, mscorlib">
|
||||
<data name="lblFirebaseWebAPIKey.AutoSize" type="System.Boolean, mscorlib">
|
||||
<value>True</value>
|
||||
</data>
|
||||
<data name="lbFirebaseWebAPIKey.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
|
||||
<data name="lblFirebaseWebAPIKey.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
|
||||
<value>NoControl</value>
|
||||
</data>
|
||||
<data name="lbFirebaseWebAPIKey.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<data name="lblFirebaseWebAPIKey.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>15, 17</value>
|
||||
</data>
|
||||
<data name="lbFirebaseWebAPIKey.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<data name="lblFirebaseWebAPIKey.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>74, 13</value>
|
||||
</data>
|
||||
<data name="lbFirebaseWebAPIKey.TabIndex" type="System.Int32, mscorlib">
|
||||
<data name="lblFirebaseWebAPIKey.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>2</value>
|
||||
</data>
|
||||
<data name="lbFirebaseWebAPIKey.Text" xml:space="preserve">
|
||||
<data name="lblFirebaseWebAPIKey.Text" xml:space="preserve">
|
||||
<value>Web API Key:</value>
|
||||
</data>
|
||||
<data name=">>lbFirebaseWebAPIKey.Name" xml:space="preserve">
|
||||
<value>lbFirebaseWebAPIKey</value>
|
||||
<data name=">>lblFirebaseWebAPIKey.Name" xml:space="preserve">
|
||||
<value>lblFirebaseWebAPIKey</value>
|
||||
</data>
|
||||
<data name=">>lbFirebaseWebAPIKey.Type" xml:space="preserve">
|
||||
<data name=">>lblFirebaseWebAPIKey.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>lbFirebaseWebAPIKey.Parent" xml:space="preserve">
|
||||
<data name=">>lblFirebaseWebAPIKey.Parent" xml:space="preserve">
|
||||
<value>tpFirebaseDynamicLinks</value>
|
||||
</data>
|
||||
<data name=">>lbFirebaseWebAPIKey.ZOrder" xml:space="preserve">
|
||||
<data name=">>lblFirebaseWebAPIKey.ZOrder" xml:space="preserve">
|
||||
<value>4</value>
|
||||
</data>
|
||||
<data name="cbFirebaseIsShort.AutoSize" type="System.Boolean, mscorlib">
|
||||
|
|
@ -11955,7 +11958,7 @@ Using an encrypted library disables sharing.</value>
|
|||
<value>4, 4, 4, 4</value>
|
||||
</data>
|
||||
<data name="ucLocalhostAccounts.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>792, 3594</value>
|
||||
<value>792, 4113</value>
|
||||
</data>
|
||||
<data name="ucLocalhostAccounts.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>6</value>
|
||||
|
|
|
|||
|
|
@ -932,9 +932,6 @@
|
|||
<ItemGroup>
|
||||
<None Include="Favicons\Firebase.ico" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="Resources\Firebase.ico" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<PropertyGroup>
|
||||
<PreBuildEvent>cd $(ProjectDir)APIKeys\
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ public override URLShortener CreateShortener(UploadersConfig config, TaskReferen
|
|||
return new FirebaseDynamicLinksURLShortener
|
||||
{
|
||||
FirebaseWebAPIKey = config.FirebaseWebAPIKey,
|
||||
dynamicLinkDomain = config.FirebaseDynamicLinkDomain,
|
||||
DynamicLinkDomain = config.FirebaseDynamicLinkDomain,
|
||||
IsShort = config.FirebaseIsShort
|
||||
};
|
||||
}
|
||||
|
|
@ -29,20 +29,26 @@ public override URLShortener CreateShortener(UploadersConfig config, TaskReferen
|
|||
public override TabPage GetUploadersConfigTabPage(UploadersConfigForm form) => form.tpFirebaseDynamicLinks;
|
||||
}
|
||||
|
||||
public class FirebaseDynamicLinksURLShortenerServiceResponse
|
||||
{
|
||||
public string shortLink { get; set; }
|
||||
public string previewLink { get; set; }
|
||||
}
|
||||
|
||||
public sealed class FirebaseDynamicLinksURLShortener : URLShortener
|
||||
{
|
||||
public string FirebaseWebAPIKey { get; set; }
|
||||
public string dynamicLinkDomain { get; set; }
|
||||
public string DynamicLinkDomain { get; set; }
|
||||
public bool IsShort { get; set; }
|
||||
private string option;
|
||||
private string requesturl = "https://firebasedynamiclinks.googleapis.com/v1/shortLinks?key=";
|
||||
private string RequestUrl = "https://firebasedynamiclinks.googleapis.com/v1/shortLinks?key=";
|
||||
|
||||
public override UploadResult ShortenURL(string url)
|
||||
{
|
||||
UploadResult result = new UploadResult { URL = url };
|
||||
|
||||
string apiurl = requesturl + FirebaseWebAPIKey;
|
||||
string longDynamicLink = BrowserProtocol.https + dynamicLinkDomain + ".app.goo.gl/?link=" + url;
|
||||
RequestUrl = RequestUrl + FirebaseWebAPIKey;
|
||||
string longDynamicLink = BrowserProtocol.https + DynamicLinkDomain + ".app.goo.gl/?link=" + url;
|
||||
|
||||
if (IsShort)
|
||||
{
|
||||
|
|
@ -64,8 +70,8 @@ public override UploadResult ShortenURL(string url)
|
|||
};
|
||||
|
||||
string json = JsonConvert.SerializeObject(FDLObject);
|
||||
string response = SendRequest(HttpMethod.POST, apiurl, json, ContentTypeJSON);
|
||||
result.ShortenedURL = Helpers.ParseJSON(response, "shortLink");
|
||||
string response = SendRequest(HttpMethod.POST, RequestUrl, json, ContentTypeJSON);
|
||||
result.ShortenedURL = JsonConvert.DeserializeObject<FirebaseDynamicLinksURLShortenerServiceResponse>(response).shortLink;
|
||||
|
||||
return result;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue