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

update linphone submodule (java info api, log handler)

Browse source
This commit is contained in:
Simon Morlat 2013-05-23 13:23:03 +02:00
parent efaddfe875
commit cc590772e8
3 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
custom_rules.xml
View file

@ -37,8 +37,7 @@
<class name="org.linphone.core.LinphoneProxyConfigImpl" /> <class name="org.linphone.core.LinphoneProxyConfigImpl" />
<class name="org.linphone.core.PayloadTypeImpl" /> <class name="org.linphone.core.PayloadTypeImpl" />
<class name="org.linphone.core.LpConfigImpl" /> <class name="org.linphone.core.LpConfigImpl" />
<class name="org.linphone.core.LinphoneContentImpl" /> <class name="org.linphone.core.LinphoneInfoMessageImpl" />
<class name="org.linphone.core.LinphoneInfoMessage" />
</javah> </javah>
<javah outputfile="gen/xml2lpc_jni.h"> <javah outputfile="gen/xml2lpc_jni.h">
<classpath> <classpath>

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

@ -59,6 +59,7 @@ import org.linphone.core.LinphoneCallParams;
import org.linphone.core.LinphoneCallStats; import org.linphone.core.LinphoneCallStats;
import org.linphone.core.LinphoneChatMessage; import org.linphone.core.LinphoneChatMessage;
import org.linphone.core.LinphoneChatRoom; import org.linphone.core.LinphoneChatRoom;
import org.linphone.core.LinphoneContent;
import org.linphone.core.LinphoneCore; import org.linphone.core.LinphoneCore;
import org.linphone.core.LinphoneCore.EcCalibratorStatus; import org.linphone.core.LinphoneCore.EcCalibratorStatus;
import org.linphone.core.LinphoneCore.FirewallPolicy; import org.linphone.core.LinphoneCore.FirewallPolicy;
@ -70,6 +71,8 @@ import org.linphone.core.LinphoneCoreException;
import org.linphone.core.LinphoneCoreFactory; import org.linphone.core.LinphoneCoreFactory;
import org.linphone.core.LinphoneCoreListener; import org.linphone.core.LinphoneCoreListener;
import org.linphone.core.LinphoneFriend; import org.linphone.core.LinphoneFriend;
import org.linphone.core.LinphoneInfoMessage;
import org.linphone.core.LinphoneLogHandler;
import org.linphone.core.LinphoneProxyConfig; import org.linphone.core.LinphoneProxyConfig;
import org.linphone.core.PayloadType; import org.linphone.core.PayloadType;
import org.linphone.mediastream.Log; import org.linphone.mediastream.Log;
@ -1708,4 +1711,12 @@ public final class LinphoneManager implements LinphoneCoreListener {
// TODO Auto-generated method stub // TODO Auto-generated method stub
} }
@Override
public void infoReceived(LinphoneCore lc, LinphoneInfoMessage info) {
Log.d("Info message received from "+info.getFrom());
LinphoneContent ct=info.getContent();
if (ct!=null){
Log.d("Info received with body with mime type "+ct.getType()+"/"+ct.getSubtype()+" and data ["+ct.getDataAsString()+"]");
}
}
} }

2
submodules/linphone

@ -1 +1 @@
Subproject commit 53d4d1b7f8bcd5b604011dafef37224c1751bfc4 Subproject commit 1939dd72cec0d200e0ca50f99f61ac900185c249