Part of commons-app#3127

* Added Room Dependency * Shifted ContributionsDao to use RoomDB
ashishkumar468 · Jan 13, 2020 · 9e0b8f0 · 9e0b8f0
1 parent d26b436
commit 9e0b8f0
Show file tree

Hide file tree

Showing 27 changed files with 315 additions and 871 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -102,6 +102,11 @@ dependencies {
 
     //swipe_layout
     implementation 'com.daimajia.swipelayout:library:1.2.0@aar'
+
+    //Room
+    def room_version= '2.2.3'
+    implementation "androidx.room:room-runtime:$room_version"
+    kapt "androidx.room:room-compiler:$room_version" // For Kotlin use kapt instead of annotationProcessor
 }
 
 android {

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -150,18 +150,6 @@
                 android:name="android.accounts.AccountAuthenticator"
                 android:resource="@xml/authenticator" />
         </service>
-        <service
-            android:name=".contributions.ContributionsSyncService"
-            android:exported="true"
-            android:process=":sync">
-            <intent-filter>
-                <action android:name="android.content.SyncAdapter" />
-            </intent-filter>
-
-            <meta-data
-                android:name="android.content.SyncAdapter"
-                android:resource="@xml/contributions_sync_adapter" />
-        </service>
 
         <service
             android:name="org.acra.sender.SenderService"
@@ -177,12 +165,6 @@
                 android:name="android.support.FILE_PROVIDER_PATHS"
                 android:resource="@xml/provider_paths" />
         </provider>
-        <provider
-            android:name=".contributions.ContributionsContentProvider"
-            android:authorities="${applicationId}.contributions.contentprovider"
-            android:exported="false"
-            android:label="@string/provider_contributions"
-            android:syncable="true" />
 
         <provider
             android:name=".category.CategoryContentProvider"

diff --git a/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java b/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java
@@ -37,8 +37,8 @@
 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;
@@ -114,6 +114,9 @@ public AppLanguageLookUpTable getLanguageLookUpTable() {
         return languageLookUpTable;
     }
 
+    @Inject
+    AppDatabase appDatabase;
+
     /**
      * Used to declare and initialize various components and dependencies
      */
@@ -277,7 +280,7 @@ private void updateAllDatabases() {
         SQLiteDatabase db = dbOpenHelper.getWritableDatabase();
 
         CategoryDao.Table.onDelete(db);
-        ContributionDao.Table.onDelete(db);
+        appDatabase.getContributionDao().deleteAll();
         BookmarkPicturesDao.Table.onDelete(db);
         BookmarkLocationsDao.Table.onDelete(db);
     }

diff --git a/app/src/main/java/fr/free/nrw/commons/Media.java b/app/src/main/java/fr/free/nrw/commons/Media.java
@@ -6,6 +6,8 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.room.Entity;
+import androidx.room.PrimaryKey;
 
 import org.apache.commons.lang3.StringUtils;
 import org.wikipedia.dataclient.mwapi.MwQueryPage;
@@ -26,6 +28,7 @@
 import fr.free.nrw.commons.utils.CommonsDateUtil;
 import fr.free.nrw.commons.utils.MediaDataExtractorUtil;
 
+@Entity
 public class Media implements Parcelable {
 
     public static final Media EMPTY = new Media("");
@@ -42,25 +45,27 @@ public Media[] newArray(int i) {
     };
 
     // Primary metadata fields
-    protected Uri localUri;
-    private String thumbUrl;
-    protected String imageUrl;
-    protected String filename;
-    protected String description; // monolingual description on input...
-    protected String discussion;
-    protected long dataLength;
-    protected Date dateCreated;
-    protected @Nullable Date dateUploaded;
-    protected int width;
-    protected int height;
-    protected String license;
-    protected String licenseUrl;
-    protected String creator;
-    protected ArrayList<String> categories; // as loaded at runtime?
-    protected boolean requestedDeletion;
-    private Map<String, String> descriptions; // multilingual descriptions as loaded
-    private HashMap<String, Object> tags = new HashMap<>();
-    private @Nullable LatLng coordinates;
+    @PrimaryKey
+    @NonNull
+    public Uri localUri;
+    public String thumbUrl;
+    public String imageUrl;
+    public String filename;
+    public String description; // monolingual description on input...
+    public String discussion;
+    long dataLength;
+    public Date dateCreated;
+    @Nullable public  Date dateUploaded;
+    public int width;
+    public int height;
+    public String license;
+    public String licenseUrl;
+    public String creator;
+    public ArrayList<String> categories; // as loaded at runtime?
+    public boolean requestedDeletion;
+    public HashMap<String, String> descriptions; // multilingual descriptions as loaded
+    public HashMap<String, String> tags = new HashMap<>();
+    @Nullable public  LatLng coordinates;
 
     /**
      * Provides local constructor
@@ -118,7 +123,7 @@ public Media(Parcel in) {
         dateCreated = (Date) in.readSerializable();
         dateUploaded = (Date) in.readSerializable();
         creator = in.readString();
-        tags = (HashMap<String, Object>) in.readSerializable();
+        tags = (HashMap<String, String>) in.readSerializable();
         width = in.readInt();
         height = in.readInt();
         license = in.readString();
@@ -218,7 +223,7 @@ public Object getTag(String key) {
      * @param key Media key
      * @param value Media value
      */
-    public void setTag(String key, Object value) {
+    public void setTag(String key, String value) {
         tags.put(key, value);
     }
 

diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/Contribution.java b/app/src/main/java/fr/free/nrw/commons/contributions/Contribution.java
@@ -6,6 +6,7 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.StringDef;
+import androidx.room.Entity;
 
 import org.apache.commons.lang3.StringUtils;
 
@@ -21,6 +22,7 @@
 
 import static java.lang.annotation.RetentionPolicy.SOURCE;
 
+@Entity
 public class  Contribution extends Media {
 
     //{{According to EXIF data|2009-01-09}}
@@ -55,16 +57,16 @@ public Contribution[] newArray(int i) {
     public static final String SOURCE_GALLERY = "gallery";
     public static final String SOURCE_EXTERNAL = "external";
 
-    private Uri contentUri;
-    private String source;
-    private String editSummary;
-    private int state;
-    private long transferred;
-    private String decimalCoords;
-    private boolean isMultiple;
-    private String wikiDataEntityId;
-    private Uri contentProviderUri;
-    private String dateCreatedSource;
+    public Uri contentUri;
+    public String source;
+    public String editSummary;
+    public int state;
+    public long transferred;
+    public String decimalCoords;
+    public boolean isMultiple;
+    public String wikiDataEntityId;
+    public Uri contentProviderUri;
+    public String dateCreatedSource;
 
     public Contribution(Uri contentUri, String filename, Uri localUri, String imageUrl, Date dateCreated,
                         int state, long dataLength, Date dateUploaded, long transferred,