@@ -147,7 +147,6 @@ private void initLanguageSpinner(int position, Description description) {
147147 spinnerDescriptionLanguages .getContext (),
148148 R .layout .row_item_languages_spinner , selectedLanguages ,
149149 savedLanguageValue );
150- languagesAdapter .notifyDataSetChanged ();
151150 spinnerDescriptionLanguages .setAdapter (languagesAdapter );
152151
153152 spinnerDescriptionLanguages .setOnItemSelectedListener (new OnItemSelectedListener () {
@@ -162,6 +161,7 @@ public void onItemSelected(AdapterView<?> adapterView, View view, int position,
162161 selectedLanguages .put (adapterView , languageCode );
163162 ((SpinnerLanguagesAdapter ) adapterView
164163 .getAdapter ()).selectedLangCode = languageCode ;
164+ spinnerDescriptionLanguages .setSelection (position );
165165 Timber .d ("Description language code is: " +languageCode );
166166 }
167167
@@ -171,7 +171,7 @@ public void onNothingSelected(AdapterView<?> adapterView) {
171171 });
172172
173173 if (description .getSelectedLanguageIndex () == -1 ) {
174- if (savedLanguageValue != null ) {
174+ if (! TextUtils . isEmpty ( savedLanguageValue ) ) {
175175 // If user has chosen a default language from settings activity savedLanguageValue is not null
176176 spinnerDescriptionLanguages .setSelection (languagesAdapter .getIndexOfLanguageCode (savedLanguageValue ));
177177 } else {
@@ -180,7 +180,7 @@ public void onNothingSelected(AdapterView<?> adapterView) {
180180 .getIndexOfUserDefaultLocale (spinnerDescriptionLanguages .getContext ());
181181 spinnerDescriptionLanguages .setSelection (defaultLocaleIndex , true );
182182 } else {
183- spinnerDescriptionLanguages .setSelection (0 );
183+ spinnerDescriptionLanguages .setSelection (0 , true );
184184 }
185185 }
186186
0 commit comments