From 5bdb21cb3ee7e9e290761dd97a1501ca437925c3 Mon Sep 17 00:00:00 2001
From: Pratham Pahariya <54663429+Pratham2305@users.noreply.github.com>
Date: Sun, 27 Dec 2020 16:18:57 +0530
Subject: [PATCH] Fixed issue with "Copy previous captions & descriptions".
 (#4109)

* Fixed issue with "Copy previous captions & descriptions".

* Added comments and also fixed the styling issue.

Co-authored-by: Pratham2305 <Pratham2305@users.noreply.github.com>
---
 .../upload/UploadMediaDetailAdapter.java       | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadMediaDetailAdapter.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadMediaDetailAdapter.java
index 2e0a289f7..ae3bafac7 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/UploadMediaDetailAdapter.java
+++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadMediaDetailAdapter.java
@@ -179,12 +179,20 @@ public class UploadMediaDetailAdapter extends RecyclerView.Adapter<UploadMediaDe
                     // If user has chosen a default language from settings activity savedLanguageValue is not null
                     spinnerDescriptionLanguages.setSelection(languagesAdapter.getIndexOfLanguageCode(savedLanguageValue));
                 } else {
-                    if (position == 0) {
-                        int defaultLocaleIndex = languagesAdapter
-                                .getIndexOfUserDefaultLocale(spinnerDescriptionLanguages.getContext());
-                        spinnerDescriptionLanguages.setSelection(defaultLocaleIndex, true);
+                    //Checking whether Language Code attribute is null or not.
+                    if(uploadMediaDetails.get(position).getLanguageCode() != null){
+                        //If it is not null that means it is fetching details from the previous upload (i.e. when user has pressed copy previous caption & description)
+                        //hence providing same language code for the current upload.
+                        spinnerDescriptionLanguages.setSelection(languagesAdapter
+                            .getIndexOfLanguageCode(uploadMediaDetails.get(position).getLanguageCode()), true);
                     } else {
-                        spinnerDescriptionLanguages.setSelection(0,true);
+                        if (position == 0) {
+                            int defaultLocaleIndex = languagesAdapter
+                                .getIndexOfUserDefaultLocale(spinnerDescriptionLanguages.getContext());
+                            spinnerDescriptionLanguages.setSelection(defaultLocaleIndex, true);
+                        } else {
+                            spinnerDescriptionLanguages.setSelection(0,true);
+                        }
                     }
                 }