From e6ec309bc2e1caa9760e835cfc58c5b8c5c6f34f Mon Sep 17 00:00:00 2001 From: Robert Goldmann <deadlocker@gmx.de> Date: Fri, 25 Aug 2017 09:47:09 +0200 Subject: [PATCH] re-enabled all update downloads --- .../deadlocker8/budgetmaster/logic/updater/Updater.java | 6 +++--- .../budgetmaster/resources/languages/_de.properties | 2 +- .../budgetmaster/ui/controller/Controller.java | 8 +++----- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/de/deadlocker8/budgetmaster/logic/updater/Updater.java b/src/de/deadlocker8/budgetmaster/logic/updater/Updater.java index 68370afb9..c38ca88e2 100644 --- a/src/de/deadlocker8/budgetmaster/logic/updater/Updater.java +++ b/src/de/deadlocker8/budgetmaster/logic/updater/Updater.java @@ -120,7 +120,7 @@ public class Updater { //download into temp directory and file String ending = "jar"; - if(osType == OSType.Other.Windows) + if(osType == OSType.Windows) { ending = "exe"; } @@ -156,8 +156,8 @@ public class Updater PathUtils.checkFolder(new File(PathUtils.getOSindependentPath() + Localization.getString(Strings.FOLDER))); //download latest updater.jar - //DEBUG -// downloadLatestUpdater(OS.getType()); + + downloadLatestUpdater(OS.getType()); //download into temp directory and file Path target; diff --git a/src/de/deadlocker8/budgetmaster/resources/languages/_de.properties b/src/de/deadlocker8/budgetmaster/resources/languages/_de.properties index 630f69398..3b4859f07 100644 --- a/src/de/deadlocker8/budgetmaster/resources/languages/_de.properties +++ b/src/de/deadlocker8/budgetmaster/resources/languages/_de.properties @@ -1,6 +1,6 @@ # DEFAULT app.name=BudgetMaster -version.code=3 +version.code=9 version.name=1.5.0_alpha version.date=23.08.17 author=Robert Goldmann diff --git a/src/de/deadlocker8/budgetmaster/ui/controller/Controller.java b/src/de/deadlocker8/budgetmaster/ui/controller/Controller.java index 6c3a9b295..9b28b2662 100644 --- a/src/de/deadlocker8/budgetmaster/ui/controller/Controller.java +++ b/src/de/deadlocker8/budgetmaster/ui/controller/Controller.java @@ -351,11 +351,9 @@ public class Controller { try { - boolean updateAvailable = updater.isUpdateAvailable(Integer.parseInt(Localization.getString(Strings.VERSION_CODE))); - //DEBUG - //String changes = updater.getChangelog(updater.getLatestVersion().getVersionCode()); - String changes = ""; - + boolean updateAvailable = updater.isUpdateAvailable(Integer.parseInt(Localization.getString(Strings.VERSION_CODE))); + String changes = updater.getChangelog(updater.getLatestVersion().getVersionCode()); + if(!updateAvailable) return; -- GitLab