[Fixed + Bump] Licensing issues in Windows app

KaustubhPatange · Dec 2, 2022 · d202a55 · d202a55
1 parent ea60458
commit d202a55
Show file tree

Hide file tree

Showing 10 changed files with 35 additions and 9 deletions.
diff --git a/XClipper.App/Data/helpers/AppException.cs b/XClipper.App/Data/helpers/AppException.cs
@@ -162,6 +162,7 @@ private async Task SendReport(string sender, string content)
                 .Append("&category=0"); // 0 means Desktop
             var client = new RestClient();
             var request = new RestRequest(queryBuilder.ToString(), Method.POST);
+            request.AddHeaders(COMMON_HEADERS());
             request.AddParameter("text/plain", content, ParameterType.RequestBody);
             await client.ExecuteTaskAsync(request).ConfigureAwait(false);
         }

diff --git a/XClipper.App/Properties/AssemblyInfo.cs b/XClipper.App/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.1.5.7")]
-[assembly: AssemblyFileVersion("0.1.5.7")]
+[assembly: AssemblyVersion("0.1.5.8")]
+[assembly: AssemblyFileVersion("0.1.5.8")]
diff --git a/XClipper.App/ViewModel/BuyViewModel.cs b/XClipper.App/ViewModel/BuyViewModel.cs
@@ -68,7 +68,7 @@ private async void MigrationMethod()
             IsProgressiveWork = true;
 
             var client = new RestClient(MIGRATION_SERVER(UID, MTI, DOP.ToFormattedDate()));
-            var response = await client.ExecuteTaskAsync(new RestRequest(Method.POST)).ConfigureAwait(true);
+            var response = await client.ExecuteTaskAsync(new RestRequest(Method.POST).AddHeaders(COMMON_HEADERS())).ConfigureAwait(true);
             if (response.StatusCode != System.Net.HttpStatusCode.NotFound)
             {
                 var obj = JObject.Parse(response.Content);
@@ -121,7 +121,7 @@ private async void ActivationMethod()
             IsProgressiveWork = true;
 
             var client = new RestClient(ACTIVATION_SERVER(UID, EM, TI, LT.GetName()));
-            var response = await client.ExecuteTaskAsync(new RestRequest(Method.POST)).ConfigureAwait(true);
+            var response = await client.ExecuteTaskAsync(new RestRequest(Method.POST).AddHeaders(COMMON_HEADERS())).ConfigureAwait(true);
             try {
                 var obj = JObject.Parse(response.Content);
                 if (response.StatusCode == System.Net.HttpStatusCode.OK)

diff --git a/XClipper.Core/Data/Extensions/RestClientExtensions.cs b/XClipper.Core/Data/Extensions/RestClientExtensions.cs
@@ -0,0 +1,22 @@
+using RestSharp;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Components
+{
+    public static class RestClientExtensions
+    {
+        public static RestRequest AddHeaders(this RestRequest request, Dictionary<string, string> headers)
+        {
+            foreach (var header in headers)
+            {
+                request.AddHeader(header.Key, header.Value);
+            }
+            return request;
+        }
+    }
+}
diff --git a/XClipper.Core/XClipper.Core.csproj b/XClipper.Core/XClipper.Core.csproj
@@ -55,6 +55,9 @@
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
+    <Reference Include="RestSharp, Version=104.4.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\RestSharp.104.4.0\lib\net4\RestSharp.dll</HintPath>
+    </Reference>
     <Reference Include="SQLite-net, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\sqlite-net-sqlcipher.1.6.292\lib\netstandard1.1\SQLite-net.dll</HintPath>
     </Reference>
@@ -113,6 +116,7 @@
     <Compile Include="Data\Extensions\GenericExtensions.cs" />
     <Compile Include="Data\Extensions\Misc\AuthEventArgs.cs" />
     <Compile Include="Data\Extensions\Misc\AuthManager.cs" />
+    <Compile Include="Data\Extensions\RestClientExtensions.cs" />
     <Compile Include="Data\Extensions\ScrollViewerExtensions.cs" />
     <Compile Include="Data\Extensions\TypeSpecific\CollectionExtensions.cs" />
     <Compile Include="Data\Extensions\TypeSpecific\IntegerExtensions.cs" />

diff --git a/XClipper.Core/packages.config b/XClipper.Core/packages.config
@@ -7,6 +7,7 @@
   <package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net45" />
   <package id="NotificationsExtensions.Win10" version="14332.0.2" targetFramework="net45" />
+  <package id="RestSharp" version="104.4.0" targetFramework="net45" />
   <package id="SQLite.Net.Core-PCL" version="3.1.1" targetFramework="net45" />
   <package id="SQLite.Net-PCL" version="3.1.1" targetFramework="net45" />
   <package id="SQLiteNetExtensions" version="2.1.0" targetFramework="net45" />

diff --git a/XClipper.Web/js/purchase.min.js b/XClipper.Web/js/purchase.min.js
diff --git a/docs/wiki b/docs/wiki
diff --git a/scripts/changes.txt b/scripts/changes.txt
@@ -1,6 +1,4 @@
 ## What's new in version v0.1.x.x? 
 <!-- Loaded from scripts\changes.txt -->
 <!-- Make sure you update version number in XClipper.sln for this new release -->
-- Added: "Tools" section in Firebase Configuration window where user can export, import & delete all the data on Firebase.
-- Improved: Proper message when activating license fails.
-- Fixed: Incorrect exception reporting data handling.
+- Fixed: Licensing issues.
diff --git a/scripts/csproj.tar.gz b/scripts/csproj.tar.gz