mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-18 03:28:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Route was never set at the proxy config creation + allow linphonecore to init without linphonerc nor factory

Browse source
This commit is contained in:
Sylvain Berfini 2013-11-05 15:30:35 +01:00
parent 68a23b44b0
commit dbba820b5a
3 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
java/impl/org/linphone/core/LinphoneCoreFactoryImpl.java
View file

@ -97,7 +97,9 @@ public class LinphoneCoreFactoryImpl extends LinphoneCoreFactory {
String userConfig, String factoryConfig, Object userdata)
throws LinphoneCoreException {
try {
return new LinphoneCoreImpl(listener,new File(userConfig),new File(factoryConfig),userdata);
File user = userConfig == null ? null : new File(userConfig);
File factory = factoryConfig == null ? null : new File(factoryConfig);
return new LinphoneCoreImpl(listener, user, factory, userdata);
} catch (IOException e) {
throw new LinphoneCoreException("Cannot create LinphoneCore",e);
}

10
java/impl/org/linphone/core/LinphoneCoreImpl.java
View file

@ -145,12 +145,14 @@ class LinphoneCoreImpl implements LinphoneCore {
private native void setChatDatabasePath(long nativePtr, String path);
private native long[] getChatRooms(long nativePtr);
LinphoneCoreImpl(LinphoneCoreListener listener, File userConfig,File factoryConfig,Object userdata) throws IOException {
mListener=listener;
nativePtr = newLinphoneCore(listener,userConfig.getCanonicalPath(),factoryConfig.getCanonicalPath(),userdata);
LinphoneCoreImpl(LinphoneCoreListener listener, File userConfig, File factoryConfig, Object userdata) throws IOException {
mListener = listener;
String user = userConfig == null ? null : userConfig.getCanonicalPath();
String factory = factoryConfig == null ? null : factoryConfig.getCanonicalPath();
nativePtr = newLinphoneCore(listener, user, factory, userdata);
}
LinphoneCoreImpl(LinphoneCoreListener listener) throws IOException {
mListener=listener;
mListener = listener;
nativePtr = newLinphoneCore(listener,null,null,null);
}

1
java/impl/org/linphone/core/LinphoneProxyConfigImpl.java
View file

@ -37,6 +37,7 @@ class LinphoneProxyConfigImpl implements LinphoneProxyConfig {
nativePtr = newLinphoneProxyConfig();
setIdentity(identity);
setProxy(proxy);
setRoute(route);
enableRegister(enableRegister);
ownPtr=true;
}