From 07a71cbef285a6b5df5faa93732c6bff51a41e6c Mon Sep 17 00:00:00 2001
From: Rohit Verma <rv17837@outlook.com>
Date: Sun, 9 Mar 2025 22:08:45 +0530
Subject: [PATCH] fix: remove if-condition to prevent hiding top card and
 refactor code

---
 .../nrw/commons/upload/UploadPresenter.kt     | 47 +++++++++----------
 1 file changed, 22 insertions(+), 25 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadPresenter.kt b/app/src/main/java/fr/free/nrw/commons/upload/UploadPresenter.kt
index 9ee8fb483..5d721f408 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/UploadPresenter.kt
+++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadPresenter.kt
@@ -146,34 +146,31 @@ class UploadPresenter @Inject internal constructor(
 
     override fun deletePictureAtIndex(index: Int) {
         val uploadableFiles = view.getUploadableFiles()
-        if (index == uploadableFiles!!.size - 1) {
-            // If the next fragment to be shown is not one of the MediaDetailsFragment
-            // lets hide the top card so that it doesn't appear on the other fragments
-            view.showHideTopCard(false)
-        }
-        view.setImageCancelled(true)
-        repository.deletePicture(uploadableFiles[index].getFilePath())
-        if (uploadableFiles.size == 1) {
-            view.showMessage(R.string.upload_cancelled)
-            view.finish()
-            return
-        }
-
-        presenter.updateImageQualitiesJSON(uploadableFiles.size, index)
-        view.onUploadMediaDeleted(index)
-        if (index != uploadableFiles.size && index != 0) {
-            // if the deleted image was not the last item to be uploaded, check quality of next
-            repository.getUploadItem(index)?.let {
-                presenter.checkImageQuality(it, index)
+        uploadableFiles?.let {
+            view.setImageCancelled(true)
+            repository.deletePicture(uploadableFiles[index].getFilePath())
+            if (uploadableFiles.size == 1) {
+                view.showMessage(R.string.upload_cancelled)
+                view.finish()
+                return
             }
-        }
 
-        if (uploadableFiles.size < 2) {
-            view.showHideTopCard(false)
-        }
+            presenter.updateImageQualitiesJSON(uploadableFiles.size, index)
+            view.onUploadMediaDeleted(index)
+            if (index != uploadableFiles.size && index != 0) {
+                // if the deleted image was not the last item to be uploaded, check quality of next
+                repository.getUploadItem(index)?.let {
+                    presenter.checkImageQuality(it, index)
+                }
+            }
 
-        //In case lets update the number of uploadable media
-        view.updateTopCardTitle()
+            if (uploadableFiles.size < 2) {
+                view.showHideTopCard(false)
+            }
+
+            //In case lets update the number of uploadable media
+            view.updateTopCardTitle()
+        }
     }
 
     override fun onAttachView(view: UploadContract.View) {