1 files changed, 14 insertions, 14 deletions
diff --git a/main/src/cgeo/geocaching/export/FieldnoteExport.java b/main/src/cgeo/geocaching/export/FieldnoteExport.java
index d0040a9..1ae97f3 100644
--- a/main/src/cgeo/geocaching/export/FieldnoteExport.java
+++ b/main/src/cgeo/geocaching/export/FieldnoteExport.java
@@ -1,9 +1,9 @@
 package cgeo.geocaching.export;
 
+import cgeo.geocaching.DataStore;
 import cgeo.geocaching.Geocache;
 import cgeo.geocaching.LogEntry;
 import cgeo.geocaching.R;
-import cgeo.geocaching.cgData;
 import cgeo.geocaching.activity.ActivityMixin;
 import cgeo.geocaching.connector.gc.Login;
 import cgeo.geocaching.enumerations.StatusCode;
@@ -13,11 +13,12 @@ import cgeo.geocaching.settings.Settings;
 import cgeo.geocaching.ui.Formatter;
 import cgeo.geocaching.utils.AsyncTaskWithProgress;
 import cgeo.geocaching.utils.FileUtils;
-import cgeo.geocaching.utils.IOUtils;
 import cgeo.geocaching.utils.Log;
 
+import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.CharEncoding;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.time.FastDateFormat;
 
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -42,7 +43,7 @@ import java.util.Locale;
 import java.util.TimeZone;
 
 /**
- * Exports offline-logs in the Groundspeak Field Note format.<br>
+ * Exports offline logs in the Groundspeak Field Note format.<br>
  * <br>
  *
  * Field Notes are simple plain text files, but poorly documented. Syntax:<br>
@@ -50,10 +51,7 @@ import java.util.TimeZone;
  */
 class FieldnoteExport extends AbstractExport {
     private static final File exportLocation = new File(Environment.getExternalStorageDirectory().getAbsolutePath() + "/field-notes");
-    private static final SimpleDateFormat fieldNoteDateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.US);
-    static {
-        fieldNoteDateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
-    }
+    private static final FastDateFormat fieldNoteDateFormat = FastDateFormat.getInstance("yyyy-MM-dd'T'HH:mm:ss'Z'", TimeZone.getTimeZone("UTC"), Locale.US);
 
     protected FieldnoteExport() {
         super(getString(R.string.export_fieldnotes));
@@ -80,22 +78,24 @@ class FieldnoteExport extends AbstractExport {
         builder.setView(layout);
 
         final CheckBox uploadOption = (CheckBox) layout.findViewById(R.id.upload);
+        uploadOption.setChecked(Settings.getFieldNoteExportUpload());
         final CheckBox onlyNewOption = (CheckBox) layout.findViewById(R.id.onlynew);
+        onlyNewOption.setChecked(Settings.getFieldNoteExportOnlyNew());
 
         if (Settings.getFieldnoteExportDate() > 0) {
-            onlyNewOption.setText(getString(R.string.export_fieldnotes_onlynew) + "\n(" + Formatter.formatShortDateTime(Settings.getFieldnoteExportDate()) + ')');
+            onlyNewOption.setText(getString(R.string.export_fieldnotes_onlynew) + " (" + Formatter.formatDateTime(Settings.getFieldnoteExportDate()) + ')');
         }
 
         builder.setPositiveButton(R.string.export, new DialogInterface.OnClickListener() {
 
             @Override
             public void onClick(DialogInterface dialog, int which) {
+                final boolean upload = uploadOption.isChecked();
+                final boolean onlyNew = onlyNewOption.isChecked();
+                Settings.setFieldNoteExportUpload(upload);
+                Settings.setFieldNoteExportOnlyNew(onlyNew);
                 dialog.dismiss();
-                new ExportTask(
-                        activity,
-                        uploadOption.isChecked(),
-                        onlyNewOption.isChecked())
-                        .execute(caches);
+                new ExportTask(activity, upload, onlyNew).execute(caches);
             }
         });
 
@@ -134,7 +134,7 @@ class FieldnoteExport extends AbstractExport {
                 int i = 0;
                 for (final Geocache cache : caches) {
                     if (cache.isLogOffline()) {
-                        final LogEntry log = cgData.loadLogOffline(cache.getGeocode());
+                        final LogEntry log = DataStore.loadLogOffline(cache.getGeocode());
                         if (!onlyNew || log.date > Settings.getFieldnoteExportDate()) {
                             appendFieldNote(fieldNoteBuffer, cache, log);
                         }