pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Fix NPE at BookmarkManager.getBookmarksFilenameFromUri

Browse source 
Closes #855

Signed-off-by: Roman Tsisyk <roman@tsisyk.com>
This commit is contained in:
Roman Tsisyk 2021-07-14 10:48:36 +03:00 • committed by Alexander Borsuk
parent 825912e932
commit 86b76885fd
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
android/src/com/mapswithme/maps/bookmarks/data/BookmarkManager.java
View file

@ -452,14 +452,17 @@ public enum BookmarkManager
// Try get guess extension from the mime type.
final String mime = resolver.getType(uri);
final int i = mime.lastIndexOf('.');
if (i != -1)
if (mime != null)
{
final String type = mime.substring(i + 1);
if (type.equalsIgnoreCase("kmz"))
return filename + ".kmz";
else if (type.equalsIgnoreCase("kml+xml"))
return filename + ".kml";
final int i = mime.lastIndexOf('.');
if (i != -1)
{
final String type = mime.substring(i + 1);
if (type.equalsIgnoreCase("kmz"))
return filename + ".kmz";
else if (type.equalsIgnoreCase("kml+xml"))
return filename + ".kml";
}
}
return null;