Merge branch '2.11-release'

Author: misaochan

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Wikimedia Commons for Android
 
+## v2.11.0
+- Refactored upload process, explore/media details, and peer review to use MVP architecture
+- Refactored all AsyncTasks to use RxAndroid
+- Partial migration to Retrofit
+- Allow users to remove EXIF tags from their uploads if desired
+- Multiple crash and bug fixes
+
 ## v2.10.2
 - Fixed remaining issues with date image taken
 - Fixed database crash

app/build.gradle

@@ -108,8 +108,8 @@ android {
 
     defaultConfig {
         applicationId 'fr.free.nrw.commons'
-        versionCode 243
-        versionName '2.10.2'
+        versionCode 475
+        versionName '2.11.0'
         setProperty("archivesBaseName", "app-commons-v$versionName-" + getBranchName())
 
         minSdkVersion 19

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

@@ -147,7 +147,6 @@ private void initLanguageSpinner(int position, Description description) {
                     spinnerDescriptionLanguages.getContext(),
                     R.layout.row_item_languages_spinner, selectedLanguages,
                     savedLanguageValue);
-            languagesAdapter.notifyDataSetChanged();
             spinnerDescriptionLanguages.setAdapter(languagesAdapter);
 
             spinnerDescriptionLanguages.setOnItemSelectedListener(new OnItemSelectedListener() {
@@ -162,6 +161,7 @@ public void onItemSelected(AdapterView<?> adapterView, View view, int position,
                     selectedLanguages.put(adapterView, languageCode);
                     ((SpinnerLanguagesAdapter) adapterView
                             .getAdapter()).selectedLangCode = languageCode;
+                    spinnerDescriptionLanguages.setSelection(position);
                     Timber.d("Description language code is: "+languageCode);
                 }
 
@@ -171,7 +171,7 @@ public void onNothingSelected(AdapterView<?> adapterView) {
             });
 
             if (description.getSelectedLanguageIndex() == -1) {
-                if (savedLanguageValue != null) {
+                if (!TextUtils.isEmpty(savedLanguageValue)) {
                     // If user has chosen a default language from settings activity savedLanguageValue is not null
                     spinnerDescriptionLanguages.setSelection(languagesAdapter.getIndexOfLanguageCode(savedLanguageValue));
                 } else {
@@ -180,7 +180,7 @@ public void onNothingSelected(AdapterView<?> adapterView) {
                                 .getIndexOfUserDefaultLocale(spinnerDescriptionLanguages.getContext());
                         spinnerDescriptionLanguages.setSelection(defaultLocaleIndex, true);
                     } else {
-                        spinnerDescriptionLanguages.setSelection(0);
+                        spinnerDescriptionLanguages.setSelection(0,true);
                     }
                 }
 

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

@@ -139,14 +139,7 @@ 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(savedLanguageValue.equals("")){
-                savedLanguageValue = Locale.getDefault().getLanguage();
-            }
-
             if (!isDropDownView) {
-                    if( !dropDownClicked){
-                    languageCode = LangCodeUtils.fixLanguageCode(savedLanguageValue);
-                }
                 view.setVisibility(View.GONE);
                 if (languageCode.length() > 2)
                     tvLanguage.setText(languageCode.substring(0, 2));