Fixed issue #1, slightly simplified IsUpdateCheckEnabled, removed unn…

…ecessary replace
BitesizedLion · Dec 21, 2022 · fe05484 · fe05484
1 parent 5f07edf
commit fe05484
Show file tree

Hide file tree

Showing 6 changed files with 53 additions and 57 deletions.
diff --git a/App.config b/App.config
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
     </startup>
-</configuration>
+</configuration>
diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
@@ -32,5 +32,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("1.1.2.3")]
-[assembly: AssemblyFileVersion("1.1.2.3")]
+[assembly: AssemblyVersion("1.1.3.4")]
+[assembly: AssemblyFileVersion("1.1.3.4")]
diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs
diff --git a/Properties/Settings.Designer.cs b/Properties/Settings.Designer.cs
diff --git a/TidalRPC.csproj b/TidalRPC.csproj
@@ -8,7 +8,7 @@
     <OutputType>WinExe</OutputType>
     <RootNamespace>TidalRPC</RootNamespace>
     <AssemblyName>TidalRPC</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Deterministic>true</Deterministic>
@@ -27,6 +27,8 @@
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
+    <TargetFrameworkProfile />
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -85,6 +87,7 @@
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DependentUpon>Resources.resx</DependentUpon>
+      <DesignTime>True</DesignTime>
     </Compile>
     <None Include="packages.config" />
     <None Include="Properties\Settings.settings">

diff --git a/UpdateManager.cs b/UpdateManager.cs
@@ -11,24 +11,24 @@ namespace TidalRPC
 {
     public static class UpdateManager
     {
-        static bool updateDenied = false;
+        private static bool updateDenied = false;
+        private static bool updatePrompted = false;
 
         // Method for checking if update checking is enabled
         public static bool IsUpdateCheckEnabled()
         {
             string keyName = "SOFTWARE\\TidalRPC\\Settings";
             string valueName = "CheckForUpdates";
 
-            using (RegistryKey key = Registry.CurrentUser.OpenSubKey(keyName))
-            {
-                if (key == null)
-                {
-                    ToggleUpdateCheck(true);
-                    return true;
-                }
+            using RegistryKey key = Registry.CurrentUser.OpenSubKey(keyName);
 
-                return (int)key.GetValue(valueName, 0) != 0;
+            if (key == null)
+            {
+                ToggleUpdateCheck(true);
+                return true;
             }
+
+            return (int)key.GetValue(valueName, 0) != 0;
         }
 
         // Method for toggling update checking
@@ -58,31 +58,36 @@ public static async Task CheckForUpdates()
 
             while (!updateDenied)
             {
-                if (!IsUpdateCheckEnabled()) return;
+                if (!IsUpdateCheckEnabled() || updatePrompted) return;
 
                 // Fetch the latest release information from the GitHub API
                 HttpResponseMessage response = await client.GetAsync("https://api.github.com/repos/BitesizedLion/TidalRPC/releases/latest");
 
                 if (response.IsSuccessStatusCode)
                 {
                     string json = await response.Content.ReadAsStringAsync();
-                    dynamic release = JsonConvert.DeserializeObject(json);
-                    Version latestVersion = new Version(((string)release.tag_name).Replace("v", ""));
+                    dynamic release = JsonConvert.DeserializeObject(json); // i know this is bad, it will be improved later
+
+                    Version latestVersion = new Version(((string)release.tag_name));
 
                     // Compare the version numbers
                     if (latestVersion > currentVersion)
                     {
                         // Prompt the user to update
                         DialogResult result = MessageBox.Show("A new version of the software is available. Do you want to download it?", "Update Available", MessageBoxButtons.YesNo);
 
+                        updatePrompted = true;
+
                         switch (result)
                         {
                             case DialogResult.Yes:
                                 Process.Start((string)release.html_url); // Open the download URL in the default web browser
+                                updatePrompted = false;
                                 break;
 
                             case DialogResult.No:
                                 updateDenied = true;
+                                updatePrompted = false;
                                 break;
 
                         }