From bd62a1c53eaff494980751007f1344adcedf7ccb Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Fri, 30 Oct 2015 15:47:15 +0100
Subject: [PATCH] fix remote provisioning stuff

---
 src/org/linphone/LinphoneManager.java     | 13 +++++++------
 src/org/linphone/LinphonePreferences.java |  7 ++-----
 submodules/linphone                       |  2 +-
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index f5583fad8..cfda7c550 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -598,12 +598,6 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
 
 			mLc = LinphoneCoreFactory.instance().createLinphoneCore(this, mLinphoneConfigFile, mLinphoneFactoryConfigFile, null, c);
 
-			try {
-				initLiblinphone();
-			} catch (LinphoneCoreException e) {
-				Log.e(e);
-			}
-
 			TimerTask lTask = new TimerTask() {
 				@Override
 				public void run() {
@@ -899,6 +893,13 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
 
 	public void globalState(final LinphoneCore lc, final GlobalState state, final String message) {
 		Log.i("New global state [",state,"]");
+		if (state == GlobalState.GlobalOn){
+			try {
+					initLiblinphone();
+			} catch (LinphoneCoreException e) {
+				Log.e(e);
+			}
+		}
 	}
 
 	public void registrationState(final LinphoneCore lc, final LinphoneProxyConfig proxy,final RegistrationState state,final String message) {
diff --git a/src/org/linphone/LinphonePreferences.java b/src/org/linphone/LinphonePreferences.java
index ee73d6ee0..647ae1882 100644
--- a/src/org/linphone/LinphonePreferences.java
+++ b/src/org/linphone/LinphonePreferences.java
@@ -1050,14 +1050,11 @@ public class LinphonePreferences {
 		if (url != null && url.length() == 0) {
 			url = null;
 		}
-
-		LpConfig config = getConfig();
-		config.setString("misc", "config-uri", url);
-		config.sync();
+		getLc().setProvisioningUri(url);
 	}
 
 	public String getRemoteProvisioningUrl() {
-		return getConfig().getString("misc", "config-uri", null);
+		return getLc().getProvisioningUri();
 	}
 
 	public void setDefaultDisplayName(String displayName) {
diff --git a/submodules/linphone b/submodules/linphone
index f06140d07..d94a20367 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit f06140d0758a409a70070aa2bd6f31086613cf1d
+Subproject commit d94a20367fca31e882632d6b44d354ee4efea62f