From 71a83385e7bbb37be2766fa72670154b065007cf Mon Sep 17 00:00:00 2001 From: ayans Date: Mon, 13 Jun 2022 11:59:50 +0530 Subject: [PATCH] Database created --- .../commons/customselector/database/NotForUploadDao.kt | 6 ++++-- app/src/main/java/fr/free/nrw/commons/db/AppDatabase.kt | 6 +++--- .../fr/free/nrw/commons/di/CommonsApplicationModule.java | 9 +++++++++ 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/customselector/database/NotForUploadDao.kt b/app/src/main/java/fr/free/nrw/commons/customselector/database/NotForUploadDao.kt index 18e60f488..ba61afd53 100644 --- a/app/src/main/java/fr/free/nrw/commons/customselector/database/NotForUploadDao.kt +++ b/app/src/main/java/fr/free/nrw/commons/customselector/database/NotForUploadDao.kt @@ -7,7 +7,7 @@ import androidx.room.* * Dao class for Not For Upload */ @Dao -abstract class NotForUploadDao { +abstract class NotForUploadStatusDao { /** * Insert into Not For Upload status. @@ -20,4 +20,6 @@ abstract class NotForUploadDao { */ @Delete abstract suspend fun delete(notForUploadStatus: NotForUploadStatus) -} \ No newline at end of file +} + + diff --git a/app/src/main/java/fr/free/nrw/commons/db/AppDatabase.kt b/app/src/main/java/fr/free/nrw/commons/db/AppDatabase.kt index fd85731d8..5c046c19f 100644 --- a/app/src/main/java/fr/free/nrw/commons/db/AppDatabase.kt +++ b/app/src/main/java/fr/free/nrw/commons/db/AppDatabase.kt @@ -5,8 +5,7 @@ import androidx.room.RoomDatabase import androidx.room.TypeConverters import fr.free.nrw.commons.contributions.Contribution import fr.free.nrw.commons.contributions.ContributionDao -import fr.free.nrw.commons.customselector.database.UploadedStatus -import fr.free.nrw.commons.customselector.database.UploadedStatusDao +import fr.free.nrw.commons.customselector.database.* import fr.free.nrw.commons.upload.depicts.Depicts import fr.free.nrw.commons.upload.depicts.DepictsDao @@ -14,10 +13,11 @@ import fr.free.nrw.commons.upload.depicts.DepictsDao * The database for accessing the respective DAOs * */ -@Database(entities = [Contribution::class, Depicts::class, UploadedStatus::class], version = 12, exportSchema = false) +@Database(entities = [Contribution::class, Depicts::class, UploadedStatus::class, NotForUploadStatus::class], version = 12, exportSchema = false) @TypeConverters(Converters::class) abstract class AppDatabase : RoomDatabase() { abstract fun contributionDao(): ContributionDao abstract fun DepictsDao(): DepictsDao; abstract fun UploadedStatusDao(): UploadedStatusDao; + abstract fun NotForUploadStatusDao(): NotForUploadStatusDao } diff --git a/app/src/main/java/fr/free/nrw/commons/di/CommonsApplicationModule.java b/app/src/main/java/fr/free/nrw/commons/di/CommonsApplicationModule.java index 443dd8433..9185d01ec 100644 --- a/app/src/main/java/fr/free/nrw/commons/di/CommonsApplicationModule.java +++ b/app/src/main/java/fr/free/nrw/commons/di/CommonsApplicationModule.java @@ -17,6 +17,7 @@ import fr.free.nrw.commons.R; import fr.free.nrw.commons.auth.AccountUtil; import fr.free.nrw.commons.auth.SessionManager; import fr.free.nrw.commons.contributions.ContributionDao; +import fr.free.nrw.commons.customselector.database.NotForUploadStatusDao; import fr.free.nrw.commons.customselector.database.UploadedStatusDao; import fr.free.nrw.commons.customselector.ui.selector.ImageFileLoader; import fr.free.nrw.commons.data.DBOpenHelper; @@ -290,6 +291,14 @@ public class CommonsApplicationModule { return appDatabase.UploadedStatusDao(); } + /** + * Get the reference of NotForUploadStatus class. + */ + @Provides + public NotForUploadStatusDao providesNotForUploadStatusDao(AppDatabase appDatabase) { + return appDatabase.NotForUploadStatusDao(); + } + @Provides public ContentResolver providesContentResolver(Context context){ return context.getContentResolver();