diff options
| author | Bananeweizen <bananeweizen@gmx.de> | 2015-01-26 21:02:17 +0100 |
|---|---|---|
| committer | Bananeweizen <bananeweizen@gmx.de> | 2015-01-26 21:02:17 +0100 |
| commit | 5b13edd584f70ed5651549080437fb4fcbfd3eac (patch) | |
| tree | 561c2e70de6da311e56ebf5d18836d3461a5cf46 /main/src/cgeo/geocaching | |
| parent | e58bd231a1b1be9a21ca043305794a6661d0b3ac (diff) | |
| parent | ac5a1d50862578e09d1d7e7c6c7d6d44ac414735 (diff) | |
| download | cgeo-5b13edd584f70ed5651549080437fb4fcbfd3eac.zip cgeo-5b13edd584f70ed5651549080437fb4fcbfd3eac.tar.gz cgeo-5b13edd584f70ed5651549080437fb4fcbfd3eac.tar.bz2 | |
Merge branch 'release'
Diffstat (limited to 'main/src/cgeo/geocaching')
| -rw-r--r-- | main/src/cgeo/geocaching/connector/UnknownConnector.java | 2 | ||||
| -rw-r--r-- | main/src/cgeo/geocaching/settings/Settings.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/main/src/cgeo/geocaching/connector/UnknownConnector.java b/main/src/cgeo/geocaching/connector/UnknownConnector.java index 8ed1da4..fcf1152 100644 --- a/main/src/cgeo/geocaching/connector/UnknownConnector.java +++ b/main/src/cgeo/geocaching/connector/UnknownConnector.java @@ -16,7 +16,7 @@ class UnknownConnector extends AbstractConnector { @Override @NonNull public String getCacheUrl(@NonNull final Geocache cache) { - throw new IllegalStateException("getCacheUrl cannot be called on unknown caches"); + return StringUtils.EMPTY; } @Override diff --git a/main/src/cgeo/geocaching/settings/Settings.java b/main/src/cgeo/geocaching/settings/Settings.java index ad15d81..0b54fe1 100644 --- a/main/src/cgeo/geocaching/settings/Settings.java +++ b/main/src/cgeo/geocaching/settings/Settings.java @@ -337,7 +337,7 @@ public class Settings { } public static String getUsername() { - return getString(R.string.pref_username, null); + return getString(R.string.pref_username, StringUtils.EMPTY); } public static boolean isGCConnectorActive() { |