mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-24 06:38:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'belle-sip' of git.linphone.org:linphone-private into belle-sip

Browse source
This commit is contained in:
Ghislain MARY 2013-04-11 14:11:28 +02:00
commit b90047b03f
2 changed files with 25 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
coreapi/linphonecore_jni.cc
View file

@ -1338,14 +1338,14 @@ extern "C" jlong Java_org_linphone_core_LinphoneAddressImpl_newLinphoneAddressIm
,jobject thiz
,jstring juri
,jstring jdisplayName) {
const char* uri = env->GetStringUTFChars(juri, NULL);
const char* uri = juri?env->GetStringUTFChars(juri, NULL):NULL;
LinphoneAddress* address = linphone_address_new(uri);
if (jdisplayName && address) {
const char* displayName = env->GetStringUTFChars(jdisplayName, NULL);
linphone_address_set_display_name(address,displayName);
env->ReleaseStringUTFChars(jdisplayName, displayName);
}
env->ReleaseStringUTFChars(juri, uri);
if (uri) env->ReleaseStringUTFChars(juri, uri);
return (jlong) address;
}
@ -1410,6 +1410,22 @@ extern "C" void Java_org_linphone_core_LinphoneAddressImpl_setDisplayName(JNIEnv
linphone_address_set_display_name((LinphoneAddress*)address,displayName);
if (displayName != NULL) env->ReleaseStringUTFChars(jdisplayName, displayName);
}
extern "C" void Java_org_linphone_core_LinphoneAddressImpl_setUserName(JNIEnv* env
,jobject thiz
,jlong address
,jstring juserName) {
const char* userName = juserName!= NULL?env->GetStringUTFChars(juserName, NULL):NULL;
linphone_address_set_username((LinphoneAddress*)address,userName);
if (userName != NULL) env->ReleaseStringUTFChars(juserName, userName);
}
extern "C" void Java_org_linphone_core_LinphoneAddressImpl_setDomain(JNIEnv* env
,jobject thiz
,jlong address
,jstring jdomain) {
const char* domain = jdomain!= NULL?env->GetStringUTFChars(jdomain, NULL):NULL;
linphone_address_set_domain((LinphoneAddress*)address,domain);
if (domain != NULL) env->ReleaseStringUTFChars(jdomain, domain);
}
//CallLog

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

@ -30,6 +30,8 @@ public class LinphoneAddressImpl implements LinphoneAddress {
private native String getDomain(long ptr);
private native String toUri(long ptr);
private native void setDisplayName(long ptr,String name);
private native void setDomain(long ptr,String domain);
private native void setUserName(long ptr,String username);
private native String toString(long ptr);
protected LinphoneAddressImpl(String identity) {
@ -37,7 +39,9 @@ public class LinphoneAddressImpl implements LinphoneAddress {
}
protected LinphoneAddressImpl(String username,String domain,String displayName) {
nativePtr = newLinphoneAddressImpl("sip:"+username+"@"+domain, displayName);
nativePtr = newLinphoneAddressImpl(null, displayName);
this.setUserName(username);
this.setDomain(domain);
}
protected LinphoneAddressImpl(long aNativePtr,boolean javaOwnPtr) {
nativePtr = aNativePtr;
@ -85,7 +89,7 @@ public class LinphoneAddressImpl implements LinphoneAddress {
return getPortInt();
}
public void setDomain(String domain) {
throw new RuntimeException("Not implemented");
setDomain(nativePtr,domain);
}
public void setPort(String port) {
throw new RuntimeException("Not implemented");
@ -94,7 +98,7 @@ public class LinphoneAddressImpl implements LinphoneAddress {
throw new RuntimeException("Not implemented");
}
public void setUserName(String username) {
throw new RuntimeException("Not implemented");
setUserName(nativePtr,username);
}
}