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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2015-10-06 09:06:01 +02:00
commit e7422872f9
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
OsmAnd/src/net/osmand/plus/FavouritesDbHelper.java
View file

@ -512,10 +512,13 @@ public class FavouritesDbHelper {
} }
private String loadGPXFile(File file, Map<String, FavouritePoint> points) { private boolean loadGPXFile(File file, Map<String, FavouritePoint> points) {
if(!file.exists()) {
return false;
}
GPXFile res = GPXUtilities.loadGPXFile(context, file); GPXFile res = GPXUtilities.loadGPXFile(context, file);
if (res.warning != null) { if (res.warning != null) {
return res.warning; return false;
} }
for (WptPt p : res.points) { for (WptPt p : res.points) {
int c; int c;
@ -535,7 +538,7 @@ public class FavouritesDbHelper {
fp.setVisible(!p.getExtensionsToRead().containsKey(HIDDEN)); fp.setVisible(!p.getExtensionsToRead().containsKey(HIDDEN));
points.put(getKey(fp), fp); points.put(getKey(fp), fp);
} }
return null; return true;
} }
public void editFavouriteGroup(FavoriteGroup group, String newName, int color, boolean visible) { public void editFavouriteGroup(FavoriteGroup group, String newName, int color, boolean visible) {