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

Removed usless custom boolean (now handled in linphonecore) + updated linphone/ms2

Browse source
This commit is contained in:
Sylvain Berfini 2014-02-28 16:11:41 +01:00
parent a38c689966
commit a029157a4a
3 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
res/values/non_localizable_custom.xml
View file

@ -29,7 +29,6 @@
<bool name="hide_linphone_accounts_wizard">false</bool> <bool name="hide_linphone_accounts_wizard">false</bool>
<bool name="hide_generic_accounts_wizard">false</bool> <bool name="hide_generic_accounts_wizard">false</bool>
<bool name="hide_remote_provisioning_in_wizard">false</bool> <bool name="hide_remote_provisioning_in_wizard">false</bool>
<bool name="remove_remote_provisioning_after_success">true</bool>
<bool name="show_login_wizard_after_remote_provisioning_without_credentials">true</bool> <bool name="show_login_wizard_after_remote_provisioning_without_credentials">true</bool>
<bool name="hide_accounts">false</bool> <bool name="hide_accounts">false</bool>
<bool name="display_account_wizard_at_first_start">true</bool> <bool name="display_account_wizard_at_first_start">true</bool>

6
src/org/linphone/LinphoneManager.java
View file

@ -1466,14 +1466,8 @@ public class LinphoneManager implements LinphoneCoreListener {
Log.d("Remote provisioning status = " + state.toString() + " (" + message + ")"); Log.d("Remote provisioning status = " + state.toString() + " (" + message + ")");
if (state == RemoteProvisioningState.ConfiguringSuccessful) { if (state == RemoteProvisioningState.ConfiguringSuccessful) {
if (mR.getBoolean(R.bool.remove_remote_provisioning_after_success)) {
LinphonePreferences.instance().setRemoteProvisioningUrl(null);
}
if (mR.getBoolean(R.bool.show_login_wizard_after_remote_provisioning_without_credentials)) { if (mR.getBoolean(R.bool.show_login_wizard_after_remote_provisioning_without_credentials)) {
if (lc.getProxyConfigList() == null || lc.getProxyConfigList().length == 0) {
}
} }
} }
} }

2
submodules/linphone

@ -1 +1 @@
Subproject commit d5dbe3eb662c8e962e1657d741793e3906861ca8 Subproject commit 028f4c550b267c2801cfc7fd93dcb3c8d237a84d