Skip to content

Commit 1fc8c15

Browse files
Fixes commons-app#3547 *Catch possible SqliteException while deleting ContributionsDao's entries (commons-app#3964)
1 parent b8ba89d commit 1fc8c15

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

app/src/main/java/fr/free/nrw/commons/CommonsApplication.java

+7-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import android.app.NotificationManager;
1414
import android.content.Context;
1515
import android.database.sqlite.SQLiteDatabase;
16+
import android.database.sqlite.SQLiteException;
1617
import android.os.Build;
1718
import android.os.Process;
1819
import android.util.Log;
@@ -324,7 +325,12 @@ private void updateAllDatabases() {
324325

325326
CategoryDao.Table.onDelete(db);
326327
dbOpenHelper.deleteTable(db,CONTRIBUTIONS_TABLE);//Delete the contributions table in the existing db on older versions
327-
contributionDao.deleteAll();
328+
329+
try {
330+
contributionDao.deleteAll();
331+
} catch (SQLiteException e) {
332+
Timber.e(e);
333+
}
328334
BookmarkPicturesDao.Table.onDelete(db);
329335
BookmarkLocationsDao.Table.onDelete(db);
330336
}

app/src/main/java/fr/free/nrw/commons/contributions/ContributionDao.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package fr.free.nrw.commons.contributions;
22

3+
import android.database.sqlite.SQLiteException;
34
import androidx.paging.DataSource;
45
import androidx.room.Dao;
56
import androidx.room.Delete;
@@ -68,7 +69,7 @@ public Completable delete(final Contribution contribution) {
6869
public abstract Single<Integer> updateStates(int state, int[] toUpdateStates);
6970

7071
@Query("Delete FROM contribution")
71-
public abstract void deleteAll();
72+
public abstract void deleteAll() throws SQLiteException;
7273

7374
@Update
7475
public abstract void updateSynchronous(Contribution contribution);

0 commit comments

Comments
 (0)