diff options
| -rw-r--r-- | main/res/values/strings.xml | 5 | ||||
| -rw-r--r-- | main/src/cgeo/geocaching/connector/ec/ECApi.java | 6 | ||||
| -rw-r--r-- | main/src/cgeo/geocaching/enumerations/StatusCode.java | 3 |
3 files changed, 6 insertions, 8 deletions
diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml index cd0f3de..4be3ab6 100644 --- a/main/res/values/strings.xml +++ b/main/res/values/strings.xml @@ -189,9 +189,8 @@ <string name="err_log_load_data">c:geo can\'t load data required to log visit.</string> <string name="err_log_load_data_again">c:geo can\'t load data required to log visit. Trying again.</string> <string name="err_log_load_data_still">c:geo is still loading data required to post log. Please wait a little while longer.</string> - <string name="err_log_post_failed">It seems that your log was not posted. Please check it on Geocaching.com.</string> - <string name="err_log_post_failed_ec">It seems that your log was not posted. Please check it on Extremcaching.com.</string> - <string name="err_logimage_post_failed">It seems that your log image was not uploaded. Please check it on Geocaching.com.</string> + <string name="err_log_post_failed">It seems that your log was not posted. Please check it on the cache originating website.</string> + <string name="err_logimage_post_failed">It seems that your log image was not uploaded. Please check it on the cache originating website.</string> <string name="err_search_address_forgot">c:geo forgot the address you tried to find.</string> <string name="err_parse_lat">c:geo can\'t parse latitude.</string> <string name="err_parse_lon">c:geo can\'t parse longitude.</string> diff --git a/main/src/cgeo/geocaching/connector/ec/ECApi.java b/main/src/cgeo/geocaching/connector/ec/ECApi.java index 9cd08c5..4d4ca76 100644 --- a/main/src/cgeo/geocaching/connector/ec/ECApi.java +++ b/main/src/cgeo/geocaching/connector/ec/ECApi.java @@ -104,7 +104,7 @@ final class ECApi { final HttpResponse response = Network.postRequest(uri, params); if (response == null) { - return new LogResult(StatusCode.LOG_POST_ERROR_EC, ""); + return new LogResult(StatusCode.LOG_POST_ERROR, ""); } if (!isRetry && response.getStatusLine().getStatusCode() == 403) { if (ecLogin.login() == StatusCode.NO_ERROR) { @@ -112,7 +112,7 @@ final class ECApi { } } if (response.getStatusLine().getStatusCode() != 200) { - return new LogResult(StatusCode.LOG_POST_ERROR_EC, ""); + return new LogResult(StatusCode.LOG_POST_ERROR, ""); } final String data = Network.getResponseDataAlways(response); @@ -124,7 +124,7 @@ final class ECApi { return new LogResult(StatusCode.NO_ERROR, uid); } - return new LogResult(StatusCode.LOG_POST_ERROR_EC, ""); + return new LogResult(StatusCode.LOG_POST_ERROR, ""); } diff --git a/main/src/cgeo/geocaching/enumerations/StatusCode.java b/main/src/cgeo/geocaching/enumerations/StatusCode.java index 8bda371..9030e2b 100644 --- a/main/src/cgeo/geocaching/enumerations/StatusCode.java +++ b/main/src/cgeo/geocaching/enumerations/StatusCode.java @@ -21,14 +21,13 @@ public enum StatusCode { PREMIUM_ONLY(R.string.err_premium_only), MAINTENANCE(R.string.err_maintenance), LOG_POST_ERROR(R.string.err_log_post_failed), - LOG_POST_ERROR_EC(R.string.err_log_post_failed_ec), NO_LOG_TEXT(R.string.warn_log_text_fill), NOT_LOGGED_IN(R.string.init_login_popup_failed), LOGIMAGE_POST_ERROR(R.string.err_logimage_post_failed); final private int error_string; - StatusCode(int error_string) { + StatusCode(final int error_string) { this.error_string = error_string; } |