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

fix remote provisioning stuff

Browse source
This commit is contained in:
Simon Morlat 2015-10-30 15:47:15 +01:00
parent 80211b0446
commit fff9ec1c8c
3 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -582,12 +582,6 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
mLc = LinphoneCoreFactory.instance().createLinphoneCore(this, mLinphoneConfigFile, mLinphoneFactoryConfigFile, null, c); mLc = LinphoneCoreFactory.instance().createLinphoneCore(this, mLinphoneConfigFile, mLinphoneFactoryConfigFile, null, c);
try {
initLiblinphone();
} catch (LinphoneCoreException e) {
Log.e(e);
}
TimerTask lTask = new TimerTask() { TimerTask lTask = new TimerTask() {
@Override @Override
public void run() { public void run() {
@ -872,6 +866,13 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
public void globalState(final LinphoneCore lc, final GlobalState state, final String message) { public void globalState(final LinphoneCore lc, final GlobalState state, final String message) {
Log.i("New global state [",state,"]"); 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) { public void registrationState(final LinphoneCore lc, final LinphoneProxyConfig proxy,final RegistrationState state,final String message) {

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

@ -1053,14 +1053,11 @@ public class LinphonePreferences {
if (url != null && url.length() == 0) { if (url != null && url.length() == 0) {
url = null; url = null;
} }
getLc().setProvisioningUri(url);
LpConfig config = getConfig();
config.setString("misc", "config-uri", url);
config.sync();
} }
public String getRemoteProvisioningUrl() { public String getRemoteProvisioningUrl() {
return getConfig().getString("misc", "config-uri", null); return getLc().getProvisioningUri();
} }
public void setDefaultDisplayName(String displayName) { public void setDefaultDisplayName(String displayName) {

2
submodules/linphone

@ -1 +1 @@
Subproject commit f06140d0758a409a70070aa2bd6f31086613cf1d Subproject commit d94a20367fca31e882632d6b44d354ee4efea62f