corrected: usage of gpx export dir setting corrected, text on export dialog now show the correct dir

8 files changed, 25 insertions, 7 deletions

diff --git a/main/res/layout/gpx_export_dialog.xml b/main/res/layout/gpx_export_dialog.xml
index 86c0862..7c9345f 100644
--- a/main/res/layout/gpx_export_dialog.xml
+++ b/main/res/layout/gpx_export_dialog.xml
@@ -6,6 +6,7 @@
     android:padding="3dip" >

 

     <TextView

+        android:id="@id/info"

         android:layout_width="wrap_content"

         android:layout_height="wrap_content"

         android:text="@string/export_gpx_info" />

diff --git a/main/res/values-de/strings.xml b/main/res/values-de/strings.xml
index 36c6f10..05cc5a1 100644
--- a/main/res/values-de/strings.xml
+++ b/main/res/values-de/strings.xml
@@ -812,7 +812,7 @@
   <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>
-  <string name="export_gpx_info">GPX-Datei wird nach /sdcard/gpx mit dem aktuellen Datum und Zeit als Dateiname exportiert.</string>
+  <string name="export_gpx_info">GPX-Datei wird nach %1$s mit dem aktuellen Datum und Zeit als Dateiname exportiert.</string>
   <string name="export_gpx_to">Exportierte GPX-Datei senden an</string>
   
   <!-- attribute unknown -->
diff --git a/main/res/values-it/strings.xml b/main/res/values-it/strings.xml
index ab256de..d965088 100644
--- a/main/res/values-it/strings.xml
+++ b/main/res/values-it/strings.xml
@@ -796,7 +796,7 @@
   <string name="export_fieldnotes_onlynew">Solo quelli nuovi rispetto all\'ultima esportazione</string>
   <string name="export_fieldnotes_creating">Creazione Field Notes…</string>
   <string name="export_gpx">GPX</string>
-  <string name="export_gpx_info">Il file GPX sarà esportato in /sdcard/gpx con data ed ora correnti come nome file.</string>
+  <string name="export_gpx_info">Il file GPX sarà esportato in %1$s con data ed ora correnti come nome file.</string>
   <string name="export_gpx_to">Invia il GPX esportato a</string>
 
 <!--  attribute unknown -->
diff --git a/main/res/values-ja/strings.xml b/main/res/values-ja/strings.xml
index 2aa0291..acfbe4c 100644
--- a/main/res/values-ja/strings.xml
+++ b/main/res/values-ja/strings.xml
@@ -828,7 +828,7 @@
   <string name="export_fieldnotes_onlynew">最後にエクスポートした時から更新がある場合のみ</string>   <!-- only new logs since last export/upload  line53:FieldnoteExport.java -->
   <string name="export_fieldnotes_creating">フィールドノートを作成中…</string>
   <string name="export_gpx">GPX</string>
-  <string name="export_gpx_info">GPXファイルは/sdcard/gpxフォルダに保存され、ファイル名は現在の日時になります。</string>
+  <string name="export_gpx_info">GPXファイルは%1$sフォルダに保存され、ファイル名は現在の日時になります。</string>
   <string name="export_gpx_to">エクスポートしたGPXファイルを送る:</string>
   
   <!--  attribute unknown -->
diff --git a/main/res/values-sv/strings.xml b/main/res/values-sv/strings.xml
index 37fe1c7..21f72a6 100644
--- a/main/res/values-sv/strings.xml
+++ b/main/res/values-sv/strings.xml
@@ -798,7 +798,7 @@
   <string name="export_fieldnotes_onlynew">Bara sedan senaste exporteringen</string>
   <string name="export_fieldnotes_creating">Skapar Field Notes…</string>
   <string name="export_gpx">GPX</string>
-  <string name="export_gpx_info">GPX filen kommer att exporteras till /sdcard/gpx med datum och tid i filnamnet.</string>
+  <string name="export_gpx_info">GPX filen kommer att exporteras till %1$s med datum och tid i filnamnet.</string>
   <string name="export_gpx_to">Skicka exporterad GPX till</string>
 
   <!-- next things -->
diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml
index fa6dbce..e0acc61 100644
--- a/main/res/values/strings.xml
+++ b/main/res/values/strings.xml
@@ -836,7 +836,7 @@
   <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>
-  <string name="export_gpx_info">The GPX file will be exported to /sdcard/gpx with current date and time as file name.</string>
+  <string name="export_gpx_info">The GPX file will be exported to %1$s with current date and time as file name.</string>
   <string name="export_gpx_to">Send exported GPX to</string>
   
   <!--  attribute unknown -->
diff --git a/main/src/cgeo/geocaching/export/AbstractExport.java b/main/src/cgeo/geocaching/export/AbstractExport.java
index 0923cef..72ea544 100644
--- a/main/src/cgeo/geocaching/export/AbstractExport.java
+++ b/main/src/cgeo/geocaching/export/AbstractExport.java
@@ -25,6 +25,19 @@ abstract class AbstractExport implements Export {
         return cgeoapplication.getInstance().getString(resourceId);
     }
 
+    /**
+     * Generates a localized string from a resource id.
+     * 
+     * @param resourceId
+     *            the resource id of the string
+     * @param params
+     *            The parameter
+     * @return localized string
+     */
+    protected static String getString(int resourceId, Object... params) {
+        return cgeoapplication.getInstance().getString(resourceId, params);
+    }
+
     @Override
     public String toString() {
         // used in the array adapter of the dialog showing the exports
diff --git a/main/src/cgeo/geocaching/export/GpxExport.java b/main/src/cgeo/geocaching/export/GpxExport.java
index 6834f45..8af85a8 100644
--- a/main/src/cgeo/geocaching/export/GpxExport.java
+++ b/main/src/cgeo/geocaching/export/GpxExport.java
@@ -26,6 +26,7 @@ import android.os.Environment;
 import android.view.View;
 import android.widget.Button;
 import android.widget.CheckBox;
+import android.widget.TextView;
 
 import java.io.BufferedWriter;
 import java.io.File;
@@ -38,7 +39,6 @@ import java.util.Date;
 import java.util.List;
 
 class GpxExport extends AbstractExport {
-    private static final File exportLocation = new File(Settings.getGpxExportDir());
     private static final SimpleDateFormat dateFormatZ = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
 
     protected GpxExport() {
@@ -70,6 +70,9 @@ class GpxExport extends AbstractExport {
             View layout = activity.getLayoutInflater().inflate(R.layout.gpx_export_dialog, null);
             setView(layout);
 
+            final TextView text = (TextView) layout.findViewById(R.id.info);
+            text.setText(getString(R.string.export_gpx_info, Settings.getGpxExportDir()));
+
             final CheckBox shareOption = (CheckBox) layout.findViewById(R.id.share);
 
             shareOption.setChecked(Settings.getShareAfterExport());
@@ -127,10 +130,11 @@ class GpxExport extends AbstractExport {
             }
 
             try {
+                final File exportLocation = new File(Settings.getGpxExportDir());
                 exportLocation.mkdirs();
 
                 final SimpleDateFormat fileNameDateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
-                exportFile = new File(exportLocation.toString() + File.separatorChar + "export_" + fileNameDateFormat.format(new Date()) + ".gpx");
+                exportFile = new File(Settings.getGpxExportDir() + File.separatorChar + "export_" + fileNameDateFormat.format(new Date()) + ".gpx");
 
                 gpx = new BufferedWriter(new FileWriter(exportFile));