From d429330bd551adb3fd0264283638711d50981682 Mon Sep 17 00:00:00 2001
From: MadWasp79 <madwasp79@gmail.com>
Date: Wed, 8 Jan 2020 17:07:19 +0200
Subject: [PATCH] fix for #8097

---
 .../net/osmand/plus/helpers/ImportHelper.java | 40 +++++++++++++++++--
 1 file changed, 36 insertions(+), 4 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/helpers/ImportHelper.java b/OsmAnd/src/net/osmand/plus/helpers/ImportHelper.java
index 095ef0debd..31c231a211 100644
--- a/OsmAnd/src/net/osmand/plus/helpers/ImportHelper.java
+++ b/OsmAnd/src/net/osmand/plus/helpers/ImportHelper.java
@@ -230,7 +230,7 @@ public class ImportHelper {
 	}
 
 	@SuppressLint("StaticFieldLeak")
-	private void handleFavouritesImport(final Uri gpxFile, final String fileName, final boolean save, final boolean useImportDir, final boolean forceImportFavourites) {
+	private void handleFavouritesImport(final Uri fileUri, final String fileName, final boolean save, final boolean useImportDir, final boolean forceImportFavourites) {
 		new AsyncTask<Void, Void, GPXFile>() {
 			ProgressDialog progress = null;
 
@@ -242,12 +242,39 @@ public class ImportHelper {
 			@Override
 			protected GPXFile doInBackground(Void... nothing) {
 				InputStream is = null;
+				ZipInputStream zis = null;
 				try {
-					final ParcelFileDescriptor pFD = app.getContentResolver().openFileDescriptor(gpxFile, "r");
-
+					final ParcelFileDescriptor pFD = app.getContentResolver().openFileDescriptor(fileUri, "r");
 					if (pFD != null) {
 						is = new FileInputStream(pFD.getFileDescriptor());
-						return GPXUtilities.loadGPXFile(is);
+
+						if (fileName != null && fileName.endsWith(KML_SUFFIX)) {
+							final String result = Kml2Gpx.toGpx(is);
+							if (result != null) {
+								try {
+									return GPXUtilities.loadGPXFile(new ByteArrayInputStream(result.getBytes("UTF-8")));
+								} catch (UnsupportedEncodingException e) {
+									return null;
+								}
+							}
+						} else if (fileName != null && fileName.endsWith(KMZ_SUFFIX)) {
+							try {
+								zis = new ZipInputStream(is);
+								zis.getNextEntry();
+								final String result = Kml2Gpx.toGpx(zis);
+								if (result != null) {
+									try {
+										return GPXUtilities.loadGPXFile(new ByteArrayInputStream(result.getBytes("UTF-8")));
+									} catch (UnsupportedEncodingException e) {
+										return null;
+									}
+								}
+							} catch (Exception e) {
+								return null;
+							}
+						} else {
+							return GPXUtilities.loadGPXFile(is);
+						}
 					}
 				} catch (FileNotFoundException e) {
 					//
@@ -256,6 +283,10 @@ public class ImportHelper {
 						is.close();
 					} catch (IOException ignore) {
 					}
+					if (zis != null) try {
+						zis.close();
+					} catch (IOException ignore) {
+					}
 				}
 				return null;
 			}
@@ -265,6 +296,7 @@ public class ImportHelper {
 				if (isActivityNotDestroyed(activity)) {
 					progress.dismiss();
 				}
+
 				importFavourites(result, fileName, save, useImportDir, forceImportFavourites);
 			}
 		}.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);