From 459f07e12604c937e014a6804b2eb91ee82eb859 Mon Sep 17 00:00:00 2001 From: sirjonasxx <36828922+sirjonasxx@users.noreply.github.com> Date: Fri, 18 Jan 2019 14:02:34 +0100 Subject: [PATCH] remove nullpointer when harble api not uptodate --- G-Earth/src/main/java/gearth/misc/harble_api/HarbleAPI.java | 2 +- G-Earth/src/main/java/gearth/ui/extensions/Extensions.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/G-Earth/src/main/java/gearth/misc/harble_api/HarbleAPI.java b/G-Earth/src/main/java/gearth/misc/harble_api/HarbleAPI.java index 3546ed7..9d19fbf 100644 --- a/G-Earth/src/main/java/gearth/misc/harble_api/HarbleAPI.java +++ b/G-Earth/src/main/java/gearth/misc/harble_api/HarbleAPI.java @@ -198,6 +198,6 @@ public class HarbleAPI { if (Cacher.cacheFileExists(cachedMessagesPath)) { return Cacher.getCacheDir() + File.separator + cachedMessagesPath; } - return super.toString(); + return "null"; } } diff --git a/G-Earth/src/main/java/gearth/ui/extensions/Extensions.java b/G-Earth/src/main/java/gearth/ui/extensions/Extensions.java index 28011ab..91fefa7 100644 --- a/G-Earth/src/main/java/gearth/ui/extensions/Extensions.java +++ b/G-Earth/src/main/java/gearth/ui/extensions/Extensions.java @@ -158,7 +158,7 @@ public class Extensions extends SubForm { .appendString(getHConnection().getDomain()) .appendInt(getHConnection().getPort()) .appendString(getHConnection().getHotelVersion()) - .appendString(HarbleAPIFetcher.HARBLEAPI.toString()) + .appendString(HarbleAPIFetcher.HARBLEAPI + "") // automatic .toString() and no additional nullpointerexception ); } } @@ -295,7 +295,7 @@ public class Extensions extends SubForm { .appendString(getHConnection().getDomain()) .appendInt(getHConnection().getPort()) .appendString(getHConnection().getHotelVersion()) - .appendString(HarbleAPIFetcher.HARBLEAPI.toString()) + .appendString(HarbleAPIFetcher.HARBLEAPI + "") ); }