#3482 Use Room in Structured Data branch - remove unused code (#3483)

* #3482 Use Room in Structured Data branch - remove unused code

* #3482 Use Room in Structured Data branch - fix unit test compilation

* #3482 Use Room in Structured Data branch - add kdoc

Author: macgills

app/build.gradle

@@ -107,6 +107,7 @@ dependencies {
     //Room
     def room_version= '2.2.3'
     implementation "androidx.room:room-runtime:$room_version"
+    implementation "androidx.room:room-ktx:$room_version"
     kapt "androidx.room:room-compiler:$room_version" // For Kotlin use kapt instead of annotationProcessor
     implementation 'com.squareup.retrofit2:retrofit:2.7.1'
     implementation "androidx.room:room-rxjava2:$room_version"

app/src/main/AndroidManifest.xml

@@ -183,14 +183,7 @@
             android:authorities="${applicationId}.categories.contentprovider"
             android:exported="false"
             android:label="@string/provider_categories"
-            android:syncable="false" />
-
-        <provider
-            android:authorities="${applicationId}.depicts.contentprovider"
-            android:name=".upload.structure.depictions.DepictsContentProvider"
-            android:exported="false"
-            android:label="@string/provider_depictions"
-            android:syncable="false"/>
+          android:syncable="false" />
 
         <provider
             android:name=".explore.recentsearches.RecentSearchesContentProvider"

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

@@ -6,7 +6,6 @@
 import android.app.NotificationManager;
 import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteException;
 import android.os.Build;
 import android.os.Process;
 import android.util.Log;
@@ -16,10 +15,7 @@
 import com.facebook.drawee.backends.pipeline.Fresco;
 import com.facebook.imagepipeline.core.ImagePipeline;
 import com.facebook.imagepipeline.core.ImagePipelineConfig;
-import com.facebook.imagepipeline.producers.Consumer;
-import com.facebook.imagepipeline.producers.FetchState;
 import com.facebook.imagepipeline.producers.NetworkFetcher;
-import com.facebook.imagepipeline.producers.ProducerContext;
 import com.mapbox.mapboxsdk.Mapbox;
 import com.squareup.leakcanary.LeakCanary;
 import com.squareup.leakcanary.RefWatcher;
@@ -45,15 +41,14 @@
 import fr.free.nrw.commons.category.CategoryDao;
 import fr.free.nrw.commons.concurrency.BackgroundPoolExceptionHandler;
 import fr.free.nrw.commons.concurrency.ThreadPoolService;
+import fr.free.nrw.commons.contributions.ContributionDao;
 import fr.free.nrw.commons.data.DBOpenHelper;
-import fr.free.nrw.commons.db.AppDatabase;
 import fr.free.nrw.commons.di.ApplicationlessInjection;
 import fr.free.nrw.commons.kvstore.JsonKvStore;
 import fr.free.nrw.commons.logging.FileLoggingTree;
 import fr.free.nrw.commons.logging.LogUtils;
 import fr.free.nrw.commons.settings.Prefs;
 import fr.free.nrw.commons.upload.FileUtils;
-import fr.free.nrw.commons.upload.structure.depictions.DepictionDao;
 import fr.free.nrw.commons.utils.ConfigUtils;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.internal.functions.Functions;
@@ -129,8 +124,7 @@ public AppLanguageLookUpTable getLanguageLookUpTable() {
         return languageLookUpTable;
     }
 
-    @Inject
-    AppDatabase appDatabase;
+    @Inject ContributionDao contributionDao;
 
     /**
      * Used to declare and initialize various components and dependencies
@@ -312,9 +306,8 @@ private void updateAllDatabases() {
         SQLiteDatabase db = dbOpenHelper.getWritableDatabase();
 
         CategoryDao.Table.onDelete(db);
-        DepictionDao.Table.onDelete(db);
         dbOpenHelper.deleteTable(db,CONTRIBUTIONS_TABLE);//Delete the contributions table in the existing db on older versions
-        appDatabase.getContributionDao().deleteAll();
+        contributionDao.deleteAll();
         BookmarkPicturesDao.Table.onDelete(db);
         BookmarkLocationsDao.Table.onDelete(db);
     }

app/src/main/java/fr/free/nrw/commons/data/DBOpenHelper.java

@@ -9,7 +9,6 @@
 import fr.free.nrw.commons.bookmarks.pictures.BookmarkPicturesDao;
 import fr.free.nrw.commons.category.CategoryDao;
 import fr.free.nrw.commons.explore.recentsearches.RecentSearchesDao;
-import fr.free.nrw.commons.upload.structure.depictions.DepictionDao;
 
 public class DBOpenHelper  extends SQLiteOpenHelper {
 
@@ -29,7 +28,6 @@ public DBOpenHelper(Context context) {
     @Override
     public void onCreate(SQLiteDatabase sqLiteDatabase) {
         CategoryDao.Table.onCreate(sqLiteDatabase);
-        DepictionDao.Table.onCreate(sqLiteDatabase);
         BookmarkPicturesDao.Table.onCreate(sqLiteDatabase);
         BookmarkLocationsDao.Table.onCreate(sqLiteDatabase);
         RecentSearchesDao.Table.onCreate(sqLiteDatabase);
@@ -38,7 +36,6 @@ public void onCreate(SQLiteDatabase sqLiteDatabase) {
     @Override
     public void onUpgrade(SQLiteDatabase sqLiteDatabase, int from, int to) {
         CategoryDao.Table.onUpdate(sqLiteDatabase, from, to);
-        DepictionDao.Table.onUpdate(sqLiteDatabase, from, to);
         BookmarkPicturesDao.Table.onUpdate(sqLiteDatabase, from, to);
         BookmarkLocationsDao.Table.onUpdate(sqLiteDatabase, from, to);
         RecentSearchesDao.Table.onUpdate(sqLiteDatabase, from, to);

app/src/main/java/fr/free/nrw/commons/db/AppDatabase.java

@@ -0,0 +1,17 @@
+package fr.free.nrw.commons.db
+
+import androidx.room.Database
+import androidx.room.RoomDatabase
+import androidx.room.TypeConverters
+import fr.free.nrw.commons.contributions.Contribution
+import fr.free.nrw.commons.contributions.ContributionDao
+
+/**
+ * The database for accessing the respective DAOs
+ *
+ */
+@Database(entities = [Contribution::class], version = 1, exportSchema = false)
+@TypeConverters(Converters::class)
+abstract class AppDatabase : RoomDatabase() {
+  abstract fun contributionDao(): ContributionDao
+}

app/src/main/java/fr/free/nrw/commons/db/AppDatabase.kt

@@ -55,7 +55,6 @@ public class CommonsApplicationModule {
     private Context applicationContext;
     public static final String IO_THREAD="io_thread";
     public static final String MAIN_THREAD="main_thread";
-    private AppDatabase appDatabase;
 
     public CommonsApplicationModule(Context applicationContext) {
         this.applicationContext = applicationContext;
@@ -247,12 +246,11 @@ public QuadTree providesQuadTres() {
     @Provides
     @Singleton
     public AppDatabase provideAppDataBase() {
-        appDatabase=Room.databaseBuilder(applicationContext, AppDatabase.class, "commons_room.db").build();
-        return appDatabase;
+        return Room.databaseBuilder(applicationContext, AppDatabase.class, "commons_room.db").build();
     }
 
     @Provides
-    public ContributionDao providesContributionsDao() {
-        return appDatabase.getContributionDao();
+    public ContributionDao providesContributionsDao(AppDatabase appDatabase) {
+        return appDatabase.contributionDao();
     }
-}
+}

app/src/main/java/fr/free/nrw/commons/di/CommonsApplicationModule.java

@@ -6,30 +6,25 @@
 import fr.free.nrw.commons.bookmarks.pictures.BookmarkPicturesContentProvider;
 import fr.free.nrw.commons.category.CategoryContentProvider;
 import fr.free.nrw.commons.explore.recentsearches.RecentSearchesContentProvider;
-import fr.free.nrw.commons.upload.structure.depictions.DepictsContentProvider;
 
 /**
  * This Class Represents the Module for dependency injection (using dagger)
  * so, if a developer needs to add a new ContentProvider to the commons app
- * then that must be mentioned here to inject the dependencies 
+ * then that must be mentioned here to inject the dependencies
  */
 @Module
-@SuppressWarnings({"WeakerAccess", "unused"})
+@SuppressWarnings({ "WeakerAccess", "unused" })
 public abstract class ContentProviderBuilderModule {
 
-    @ContributesAndroidInjector
-    abstract CategoryContentProvider bindCategoryContentProvider();
+	@ContributesAndroidInjector
+	abstract CategoryContentProvider bindCategoryContentProvider();
 
-    @ContributesAndroidInjector
-    abstract DepictsContentProvider bindDepictsContentProvider();
+	@ContributesAndroidInjector
+	abstract RecentSearchesContentProvider bindRecentSearchesContentProvider();
 
-    @ContributesAndroidInjector
-    abstract RecentSearchesContentProvider bindRecentSearchesContentProvider();
-
-    @ContributesAndroidInjector
-    abstract BookmarkPicturesContentProvider bindBookmarkContentProvider();
-
-    @ContributesAndroidInjector
-    abstract BookmarkLocationsContentProvider bindBookmarkLocationContentProvider();
+	@ContributesAndroidInjector
+	abstract BookmarkPicturesContentProvider bindBookmarkContentProvider();
 
+	@ContributesAndroidInjector
+	abstract BookmarkLocationsContentProvider bindBookmarkLocationContentProvider();
 }

app/src/main/java/fr/free/nrw/commons/di/ContentProviderBuilderModule.java

@@ -58,7 +58,7 @@ public Observable<DepictedItem> searchForDepictions(String query, int limit, int
                 String.valueOf(offset)
         )
                 .flatMap(depictSearchResponse ->Observable.fromIterable(depictSearchResponse.getSearch()))
-                .map(depictSearchItem -> new DepictedItem(depictSearchItem.getLabel(), depictSearchItem.getDescription(), "", false, depictSearchItem.getId()));
+                .map(DepictedItem::new);
     }
 
     /**

app/src/main/java/fr/free/nrw/commons/explore/depictions/DepictsClient.java

@@ -21,7 +21,6 @@
 import fr.free.nrw.commons.upload.UploadModel.UploadItem;
 import fr.free.nrw.commons.upload.structure.depictions.DepictModel;
 import fr.free.nrw.commons.upload.structure.depictions.DepictedItem;
-import fr.free.nrw.commons.upload.structure.depictions.DepictedItem;
 import io.reactivex.Observable;
 import io.reactivex.Single;
 
@@ -230,8 +229,8 @@ public List<DepictedItem> getSelectedDepictions() {
      * get all depictions
      */
 
-    public Observable<DepictedItem> searchAllEntities(String query, List<String> imageTitleList) {
-        return depictModel.searchAllEntities(query, imageTitleList);
+    public Observable<DepictedItem> searchAllEntities(String query) {
+        return depictModel.searchAllEntities(query);
     }
 
     public void setSelectedDepictions(List<String> selectedDepictions) {