@@ -147,7 +147,6 @@ private void initLanguageSpinner(int position, Description description) {
147
147
spinnerDescriptionLanguages .getContext (),
148
148
R .layout .row_item_languages_spinner , selectedLanguages ,
149
149
savedLanguageValue );
150
- languagesAdapter .notifyDataSetChanged ();
151
150
spinnerDescriptionLanguages .setAdapter (languagesAdapter );
152
151
153
152
spinnerDescriptionLanguages .setOnItemSelectedListener (new OnItemSelectedListener () {
@@ -162,6 +161,7 @@ public void onItemSelected(AdapterView<?> adapterView, View view, int position,
162
161
selectedLanguages .put (adapterView , languageCode );
163
162
((SpinnerLanguagesAdapter ) adapterView
164
163
.getAdapter ()).selectedLangCode = languageCode ;
164
+ spinnerDescriptionLanguages .setSelection (position );
165
165
Timber .d ("Description language code is: " +languageCode );
166
166
}
167
167
@@ -171,7 +171,7 @@ public void onNothingSelected(AdapterView<?> adapterView) {
171
171
});
172
172
173
173
if (description .getSelectedLanguageIndex () == -1 ) {
174
- if (savedLanguageValue != null ) {
174
+ if (! TextUtils . isEmpty ( savedLanguageValue ) ) {
175
175
// If user has chosen a default language from settings activity savedLanguageValue is not null
176
176
spinnerDescriptionLanguages .setSelection (languagesAdapter .getIndexOfLanguageCode (savedLanguageValue ));
177
177
} else {
@@ -180,7 +180,7 @@ public void onNothingSelected(AdapterView<?> adapterView) {
180
180
.getIndexOfUserDefaultLocale (spinnerDescriptionLanguages .getContext ());
181
181
spinnerDescriptionLanguages .setSelection (defaultLocaleIndex , true );
182
182
} else {
183
- spinnerDescriptionLanguages .setSelection (0 );
183
+ spinnerDescriptionLanguages .setSelection (0 , true );
184
184
}
185
185
}
186
186
0 commit comments