From 7c09ead7cc72922b8fb65dc68c4f69689c22fd28 Mon Sep 17 00:00:00 2001 From: Samuel Tardieu Date: Sun, 18 Nov 2012 14:28:06 +0100 Subject: fix #2173: GSAK field notes export GSAK requires the log type to be capitalized, e.g., "Found it", while we were generating "found it" instead. Some code has been factored out to be more easily testable. --- .../cgeo/geocaching/export/FieldnoteExport.java | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) (limited to 'main/src/cgeo/geocaching/export/FieldnoteExport.java') diff --git a/main/src/cgeo/geocaching/export/FieldnoteExport.java b/main/src/cgeo/geocaching/export/FieldnoteExport.java index 465641f..11214db 100644 --- a/main/src/cgeo/geocaching/export/FieldnoteExport.java +++ b/main/src/cgeo/geocaching/export/FieldnoteExport.java @@ -135,20 +135,13 @@ class FieldnoteExport extends AbstractExport { @Override protected Boolean doInBackground(Void... params) { final StringBuilder fieldNoteBuffer = new StringBuilder(); + final cgeoapplication app = cgeoapplication.getInstance(); try { int i = 0; for (cgCache cache : caches) { if (cache.isLogOffline()) { - final LogEntry log = cgeoapplication.getInstance().loadLogOffline(cache.getGeocode()); - fieldNoteBuffer.append(cache.getGeocode()) - .append(',') - .append(fieldNoteDateFormat.format(new Date(log.date))) - .append(',') - .append(log.type.type) - .append(",\"") - .append(StringUtils.replaceChars(log.log, '"', '\'')) - .append("\"\n"); + appendFieldNote(fieldNoteBuffer, cache, app.loadLogOffline(cache.getGeocode())); publishProgress(++i); } } @@ -270,4 +263,15 @@ class FieldnoteExport extends AbstractExport { } } } + + static void appendFieldNote(final StringBuilder fieldNoteBuffer, final cgCache cache, final LogEntry log) { + fieldNoteBuffer.append(cache.getGeocode()) + .append(',') + .append(fieldNoteDateFormat.format(new Date(log.date))) + .append(',') + .append(StringUtils.capitalize(log.type.type)) + .append(",\"") + .append(StringUtils.replaceChars(log.log, '"', '\'')) + .append("\"\n"); + } } -- cgit v1.1