Merge branch '2.12-release'

Author: misaochan

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

@@ -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;
 
@@ -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;
             }
@@ -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;
+            }
         }
     }
 }

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