From 4b975a89d42aeeaae49e5ce480d944a300c7f4b1 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Wed, 3 Apr 2019 16:20:39 +0200
Subject: [PATCH] Fixed crash when resuming LinphoneActivity if current
 fragment is Settings or AccountSettings

---
 app/src/main/java/org/linphone/settings/SettingsFragment.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/org/linphone/settings/SettingsFragment.java b/app/src/main/java/org/linphone/settings/SettingsFragment.java
index 6c8751085..a8fe70b4f 100644
--- a/app/src/main/java/org/linphone/settings/SettingsFragment.java
+++ b/app/src/main/java/org/linphone/settings/SettingsFragment.java
@@ -85,7 +85,6 @@ public class SettingsFragment extends PreferenceFragment {
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        addPreferencesFromResource(R.xml.preferences);
     }
 
     private static void setListPreferenceValues(
@@ -108,6 +107,7 @@ public class SettingsFragment extends PreferenceFragment {
     @Override
     public void onStart() {
         super.onStart();
+        addPreferencesFromResource(R.xml.preferences);
 
         mPrefs = LinphonePreferences.instance();
         removePreviousPreferencesFile(); // Required when updating the preferences order