mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-26 20:33:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch '2.12-release'

Browse source
This commit is contained in:
Josephine Lim 2019-12-10 23:52:22 +10:00
commit e23b80dfcd
2 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/java/fr/free/nrw/commons/bookmarks/locations/BookmarkLocationsDao.java
View file

@ -19,6 +19,7 @@ import fr.free.nrw.commons.location.LatLng;
import fr.free.nrw.commons.nearby.Label; import fr.free.nrw.commons.nearby.Label;
import fr.free.nrw.commons.nearby.Place; import fr.free.nrw.commons.nearby.Place;
import fr.free.nrw.commons.nearby.Sitelinks; import fr.free.nrw.commons.nearby.Sitelinks;
import timber.log.Timber;
import static fr.free.nrw.commons.bookmarks.locations.BookmarkLocationsContentProvider.BASE_URI; 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) { public static void onUpdate(SQLiteDatabase db, int from, int to) {
Timber.d("bookmarksLocations db is updated from:"+from+", to:"+to);
if (from == to) { if (from == to) {
return; return;
} }
@ -260,6 +262,11 @@ public class BookmarkLocationsDao {
onUpdate(db, from, to); onUpdate(db, from, to);
return; return;
} }
if (from == 10 && to == 11) {
from++;
db.execSQL("ALTER TABLE bookmarksLocations ADD COLUMN location_pic STRING;");
return;
}
} }
} }
} }

2
app/src/main/java/fr/free/nrw/commons/data/DBOpenHelper.java
View file

@ -13,7 +13,7 @@ import fr.free.nrw.commons.explore.recentsearches.RecentSearchesDao;
public class DBOpenHelper extends SQLiteOpenHelper { public class DBOpenHelper extends SQLiteOpenHelper {
private static final String DATABASE_NAME = "commons.db"; 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 * Do not use directly - @Inject an instance where it's needed and let