From 34f0baa833c4b7bb37c6ec45b18eaf9caad2e779 Mon Sep 17 00:00:00 2001 From: Ashish Kumar Date: Tue, 21 Jan 2020 22:08:28 +0530 Subject: [PATCH] Fixes #3335 Handled sqlitexception for adding existig column in app versions which already have COLUMN location_pic --- .../bookmarks/locations/BookmarkLocationsDao.java | 9 ++++++++- 1 file changed, 8 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 a2d7cd6fd4..81591cb361 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 @@ -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; import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat; @@ -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; } }