From 9a23b03ccdbbaad25ed7ce34b83ce0037244d633 Mon Sep 17 00:00:00 2001 From: neslihanturan Date: Wed, 4 Dec 2019 14:58:09 +0300 Subject: [PATCH 1/2] Update tables from 10 to 11 --- .../bookmarks/locations/BookmarkLocationsDao.java | 9 +++++++++ .../main/java/fr/free/nrw/commons/data/DBOpenHelper.java | 2 +- 2 files changed, 10 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 1edff1c078..5339cf27c4 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 @@ -5,6 +5,8 @@ import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; import android.os.RemoteException; +import android.util.Log; + import androidx.annotation.NonNull; import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat; @@ -19,6 +21,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; @@ -239,6 +242,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; } @@ -260,6 +264,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; + } } } } 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 b90acd95dd..aaade6277f 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 @@ 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 From 1731ec4b7e2876c441e7b55a2e53f4489f3c3ea2 Mon Sep 17 00:00:00 2001 From: neslihanturan Date: Wed, 4 Dec 2019 15:04:29 +0300 Subject: [PATCH 2/2] Remove unneeded changes --- .../nrw/commons/bookmarks/locations/BookmarkLocationsDao.java | 2 -- 1 file changed, 2 deletions(-) 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 5339cf27c4..a2d7cd6fd4 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 @@ -5,8 +5,6 @@ import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; import android.os.RemoteException; -import android.util.Log; - import androidx.annotation.NonNull; import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat;