mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-27 12:53:55 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixes #3547 *Catch possible SqliteException while deleting ContributionsDao's entries (#3964)

Browse source
This commit is contained in:
Ashish 2020-10-21 06:24:44 +05:30 • committed by GitHub
parent b8ba89d077
commit 1fc8c15c08
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/fr/free/nrw/commons/CommonsApplication.java
View file

@ -13,6 +13,7 @@ import android.app.NotificationChannel;
import android.app.NotificationManager; import android.app.NotificationManager;
import android.content.Context; import android.content.Context;
import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteException;
import android.os.Build; import android.os.Build;
import android.os.Process; import android.os.Process;
import android.util.Log; import android.util.Log;
@ -324,7 +325,12 @@ public class CommonsApplication extends MultiDexApplication {
CategoryDao.Table.onDelete(db); CategoryDao.Table.onDelete(db);
dbOpenHelper.deleteTable(db,CONTRIBUTIONS_TABLE);//Delete the contributions table in the existing db on older versions dbOpenHelper.deleteTable(db,CONTRIBUTIONS_TABLE);//Delete the contributions table in the existing db on older versions
contributionDao.deleteAll();
try {
contributionDao.deleteAll();
} catch (SQLiteException e) {
Timber.e(e);
}
BookmarkPicturesDao.Table.onDelete(db); BookmarkPicturesDao.Table.onDelete(db);
BookmarkLocationsDao.Table.onDelete(db); BookmarkLocationsDao.Table.onDelete(db);
} }

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

@ -1,5 +1,6 @@
package fr.free.nrw.commons.contributions; package fr.free.nrw.commons.contributions;
import android.database.sqlite.SQLiteException;
import androidx.paging.DataSource; import androidx.paging.DataSource;
import androidx.room.Dao; import androidx.room.Dao;
import androidx.room.Delete; import androidx.room.Delete;
@ -68,7 +69,7 @@ public abstract class ContributionDao {
public abstract Single<Integer> updateStates(int state, int[] toUpdateStates); public abstract Single<Integer> updateStates(int state, int[] toUpdateStates);
@Query("Delete FROM contribution") @Query("Delete FROM contribution")
public abstract void deleteAll(); public abstract void deleteAll() throws SQLiteException;
@Update @Update
public abstract void updateSynchronous(Contribution contribution); public abstract void updateSynchronous(Contribution contribution);