From 66e15a17ef29351a7cdb4330cdff96406491443b Mon Sep 17 00:00:00 2001
From: Chan Jun Da <65345505+chan-j-d@users.noreply.github.com>
Date: Thu, 16 Mar 2023 09:19:24 +0800
Subject: [PATCH] Change UploadModel::createAndAddUploadItem to not duplicate
 new uploadItems of same UploadableFile (#5179)

---
 .../main/java/fr/free/nrw/commons/upload/UploadModel.java  | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadModel.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadModel.java
index d0ae2ead3..369ce0244 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/UploadModel.java
+++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadModel.java
@@ -117,6 +117,13 @@ public class UploadModel {
                 createdTimestampSource,
                 uploadableFile.getContentUri(),
                 fileCreatedDateString);
+
+        // If an uploadItem of the same uploadableFile has been created before, we return that.
+        // This is to avoid multiple instances of uploadItem of same file passed around.
+        if (items.contains(uploadItem)) {
+            return items.get(items.indexOf(uploadItem));
+        }
+
         if (place != null) {
             uploadItem.getUploadMediaDetails().set(0, new UploadMediaDetail(place));
         }