diff options
| author | rsudev <rasch@munin-soft.de> | 2013-05-26 22:48:47 +0200 |
|---|---|---|
| committer | rsudev <rasch@munin-soft.de> | 2013-05-26 22:48:47 +0200 |
| commit | 938049304233c0b84b6dd4f914a51c4af3d8ea37 (patch) | |
| tree | ad5e0a6ab536bc08e4c8e6a927febc4d34e1f1da /main/src/cgeo | |
| parent | 8e2ec9dd830d9c5c370ae8aa77163c22364e47e0 (diff) | |
| download | cgeo-938049304233c0b84b6dd4f914a51c4af3d8ea37.zip cgeo-938049304233c0b84b6dd4f914a51c4af3d8ea37.tar.gz cgeo-938049304233c0b84b6dd4f914a51c4af3d8ea37.tar.bz2 | |
Fixes after review
Diffstat (limited to 'main/src/cgeo')
3 files changed, 8 insertions, 11 deletions
diff --git a/main/src/cgeo/geocaching/connector/gc/GCLoggingManager.java b/main/src/cgeo/geocaching/connector/gc/GCLoggingManager.java index 334a8e4..0fbd718 100644 --- a/main/src/cgeo/geocaching/connector/gc/GCLoggingManager.java +++ b/main/src/cgeo/geocaching/connector/gc/GCLoggingManager.java @@ -54,19 +54,16 @@ public class GCLoggingManager implements ILoggingManager, LoaderManager.LoaderCa @Override public void onLoadFinished(Loader<String> arg0, String page) { + if (page == null) { hasLoaderError = true; } else { - viewstates = Login.getViewstates(page); - trackables = GCParser.parseTrackableLog(page); - possibleLogTypes = GCParser.parseTypes(page); + viewstates = Login.getViewstates(page); + trackables = GCParser.parseTrackableLog(page); + possibleLogTypes = GCParser.parseTypes(page); - if (possibleLogTypes.isEmpty()) { - hasLoaderError = true; - } else { - hasLoaderError = false; - } + hasLoaderError = possibleLogTypes.isEmpty(); } activity.onLoadFinished(); diff --git a/main/src/cgeo/geocaching/connector/oc/OCApiConnector.java b/main/src/cgeo/geocaching/connector/oc/OCApiConnector.java index a236a0e..3780c4d 100644 --- a/main/src/cgeo/geocaching/connector/oc/OCApiConnector.java +++ b/main/src/cgeo/geocaching/connector/oc/OCApiConnector.java @@ -23,7 +23,7 @@ public class OCApiConnector extends OCConnector implements ISearchByGeocode { @Override public String getLicenseText(final Geocache cache) { // NOT TO BE TRANSLATED - return "©" + cache.getOwnerDisplayName() + ", <a href=\"" + getCacheUrl(cache) + "\">" + getName() + "</a>, CC-BY-NC-ND, alle Logeinträge © jeweiliger Autor"; + return "© " + cache.getOwnerDisplayName() + ", <a href=\"" + getCacheUrl(cache) + "\">" + getName() + "</a>, CC-BY-NC-ND, alle Logeinträge © jeweiliger Autor"; } @Override diff --git a/main/src/cgeo/geocaching/enumerations/LogType.java b/main/src/cgeo/geocaching/enumerations/LogType.java index 6a055f4..9902d3f 100644 --- a/main/src/cgeo/geocaching/enumerations/LogType.java +++ b/main/src/cgeo/geocaching/enumerations/LogType.java @@ -18,8 +18,8 @@ public enum LogType { FOUND_IT(2, "2", "found it", "Found it", R.string.log_found, R.drawable.mark_green), DIDNT_FIND_IT(3, "3", "didn't find it", "Didn't find it", R.string.log_dnf, R.drawable.mark_red), NOTE(4, "4", "write note", "Comment", R.string.log_note), - PUBLISH_LISTING(1003, "24", "", "publish listing", R.string.log_published, R.drawable.mark_green_more), - ENABLE_LISTING(23, "23", "", "enable listing", R.string.log_enabled, R.drawable.mark_green_more), + PUBLISH_LISTING(1003, "24", "publish listing", "", R.string.log_published, R.drawable.mark_green_more), + ENABLE_LISTING(23, "23", "enable listing", "", R.string.log_enabled, R.drawable.mark_green_more), ARCHIVE(5, "5", "archive", "", R.string.log_archived, R.drawable.mark_red_more), UNARCHIVE(12, "12", "unarchive", "", R.string.log_unarchived, R.drawable.mark_green_more), TEMP_DISABLE_LISTING(22, "22", "temporarily disable listing", "", R.string.log_disabled, R.drawable.mark_red_more), |