Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix edit contact and start at boot

Browse source
This commit is contained in:
Margaux Clerc 2016-03-02 16:46:11 +01:00
parent f01ef97edd
commit 2f174922b8
4 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
res/raw/linphonerc_default
View file

@ -15,6 +15,7 @@ size=qvga
sharing_server=https://www.linphone.org:444/lft.php sharing_server=https://www.linphone.org:444/lft.php
tunnel=disabled tunnel=disabled
push_notification=1 push_notification=1
auto_start=1
[tunnel] [tunnel]
host= host=

2
src/org/linphone/ContactDetailsFragment.java
View file

@ -262,7 +262,7 @@ public class ContactDetailsFragment extends Fragment implements OnClickListener
dialog.show(); dialog.show();
} }
if (id == R.id.back) { if (id == R.id.back) {
getFragmentManager().popBackStackImmediate(); LinphoneActivity.instance().displayContacts(false);
} }
} }

7
src/org/linphone/ContactEditorFragment.java
View file

@ -160,7 +160,12 @@ public class ContactEditorFragment extends Fragment {
e.printStackTrace(); 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)) if(LinphoneActivity.instance().getResources().getBoolean(R.bool.isTablet))
ContactsListFragment.instance().invalidate(); ContactsListFragment.instance().invalidate();

2
src/org/linphone/LinphonePreferences.java
View file

@ -1031,7 +1031,7 @@ public class LinphonePreferences {
} }
public boolean isAutoStartEnabled() { public boolean isAutoStartEnabled() {
return getConfig().getBool("app", "auto_start", true); return getConfig().getBool("app", "auto_start", false);
} }
public void setAutoStart(boolean autoStartEnabled) { public void setAutoStart(boolean autoStartEnabled) {