From e9470242ebe56e27c5fd1000f25b8a080e1784c9 Mon Sep 17 00:00:00 2001 From: Alex Tusinean Date: Tue, 8 Jun 2021 11:00:46 +0300 Subject: [PATCH 1/2] this wasn't really needed but --- FModel/ViewModels/ApiEndpoints/FModelApi.cs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/FModel/ViewModels/ApiEndpoints/FModelApi.cs b/FModel/ViewModels/ApiEndpoints/FModelApi.cs index 5ba50e5a..5e6fa2c3 100644 --- a/FModel/ViewModels/ApiEndpoints/FModelApi.cs +++ b/FModel/ViewModels/ApiEndpoints/FModelApi.cs @@ -13,6 +13,7 @@ using MessageBox = AdonisUI.Controls.MessageBox; using MessageBoxButton = AdonisUI.Controls.MessageBoxButton; using MessageBoxImage = AdonisUI.Controls.MessageBoxImage; using MessageBoxResult = AdonisUI.Controls.MessageBoxResult; +using FModel.Settings; namespace FModel.ViewModels.ApiEndpoints { @@ -109,11 +110,14 @@ namespace FModel.ViewModels.ApiEndpoints { if (args != null) { - if (new Version(args.CurrentVersion) == args.InstalledVersion) return; + Version currentVersion = new Version(args.CurrentVersion); + if (currentVersion == args.InstalledVersion) return; + + bool downgrade = currentVersion < args.InstalledVersion; var messageBox = new MessageBoxModel { - Text = $"FModel {args.CurrentVersion} is available. You are using version {args.InstalledVersion}. Do you want to update the application now?", - Caption = "Update Available", + Text = $"The latest version of FModel {UserSettings.Default.UpdateMode} is {args.CurrentVersion}. You are using version {args.InstalledVersion}. Do you want to {(downgrade ? "downgrade" : "update")} the application now?", + Caption = $"{(downgrade ? "Downgrade" : "Update")} Available", Icon = MessageBoxImage.Question, Buttons = MessageBoxButtons.YesNo(), IsSoundEnabled = false From 95d013e95e2a106e04e2157690b634376115f23b Mon Sep 17 00:00:00 2001 From: Alex Tusinean Date: Tue, 8 Jun 2021 11:03:30 +0300 Subject: [PATCH 2/2] move import --- FModel/ViewModels/ApiEndpoints/FModelApi.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FModel/ViewModels/ApiEndpoints/FModelApi.cs b/FModel/ViewModels/ApiEndpoints/FModelApi.cs index 5e6fa2c3..e80267dd 100644 --- a/FModel/ViewModels/ApiEndpoints/FModelApi.cs +++ b/FModel/ViewModels/ApiEndpoints/FModelApi.cs @@ -5,6 +5,7 @@ using System.Threading; using System.Threading.Tasks; using System.Windows; using AutoUpdaterDotNET; +using FModel.Settings; using FModel.ViewModels.ApiEndpoints.Models; using Newtonsoft.Json; using RestSharp; @@ -13,7 +14,6 @@ using MessageBox = AdonisUI.Controls.MessageBox; using MessageBoxButton = AdonisUI.Controls.MessageBoxButton; using MessageBoxImage = AdonisUI.Controls.MessageBoxImage; using MessageBoxResult = AdonisUI.Controls.MessageBoxResult; -using FModel.Settings; namespace FModel.ViewModels.ApiEndpoints {