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

Fix NPE

Browse source
This commit is contained in:
Alex Sytnyk 2018-08-28 19:20:30 +03:00
parent e46e4c37f9
commit c571408815
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -108,7 +108,7 @@ public class ImportHelper {
return false; return false;
} }
public void handleFavouritesImport(Uri uri) { public void handleFavouritesImport(@NonNull Uri uri) {
String scheme = uri.getScheme(); String scheme = uri.getScheme();
boolean isFileIntent = "file".equals(scheme); boolean isFileIntent = "file".equals(scheme);
boolean isContentIntent = "content".equals(scheme); boolean isContentIntent = "content".equals(scheme);

5
OsmAnd/src/net/osmand/plus/myplaces/FavoritesActivity.java
View file

@ -141,9 +141,8 @@ public class FavoritesActivity extends TabActivity {
} }
} }
} else if (requestCode == IMPORT_FAVOURITES_REQUEST && resultCode == Activity.RESULT_OK) { } else if (requestCode == IMPORT_FAVOURITES_REQUEST && resultCode == Activity.RESULT_OK) {
if (data != null) { if (data != null && data.getData() != null) {
Uri uri = data.getData(); importHelper.handleFavouritesImport(data.getData());
importHelper.handleFavouritesImport(uri);
} }
} else { } else {
super.onActivityResult(requestCode, resultCode, data); super.onActivityResult(requestCode, resultCode, data);