Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix kmz file import

Browse source
This commit is contained in:
Vitaliy 2020-06-01 15:47:01 +03:00
parent 9fd029b089
commit 48dbb64d09
1 changed files with 24 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
OsmAnd/src/net/osmand/plus/helpers/ImportHelper.java
View file

@ -71,6 +71,7 @@ import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream; import java.util.zip.ZipInputStream;
import static android.app.Activity.RESULT_OK; import static android.app.Activity.RESULT_OK;
@ -314,7 +315,9 @@ public class ImportHelper {
} else if (fileName != null && fileName.endsWith(KMZ_SUFFIX)) { } else if (fileName != null && fileName.endsWith(KMZ_SUFFIX)) {
try { try {
zis = new ZipInputStream(is); zis = new ZipInputStream(is);
zis.getNextEntry(); ZipEntry entry;
while ((entry = zis.getNextEntry()) != null) {
if (entry.getName().endsWith(KML_SUFFIX)) {
final String result = Kml2Gpx.toGpx(zis); final String result = Kml2Gpx.toGpx(zis);
if (result != null) { if (result != null) {
try { try {
@ -323,6 +326,8 @@ public class ImportHelper {
return null; return null;
} }
} }
}
}
} catch (Exception e) { } catch (Exception e) {
return null; return null;
} }
@ -418,7 +423,10 @@ public class ImportHelper {
is = app.getContentResolver().openInputStream(kmzFile); is = app.getContentResolver().openInputStream(kmzFile);
if (is != null) { if (is != null) {
zis = new ZipInputStream(is); zis = new ZipInputStream(is);
zis.getNextEntry();
ZipEntry entry;
while ((entry = zis.getNextEntry()) != null) {
if (entry.getName().endsWith(KML_SUFFIX)) {
final String result = Kml2Gpx.toGpx(zis); final String result = Kml2Gpx.toGpx(zis);
if (result != null) { if (result != null) {
try { try {
@ -428,6 +436,8 @@ public class ImportHelper {
} }
} }
} }
}
}
} catch (Exception e) { } catch (Exception e) {
log.error(e.getMessage(), e); log.error(e.getMessage(), e);
} finally { } finally {