Fix image loading for peer review

Author: maskaravivek

app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.java

@@ -135,7 +135,7 @@ private void updateImage(Media media) {
         simpleDraweeView.setImageURI(media.getImageUrl());
 
         reviewController.onImageRefreshed(fileName); //file name is updated
-        compositeDisposable.add(reviewHelper.getFirstRevisionOfFile("File:" + fileName)
+        compositeDisposable.add(reviewHelper.getFirstRevisionOfFile(fileName)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(revision -> {

app/src/main/java/fr/free/nrw/commons/review/ReviewHelper.java

@@ -31,23 +31,28 @@ public ReviewHelper(OkHttpJsonApiClient okHttpJsonApiClient, MediaWikiApi mediaW
         this.mediaWikiApi = mediaWikiApi;
     }
 
+    Single<Media> getRandomMedia() {
+        return getRandomFileChange()
+                .flatMap(fileName -> okHttpJsonApiClient.getMedia(fileName, false));
+    }
+
     /**
-     * Gets a random media file for review.
+     * Gets a random file change for review.
      * - Picks the most recent changes in the last 30 day window
      * - Picks a random file from those changes
      * - Checks if the file is nominated for deletion
      * - Retries upto 5 times for getting a file which is not nominated for deletion
      *
      * @return
      */
-    Single<Media> getRandomMedia() {
+    private Single<String> getRandomFileChange() {
         return okHttpJsonApiClient.getRecentFileChanges()
                 .map(this::findImageInRecentChanges)
                 .flatMap(title -> mediaWikiApi.pageExists("Commons:Deletion_requests/" + title)
                         .map(pageExists -> new Pair<>(title, pageExists)))
                 .map((Pair<String, Boolean> pair) -> {
                     if (!pair.second) {
-                        return new Media(pair.first.replace("File:", ""));
+                        return pair.first;
                     }
                     throw new Exception("Already nominated for deletion");
                 }).retry(MAX_RANDOM_TRIES);

app/src/test/kotlin/fr/free/nrw/commons/review/ReviewHelperTest.kt

@@ -10,8 +10,7 @@ import org.junit.Test
 import org.mockito.ArgumentMatchers
 import org.mockito.InjectMocks
 import org.mockito.Mock
-import org.mockito.Mockito.`when`
-import org.mockito.Mockito.mock
+import org.mockito.Mockito.*
 import org.mockito.MockitoAnnotations
 import org.wikipedia.dataclient.mwapi.MwQueryPage
 import org.wikipedia.dataclient.mwapi.RecentChange
@@ -51,6 +50,10 @@ class ReviewHelperTest {
 
         `when`(mediaWikiApi?.pageExists(ArgumentMatchers.anyString()))
                 .thenReturn(Single.just(false))
+        `when`(okHttpJsonApiClient?.getMedia(ArgumentMatchers.anyString(), ArgumentMatchers.anyBoolean()))
+                .thenReturn(Single.just(mock(Media::class.java)))
+
+
         val randomMedia = reviewHelper?.randomMedia?.blockingGet()
 
         assertTrue(randomMedia is Media)