From 86b76885fd3a7af8c0bd604db6f1f8214ffdea86 Mon Sep 17 00:00:00 2001 From: Roman Tsisyk Date: Wed, 14 Jul 2021 10:48:36 +0300 Subject: [PATCH] [android] Fix NPE at BookmarkManager.getBookmarksFilenameFromUri Closes #855 Signed-off-by: Roman Tsisyk --- .../maps/bookmarks/data/BookmarkManager.java | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/android/src/com/mapswithme/maps/bookmarks/data/BookmarkManager.java b/android/src/com/mapswithme/maps/bookmarks/data/BookmarkManager.java index ea13c842ab..e595541fc3 100644 --- a/android/src/com/mapswithme/maps/bookmarks/data/BookmarkManager.java +++ b/android/src/com/mapswithme/maps/bookmarks/data/BookmarkManager.java @@ -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;