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

adapt to small api changes

Browse source
This commit is contained in:
Simon Morlat 2013-02-07 15:35:39 +01:00
parent 2f6a101e54
commit 6491500af1
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/org/linphone/ChatFragment.java
View file

@ -521,8 +521,8 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
public void onMessageReceived(int id, LinphoneAddress from, LinphoneChatMessage message) { public void onMessageReceived(int id, LinphoneAddress from, LinphoneChatMessage message) {
if (from.asStringUriOnly().equals(sipUri)) { if (from.asStringUriOnly().equals(sipUri)) {
if (message.getMessage() != null) { if (message.getText() != null) {
displayMessage(id, message.getMessage(), String.valueOf(System.currentTimeMillis()), true, null, messagesLayout); displayMessage(id, message.getText(), String.valueOf(System.currentTimeMillis()), true, null, messagesLayout);
} else if (message.getExternalBodyUrl() != null) { } else if (message.getExternalBodyUrl() != null) {
Bitmap bm = downloadImage(message.getExternalBodyUrl()); Bitmap bm = downloadImage(message.getExternalBodyUrl());
displayImageMessage(id, bm, String.valueOf(System.currentTimeMillis()), true, null, messagesLayout); displayImageMessage(id, bm, String.valueOf(System.currentTimeMillis()), true, null, messagesLayout);
@ -533,7 +533,7 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
@Override @Override
public void onLinphoneChatMessageStateChanged(LinphoneChatMessage msg, State state) { public void onLinphoneChatMessageStateChanged(LinphoneChatMessage msg, State state) {
final String finalMessage = msg.getMessage(); final String finalMessage = msg.getText();
final String finalImage = msg.getExternalBodyUrl(); final String finalImage = msg.getExternalBodyUrl();
final State finalState = state; final State finalState = state;
if (LinphoneActivity.isInstanciated() && state != State.InProgress) { if (LinphoneActivity.isInstanciated() && state != State.InProgress) {

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

@ -944,7 +944,7 @@ public final class LinphoneManager implements LinphoneCoreListener {
LinphoneAddress from = message.getFrom(); LinphoneAddress from = message.getFrom();
ChatStorage chatStorage = new ChatStorage(mServiceContext); ChatStorage chatStorage = new ChatStorage(mServiceContext);
String textMessage = message.getMessage(); String textMessage = message.getText();
String url = message.getExternalBodyUrl(); String url = message.getExternalBodyUrl();
String notificationText = null; String notificationText = null;
int id = -1; int id = -1;

2
submodules/linphone

@ -1 +1 @@
Subproject commit bf0953eb1d3c83471c6950eea505bea4e67f93e6 Subproject commit dd9241f226408096224f16df441c1cb67ce8193b