added abort button to GPXImporter and skip button for static maps import

4 files changed, 18 insertions, 3 deletions

diff --git a/main/res/values-de/strings.xml b/main/res/values-de/strings.xml
index e0de5d1..ae7c417 100644
--- a/main/res/values-de/strings.xml
+++ b/main/res/values-de/strings.xml
@@ -584,8 +584,10 @@
   <string name="gpx_import_store_static_maps">Schreibe statische Karten</string>
   <string name="gpx_import_storing">Schreibe Caches in Datenbank</string>
   <string name="gpx_import_caches_imported">Caches importiert.</string>
+  <string name="gpx_import_caches_imported_maps_skipped">Caches importiert, Download statischer Karten abgebrochen.</string>
   <string name="gpx_import_title">Importiere GPX-Datei</string>
   <string name="gpx_import_title_reading_file">Lese Datei</string>
+  <string name="gpx_import_title_static_maps">Speichern statischer Karten</string>
   <string name="gpx_import_title_caches_imported">Ergebnis</string>
   <string name="gpx_import_title_caches_import_failed">Import-Fehler</string>
   <string name="gpx_import_error_io">Fehler beim Lesen der Datei</string>
diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml
index 9396e5f..c482ea2 100644
--- a/main/res/values/strings.xml
+++ b/main/res/values/strings.xml
@@ -598,8 +598,10 @@
   <string name="gpx_import_store_static_maps">Storing static maps</string>
   <string name="gpx_import_storing">Writing caches to database</string>
   <string name="gpx_import_caches_imported">caches imported</string>
-  <string name="gpx_import_title">Import GPX</string>
+  <string name="gpx_import_caches_imported_maps_skipped">caches imported, download of static maps aborted.</string>
+  <string name="gpx_import_title_static_maps">Store static maps</string>
   <string name="gpx_import_title_reading_file">Reading file</string>
+  <string name="gpx_import_title">Import GPX</string>
   <string name="gpx_import_title_caches_imported">Result</string>
   <string name="gpx_import_title_caches_import_failed">Import failed</string>
   <string name="gpx_import_error_io">Can\'t read file</string>
diff --git a/main/src/cgeo/geocaching/activity/Progress.java b/main/src/cgeo/geocaching/activity/Progress.java
index 75f4093..ce0afb8 100644
--- a/main/src/cgeo/geocaching/activity/Progress.java
+++ b/main/src/cgeo/geocaching/activity/Progress.java
@@ -2,6 +2,7 @@ package cgeo.geocaching.activity;
 
 import android.app.ProgressDialog;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.os.Message;
 import android.view.WindowManager;
 
@@ -40,6 +41,7 @@ public class Progress {
             if (cancelMessage != null) {
                 dialog.setCancelable(true);
                 dialog.setCancelMessage(cancelMessage);
+                dialog.setButton(DialogInterface.BUTTON_NEGATIVE, context.getResources().getString(android.R.string.cancel), cancelMessage);
             } else {
                 dialog.setCancelable(false);
             }
diff --git a/main/src/cgeo/geocaching/files/GPXImporter.java b/main/src/cgeo/geocaching/files/GPXImporter.java
index dde5511..51ecd73 100644
--- a/main/src/cgeo/geocaching/files/GPXImporter.java
+++ b/main/src/cgeo/geocaching/files/GPXImporter.java
@@ -49,6 +49,7 @@ public class GPXImporter {
     static final int IMPORT_STEP_FINISHED_WITH_ERROR = 6;

     static final int IMPORT_STEP_CANCEL = 7;

     static final int IMPORT_STEP_CANCELED = 8;

+    static final int IMPORT_STEP_STATIC_MAPS_SKIPPED = 9;

 

     public static final String GPX_FILE_EXTENSION = ".gpx";

     public static final String ZIP_FILE_EXTENSION = ".zip";

@@ -194,7 +195,7 @@ public class GPXImporter {
                 StaticMapsProvider.downloadMaps(cache, app);

                 storedCacheMaps++;

                 if (progressHandler.isCancelled()) {

-                    throw new CancellationException();

+                    return;

                 }

                 progressHandler.sendMessage(progressHandler.obtainMessage(0, storedCacheMaps, 0));

             }

@@ -392,10 +393,18 @@ public class GPXImporter {
                     break;

 

                 case IMPORT_STEP_STORE_STATIC_MAPS:

-                    progress.setMessage(res.getString(msg.arg1));

+                    progress.dismiss();

+                    Message skipMessage = importStepHandler.obtainMessage(IMPORT_STEP_STATIC_MAPS_SKIPPED);

+                    progress.show((Context) fromActivity, res.getString(R.string.gpx_import_title_static_maps), res.getString(R.string.gpx_import_store_static_maps), ProgressDialog.STYLE_HORIZONTAL, skipMessage);

                     progress.setMaxProgressAndReset(msg.arg2);

                     break;

 

+                case IMPORT_STEP_STATIC_MAPS_SKIPPED:

+                    progress.dismiss();

+                    fromActivity.helpDialog(res.getString(R.string.gpx_import_title_caches_imported), msg.arg1 + " " + res.getString(R.string.gpx_import_caches_imported_maps_skipped));

+                    importFinished();

+                    break;

+

                 case IMPORT_STEP_FINISHED:

                     progress.dismiss();

                     fromActivity.helpDialog(res.getString(R.string.gpx_import_title_caches_imported), msg.arg1 + " " + res.getString(R.string.gpx_import_caches_imported));