From c0c74aac79b66fbccb41eeb1a9d769c2cdfadaec Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@linphone.org>
Date: Thu, 11 Sep 2014 12:17:29 +0200
Subject: [PATCH] Updated linphone + added missing callbacks in manager

---
 src/org/linphone/LinphoneManager.java         |  2 +-
 submodules/linphone                           |  2 +-
 .../linphone/test/LinphoneTestManager.java    | 22 +++++++++++++++++++
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index eb72513cf..cc965b893 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -1424,7 +1424,7 @@ public class LinphoneManager implements LinphoneCoreListener {
 	}
 	@Override
 	public void fileTransferRecv(LinphoneCore lc, LinphoneChatMessage message,
-			LinphoneContent content, String buffer, int size) {
+			LinphoneContent content, byte[] buffer, int size) {
 		// TODO Auto-generated method stub
 		
 	}
diff --git a/submodules/linphone b/submodules/linphone
index 856418260..e9a376a01 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 856418260aa7e20c9e46eaf7554877bb2be3d100
+Subproject commit e9a376a014262fd3051326efbe89c6cc4d635f51
diff --git a/tests/src/org/linphone/test/LinphoneTestManager.java b/tests/src/org/linphone/test/LinphoneTestManager.java
index dfe8f2e17..5ae6ed108 100644
--- a/tests/src/org/linphone/test/LinphoneTestManager.java
+++ b/tests/src/org/linphone/test/LinphoneTestManager.java
@@ -1,5 +1,6 @@
 package org.linphone.test;
 
+import java.nio.ByteBuffer;
 import java.util.Timer;
 import java.util.TimerTask;
 
@@ -446,4 +447,25 @@ public class LinphoneTestManager implements LinphoneCoreListener {
 		// TODO Auto-generated method stub
 		
 	}
+	
+	@Override
+	public void fileTransferProgressIndication(LinphoneCore lc,
+			LinphoneChatMessage message, LinphoneContent content, int progress) {
+		// TODO Auto-generated method stub
+		
+	}
+	
+	@Override
+	public void fileTransferRecv(LinphoneCore lc, LinphoneChatMessage message,
+			LinphoneContent content, byte[] buffer, int size) {
+		// TODO Auto-generated method stub
+		
+	}
+	
+	@Override
+	public int fileTransferSend(LinphoneCore lc, LinphoneChatMessage message,
+			LinphoneContent content, ByteBuffer buffer, int size) {
+		// TODO Auto-generated method stub
+		return 0;
+	}
 }