Closes #3094 (#3095)

* BugFix in SpinnerDescriptionsAdapter and SpinnerLanguagesAdapter (use the langguage code provided by the spinner, donot set the language to the one returned by the locale)

app/src/main/java/fr/free/nrw/commons/upload/DescriptionsAdapter.java

@@ -10,6 +10,10 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemSelectedListener;
+
+import java.util.ArrayList;
+import java.util.List;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.widget.AppCompatEditText;
@@ -20,82 +24,22 @@ import butterknife.ButterKnife;
 import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.utils.AbstractTextWatcher;
 import fr.free.nrw.commons.utils.BiMap;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Locale;
 import timber.log.Timber;
 
 public class DescriptionsAdapter extends RecyclerView.Adapter<DescriptionsAdapter.ViewHolder> {
 
-    private final String userDefaultLocale;
     private List<Description> descriptions;
     private Callback callback;
 
     private BiMap<AdapterView, String> selectedLanguages;
     private String savedLanguageValue;
-    private List<String> languageCodesList=new ArrayList<>();
-    private List<String> languageNamesList=new ArrayList<>();
 
-    public DescriptionsAdapter(String savedLanguageValue, String userDefaultLocale) {
+    public DescriptionsAdapter(String savedLanguageValue) {
         descriptions = new ArrayList<>();
         selectedLanguages = new BiMap<>();
-        prepareLanguages();
-        this.userDefaultLocale=userDefaultLocale;
         this.savedLanguageValue = savedLanguageValue;
     }
 
-    private void prepareLanguages() {
-        List<Language> languages = getLocaleSupportedByDevice();
-
-        for(Language language: languages) {
-            if(!languageCodesList.contains(language.getLocale().getLanguage())) {
-                languageNamesList.add(language.getLocale().getDisplayName());
-                languageCodesList.add(language.getLocale().getLanguage());
-            }
-        }
-    }
-
-    private List<Language> getLocaleSupportedByDevice() {
-        List<Language> languages = new ArrayList<>();
-        Locale[] localesArray = Locale.getAvailableLocales();
-        for (Locale locale : localesArray) {
-            languages.add(new Language(locale));
-        }
-
-        Collections.sort(languages, (language, t1) -> language.getLocale().getDisplayName()
-                .compareTo(t1.getLocale().getDisplayName()));
-        return languages;
-    }
-
-    int getIndexOfLanguageCode(String languageCode) {
-        return languageCodesList.indexOf(languageCode);
-    }
-
-    public void addDescription(Description description) {
-        if (description.getSelectedLanguageIndex() == -1) {
-            int localeIndex = 0;
-            String languageValue;
-            if (!TextUtils.isEmpty(savedLanguageValue)) {
-                // If user has chosen a default language from settings activity savedLanguageValue is not null
-                localeIndex = getIndexOfLanguageCode(savedLanguageValue);
-                languageValue = savedLanguageValue;
-            } else {
-                if (descriptions.isEmpty()) {//If this is the first description, lets let him add the description of his locale
-                    localeIndex =
-                            getIndexOfLanguageCode(
-                                    userDefaultLocale);
-                }
-                languageValue = languageCodesList.get(localeIndex);
-            }
-            description.setSelectedLanguageIndex(localeIndex);
-            description.setLanguageCode(languageValue);
-        }
-        this.descriptions.add(description);
-        notifyItemInserted(descriptions.size());
-    }
-
-
     public void setCallback(Callback callback) {
         this.callback = callback;
     }
@@ -132,6 +76,11 @@ public class DescriptionsAdapter extends RecyclerView.Adapter<DescriptionsAdapte
         return descriptions;
     }
 
+    public void addDescription(Description description) {
+        this.descriptions.add(description);
+        notifyItemInserted(descriptions.size());
+    }
+
     public class ViewHolder extends RecyclerView.ViewHolder {
 
         @Nullable
@@ -178,7 +127,7 @@ public class DescriptionsAdapter extends RecyclerView.Adapter<DescriptionsAdapte
             descItemEditText.addTextChangedListener(new AbstractTextWatcher(
                     descriptionText -> descriptions.get(position)
                             .setDescriptionText(descriptionText)));
-            initLanguageSpinner(description);
+            initLanguageSpinner(position, description);
 
             //If the description was manually added by the user, it deserves focus, if not, let the user decide
             if (description.isManuallyAdded()) {
@@ -190,15 +139,14 @@ public class DescriptionsAdapter extends RecyclerView.Adapter<DescriptionsAdapte
 
         /**
          * Extracted out the function to init the language spinner with different system supported languages
+         * @param position
          * @param description
          */
-        private void initLanguageSpinner(Description description) {
+        private void initLanguageSpinner(int position, Description description) {
             SpinnerLanguagesAdapter languagesAdapter = new SpinnerLanguagesAdapter(
                     spinnerDescriptionLanguages.getContext(),
-                    R.layout.row_item_languages_spinner, selectedLanguages);
+                    R.layout.row_item_languages_spinner, selectedLanguages,
-            languagesAdapter.setLanguageCodes(languageCodesList);
+                    savedLanguageValue);
-            languagesAdapter.setLanguageNames(languageNamesList);
-            languagesAdapter.notifyDataSetChanged();
             spinnerDescriptionLanguages.setAdapter(languagesAdapter);
 
             spinnerDescriptionLanguages.setOnItemSelectedListener(new OnItemSelectedListener() {
@@ -213,6 +161,7 @@ public class DescriptionsAdapter extends RecyclerView.Adapter<DescriptionsAdapte
                     selectedLanguages.put(adapterView, languageCode);
                     ((SpinnerLanguagesAdapter) adapterView
                             .getAdapter()).selectedLangCode = languageCode;
+                    spinnerDescriptionLanguages.setSelection(position);
                     Timber.d("Description language code is: "+languageCode);
                 }
 
@@ -220,8 +169,25 @@ public class DescriptionsAdapter extends RecyclerView.Adapter<DescriptionsAdapte
                 public void onNothingSelected(AdapterView<?> adapterView) {
                 }
             });
-            spinnerDescriptionLanguages.setSelection(description.getSelectedLanguageIndex());
+
-            selectedLanguages.put(spinnerDescriptionLanguages, description.getLanguageCode());
+            if (description.getSelectedLanguageIndex() == -1) {
+                if (!TextUtils.isEmpty(savedLanguageValue)) {
+                    // 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);
+                    } else {
+                        spinnerDescriptionLanguages.setSelection(0,true);
+                    }
+                }
+
+            } else {
+                spinnerDescriptionLanguages.setSelection(description.getSelectedLanguageIndex());
+                selectedLanguages.put(spinnerDescriptionLanguages, description.getLanguageCode());
+            }
         }
 
         /**

app/src/main/java/fr/free/nrw/commons/upload/SpinnerLanguagesAdapter.java

@@ -37,27 +37,49 @@ public class SpinnerLanguagesAdapter extends ArrayAdapter {
     private List<String> languageCodesList;
     private final BiMap<AdapterView, String> selectedLanguages;
     public String selectedLangCode="";
+    private Context context;
     private boolean dropDownClicked;
+    private String savedLanguageValue;
+
 
 
     public SpinnerLanguagesAdapter(@NonNull Context context,
                                    int resource,
-                                   BiMap<AdapterView, String> selectedLanguages) {
+                                   BiMap<AdapterView, String> selectedLanguages,
+                                   String savedLanguageValue) {
         super(context, resource);
         this.resource = resource;
         this.layoutInflater = LayoutInflater.from(context);
         languageNamesList = new ArrayList<>();
         languageCodesList = new ArrayList<>();
+        prepareLanguages();
         this.selectedLanguages = selectedLanguages;
+        this.context = context;
         this.dropDownClicked = false;
+        this.savedLanguageValue = savedLanguageValue;
     }
 
-    public void setLanguageCodes(List<String> languageCodesList) {
+    private void prepareLanguages() {
-        this.languageCodesList=languageCodesList;
+        List<Language> languages = getLocaleSupportedByDevice();
+
+        for(Language language: languages) {
+            if(!languageCodesList.contains(language.getLocale().getLanguage())) {
+                languageNamesList.add(language.getLocale().getDisplayName());
+                languageCodesList.add(language.getLocale().getLanguage());
+            }
+        }
     }
 
-    public void setLanguageNames(List<String> languageNamesList) {
+    private List<Language> getLocaleSupportedByDevice() {
-        this.languageNamesList = languageNamesList;
+        List<Language> languages = new ArrayList<>();
+        Locale[] localesArray = Locale.getAvailableLocales();
+        for (Locale locale : localesArray) {
+            languages.add(new Language(locale));
+        }
+
+        Collections.sort(languages, (language, t1) -> language.getLocale().getDisplayName()
+                .compareTo(t1.getLocale().getDisplayName()));
+        return languages;
     }
 
     @Override
@@ -79,7 +101,7 @@ public class SpinnerLanguagesAdapter extends ArrayAdapter {
             convertView = layoutInflater.inflate(resource, parent, false);
         }
         ViewHolder holder = new ViewHolder(convertView);
-        holder.init(position, true);
+        holder.init(position, true, savedLanguageValue);
 
         dropDownClicked = true;
         return convertView;
@@ -96,10 +118,11 @@ public class SpinnerLanguagesAdapter extends ArrayAdapter {
         } else {
             holder = (ViewHolder) convertView.getTag();
         }
-        holder.init(position, false);
+        holder.init(position, false, savedLanguageValue);
         return convertView;
     }
 
+
     public class ViewHolder {
 
         @BindView(R.id.tv_language)
@@ -112,13 +135,11 @@ public class SpinnerLanguagesAdapter extends ArrayAdapter {
             ButterKnife.bind(this, itemView);
         }
 
-        public void init(int position, boolean isDropDownView) {
+        public void init(int position, boolean isDropDownView, String savedLanguageValue) {
             String languageCode = LangCodeUtils.fixLanguageCode(languageCodesList.get(position));
             final String languageName = StringUtils.capitalize(languageNamesList.get(position));
+
             if (!isDropDownView) {
-                    if( !dropDownClicked){
-                    languageCode = LangCodeUtils.fixLanguageCode(languageCode);
-                }
                 view.setVisibility(View.GONE);
                 if (languageCode.length() > 2)
                     tvLanguage.setText(languageCode.substring(0, 2));
@@ -144,4 +165,12 @@ public class SpinnerLanguagesAdapter extends ArrayAdapter {
     String getLanguageCode(int position) {
         return languageCodesList.get(position);
     }
+
+    int getIndexOfUserDefaultLocale(Context context) {
+        return languageCodesList.indexOf(context.getResources().getConfiguration().locale.getLanguage());
+    }
+
+    int getIndexOfLanguageCode(String languageCode) {
+        return languageCodesList.indexOf(languageCode);
+    }
 }

app/src/main/java/fr/free/nrw/commons/upload/mediaDetails/UploadMediaDetailFragment.java

@@ -1,7 +1,5 @@
 package fr.free.nrw.commons.upload.mediaDetails;
 
-import static fr.free.nrw.commons.utils.ImageUtils.getErrorMessageForResult;
-
 import android.content.Context;
 import android.os.Bundle;
 import android.text.TextUtils;
@@ -13,17 +11,29 @@ import android.view.ViewGroup;
 import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.widget.AppCompatButton;
 import androidx.appcompat.widget.AppCompatImageButton;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
+
+import com.github.chrisbanes.photoview.PhotoView;
+import com.jakewharton.rxbinding2.widget.RxTextView;
+
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
-import com.github.chrisbanes.photoview.PhotoView;
-import com.jakewharton.rxbinding2.widget.RxTextView;
 import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.Utils;
 import fr.free.nrw.commons.filepicker.UploadableFile;
@@ -42,14 +52,10 @@ import fr.free.nrw.commons.utils.DialogUtil;
 import fr.free.nrw.commons.utils.ImageUtils;
 import fr.free.nrw.commons.utils.ViewUtil;
 import io.reactivex.disposables.Disposable;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-import javax.inject.Inject;
-import javax.inject.Named;
-import org.apache.commons.lang3.StringUtils;
 import timber.log.Timber;
 
+import static fr.free.nrw.commons.utils.ImageUtils.getErrorMessageForResult;
+
 public class UploadMediaDetailFragment extends UploadBaseFragment implements
         UploadMediaDetailsContract.View {
 
@@ -213,7 +219,7 @@ public class UploadMediaDetailFragment extends UploadBaseFragment implements
      * init the recycler veiw
      */
     private void initRecyclerView() {
-        descriptionsAdapter = new DescriptionsAdapter(defaultKvStore.getString(Prefs.KEY_LANGUAGE_VALUE,""),getUserDefaultLocale());
+        descriptionsAdapter = new DescriptionsAdapter(defaultKvStore.getString(Prefs.KEY_LANGUAGE_VALUE, ""));
         descriptionsAdapter.setCallback(this::showInfoAlert);
         rvDescriptions.setLayoutManager(new LinearLayoutManager(getContext()));
         rvDescriptions.setAdapter(descriptionsAdapter);