From d480fd9a258b4514e2852f5eeead7239faf73eb7 Mon Sep 17 00:00:00 2001
From: Miepee <38186597+Miepee@users.noreply.github.com>
Date: Wed, 5 Jan 2022 12:33:15 +0100
Subject: [PATCH] Version bump, add de+it git text, improve
 isCurrentVersionOutdated detection

---
 AM2RLauncher/AM2RLauncher/Language/Text.de.resx |  3 +++
 AM2RLauncher/AM2RLauncher/Language/Text.es.resx |  2 +-
 AM2RLauncher/AM2RLauncher/Language/Text.it.resx |  3 +++
 AM2RLauncher/AM2RLauncher/LauncherUpdater.cs    | 12 +++++++++---
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/AM2RLauncher/AM2RLauncher/Language/Text.de.resx b/AM2RLauncher/AM2RLauncher/Language/Text.de.resx
index f031bc0..55d9f05 100644
--- a/AM2RLauncher/AM2RLauncher/Language/Text.de.resx
+++ b/AM2RLauncher/AM2RLauncher/Language/Text.de.resx
@@ -219,6 +219,9 @@
   <data name="InternetConnectionDrop" xml:space="preserve">
     <value>Internetverbindung konnte nicht hergestellt werden! Bitte später erneut versuchen!</value>
   </data>
+  <data name="InvalidGitURL" xml:space="preserve">
+    <value>$NAME ist eine ungültige git URL!</value>
+  </data>
   <data name="JavaNotFound" xml:space="preserve">
     <value>Java wurde nicht gefunden! Ohne installiertes Java kann keine APK erstellt werden. Bitte sicherstellen das Java installiert, und in der PATH Systemvariable eingetragen ist.</value>
   </data>
diff --git a/AM2RLauncher/AM2RLauncher/Language/Text.es.resx b/AM2RLauncher/AM2RLauncher/Language/Text.es.resx
index fca2118..5f58a73 100644
--- a/AM2RLauncher/AM2RLauncher/Language/Text.es.resx
+++ b/AM2RLauncher/AM2RLauncher/Language/Text.es.resx
@@ -220,7 +220,7 @@
     <value>¡No se puede establecer conexión a internet! ¡Reinténtalo más tarde!</value>
   </data>
   <data name="InvalidGitURL" xml:space="preserve">
-    <value>$NAME es un enlace de Git no válido</value>
+    <value>$NAME es un enlace de Git no válido!</value>
   </data>
   <data name="JavaNotFound" xml:space="preserve">
     <value>¡Java no encontrado! No se puede generar un APK sin Java instalado. Por favor asegúrate de tener Java instalado y añadido a PATH</value>
diff --git a/AM2RLauncher/AM2RLauncher/Language/Text.it.resx b/AM2RLauncher/AM2RLauncher/Language/Text.it.resx
index 9c4538c..6e2c5df 100644
--- a/AM2RLauncher/AM2RLauncher/Language/Text.it.resx
+++ b/AM2RLauncher/AM2RLauncher/Language/Text.it.resx
@@ -219,6 +219,9 @@
   <data name="InternetConnectionDrop" xml:space="preserve">
     <value>Impossibile connettersi a internet! Riprova più tardi!</value>
   </data>
+  <data name="InvalidGitURL" xml:space="preserve">
+    <value>$NAME non è un URL di git valido!</value>
+  </data>
   <data name="JavaNotFound" xml:space="preserve">
     <value>Java non trovato! Impossibile generare un APK senza un'installazione Java. Perfavore assicurati che Java sia installato e aggiunto al PATH.</value>
   </data>
diff --git a/AM2RLauncher/AM2RLauncher/LauncherUpdater.cs b/AM2RLauncher/AM2RLauncher/LauncherUpdater.cs
index b927332..a5c2953 100644
--- a/AM2RLauncher/AM2RLauncher/LauncherUpdater.cs
+++ b/AM2RLauncher/AM2RLauncher/LauncherUpdater.cs
@@ -15,7 +15,7 @@ namespace AM2RLauncher
     public class LauncherUpdater
     {
         /// <summary>The Version that identifies this current release.</summary>
-        static readonly public string VERSION = "2.1.2";
+        static readonly public string VERSION = "2.2.0";
 
         /// <summary>The current Running platform.</summary>
         static readonly private Platform currentPlatform = Platform.Instance;   // Needs to be declared here as well, because I can't access the one from eto,
@@ -116,13 +116,19 @@ namespace AM2RLauncher
 
                 for (int i = 0; i < localVersionArray.Length; i++)
                 {
-                    if (int.Parse(onlineVersionArray[i]) > int.Parse(localVersionArray[i]))
-                    {
+                    int onlineNum = int.Parse(onlineVersionArray[i]);
+                    int localNum = int.Parse(localVersionArray[i]);
+                    if (onlineNum > localNum)
+                    { 
                         isCurrentVersionOutdated = true;
                         break;
                     }
+                    else if (localNum > onlineNum)
+                        break;
                 }
 
+                log.Info((isCurrentVersionOutdated ? "Updating" : "Not Updating") + " from " + VERSION + " to " + onlineVersion);
+
                 if (isCurrentVersionOutdated)
                 {
                     log.Info("Current version (" + VERSION + ") is outdated! Initiating update for version " + onlineVersion + ".");