From 91d5e6eb698250082378f5bbff92b82d929f6dac Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Fri, 25 Aug 2017 09:56:45 +0200
Subject: [PATCH] fixed uncaught exception if chnagelog doesn't contain
versioncode
---
src/de/deadlocker8/budgetmaster/logic/updater/Updater.java | 4 ++--
src/de/deadlocker8/budgetmaster/resources/changelog.json | 3 ++-
src/de/deadlocker8/budgetmaster/ui/controller/Controller.java | 4 ++--
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/de/deadlocker8/budgetmaster/logic/updater/Updater.java b/src/de/deadlocker8/budgetmaster/logic/updater/Updater.java
index c38ca88e2..2909d53ee 100644
--- a/src/de/deadlocker8/budgetmaster/logic/updater/Updater.java
+++ b/src/de/deadlocker8/budgetmaster/logic/updater/Updater.java
@@ -105,13 +105,13 @@ public class Updater
return parser.parse(data.toString()).getAsJsonObject();
}
- public String getChangelog(int versionCode) throws IOException
+ public String getChangelog(int versionCode) throws Exception
{
JsonObject changelogJSON = getChangelogFromURL();
if(changelogJSON != null)
{
- return changelogJSON.get(String.valueOf(versionCode)).getAsString();
+ return changelogJSON.get(String.valueOf(versionCode)).getAsString();
}
return null;
}
diff --git a/src/de/deadlocker8/budgetmaster/resources/changelog.json b/src/de/deadlocker8/budgetmaster/resources/changelog.json
index 39eea7d0f..13afef50c 100644
--- a/src/de/deadlocker8/budgetmaster/resources/changelog.json
+++ b/src/de/deadlocker8/budgetmaster/resources/changelog.json
@@ -6,5 +6,6 @@
"5":"-bugfixes\n-reports can now include a budget calculation\n",
"6":"Fixed critical bug that prevents repeating payments from being correctly updated for future months.\n",
"7":"-localized all strings into external file\n-added english localization\n-added language chooser to settings\n-remove javafx.Color from server --> server should no run on linux with normal jdk\n-bugfixes:\n -[FIXED] - report budget is calculated incorrectly\n -[FIXED] - refresh after database imprt/delete missing\n -[FIXED] - critical bug concerning repeating payments\n",
- "8":"bugfixes:\n -broken month chart if january is selected\n -wrong footer in month report\n -wrong initial file name for month report\n -server start failure\n"
+ "8":"bugfixes:\n -broken month chart if january is selected\n -wrong footer in month report\n -wrong initial file name for month report\n -server start failure\n",
+ "9":""
}
\ No newline at end of file
diff --git a/src/de/deadlocker8/budgetmaster/ui/controller/Controller.java b/src/de/deadlocker8/budgetmaster/ui/controller/Controller.java
index 9b28b2662..26d876650 100644
--- a/src/de/deadlocker8/budgetmaster/ui/controller/Controller.java
+++ b/src/de/deadlocker8/budgetmaster/ui/controller/Controller.java
@@ -351,7 +351,7 @@ public class Controller
{
try
{
- boolean updateAvailable = updater.isUpdateAvailable(Integer.parseInt(Localization.getString(Strings.VERSION_CODE)));
+ boolean updateAvailable = updater.isUpdateAvailable(Integer.parseInt(Localization.getString(Strings.VERSION_CODE)));
String changes = updater.getChangelog(updater.getLatestVersion().getVersionCode());
if(!updateAvailable)
@@ -410,7 +410,7 @@ public class Controller
}
});
}
- catch(IOException e)
+ catch(Exception e)
{
Logger.error(e);
AlertGenerator.showAlert(AlertType.ERROR,
--
GitLab