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

Linphone updated

Browse source
This commit is contained in:
Sylvain Berfini 2012-09-18 15:57:21 +02:00
parent f4e7fe1d25
commit 2044a91797
5 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -885,9 +885,9 @@ public final class LinphoneManager implements LinphoneCoreListener {
} }
@Override @Override
public void messageReceived(LinphoneCore lc, LinphoneChatRoom cr, LinphoneAddress from, LinphoneChatMessage message) { public void messageReceived(LinphoneCore lc, LinphoneChatRoom cr, LinphoneChatMessage message) {
for (LinphoneSimpleListener listener : getSimpleListeners(LinphoneActivity.class)) { for (LinphoneSimpleListener listener : getSimpleListeners(LinphoneActivity.class)) {
((LinphoneActivity) listener).onMessageReceived(from, message); ((LinphoneActivity) listener).onMessageReceived(message.getFrom(), message);
} }
} }

10
src/org/linphone/core/LinphoneChatMessageImpl.java
View file

@ -4,9 +4,10 @@ public class LinphoneChatMessageImpl implements LinphoneChatMessage {
protected final long nativePtr; protected final long nativePtr;
private native void setUserData(long ptr); private native void setUserData(long ptr);
private native String getMessage(long ptr); private native String getMessage(long ptr);
private native LinphoneAddress getPeerAddress(long ptr); private native long getPeerAddress(long ptr);
private native String getExternalBodyUrl(long ptr); private native String getExternalBodyUrl(long ptr);
private native void setExternalBodyUrl(long ptr, String url); private native void setExternalBodyUrl(long ptr, String url);
private native long getFrom(long ptr);
protected LinphoneChatMessageImpl(long aNativePtr) { protected LinphoneChatMessageImpl(long aNativePtr) {
nativePtr = aNativePtr; nativePtr = aNativePtr;
@ -35,7 +36,7 @@ public class LinphoneChatMessageImpl implements LinphoneChatMessage {
@Override @Override
public LinphoneAddress getPeerAddress() { public LinphoneAddress getPeerAddress() {
return getPeerAddress(nativePtr); return new LinphoneAddressImpl(getPeerAddress(nativePtr));
} }
@Override @Override
@ -47,4 +48,9 @@ public class LinphoneChatMessageImpl implements LinphoneChatMessage {
public void setExternalBodyUrl(String url) { public void setExternalBodyUrl(String url) {
setExternalBodyUrl(nativePtr, url); setExternalBodyUrl(nativePtr, url);
} }
@Override
public LinphoneAddress getFrom() {
return new LinphoneAddressImpl(getFrom(nativePtr));
}
} }

4
src/org/linphone/core/LinphoneChatRoomImpl.java
View file

@ -44,11 +44,7 @@ class LinphoneChatRoomImpl implements LinphoneChatRoom {
sendMessage2(nativePtr, message.getNativePtr(), listener); sendMessage2(nativePtr, message.getNativePtr(), listener);
} }
@Override
public void sendMessage(Object opaque, String message) {
// ignore, deprecated.
}
@Override @Override
public LinphoneChatMessage createLinphoneChatMessage(String message) { public LinphoneChatMessage createLinphoneChatMessage(String message) {
return new LinphoneChatMessageImpl(createLinphoneChatMessage(nativePtr, message)); return new LinphoneChatMessageImpl(createLinphoneChatMessage(nativePtr, message));

5
src/org/linphone/core/LinphoneCoreImpl.java
View file

@ -736,4 +736,9 @@ class LinphoneCoreImpl implements LinphoneCore {
public String getVersion() { public String getVersion() {
return getVersion(nativePtr); return getVersion(nativePtr);
} }
@Override
public PayloadType findPayloadType(String mime, int clockRate) {
return null;
}
} }

2
submodules/linphone

@ -1 +1 @@
Subproject commit 417d5d93e096c20ddf60da895682e412a779b572 Subproject commit a1961faa44b1306e5c04285a00ec98ccd9328ff9