Skip to content

Commit e15d8b1

Browse files
committed
fix: remove if-condition to prevent hiding top card and refactor code
1 parent 566a3c6 commit e15d8b1

File tree

1 file changed

+21
-24
lines changed

1 file changed

+21
-24
lines changed

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

Lines changed: 21 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -146,34 +146,31 @@ class UploadPresenter @Inject internal constructor(
146146

147147
override fun deletePictureAtIndex(index: Int) {
148148
val uploadableFiles = view.getUploadableFiles()
149-
if (index == uploadableFiles!!.size - 1) {
150-
// If the next fragment to be shown is not one of the MediaDetailsFragment
151-
// lets hide the top card so that it doesn't appear on the other fragments
152-
view.showHideTopCard(false)
153-
}
154-
view.setImageCancelled(true)
155-
repository.deletePicture(uploadableFiles[index].getFilePath())
156-
if (uploadableFiles.size == 1) {
157-
view.showMessage(R.string.upload_cancelled)
158-
view.finish()
159-
return
160-
}
149+
uploadableFiles?.let {
150+
view.setImageCancelled(true)
151+
repository.deletePicture(uploadableFiles[index].getFilePath())
152+
if (uploadableFiles.size == 1) {
153+
view.showMessage(R.string.upload_cancelled)
154+
view.finish()
155+
return
156+
}
161157

162-
presenter.updateImageQualitiesJSON(uploadableFiles.size, index)
163-
view.onUploadMediaDeleted(index)
164-
if (index != uploadableFiles.size && index != 0) {
165-
// if the deleted image was not the last item to be uploaded, check quality of next
166-
repository.getUploadItem(index)?.let {
167-
presenter.checkImageQuality(it, index)
158+
presenter.updateImageQualitiesJSON(uploadableFiles.size, index)
159+
view.onUploadMediaDeleted(index)
160+
if (index != uploadableFiles.size && index != 0) {
161+
// if the deleted image was not the last item to be uploaded, check quality of next
162+
repository.getUploadItem(index)?.let {
163+
presenter.checkImageQuality(it, index)
164+
}
168165
}
169-
}
170166

171-
if (uploadableFiles.size < 2) {
172-
view.showHideTopCard(false)
173-
}
167+
if (uploadableFiles.size < 2) {
168+
view.showHideTopCard(false)
169+
}
174170

175-
//In case lets update the number of uploadable media
176-
view.updateTopCardTitle()
171+
//In case lets update the number of uploadable media
172+
view.updateTopCardTitle()
173+
}
177174
}
178175

179176
override fun onAttachView(view: UploadContract.View) {

0 commit comments

Comments
 (0)