From 10392e9f9680dd8d85dacd68d68410d5c1a8d1a0 Mon Sep 17 00:00:00 2001
From: tuxuser <462620+tuxuser@users.noreply.github.com>
Date: Fri, 20 Jun 2025 02:08:21 +0200
Subject: [PATCH] feat: Trim config.json file (remove App/Fw Update URLs)

---
 PostCodeSerialMonitor/Models/AppConfiguration.cs       | 10 +---------
 PostCodeSerialMonitor/ServiceCollectionExtensions.cs   |  2 +-
 .../ViewModels/ConfigurationDialogViewModel.cs         | 10 ----------
 PostCodeSerialMonitor/Views/ConfigurationDialog.axaml  |  8 +-------
 PostCodeSerialMonitor/config.json                      |  4 +---
 5 files changed, 4 insertions(+), 30 deletions(-)

diff --git a/PostCodeSerialMonitor/Models/AppConfiguration.cs b/PostCodeSerialMonitor/Models/AppConfiguration.cs
index 2642e02..1986d01 100644
--- a/PostCodeSerialMonitor/Models/AppConfiguration.cs
+++ b/PostCodeSerialMonitor/Models/AppConfiguration.cs
@@ -7,24 +7,16 @@ public class AppConfiguration
 {
     [Required]
     [Range(1, int.MaxValue)]
-    public int FormatVersion { get; set; } = 1;
+    public int FormatVersion { get; set; } = 2;
 
     public bool CheckForAppUpdates { get; set; } = true;
     public bool CheckForCodeUpdates { get; set; } = true;
     public bool CheckForFwUpdates { get; set; } = true;
 
-    [Required]
-    [Url]
-    public Uri AppUpdateUrl { get; set; } = new Uri("https://example.com/todo");
-
     [Required]
     [Url]
     public Uri CodesMetaBaseUrl { get; set; } = new Uri("https://errors.xboxresearch.com");
 
-    [Required]
-    [Url]
-    public Uri FwUpdateUrl { get; set; } = new Uri("https://example.com/todo");
-
     [Required]
     public string Language { get; set; } = "en-US";
 
diff --git a/PostCodeSerialMonitor/ServiceCollectionExtensions.cs b/PostCodeSerialMonitor/ServiceCollectionExtensions.cs
index adaea03..e0ebd5a 100644
--- a/PostCodeSerialMonitor/ServiceCollectionExtensions.cs
+++ b/PostCodeSerialMonitor/ServiceCollectionExtensions.cs
@@ -12,7 +12,7 @@ namespace PostCodeSerialMonitor;
 
 public static class ServiceCollectionExtensions
 {
-    const int SUPPORTED_CONFIG_FORMAT_VERSION = 1;
+    const int SUPPORTED_CONFIG_FORMAT_VERSION = 2;
     public static void AddCommonServices(this IServiceCollection collection)
     {
         // Configure logging
diff --git a/PostCodeSerialMonitor/ViewModels/ConfigurationDialogViewModel.cs b/PostCodeSerialMonitor/ViewModels/ConfigurationDialogViewModel.cs
index a29dd6b..f94b827 100644
--- a/PostCodeSerialMonitor/ViewModels/ConfigurationDialogViewModel.cs
+++ b/PostCodeSerialMonitor/ViewModels/ConfigurationDialogViewModel.cs
@@ -28,15 +28,9 @@ public partial class ConfigurationDialogViewModel : ViewModelBase
     [ObservableProperty]
     private bool checkForFwUpdates;
 
-    [ObservableProperty]
-    private string appUpdateUrl;
-
     [ObservableProperty]
     private string codesMetaBaseUrl;
 
-    [ObservableProperty]
-    private string fwUpdateUrl;
-
     [ObservableProperty]
     private ObservableCollection<string> languages;
 
@@ -61,9 +55,7 @@ public ConfigurationDialogViewModel(ConfigurationService configurationService)
         CheckForAppUpdates = _originalConfiguration.CheckForAppUpdates;
         CheckForCodeUpdates = _originalConfiguration.CheckForCodeUpdates;
         CheckForFwUpdates = _originalConfiguration.CheckForFwUpdates;
-        AppUpdateUrl = _originalConfiguration.AppUpdateUrl.ToString();
         CodesMetaBaseUrl = _originalConfiguration.CodesMetaBaseUrl.ToString();
-        FwUpdateUrl = _originalConfiguration.FwUpdateUrl.ToString();
         SelectedLanguage = _originalConfiguration.Language;
 
         //Add available languages
@@ -80,9 +72,7 @@ await _configurationService.UpdateConfigurationAsync(config =>
             config.CheckForAppUpdates = CheckForAppUpdates;
             config.CheckForCodeUpdates = CheckForCodeUpdates;
             config.CheckForFwUpdates = CheckForFwUpdates;
-            config.AppUpdateUrl = new Uri(AppUpdateUrl);
             config.CodesMetaBaseUrl = new Uri(CodesMetaBaseUrl);
-            config.FwUpdateUrl = new Uri(FwUpdateUrl);
             config.Language = SelectedLanguage;
         });
 
diff --git a/PostCodeSerialMonitor/Views/ConfigurationDialog.axaml b/PostCodeSerialMonitor/Views/ConfigurationDialog.axaml
index cbf25a0..d8ea325 100644
--- a/PostCodeSerialMonitor/Views/ConfigurationDialog.axaml
+++ b/PostCodeSerialMonitor/Views/ConfigurationDialog.axaml
@@ -23,10 +23,7 @@
 
                 <CheckBox Content="{x:Static assets:Resources.CheckApplicationUpdates}" 
                           IsChecked="{Binding CheckForAppUpdates}"/>
-                <TextBox Text="{Binding AppUpdateUrl}" 
-                         Watermark="{x:Static assets:Resources.ApplicationUpdateUrl}"
-                         IsEnabled="{Binding CheckForAppUpdates}"/>
-                
+
                 <CheckBox Content="{x:Static assets:Resources.CheckCodeUpdates}" 
                           IsChecked="{Binding CheckForCodeUpdates}"
                           Margin="0,10,0,0"/>
@@ -37,9 +34,6 @@
                 <CheckBox Content="{x:Static assets:Resources.CheckFirmwareUpdates}" 
                           IsChecked="{Binding CheckForFwUpdates}"
                           Margin="0,10,0,0"/>
-                <TextBox Text="{Binding FwUpdateUrl}" 
-                         Watermark="{x:Static assets:Resources.FirmwareUpdateUrl}"
-                         IsEnabled="{Binding CheckForFwUpdates}"/>
             </StackPanel>
         </ScrollViewer>
 
diff --git a/PostCodeSerialMonitor/config.json b/PostCodeSerialMonitor/config.json
index 6d73cf6..39c9fb8 100644
--- a/PostCodeSerialMonitor/config.json
+++ b/PostCodeSerialMonitor/config.json
@@ -1,12 +1,10 @@
 {
   "AppConfiguration": {
-    "FormatVersion": 1,
+    "FormatVersion": 2,
     "CheckForAppUpdates": true,
     "CheckForCodeUpdates": true,
     "CheckForFwUpdates": true,
-    "AppUpdateUrl": "https://example.com/todo",
     "CodesMetaBaseUrl": "https://errors.xboxresearch.com/",
-    "FwUpdateUrl": "https://example.com/todo",
     "MetaStoragePath": "meta",
     "Language": "en-US",
     "MetaJsonUrl": "https://errors.xboxresearch.com/meta.json"