Skip to content

Fixes #3231 "Nearby" always first puts me in Punta Arenas #3271

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 10, 2019
Merged

Fixes #3231 "Nearby" always first puts me in Punta Arenas #3271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a23b03
Update tables from 10 to 11
neslihanturan Dec 4, 2019
1731ec4
Remove unneeded changes
neslihanturan Dec 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions app/src/main/java/fr/free/nrw/commons/bookmarks/locations/BookmarkLocationsDao.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
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;

Expand Down Expand Up @@ -239,6 +240,7 @@ public static void onDelete(SQLiteDatabase db) {
}

public static void onUpdate(SQLiteDatabase db, int from, int to) {
Timber.d("bookmarksLocations db is updated from:"+from+", to:"+to);
if (from == to) {
return;
}
Expand All @@ -260,6 +262,11 @@ public static void onUpdate(SQLiteDatabase db, int from, int to) {
onUpdate(db, from, to);
return;
}
if (from == 10 && to == 11) {
from++;
db.execSQL("ALTER TABLE bookmarksLocations ADD COLUMN location_pic STRING;");
return;
}
}
}
}
2 changes: 1 addition & 1 deletion app/src/main/java/fr/free/nrw/commons/data/DBOpenHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
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
Expand Down