From ee25db403cab8e98cbc9cc8c5d00a15e16286e5b Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@linphone.org>
Date: Fri, 9 Aug 2013 11:05:48 +0200
Subject: [PATCH] Updated liblinphone + improved message reading from database

---
 src/org/linphone/ChatStorage.java | 8 ++++++--
 submodules/linphone               | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/org/linphone/ChatStorage.java b/src/org/linphone/ChatStorage.java
index 451eb1e53..11b0eb222 100644
--- a/src/org/linphone/ChatStorage.java
+++ b/src/org/linphone/ChatStorage.java
@@ -281,8 +281,12 @@ public class ChatStorage {
 			c.close();
 		} else {
 			LinphoneChatRoom room = LinphoneManager.getLc().createChatRoom(correspondent);
-			for (LinphoneChatMessage message : room.getHistory()) {
-				ChatMessage chatMessage = new ChatMessage(message.hashCode(), message.getText(), null, String.valueOf(message.getTime()), true, 0, true);
+			LinphoneChatMessage[] history = room.getHistory();
+			for (int i = 0; i < history.length; i++) {
+				LinphoneChatMessage message = history[i];
+				ChatMessage chatMessage = new ChatMessage(i+1, message.getText(), null, 
+						String.valueOf(message.getTime()), !message.isOutgoing(), 
+						message.getStatus().toInt(), message.isRead());
 				chatMessage.setUrl(message.getExternalBodyUrl());
 				chatMessages.add(chatMessage);
 			}
diff --git a/submodules/linphone b/submodules/linphone
index 389922acc..952adab4f 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 389922acce2412e6e4f57a74d3e7ea41e8e58771
+Subproject commit 952adab4f85dec18fbe980296c2c5462def1fc92