1 files changed, 68 insertions, 35 deletions

diff --git a/main/src/cgeo/geocaching/files/GPXImporter.java b/main/src/cgeo/geocaching/files/GPXImporter.java
index cd2f445..52f68e1 100644
--- a/main/src/cgeo/geocaching/files/GPXImporter.java
+++ b/main/src/cgeo/geocaching/files/GPXImporter.java
@@ -12,8 +12,10 @@ import cgeo.geocaching.settings.Settings;
 import cgeo.geocaching.ui.dialog.Dialogs;
 import cgeo.geocaching.utils.CancellableHandler;
 import cgeo.geocaching.utils.Log;
+import cgeo.geocaching.utils.RxUtils;
 
 import org.apache.commons.lang3.StringUtils;
+import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
 
 import android.app.Activity;
@@ -93,46 +95,77 @@ public class GPXImporter {
      *
      * @param uri
      *            URI of the file to import
-     * @param knownMimeType
-     * @param knownPathName
+     * @param mimeType
+     * @param pathName
      */
-    public void importGPX(final Uri uri, final @Nullable String knownMimeType, final @Nullable String knownPathName) {
+    public void importGPX(final Uri uri, final @Nullable String mimeType, final @Nullable String pathName) {
         final ContentResolver contentResolver = fromActivity.getContentResolver();
-        String mimeType = knownMimeType;
-        final String pathName = knownPathName != null ? knownPathName : uri.getPath();
-
-        // if mimetype can't be determined (e.g. for emulators email app), derive it from uri file extension
-        // contentResolver.getType(uri) doesn't help but throws exception for emulators email app
-        //   Permission Denial: reading com.android.email.provider.EmailProvider uri
-        // Google search says: there is no solution for this problem
-        // Gmail doesn't work at all, see #967
-        if (mimeType == null) {
-            if (StringUtils.endsWithIgnoreCase(pathName, GPX_FILE_EXTENSION) || StringUtils.endsWithIgnoreCase(pathName, LOC_FILE_EXTENSION)) {
-                mimeType = "application/xml";
-            } else {
-                // if we can't determine a better type, default to zip import
-                // emulator email sends e.g. content://com.android.email.attachmentprovider/1/1/RAW, mimetype=null
-                mimeType = "application/zip";
-            }
-        }
 
         Log.i("importGPX: " + uri + ", mimetype=" + mimeType);
-        if (GPX_MIME_TYPES.contains(mimeType)) {
-            if (StringUtils.endsWithIgnoreCase(pathName, LOC_FILE_EXTENSION)) {
-                new ImportLocAttachmentThread(uri, contentResolver, listId, importStepHandler, progressHandler).start();
-            } else {
-                new ImportGpxAttachmentThread(uri, contentResolver, listId, importStepHandler, progressHandler).start();
-            }
-        } else if (ZIP_MIME_TYPES.contains(mimeType)) {
-            new ImportGpxZipAttachmentThread(uri, contentResolver, listId, importStepHandler, progressHandler).start();
-        } else {
-            importFinished();
+		@NonNull
+		FileType fileType = new FileTypeDetector(uri, contentResolver)
+				.getFileType();
+
+		if (fileType == FileType.UNKNOWN) {
+			fileType = getFileTypeFromPathName(pathName);
+		}
+		if (fileType == FileType.UNKNOWN) {
+			fileType = getFileTypeFromMimeType(mimeType);
+		}
+
+		ImportThread importer = getImporterFromFileType(uri, contentResolver,
+				fileType);
+
+		if (importer != null) {
+			importer.start();
+		} else {
+			importFinished();
+		}
+	}
+
+	private static @NonNull FileType getFileTypeFromPathName(
+			final String pathName) {
+        if (StringUtils.endsWithIgnoreCase(pathName, GPX_FILE_EXTENSION)) {
+        		return FileType.GPX;
         }
-    }
 
-    /**
-     * Import GPX provided via intent of activity that instantiated this GPXImporter.
-     */
+	if (StringUtils.endsWithIgnoreCase(pathName, LOC_FILE_EXTENSION)) {
+		return FileType.LOC;
+	}
+		return FileType.UNKNOWN;
+	}
+
+	private static @NonNull FileType getFileTypeFromMimeType(
+			final String mimeType) {
+        if (GPX_MIME_TYPES.contains(mimeType)) {
+			return FileType.GPX;
+        } else if (ZIP_MIME_TYPES.contains(mimeType)) {
+			return FileType.ZIP;
+		}
+		return FileType.UNKNOWN;
+	}
+
+	private ImportThread getImporterFromFileType(Uri uri,
+			ContentResolver contentResolver, FileType fileType) {
+		switch (fileType) {
+		case ZIP:
+			return new ImportGpxZipAttachmentThread(uri, contentResolver,
+					listId, importStepHandler, progressHandler);
+		case GPX:
+			return new ImportGpxAttachmentThread(uri, contentResolver, listId,
+					importStepHandler, progressHandler);
+		case LOC:
+			return new ImportLocAttachmentThread(uri, contentResolver, listId,
+					importStepHandler, progressHandler);
+		default:
+			return null;
+		}
+	}
+
+	/**
+	 * Import GPX provided via intent of activity that instantiated this
+	 * GPXImporter.
+	 */
     public void importGPX() {
         final Intent intent = fromActivity.getIntent();
         final Uri uri = intent.getData();
@@ -194,7 +227,7 @@ public class GPXImporter {
                 final Geocache cache = DataStore.loadCache(geocode, LoadFlags.LOAD_WAYPOINTS);
                 if (cache != null) {
                     Log.d("GPXImporter.ImportThread.importStaticMaps start downloadMaps for cache " + geocode);
-                    StaticMapsProvider.downloadMaps(cache);
+                    RxUtils.waitForCompletion(StaticMapsProvider.downloadMaps(cache));
                 } else {
                     Log.d("GPXImporter.ImportThread.importStaticMaps: no data found for " + geocode);
                 }