From 6491500af16015724f8bb17732001222fb8297de Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Thu, 7 Feb 2013 15:35:39 +0100 Subject: [PATCH] adapt to small api changes --- src/org/linphone/ChatFragment.java | 6 +++--- src/org/linphone/LinphoneManager.java | 2 +- submodules/linphone | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/org/linphone/ChatFragment.java b/src/org/linphone/ChatFragment.java index b7de1fa4e..9dd8e8ffe 100644 --- a/src/org/linphone/ChatFragment.java +++ b/src/org/linphone/ChatFragment.java @@ -521,8 +521,8 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC public void onMessageReceived(int id, LinphoneAddress from, LinphoneChatMessage message) { if (from.asStringUriOnly().equals(sipUri)) { - if (message.getMessage() != null) { - displayMessage(id, message.getMessage(), String.valueOf(System.currentTimeMillis()), true, null, messagesLayout); + if (message.getText() != null) { + displayMessage(id, message.getText(), String.valueOf(System.currentTimeMillis()), true, null, messagesLayout); } else if (message.getExternalBodyUrl() != null) { Bitmap bm = downloadImage(message.getExternalBodyUrl()); displayImageMessage(id, bm, String.valueOf(System.currentTimeMillis()), true, null, messagesLayout); @@ -533,7 +533,7 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC @Override public void onLinphoneChatMessageStateChanged(LinphoneChatMessage msg, State state) { - final String finalMessage = msg.getMessage(); + final String finalMessage = msg.getText(); final String finalImage = msg.getExternalBodyUrl(); final State finalState = state; if (LinphoneActivity.isInstanciated() && state != State.InProgress) { diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java index 4eed24eb2..e7afcb1b7 100644 --- a/src/org/linphone/LinphoneManager.java +++ b/src/org/linphone/LinphoneManager.java @@ -944,7 +944,7 @@ public final class LinphoneManager implements LinphoneCoreListener { LinphoneAddress from = message.getFrom(); ChatStorage chatStorage = new ChatStorage(mServiceContext); - String textMessage = message.getMessage(); + String textMessage = message.getText(); String url = message.getExternalBodyUrl(); String notificationText = null; int id = -1; diff --git a/submodules/linphone b/submodules/linphone index bf0953eb1..dd9241f22 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit bf0953eb1d3c83471c6950eea505bea4e67f93e6 +Subproject commit dd9241f226408096224f16df441c1cb67ce8193b