diff options
| -rw-r--r-- | main/res/values-de/strings.xml | 2 | ||||
| -rw-r--r-- | main/res/values/strings.xml | 4 | ||||
| -rw-r--r-- | main/src/cgeo/geocaching/export/FieldnoteExport.java | 26 |
3 files changed, 20 insertions, 12 deletions
diff --git a/main/res/values-de/strings.xml b/main/res/values-de/strings.xml index 988daa8..3ba17bf 100644 --- a/main/res/values-de/strings.xml +++ b/main/res/values-de/strings.xml @@ -778,7 +778,9 @@ <string name="export_fieldnotes_info">Field Notes werden nach /sdcard/field-notes mit dem aktuellen Datum und Zeit als Dateiname exportiert.</string> <string name="export_fieldnotes_upload">Hochladen auf geocaching.com</string> <string name="export_fieldnotes_uploading">Hochladen…</string> + <string name="export_fieldnotes_upload_success">Hochladen auf geocaching.com erfolgreich</string> <string name="export_fieldnotes_onlynew">Nur seit letztem Export</string> + <string name="export_fieldnotes_creating">Erstelle Field Notes…</string> <string name="export_gpx">GPX</string> <!-- attributes (permissions -> allowed, not allowed) --> diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml index 5633887..a52326e 100644 --- a/main/res/values/strings.xml +++ b/main/res/values/strings.xml @@ -809,12 +809,14 @@ <string name="export">Export</string> <string name="export_as">Export as…</string> <string name="export_exportedto">exported to</string> - <string name="export_failed">Exported failed</string> + <string name="export_failed">Export failed</string> <string name="export_fieldnotes">Field Notes</string> <string name="export_fieldnotes_info">Field Notes will be exported into /sdcard/field-notes with current date and time as file name.</string> <string name="export_fieldnotes_upload">Upload to geocaching.com</string> <string name="export_fieldnotes_uploading">Uploading…</string> + <string name="export_fieldnotes_upload_success">Upload to geocaching.com successful</string> <string name="export_fieldnotes_onlynew">Only since last export</string> + <string name="export_fieldnotes_creating">Creating Field Notes…</string> <string name="export_gpx">GPX</string> <!-- attributes (permissions -> allowed, not allowed) --> diff --git a/main/src/cgeo/geocaching/export/FieldnoteExport.java b/main/src/cgeo/geocaching/export/FieldnoteExport.java index 07bb6d9..3ea7c78 100644 --- a/main/src/cgeo/geocaching/export/FieldnoteExport.java +++ b/main/src/cgeo/geocaching/export/FieldnoteExport.java @@ -17,7 +17,6 @@ import org.apache.commons.lang3.StringUtils; import android.app.Activity; import android.app.AlertDialog; -import android.app.ProgressDialog; import android.os.AsyncTask; import android.os.Environment; import android.view.View; @@ -132,8 +131,7 @@ class FieldnoteExport extends AbstractExport { @Override protected void onPreExecute() { if (null != activity) { - progress.show(activity, null, getString(R.string.export) + ": " + getName(), ProgressDialog.STYLE_HORIZONTAL, null); - progress.setMaxProgressAndReset(caches.size()); + progress.show(activity, getString(R.string.export) + ": " + getName(), getString(R.string.export_fieldnotes_creating), true, null); } } @@ -154,9 +152,9 @@ class FieldnoteExport extends AbstractExport { logTypes.put(LogType.ATTENDED, "Attended"); logTypes.put(LogType.WEBCAM_PHOTO_TAKEN, "Webcam Photo Taken"); - for (int i = 0; i < caches.size(); i++) { + int i = 0; + for (cgCache cache : caches) { try { - final cgCache cache = caches.get(i); if (cache.isLogOffline()) { LogEntry log = cgeoapplication.getInstance().loadLogOffline(cache.getGeocode()); if (null != logTypes.get(log.type)) { @@ -168,9 +166,10 @@ class FieldnoteExport extends AbstractExport { .append(",\"") .append(StringUtils.replaceChars(log.log, '"', '\'')) .append("\"\n"); + + publishProgress(++i); } } - publishProgress(i + 1); } catch (Exception e) { Log.e("FieldnoteExport.ExportTask generation", e); return false; @@ -230,7 +229,7 @@ class FieldnoteExport extends AbstractExport { if (loginState == StatusCode.NO_ERROR) { page = Network.getResponseData(Network.getRequest(uri)); } else { - Log.e("FieldnoteExport.ExportTask upload: No login (error: " + loginState + ")"); + Log.e("FieldnoteExport.ExportTask upload: No login (error: " + loginState + ')'); return false; } } @@ -265,10 +264,15 @@ class FieldnoteExport extends AbstractExport { progress.dismiss(); if (result) { - if (onlyNew) { - // update last export time in settings - } + // if (onlyNew) { + // // update last export time in settings when doing it ourself (currently we use the date check from gc.com) + // } + ActivityMixin.showToast(activity, getName() + ' ' + getString(R.string.export_exportedto) + ": " + exportFile.toString()); + + if (upload) { + ActivityMixin.showToast(activity, getString(R.string.export_fieldnotes_upload_success)); + } } else { ActivityMixin.showToast(activity, getString(R.string.export_failed)); } @@ -281,7 +285,7 @@ class FieldnoteExport extends AbstractExport { if (STATUS_UPLOAD == status[0]) { progress.setMessage(getString(R.string.export_fieldnotes_uploading)); } else { - progress.setProgress(status[0]); + progress.setMessage(getString(R.string.export_fieldnotes_creating) + " (" + status[0] + ')'); } } } |