From 2f174922b8b15b046ef885e0701fd481ab1dfa7f Mon Sep 17 00:00:00 2001 From: Margaux Clerc Date: Wed, 2 Mar 2016 16:46:11 +0100 Subject: [PATCH] Fix edit contact and start at boot --- res/raw/linphonerc_default | 1 + src/org/linphone/ContactDetailsFragment.java | 2 +- src/org/linphone/ContactEditorFragment.java | 7 ++++++- src/org/linphone/LinphonePreferences.java | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/res/raw/linphonerc_default b/res/raw/linphonerc_default index 27dcac0ab..2238536a3 100644 --- a/res/raw/linphonerc_default +++ b/res/raw/linphonerc_default @@ -15,6 +15,7 @@ size=qvga sharing_server=https://www.linphone.org:444/lft.php tunnel=disabled push_notification=1 +auto_start=1 [tunnel] host= diff --git a/src/org/linphone/ContactDetailsFragment.java b/src/org/linphone/ContactDetailsFragment.java index 7cc52a3cd..90aa91e8a 100644 --- a/src/org/linphone/ContactDetailsFragment.java +++ b/src/org/linphone/ContactDetailsFragment.java @@ -262,7 +262,7 @@ public class ContactDetailsFragment extends Fragment implements OnClickListener dialog.show(); } if (id == R.id.back) { - getFragmentManager().popBackStackImmediate(); + LinphoneActivity.instance().displayContacts(false); } } diff --git a/src/org/linphone/ContactEditorFragment.java b/src/org/linphone/ContactEditorFragment.java index f5ca46a41..4d40d2622 100644 --- a/src/org/linphone/ContactEditorFragment.java +++ b/src/org/linphone/ContactEditorFragment.java @@ -160,7 +160,12 @@ public class ContactEditorFragment extends Fragment { e.printStackTrace(); } - getFragmentManager().popBackStackImmediate(); + Contact updatedContact = contactsManager.findContactWithDisplayName(contactsManager.getDisplayName(firstName.getText().toString(), lastName.getText().toString())); + if(updatedContact != null) { + LinphoneActivity.instance().displayContact(updatedContact, false); + } else { + LinphoneActivity.instance().displayContacts(false); + } if(LinphoneActivity.instance().getResources().getBoolean(R.bool.isTablet)) ContactsListFragment.instance().invalidate(); diff --git a/src/org/linphone/LinphonePreferences.java b/src/org/linphone/LinphonePreferences.java index 69880d3ee..9b92f122e 100644 --- a/src/org/linphone/LinphonePreferences.java +++ b/src/org/linphone/LinphonePreferences.java @@ -1031,7 +1031,7 @@ public class LinphonePreferences { } public boolean isAutoStartEnabled() { - return getConfig().getBool("app", "auto_start", true); + return getConfig().getBool("app", "auto_start", false); } public void setAutoStart(boolean autoStartEnabled) {