Merge pull request #3439 from matthewburnett/fdl-update

Removed hardcoded app.goo.gl domain to support new domain format

ShareX.UploadersLib/Forms/UploadersConfigForm.Designer.cs

@@ -166,7 +166,6 @@ private void InitializeComponent()
             this.lblPolrAPIHostname = new System.Windows.Forms.Label();
             this.tpFirebaseDynamicLinks = new System.Windows.Forms.TabPage();
             this.cbFirebaseIsShort = new System.Windows.Forms.CheckBox();
-            this.lblFirebaseDomain = new System.Windows.Forms.Label();
             this.txtFirebaseDomain = new System.Windows.Forms.TextBox();
             this.txtFirebaseWebAPIKey = new System.Windows.Forms.TextBox();
             this.lblFirebaseWebAPIKey = new System.Windows.Forms.Label();
@@ -648,6 +647,7 @@ private void InitializeComponent()
             this.lblWidthHint = new System.Windows.Forms.Label();
             this.ttlvMain = new ShareX.HelpersLib.TabToListView();
             this.actRapidShareAccountType = new ShareX.UploadersLib.AccountTypeControl();
+            this.lblFirebaseDomain = new System.Windows.Forms.Label();
             this.tpOtherUploaders.SuspendLayout();
             this.tcOtherUploaders.SuspendLayout();
             this.tpTwitter.SuspendLayout();
@@ -1743,8 +1743,8 @@ private void InitializeComponent()
             // 
             // tpFirebaseDynamicLinks
             // 
-            this.tpFirebaseDynamicLinks.Controls.Add(this.cbFirebaseIsShort);
             this.tpFirebaseDynamicLinks.Controls.Add(this.lblFirebaseDomain);
+            this.tpFirebaseDynamicLinks.Controls.Add(this.cbFirebaseIsShort);
             this.tpFirebaseDynamicLinks.Controls.Add(this.txtFirebaseDomain);
             this.tpFirebaseDynamicLinks.Controls.Add(this.txtFirebaseWebAPIKey);
             this.tpFirebaseDynamicLinks.Controls.Add(this.lblFirebaseWebAPIKey);
@@ -1759,11 +1759,6 @@ private void InitializeComponent()
             this.cbFirebaseIsShort.UseVisualStyleBackColor = true;
             this.cbFirebaseIsShort.CheckedChanged += new System.EventHandler(this.cbFirebaseIsShort_CheckedChanged);
             // 
-            // lblFirebaseDomain
-            // 
-            resources.ApplyResources(this.lblFirebaseDomain, "lblFirebaseDomain");
-            this.lblFirebaseDomain.Name = "lblFirebaseDomain";
-            // 
             // txtFirebaseDomain
             // 
             resources.ApplyResources(this.txtFirebaseDomain, "txtFirebaseDomain");
@@ -5285,6 +5280,11 @@ private void InitializeComponent()
             this.actRapidShareAccountType.Name = "actRapidShareAccountType";
             this.actRapidShareAccountType.SelectedAccountType = ShareX.UploadersLib.AccountType.Anonymous;
             // 
+            // lblFirebaseDomain
+            // 
+            resources.ApplyResources(this.lblFirebaseDomain, "lblFirebaseDomain");
+            this.lblFirebaseDomain.Name = "lblFirebaseDomain";
+            // 
             // UploadersConfigForm
             // 
             resources.ApplyResources(this, "$this");
@@ -6059,7 +6059,6 @@ 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 lblFirebaseDomain;
         private System.Windows.Forms.TextBox txtFirebaseDomain;
         private System.Windows.Forms.TextBox txtFirebaseWebAPIKey;
         private System.Windows.Forms.Label lblFirebaseWebAPIKey;
@@ -6083,5 +6082,6 @@ private void InitializeComponent()
         private System.Windows.Forms.ListBox lbSharedFolderAccounts;
         private System.Windows.Forms.Label lblGoogleCloudStoragePathPreviewLabel;
         private System.Windows.Forms.Label lblGoogleCloudStoragePathPreview;
+        private System.Windows.Forms.Label lblFirebaseDomain;
     }
 }

ShareX.UploadersLib/Forms/UploadersConfigForm.resx

@@ -3401,6 +3401,33 @@ store.book[0].title</value>
   <data name="&gt;&gt;tpPolr.ZOrder" xml:space="preserve">
     <value>3</value>
   </data>
+  <data name="lblFirebaseDomain.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="lblFirebaseDomain.Location" type="System.Drawing.Point, System.Drawing">
+    <value>13, 55</value>
+  </data>
+  <data name="lblFirebaseDomain.Size" type="System.Drawing.Size, System.Drawing">
+    <value>46, 13</value>
+  </data>
+  <data name="lblFirebaseDomain.TabIndex" type="System.Int32, mscorlib">
+    <value>5</value>
+  </data>
+  <data name="lblFirebaseDomain.Text" xml:space="preserve">
+    <value>Domain:</value>
+  </data>
+  <data name="&gt;&gt;lblFirebaseDomain.Name" xml:space="preserve">
+    <value>lblFirebaseDomain</value>
+  </data>
+  <data name="&gt;&gt;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="&gt;&gt;lblFirebaseDomain.Parent" xml:space="preserve">
+    <value>tpFirebaseDynamicLinks</value>
+  </data>
+  <data name="&gt;&gt;lblFirebaseDomain.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
   <data name="cbFirebaseIsShort.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
@@ -3408,7 +3435,7 @@ store.book[0].title</value>
     <value>NoControl</value>
   </data>
   <data name="cbFirebaseIsShort.Location" type="System.Drawing.Point, System.Drawing">
-    <value>16, 85</value>
+    <value>16, 97</value>
   </data>
   <data name="cbFirebaseIsShort.Size" type="System.Drawing.Size, System.Drawing">
     <value>70, 17</value>
@@ -3429,43 +3456,13 @@ store.book[0].title</value>
     <value>tpFirebaseDynamicLinks</value>
   </data>
   <data name="&gt;&gt;cbFirebaseIsShort.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="lblFirebaseDomain.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="lblFirebaseDomain.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
-  <data name="lblFirebaseDomain.Location" type="System.Drawing.Point, System.Drawing">
-    <value>62, 61</value>
-  </data>
-  <data name="lblFirebaseDomain.Size" type="System.Drawing.Size, System.Drawing">
-    <value>60, 13</value>
-  </data>
-  <data name="lblFirebaseDomain.TabIndex" type="System.Int32, mscorlib">
-    <value>3</value>
-  </data>
-  <data name="lblFirebaseDomain.Text" xml:space="preserve">
-    <value>.app.goo.gl</value>
-  </data>
-  <data name="&gt;&gt;lblFirebaseDomain.Name" xml:space="preserve">
-    <value>lblFirebaseDomain</value>
-  </data>
-  <data name="&gt;&gt;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="&gt;&gt;lblFirebaseDomain.Parent" xml:space="preserve">
-    <value>tpFirebaseDynamicLinks</value>
-  </data>
-  <data name="&gt;&gt;lblFirebaseDomain.ZOrder" xml:space="preserve">
     <value>1</value>
   </data>
   <data name="txtFirebaseDomain.Location" type="System.Drawing.Point, System.Drawing">
-    <value>16, 58</value>
+    <value>16, 71</value>
   </data>
   <data name="txtFirebaseDomain.Size" type="System.Drawing.Size, System.Drawing">
-    <value>40, 20</value>
+    <value>120, 20</value>
   </data>
   <data name="txtFirebaseDomain.TabIndex" type="System.Int32, mscorlib">
     <value>2</value>
@@ -3540,7 +3537,7 @@ store.book[0].title</value>
     <value>3, 3, 3, 3</value>
   </data>
   <data name="tpFirebaseDynamicLinks.Size" type="System.Drawing.Size, System.Drawing">
-    <value>178, 42</value>
+    <value>972, 537</value>
   </data>
   <data name="tpFirebaseDynamicLinks.TabIndex" type="System.Int32, mscorlib">
     <value>7</value>

ShareX.UploadersLib/URLShorteners/FirebaseDynamicLinksURLShortener.cs

@@ -94,7 +94,7 @@ public override UploadResult ShortenURL(string url)
             {
                 dynamicLinkInfo = new DynamicLinkInfo
                 {
-                    dynamicLinkDomain = DynamicLinkDomain + ".app.goo.gl",
+                    dynamicLinkDomain = DynamicLinkDomain,
                     link = url
                 }
             };