With lazy loading of contributions

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

@@ -11,7 +11,9 @@
 import androidx.room.Update;
 import io.reactivex.Completable;
 import io.reactivex.Single;
+import io.reactivex.functions.Action;
 import java.util.List;
+import java.util.concurrent.Callable;
 
 @Dao
 public abstract class ContributionDao {
@@ -20,20 +22,36 @@ public abstract class ContributionDao {
   abstract DataSource.Factory<Integer, Contribution> fetchContributions();
 
   @Insert(onConflict = OnConflictStrategy.REPLACE)
-  public abstract void save(Contribution contribution);
+  public abstract void saveSyncronous(Contribution contribution);
+
+  public Completable save(final Contribution contribution) {
+    return Completable
+        .fromAction(() -> saveSyncronous(contribution));
+  }
 
   @Transaction
   public void deleteAndSaveContribution(final Contribution oldContribution,
       final Contribution newContribution) {
-    delete(oldContribution);
-    save(newContribution);
+    deleteSyncronous(oldContribution);
+    saveSyncronous(newContribution);
+  }
+
+  public Completable saveAndDelete(final Contribution oldContribution,
+      final Contribution newContribution) {
+    return Completable
+        .fromAction(() -> deleteAndSaveContribution(oldContribution, newContribution));
   }
 
   @Insert(onConflict = OnConflictStrategy.REPLACE)
   public abstract Single<List<Long>> save(List<Contribution> contribution);
 
   @Delete
-  public abstract void delete(Contribution contribution);
+  public abstract void deleteSyncronous(Contribution contribution);
+
+  public Completable delete(final Contribution contribution) {
+    return Completable
+        .fromAction(() -> deleteSyncronous(contribution));
+  }
 
   @Query("SELECT * from contribution WHERE filename=:fileName")
   public abstract List<Contribution> getContributionWithTitle(String fileName);
@@ -45,5 +63,10 @@ public void deleteAndSaveContribution(final Contribution oldContribution,
   public abstract void deleteAll();
 
   @Update
-  public abstract void update(Contribution contribution);
+  public abstract void updateSyncronous(Contribution contribution);
+
+  public Completable update(final Contribution contribution) {
+    return Completable
+        .fromAction(() -> updateSyncronous(contribution));
+  }
 }

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

@@ -39,9 +39,9 @@ public void onAttachView(final ContributionsListContract.View view) {
   }
 
   /**
-   * Setup the paged list.
-   * This method sets the configuration for paged list and ties it up with the live data object.
-   * This method can be tweaked to update the lazy loading behavior of the contributions list
+   * Setup the paged list. This method sets the configuration for paged list and ties it up with the
+   * live data object. This method can be tweaked to update the lazy loading behavior of the
+   * contributions list
    */
   void setup() {
     final PagedList.Config pagedListConfig =
@@ -62,7 +62,10 @@ public void onDetachView() {
    */
   @Override
   public void deleteUpload(final Contribution contribution) {
-    ioThreadScheduler.scheduleDirect(() -> repository.deleteContributionFromDB(contribution));
+    compositeDisposable.add(repository
+        .deleteContributionFromDB(contribution)
+        .subscribeOn(ioThreadScheduler)
+        .subscribe());
   }
 
 }

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

@@ -1,6 +1,7 @@
 package fr.free.nrw.commons.contributions;
 
 import androidx.paging.DataSource.Factory;
+import io.reactivex.Completable;
 import java.util.List;
 
 import javax.inject.Inject;
@@ -57,8 +58,8 @@ public Contribution getContributionWithFileName(String uri) {
      * @param contribution
      * @return
      */
-    public void deleteContribution(Contribution contribution) {
-        contributionDao.delete(contribution);
+    public Completable deleteContribution(Contribution contribution) {
+        return contributionDao.delete(contribution);
     }
 
     public Factory<Integer, Contribution> getContributions() {
@@ -73,7 +74,7 @@ public void set(String key, long value) {
         defaultKVStore.putLong(key,value);
     }
 
-    public void updateContribution(Contribution contribution) {
-        contributionDao.update(contribution);
+    public Completable updateContribution(Contribution contribution) {
+        return contributionDao.update(contribution);
     }
 }

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

@@ -72,12 +72,18 @@ public Contribution getContributionsWithTitle(String title) {
      */
     @Override
     public void deleteUpload(Contribution contribution) {
-        ioThreadScheduler.scheduleDirect(() -> repository.deleteContributionFromDB(contribution));
+        compositeDisposable.add(repository
+            .deleteContributionFromDB(contribution)
+            .subscribeOn(ioThreadScheduler)
+            .subscribe());
     }
 
     @Override
     public void updateContribution(Contribution contribution) {
-        ioThreadScheduler.scheduleDirect(() -> repository.updateContribution(contribution));
+        compositeDisposable.add(repository
+            .updateContribution(contribution)
+            .subscribeOn(ioThreadScheduler)
+            .subscribe());
     }
 
     @Override

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

@@ -1,6 +1,7 @@
 package fr.free.nrw.commons.contributions;
 
 import androidx.paging.DataSource.Factory;
+import io.reactivex.Completable;
 import java.util.List;
 
 import javax.inject.Inject;
@@ -31,8 +32,8 @@ public String getString(String key) {
      * @param contribution
      * @return
      */
-    public void deleteContributionFromDB(Contribution contribution) {
-        localDataSource.deleteContribution(contribution);
+    public Completable deleteContributionFromDB(Contribution contribution) {
+        return localDataSource.deleteContribution(contribution);
     }
 
     /**
@@ -56,7 +57,7 @@ public void set(String key, long value) {
         localDataSource.set(key,value);
     }
 
-    public void updateContribution(Contribution contribution) {
-        localDataSource.updateContribution(contribution);
+    public Completable updateContribution(Contribution contribution) {
+        return localDataSource.updateContribution(contribution);
     }
 }

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

@@ -29,6 +29,7 @@
 import io.reactivex.Single;
 import io.reactivex.disposables.CompositeDisposable;
 import io.reactivex.disposables.Disposable;
+import io.reactivex.functions.Action;
 import io.reactivex.functions.Consumer;
 import io.reactivex.processors.PublishProcessor;
 import io.reactivex.schedulers.Schedulers;
@@ -112,9 +113,9 @@ public void onProgress(long transferred, long total) {
 
             contribution.setTransferred(transferred);
 
-            ioThreadScheduler.scheduleDirect(() -> {
-                contributionDao.update(contribution);
-            });
+            compositeDisposable.add(contributionDao.update(contribution)
+                .subscribeOn(ioThreadScheduler)
+                .subscribe());
         }
 
     }
@@ -162,10 +163,10 @@ public void handleUpload(Contribution contribution) {
             notificationManager.notify(contribution.getLocalUri().toString(), NOTIFICATION_UPLOAD_IN_PROGRESS, curNotification.build());
         }
 
-        ioThreadScheduler.scheduleDirect(() -> {
-            contributionDao.save(contribution);
-            uploadContribution(contribution);
-        });
+        compositeDisposable.add(contributionDao
+            .save(contribution)
+            .subscribeOn(ioThreadScheduler)
+            .subscribe(() -> uploadContribution(contribution)));
     }
 
     private boolean freshStart = true;
@@ -297,7 +298,7 @@ private void onSuccessfulUpload(Contribution contribution, UploadResult uploadRe
     private void saveCompletedContribution(Contribution contribution, UploadResult uploadResult) {
         compositeDisposable.add(mediaClient.getMedia("File:" + uploadResult.getFilename())
         .map(media -> new Contribution(media, Contribution.STATE_COMPLETED))
-        .subscribe(newContribution -> contributionDao.deleteAndSaveContribution(contribution, newContribution)));
+        .subscribe(newContribution -> contributionDao.saveAndDelete(contribution, newContribution)));
     }
 
     @SuppressLint("StringFormatInvalid")
@@ -312,9 +313,10 @@ private void showFailedNotification(Contribution contribution) {
 
         contribution.setState(Contribution.STATE_FAILED);
 
-        ioThreadScheduler.scheduleDirect(() -> {
-            contributionDao.update(contribution);
-        });
+        compositeDisposable.add(contributionDao
+            .update(contribution)
+            .subscribeOn(ioThreadScheduler)
+            .subscribe());
     }
 
     private String findUniqueFilename(String fileName) throws IOException {

app/src/test/kotlin/fr/free/nrw/commons/contributions/ContributionsListPresenterTest.kt

@@ -8,6 +8,7 @@ import com.nhaarman.mockitokotlin2.whenever
 import fr.free.nrw.commons.Media
 import fr.free.nrw.commons.auth.SessionManager
 import fr.free.nrw.commons.media.MediaClient
+import io.reactivex.Completable
 import io.reactivex.Scheduler
 import io.reactivex.Single
 import io.reactivex.schedulers.Schedulers
@@ -53,6 +54,8 @@ class ContributionsListPresenterTest {
 
     @Test
     fun testDeleteUpload() {
+        whenever(repository.deleteContributionFromDB(any<Contribution>()))
+            .thenReturn(Completable.complete())
         contributionsListPresenter.deleteUpload(mock(Contribution::class.java))
         verify(repository, times(1))
             .deleteContributionFromDB(ArgumentMatchers.any(Contribution::class.java));

app/src/test/kotlin/fr/free/nrw/commons/contributions/ContributionsPresenterTest.kt

@@ -7,16 +7,19 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.loader.content.CursorLoader
 import androidx.loader.content.Loader
+import com.nhaarman.mockitokotlin2.any
 import com.nhaarman.mockitokotlin2.mock
 import com.nhaarman.mockitokotlin2.verify
 import com.nhaarman.mockitokotlin2.whenever
+import io.reactivex.Completable
 import io.reactivex.Scheduler
 import io.reactivex.Single
 import io.reactivex.schedulers.TestScheduler
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.mockito.ArgumentMatchers
+import org.mockito.ArgumentMatchers.*
 import org.mockito.Mock
 import org.mockito.Mockito
 import org.mockito.MockitoAnnotations
@@ -66,8 +69,9 @@ class ContributionsPresenterTest {
      */
     @Test
     fun testDeleteContribution() {
+        whenever(repository.deleteContributionFromDB(ArgumentMatchers.any<Contribution>()))
+            .thenReturn(Completable.complete())
         contributionsPresenter.deleteUpload(contribution)
-        scheduler.advanceTimeBy(1000, TimeUnit.MILLISECONDS)
         verify(repository).deleteContributionFromDB(contribution)
     }