aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2019-09-09 19:44:13 +0200
committerChristian Schneppe <christian@pix-art.de>2019-09-09 19:44:13 +0200
commit8427f377eac36950879c4d074cf2fa034decc0ae (patch)
treec6a8536a002d70b0321bff3a3368825a6366d45b
parent5606b32db7ad5a6ae196766f96befc77d4e7785b (diff)
catch exception in updater
-rw-r--r--src/main/java/de/pixart/messenger/services/UpdateService.java28
1 files changed, 17 insertions, 11 deletions
diff --git a/src/main/java/de/pixart/messenger/services/UpdateService.java b/src/main/java/de/pixart/messenger/services/UpdateService.java
index 1d797324e..72c1b280a 100644
--- a/src/main/java/de/pixart/messenger/services/UpdateService.java
+++ b/src/main/java/de/pixart/messenger/services/UpdateService.java
@@ -181,18 +181,24 @@ public class UpdateService extends AsyncTask<String, Object, UpdateService.Wrapp
}
int i = 0;
// set index to first non-equal ordinal or length of shortest localVersion string
- if (remote != null && installed != null) {
- while (i < remote.length && i < installed.length && remote[i].equals(installed[i])) {
- i++;
- }
- // compare first non-equal ordinal number
- if (i < remote.length && i < installed.length) {
- int diff = Integer.valueOf(remote[i]).compareTo(Integer.valueOf(installed[i]));
- return Integer.signum(diff);
+ try {
+ if (remote != null && installed != null) {
+ while (i < remote.length && i < installed.length && remote[i].equals(installed[i])) {
+ i++;
+ }
+ // compare first non-equal ordinal number
+ if (i < remote.length && i < installed.length) {
+ int diff = Integer.valueOf(remote[i]).compareTo(Integer.valueOf(installed[i]));
+ return Integer.signum(diff);
+ }
+ // the strings are equal or one string is a substring of the other
+ // e.g. "1.2.3" = "1.2.3" or "1.2.3" < "1.2.3.4"
+ return Integer.signum(remote.length - installed.length);
}
- // the strings are equal or one string is a substring of the other
- // e.g. "1.2.3" = "1.2.3" or "1.2.3" < "1.2.3.4"
- return Integer.signum(remote.length - installed.length);
+ } catch (Exception e) {
+ showToastMessage(true, true);
+ e.printStackTrace();
+ return 0;
}
return 0;
}