With lazy loading of contributions

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

@@ -6,6 +6,7 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.room.Entity;
+import androidx.room.PrimaryKey;
 import fr.free.nrw.commons.location.LatLng;
 import fr.free.nrw.commons.utils.CommonsDateUtil;
 import fr.free.nrw.commons.utils.MediaDataExtractorUtil;
@@ -50,6 +51,9 @@ public class Media implements Parcelable {
     public HashMap<String, String> descriptions; // multilingual descriptions as loaded
     public HashMap<String, String> tags = new HashMap<>();
     @Nullable public  LatLng coordinates;
+    @PrimaryKey
+    @NonNull
+    public int pageId;
 
     /**
      * Provides local constructor
@@ -154,6 +158,7 @@ public static Media from(MwQueryPage page) {
         if (metadata == null) {
             Media media = new Media(null, imageInfo.getOriginalUrl(),
                     page.title(), "", 0, null, null, null);
+            media.pageId=page.pageId();
             if (!StringUtils.isBlank(imageInfo.getThumbUrl())) {
                 media.setThumbUrl(imageInfo.getThumbUrl());
             }
@@ -169,6 +174,7 @@ public static Media from(MwQueryPage page) {
                 safeParseDate(metadata.dateTime()),
                 getArtist(metadata)
         );
+        media.pageId=page.pageId();
 
         if (!StringUtils.isBlank(imageInfo.getThumbUrl())) {
             media.setThumbUrl(imageInfo.getThumbUrl());

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

@@ -41,9 +41,7 @@ public class  Contribution extends Media {
     public static final String SOURCE_CAMERA = "camera";
     public static final String SOURCE_GALLERY = "gallery";
     public static final String SOURCE_EXTERNAL = "external";
-    @PrimaryKey (autoGenerate = true)
-    @NonNull
-    public long _id;
+
     public Uri contentUri;
     public String source;
     public String editSummary;
@@ -73,7 +71,7 @@ public Contribution(Media media) {
             media.license, media.getLicenseUrl(), media.creator, media.getCategories(),
             media.requestedDeletion,
             media.descriptions, media.tags, media.coordinates);
-
+        this.pageId=media.pageId;
         this.state = STATE_COMPLETED;
     }
 
@@ -258,7 +256,6 @@ public int describeContents() {
     @Override
     public void writeToParcel(Parcel dest, int flags) {
         super.writeToParcel(dest, flags);
-        dest.writeLong(this._id);
         dest.writeParcelable(this.contentUri, flags);
         dest.writeString(this.source);
         dest.writeString(this.editSummary);
@@ -275,7 +272,6 @@ public void writeToParcel(Parcel dest, int flags) {
 
     protected Contribution(Parcel in) {
         super(in);
-        this._id = in.readLong();
         this.contentUri = in.readParcelable(Uri.class.getClassLoader());
         this.source = in.readString();
         this.editSummary = in.readString();
@@ -305,7 +301,7 @@ public Contribution[] newArray(int size) {
     @NonNull
     @Override
     public String toString() {
-        return String.valueOf(_id);
+        return String.valueOf(pageId);
     }
 
     @Override

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

@@ -24,18 +24,8 @@ public abstract class ContributionDao {
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     public abstract Single<Long> save(Contribution contribution);
 
-    public Completable deleteAllAndSave(List<Contribution> contributions){
-        return Completable.fromAction(() -> deleteAllAndSaveTransaction(contributions));
-    }
-
-    @Transaction
-    public void deleteAllAndSaveTransaction(List<Contribution> contributions){
-        deleteAll(Contribution.STATE_COMPLETED);
-        save(contributions);
-    }
-
-    @Insert
-    public abstract void save(List<Contribution> contribution);
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    public abstract Single<List<Long>> save(List<Contribution> contribution);
 
     @Delete
     public abstract Single<Integer> delete(Contribution contribution);

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

@@ -19,9 +19,10 @@ public class ContributionsListAdapter extends RecyclerView.Adapter<ContributionV
     private Callback callback;
     private List<Contribution> contributions;
 
-    public ContributionsListAdapter(Callback callback) {
+    public ContributionsListAdapter(final Callback callback) {
         this.callback = callback;
         contributions = new ArrayList<>();
+        setHasStableIds(true);
     }
 
     /**
@@ -54,12 +55,7 @@ public int getItemCount() {
     }
 
     public void setContributions(@NonNull final List<Contribution> contributionList) {
-        contributions.addAll(contributionList);
-        final HashSet<Contribution> hashSet = new HashSet<>(contributions);
-        contributions.clear();
-        contributions.addAll(hashSet);
-        Collections.sort(contributions,
-            (o1, o2) -> -o1.getDateUploaded().compareTo(o2.getDateUploaded()));
+        contributions = contributionList;
         notifyDataSetChanged();
     }
 
@@ -69,7 +65,7 @@ public Contribution getContributionForPosition(int position) {
 
     @Override
     public long getItemId(int position) {
-        return contributions.get(position)._id;
+        return contributions.get(position).pageId;
     }
 
     public interface Callback {

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

@@ -197,7 +197,7 @@ public void showNoContributionsUI(boolean shouldShow) {
     }
 
     @Override
-    public void showContributions(List<Contribution> contributionList) {
+    public void showContributions(final List<Contribution> contributionList) {
         adapter.setContributions(contributionList);
     }
 

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

@@ -96,10 +96,10 @@ public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
 
   public void fetchContributions() {
     if (NetworkUtils.isInternetConnectionEstablished(CommonsApplication.getInstance())) {
-      view.showProgress(true);
-      this.user = sessionManager.getUserName();
-
-      view.showContributions(Collections.emptyList());
+      if (contributionList.isEmpty()) {
+        view.showProgress(true);
+      }
+      user = sessionManager.getUserName();
       compositeDisposable.add(mediaClient.getMediaListForUser(user)
           .subscribeOn(ioThreadScheduler)
           .observeOn(mainThreadScheduler)
@@ -146,7 +146,7 @@ private void showContributions(@NonNull final List<Contribution> contributions)
     }
   }
 
-  private void saveContributionsToDB(List<Contribution> contributions) {
+  private void saveContributionsToDB(final List<Contribution> contributions) {
     repository.save(contributions).subscribeOn(ioThreadScheduler).subscribe();
     repository.set("last_fetch_timestamp", System.currentTimeMillis());
   }

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

@@ -67,8 +67,8 @@ public LiveData<List<Contribution>> getContributions() {
         return contributionDao.fetchContributions();
     }
 
-    public Completable saveContributions(List<Contribution> contributions) {
-        return contributionDao.deleteAllAndSave(contributions);
+    public Single<List<Long>> saveContributions(List<Contribution> contributions) {
+        return contributionDao.save(contributions);
     }
 
     public void set(String key, long value) {

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

@@ -6,7 +6,6 @@
 
 import javax.inject.Inject;
 
-import io.reactivex.Completable;
 import io.reactivex.Single;
 
 /**
@@ -50,7 +49,7 @@ public LiveData<List<Contribution>> fetchContributions() {
         return localDataSource.getContributions();
     }
 
-    public Completable save(List<Contribution> contributions) {
+    public Single<List<Long>> save(List<Contribution> contributions) {
         return localDataSource.saveContributions(contributions);
     }
 

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

@@ -7,7 +7,7 @@
 import fr.free.nrw.commons.contributions.Contribution;
 import fr.free.nrw.commons.contributions.ContributionDao;
 
-@Database(entities = {Contribution.class}, version = 1, exportSchema = false)
+@Database(entities = {Contribution.class}, version = 2, exportSchema = false)
 @TypeConverters({Converters.class})
 abstract public class AppDatabase extends RoomDatabase {
     public abstract ContributionDao getContributionDao();

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

@@ -7,6 +7,9 @@
 import android.view.inputmethod.InputMethodManager;
 import androidx.collection.LruCache;
 import androidx.room.Room;
+import androidx.room.RoomDatabase.Builder;
+import androidx.room.migration.Migration;
+import androidx.sqlite.db.SupportSQLiteDatabase;
 import com.github.varunpant.quadtree.QuadTree;
 import com.google.gson.Gson;
 import dagger.Module;
@@ -231,10 +234,55 @@ public QuadTree providesQuadTres() {
     @Provides
     @Singleton
     public AppDatabase provideAppDataBase() {
-        appDatabase=Room.databaseBuilder(applicationContext, AppDatabase.class, "commons_room.db").build();
+        Builder<AppDatabase> appDatabaseBuilder = Room
+            .databaseBuilder(applicationContext, AppDatabase.class, "commons_room.db");
+        appDatabaseBuilder.addMigrations(MIGRATION_1_2);
+        appDatabase = appDatabaseBuilder.build();
         return appDatabase;
     }
 
+    static final Migration MIGRATION_1_2 = new Migration(1, 2) {
+        @Override
+        public void migrate(SupportSQLiteDatabase database) {
+            database.execSQL("DROP TABLE `contribution`");
+            database.execSQL("CREATE TABLE IF NOT EXISTS `contribution` ("
+                + "`localUri` TEXT,"
+                + " `thumbUrl` TEXT,"
+                + " `imageUrl` TEXT,"
+                + " `filename` TEXT,"
+                + " `description` TEXT,"
+                + " `discussion` TEXT,"
+                + " `dateCreated` INTEGER,"
+                + " `dateUploaded` INTEGER,"
+                + " `width` INTEGER NOT NULL,"
+                + " `height` INTEGER NOT NULL,"
+                + " `license` TEXT,"
+                + " `licenseUrl` TEXT,"
+                + " `creator` TEXT,"
+                + " `categories` TEXT,"
+                + " `requestedDeletion`"
+                + " INTEGER NOT NULL,"
+                + " `descriptions` TEXT,"
+                + " `tags` TEXT,"
+                + " `coordinates` TEXT,"
+                + " `pageId` INTEGER NOT NULL,"
+                + " `contentUri` TEXT,"
+                + " `source` TEXT,"
+                + " `editSummary` TEXT,"
+                + " `state` INTEGER NOT NULL,"
+                + " `transferred` INTEGER NOT NULL,"
+                + " `decimalCoords` TEXT,"
+                + " `isMultiple` INTEGER NOT NULL,"
+                + " `wikiDataEntityId` TEXT,"
+                + " `wikiItemName` TEXT,"
+                + " `p18Value` TEXT,"
+                + " `contentProviderUri` TEXT,"
+                + " `dateCreatedSource` TEXT,"
+                + " `dataLength` INTEGER NOT NULL,"
+                + " PRIMARY KEY(`pageId`))");
+        }
+    };
+
     @Provides
     public ContributionDao providesContributionsDao() {
         return appDatabase.getContributionDao();

app/src/main/java/fr/free/nrw/commons/upload/UploadService.java

@@ -169,8 +169,7 @@ public void queue(int what, Contribution contribution) {
                         .subscribeOn(ioThreadScheduler)
                         .observeOn(mainThreadScheduler)
                         .subscribe(aLong->{
-                            contribution._id = aLong;
-                            UploadService.super.queue(what, contribution);
+                            super.queue(what, contribution);
                         }, Throwable::printStackTrace));
                 break;
             default: