Merge branch '2.12-release'

Author: misaochan

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Wikimedia Commons for Android
 
+## v2.12.2
+- Fixed crash on startup (hopefully, could not reproduce it)
+
 ## v2.12.1
 - Fixed issue with Nearby loading in wrong location
 - Various crash fixes

app/build.gradle

@@ -110,8 +110,8 @@ android {
 
     defaultConfig {
         applicationId 'fr.free.nrw.commons'
-        versionCode 542
-        versionName '2.12.1'
+        versionCode 549
+        versionName '2.12.2'
         setProperty("archivesBaseName", "app-commons-v$versionName-" + getBranchName())
 
         minSdkVersion 19

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

@@ -4,6 +4,7 @@
 import android.content.ContentValues;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteException;
 import android.os.RemoteException;
 
 import androidx.annotation.NonNull;
@@ -264,7 +265,13 @@ public static void onUpdate(SQLiteDatabase db, int from, int to) {
             }
             if (from == 10 && to == 11) {
                 from++;
-                db.execSQL("ALTER TABLE bookmarksLocations ADD COLUMN location_pic STRING;");
+                //This is safe, and can be called clean, as we/I do not remember the appropriate version for this
+                //We are anyways switching to room, these things won't be nescessary then
+                try {
+                    db.execSQL("ALTER TABLE bookmarksLocations ADD COLUMN location_pic STRING;");
+                }catch (SQLiteException exception){
+                    Timber.e(exception);//
+                }
                 return;
             }
         }