From 959b3afd4c1abdc0aa8026007a3643486d1744bd Mon Sep 17 00:00:00 2001 From: neslihanturan Date: Tue, 10 Dec 2019 16:47:10 +0300 Subject: [PATCH] Fixes #3231 "Nearby" always first puts me in Punta Arenas (#3271) * Update tables from 10 to 11 * Remove unneeded changes --- .../commons/bookmarks/locations/BookmarkLocationsDao.java | 7 +++++++ .../main/java/fr/free/nrw/commons/data/DBOpenHelper.java | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/fr/free/nrw/commons/bookmarks/locations/BookmarkLocationsDao.java b/app/src/main/java/fr/free/nrw/commons/bookmarks/locations/BookmarkLocationsDao.java index 1edff1c07..a2d7cd6fd 100644 --- a/app/src/main/java/fr/free/nrw/commons/bookmarks/locations/BookmarkLocationsDao.java +++ b/app/src/main/java/fr/free/nrw/commons/bookmarks/locations/BookmarkLocationsDao.java @@ -19,6 +19,7 @@ import fr.free.nrw.commons.location.LatLng; import fr.free.nrw.commons.nearby.Label; import fr.free.nrw.commons.nearby.Place; import fr.free.nrw.commons.nearby.Sitelinks; +import timber.log.Timber; import static fr.free.nrw.commons.bookmarks.locations.BookmarkLocationsContentProvider.BASE_URI; @@ -239,6 +240,7 @@ public class BookmarkLocationsDao { } public static void onUpdate(SQLiteDatabase db, int from, int to) { + Timber.d("bookmarksLocations db is updated from:"+from+", to:"+to); if (from == to) { return; } @@ -260,6 +262,11 @@ public class BookmarkLocationsDao { onUpdate(db, from, to); return; } + if (from == 10 && to == 11) { + from++; + db.execSQL("ALTER TABLE bookmarksLocations ADD COLUMN location_pic STRING;"); + return; + } } } } diff --git a/app/src/main/java/fr/free/nrw/commons/data/DBOpenHelper.java b/app/src/main/java/fr/free/nrw/commons/data/DBOpenHelper.java index b90acd95d..aaade6277 100644 --- a/app/src/main/java/fr/free/nrw/commons/data/DBOpenHelper.java +++ b/app/src/main/java/fr/free/nrw/commons/data/DBOpenHelper.java @@ -13,7 +13,7 @@ import fr.free.nrw.commons.explore.recentsearches.RecentSearchesDao; public class DBOpenHelper extends SQLiteOpenHelper { private static final String DATABASE_NAME = "commons.db"; - private static final int DATABASE_VERSION = 10; + private static final int DATABASE_VERSION = 11; /** * Do not use directly - @Inject an instance where it's needed and let