From a029157a4abdf9bc1431260e50a754645ff98185 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Fri, 28 Feb 2014 16:11:41 +0100 Subject: [PATCH] Removed usless custom boolean (now handled in linphonecore) + updated linphone/ms2 --- res/values/non_localizable_custom.xml | 1 - src/org/linphone/LinphoneManager.java | 8 +------- submodules/linphone | 2 +- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/res/values/non_localizable_custom.xml b/res/values/non_localizable_custom.xml index 6c9c2031a..ccf0d6af3 100644 --- a/res/values/non_localizable_custom.xml +++ b/res/values/non_localizable_custom.xml @@ -29,7 +29,6 @@ false false false - true true false true diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java index 4391f14f1..728df5c21 100644 --- a/src/org/linphone/LinphoneManager.java +++ b/src/org/linphone/LinphoneManager.java @@ -1466,14 +1466,8 @@ public class LinphoneManager implements LinphoneCoreListener { Log.d("Remote provisioning status = " + state.toString() + " (" + message + ")"); 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 (lc.getProxyConfigList() == null || lc.getProxyConfigList().length == 0) { - - } + } } } diff --git a/submodules/linphone b/submodules/linphone index d5dbe3eb6..028f4c550 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit d5dbe3eb662c8e962e1657d741793e3906861ca8 +Subproject commit 028f4c550b267c2801cfc7fd93dcb3c8d237a84d