#3601 [structured-commons] Wrong thumbnails at the "depictions" step when uploading - minor cleanup

Author: macgills

app/src/main/java/fr/free/nrw/commons/upload/depicts/DepictsContract.java

@@ -43,8 +43,7 @@ interface View {
         void setDepictsList(List<DepictedItem> depictedItemList);
 
 
-      void updateUrlInAdapter(@NotNull DepictedItem depictedItem,
-          @NotNull String response);
+        void onUrlFetched(@NotNull DepictedItem depictedItem, @NotNull String url);
     }
 
     interface UserActionListener extends BasePresenter<View> {

app/src/main/java/fr/free/nrw/commons/upload/depicts/DepictsFragment.java

@@ -1,7 +1,6 @@
 package fr.free.nrw.commons.upload.depicts;
 
 import android.os.Bundle;
-import android.text.Editable;
 import android.util.Pair;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -146,10 +145,10 @@ public void setDepictsList(List<DepictedItem> depictedItemList) {
     }
 
     @Override
-    public void updateUrlInAdapter(@NotNull DepictedItem depictedItem, @NotNull String response) {
+    public void onUrlFetched(@NotNull DepictedItem depictedItem, @NotNull String url) {
         final Pair<DepictedItem, Integer> itemAndPosition = returnItemAndPosition(depictedItem);
         if (itemAndPosition != null) {
-            itemAndPosition.first.setImageUrl(response);
+            itemAndPosition.first.setImageUrl(url);
             adapter.notifyItemChanged(itemAndPosition.second);
         }
     }

app/src/main/java/fr/free/nrw/commons/upload/depicts/DepictsPresenter.kt

@@ -40,7 +40,6 @@ class DepictsPresenter @Inject constructor(
     private val depictedItems: MutableLiveData<List<DepictedItem>> = MutableLiveData()
     private val idsToImageUrls = mutableMapOf<String, String>()
 
-
     override fun onAttachView(view: DepictsContract.View) {
         this.view = view
         compositeDisposable.add(
@@ -68,9 +67,7 @@ class DepictsPresenter @Inject constructor(
         return Flowable.zip(
             searchResults(it),
             Flowable.just(it),
-            BiFunction { results: List<DepictedItem>, term: String ->
-                Pair(results, term)
-            }
+            BiFunction { results: List<DepictedItem>, term: String -> Pair(results, term) }
         )
     }
 
@@ -84,9 +81,7 @@ class DepictsPresenter @Inject constructor(
 
     private fun addImageUrlsFromCache(depictions: List<DepictedItem>) =
         depictions.map { item ->
-            idsToImageUrls.getOrElse(item.id, { null })
-                ?.let { item.copy(imageUrl = it) }
-                ?: item
+            idsToImageUrls[item.id]?.let { item.copy(imageUrl = it) } ?: item
         }
 
     override fun onDetachView() {
@@ -120,9 +115,7 @@ class DepictsPresenter @Inject constructor(
      * from the depiction list
      */
     override fun verifyDepictions() {
-        val selectedDepictions =
-            repository.selectedDepictions
-        if (selectedDepictions.isNotEmpty()) {
+        if (repository.selectedDepictions.isNotEmpty()) {
             view.goToNextScreen()
         } else {
             view.noDepictionSelected()
@@ -140,7 +133,7 @@ class DepictsPresenter @Inject constructor(
                 .observeOn(mainThreadScheduler)
                 .filter { it != NO_DEPICTED_IMAGE }
                 .subscribe(
-                    { view.updateUrlInAdapter(depictedItem, it) },
+                    { view.onUrlFetched(depictedItem, it) },
                     { Timber.e(it) }
                 )
         )

app/src/test/kotlin/fr/free/nrw/commons/upload/DepictsPresenterTest.kt

@@ -155,7 +155,7 @@ class DepictsPresenterTest {
         whenever(depictsClient.getP18ForItem(depictedItem.id)).thenReturn(Single.just("url"))
         depictsPresenter.fetchThumbnailForEntityId(depictedItem)
         testScheduler.triggerActions()
-        verify(view).updateUrlInAdapter(depictedItem, "url")
+        verify(view).onUrlFetched(depictedItem, "url")
     }
 
     @Test
@@ -165,7 +165,7 @@ class DepictsPresenterTest {
             .thenReturn(Single.just(NO_DEPICTED_IMAGE))
         depictsPresenter.fetchThumbnailForEntityId(depictedItem)
         testScheduler.triggerActions()
-        verify(view, never()).updateUrlInAdapter(depictedItem, NO_DEPICTED_IMAGE)
+        verify(view, never()).onUrlFetched(depictedItem, NO_DEPICTED_IMAGE)
     }
 
     @Test
@@ -174,10 +174,10 @@ class DepictsPresenterTest {
         whenever(depictsClient.getP18ForItem(depictedItem.id)).thenReturn(Single.just("url"))
         depictsPresenter.fetchThumbnailForEntityId(depictedItem)
         testScheduler.triggerActions()
-        verify(view).updateUrlInAdapter(depictedItem, "url")
+        verify(view).onUrlFetched(depictedItem, "url")
         depictsPresenter.fetchThumbnailForEntityId(depictedItem)
         testScheduler.triggerActions()
-        verify(view, times(2)).updateUrlInAdapter(depictedItem, "url")
+        verify(view, times(2)).onUrlFetched(depictedItem, "url")
     }
 }