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

Merge branch 'sasha_pasha_branch' of ssh://github.com/osmandapp/Osmand into sasha_pasha_branch

Browse source
This commit is contained in:
PavelRatushny 2017-09-15 12:34:13 +03:00
commit 7f7589a673
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
OsmAnd/src/net/osmand/plus/MapMarkersHelper.java
View file

@ -302,6 +302,9 @@ public class MapMarkersHelper {
if (group.getType() == MarkersSyncGroup.FAVORITES_TYPE) {
FavouritesDbHelper.FavoriteGroup favGroup = ctx.getFavorites().getGroup(group.name);
if (favGroup == null) {
return;
}
if (!favGroup.visible) {
removeActiveMarkersFromSyncGroup(group.id);
return;

4
OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersDbHelper.java
View file

@ -117,9 +117,7 @@ public class MapMarkersDbHelper {
}
private void onUpgrade(SQLiteConnection db, int oldVersion, int newVersion) {
db.execSQL("DROP TABLE IF EXISTS " + MARKERS_TABLE_NAME);
db.execSQL("DROP TABLE IF EXISTS " + GROUPS_TABLE_NAME);
onCreate(db);
}
private void saveExistingMarkersToDb() {