From cc590772e86365084e494935701b86886691e739 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Thu, 23 May 2013 13:23:03 +0200
Subject: [PATCH] update linphone submodule (java info api, log handler)

---
 custom_rules.xml                      |  3 +--
 src/org/linphone/LinphoneManager.java | 11 +++++++++++
 submodules/linphone                   |  2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/custom_rules.xml b/custom_rules.xml
index 1039d86be..77071ac68 100644
--- a/custom_rules.xml
+++ b/custom_rules.xml
@@ -37,8 +37,7 @@
 			<class name="org.linphone.core.LinphoneProxyConfigImpl" />
 			<class name="org.linphone.core.PayloadTypeImpl" />
 			<class name="org.linphone.core.LpConfigImpl" />
-			<class name="org.linphone.core.LinphoneContentImpl" />
-			<class name="org.linphone.core.LinphoneInfoMessage" />
+			<class name="org.linphone.core.LinphoneInfoMessageImpl" />
 		</javah>
 		<javah outputfile="gen/xml2lpc_jni.h">
 			<classpath>
diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index 253d2cd7d..fa57ff2d1 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -59,6 +59,7 @@ import org.linphone.core.LinphoneCallParams;
 import org.linphone.core.LinphoneCallStats;
 import org.linphone.core.LinphoneChatMessage;
 import org.linphone.core.LinphoneChatRoom;
+import org.linphone.core.LinphoneContent;
 import org.linphone.core.LinphoneCore;
 import org.linphone.core.LinphoneCore.EcCalibratorStatus;
 import org.linphone.core.LinphoneCore.FirewallPolicy;
@@ -70,6 +71,8 @@ import org.linphone.core.LinphoneCoreException;
 import org.linphone.core.LinphoneCoreFactory;
 import org.linphone.core.LinphoneCoreListener;
 import org.linphone.core.LinphoneFriend;
+import org.linphone.core.LinphoneInfoMessage;
+import org.linphone.core.LinphoneLogHandler;
 import org.linphone.core.LinphoneProxyConfig;
 import org.linphone.core.PayloadType;
 import org.linphone.mediastream.Log;
@@ -1708,4 +1711,12 @@ public final class LinphoneManager implements LinphoneCoreListener {
 		// 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()+"]");
+		}
+	}
 }
diff --git a/submodules/linphone b/submodules/linphone
index 53d4d1b7f..1939dd72c 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 53d4d1b7f8bcd5b604011dafef37224c1751bfc4
+Subproject commit 1939dd72cec0d200e0ca50f99f61ac900185c249