Fixed crash when resuming LinphoneActivity if current fragment is Settings or AccountSettings

This commit is contained in:
Sylvain Berfini 2019-04-03 16:20:39 +02:00
parent 1cfdc5c2ff
commit 4b975a89d4

View file

@ -85,7 +85,6 @@ public class SettingsFragment extends PreferenceFragment {
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
addPreferencesFromResource(R.xml.preferences);
} }
private static void setListPreferenceValues( private static void setListPreferenceValues(
@ -108,6 +107,7 @@ public class SettingsFragment extends PreferenceFragment {
@Override @Override
public void onStart() { public void onStart() {
super.onStart(); super.onStart();
addPreferencesFromResource(R.xml.preferences);
mPrefs = LinphonePreferences.instance(); mPrefs = LinphonePreferences.instance();
removePreviousPreferencesFile(); // Required when updating the preferences order removePreviousPreferencesFile(); // Required when updating the preferences order