aboutsummaryrefslogtreecommitdiffstats
path: root/main/src/cgeo/geocaching/connector/opencaching/OkapiClient.java
diff options
context:
space:
mode:
Diffstat (limited to 'main/src/cgeo/geocaching/connector/opencaching/OkapiClient.java')
-rw-r--r--main/src/cgeo/geocaching/connector/opencaching/OkapiClient.java21
1 files changed, 10 insertions, 11 deletions
diff --git a/main/src/cgeo/geocaching/connector/opencaching/OkapiClient.java b/main/src/cgeo/geocaching/connector/opencaching/OkapiClient.java
index 7c1138a..4e4d9f7 100644
--- a/main/src/cgeo/geocaching/connector/opencaching/OkapiClient.java
+++ b/main/src/cgeo/geocaching/connector/opencaching/OkapiClient.java
@@ -1,9 +1,8 @@
package cgeo.geocaching.connector.opencaching;
-import cgeo.geocaching.Settings;
import cgeo.geocaching.cgCache;
import cgeo.geocaching.cgImage;
-import cgeo.geocaching.cgLog;
+import cgeo.geocaching.LogEntry;
import cgeo.geocaching.cgeoapplication;
import cgeo.geocaching.connector.ConnectorFactory;
import cgeo.geocaching.connector.IConnector;
@@ -114,7 +113,7 @@ final public class OkapiClient {
return caches;
}
} catch (JSONException e) {
- Log.e(Settings.tag, "OkapiClient.parseCaches", e);
+ Log.e("OkapiClient.parseCaches", e);
}
return null;
}
@@ -181,7 +180,7 @@ final public class OkapiClient {
// save full detailed caches
cgeoapplication.getInstance().saveCache(cache, EnumSet.of(SaveFlag.SAVE_DB));
} catch (JSONException e) {
- Log.e(Settings.tag, "OkapiClient.parseCache", e);
+ Log.e("OkapiClient.parseCache", e);
}
return cache;
}
@@ -203,22 +202,22 @@ final public class OkapiClient {
return user.getString(USER_USERNAME);
}
- private static List<cgLog> parseLogs(JSONArray logsJSON) {
- List<cgLog> result = null;
+ private static List<LogEntry> parseLogs(JSONArray logsJSON) {
+ List<LogEntry> result = null;
for (int i = 0; i < logsJSON.length(); i++) {
try {
JSONObject logResponse = logsJSON.getJSONObject(i);
- cgLog log = new cgLog();
+ LogEntry log = new LogEntry();
log.date = parseDate(logResponse.getString(LOG_DATE)).getTime();
log.log = logResponse.getString(LOG_COMMENT).trim();
log.type = parseLogType(logResponse.getString(LOG_TYPE));
log.author = parseUser(logResponse.getJSONObject(LOG_USER));
if (result == null) {
- result = new ArrayList<cgLog>();
+ result = new ArrayList<LogEntry>();
}
result.add(log);
} catch (JSONException e) {
- Log.e(Settings.tag, "OkapiClient.parseLogs", e);
+ Log.e("OkapiClient.parseLogs", e);
}
}
return result;
@@ -240,7 +239,7 @@ final public class OkapiClient {
try {
return ISO8601DATEFORMAT.parse(strippedDate);
} catch (ParseException e) {
- Log.e(Settings.tag, "OkapiClient.parseDate", e);
+ Log.e("OkapiClient.parseDate", e);
}
return null;
}
@@ -260,7 +259,7 @@ final public class OkapiClient {
try {
size = response.getDouble(CACHE_SIZE);
} catch (JSONException e) {
- Log.e(Settings.tag, "OkapiClient.getCacheSize", e);
+ Log.e("OkapiClient.getCacheSize", e);
}
switch ((int) Math.round(size)) {
case 1: