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

update linphone and fix crash with chat

Browse source
This commit is contained in:
Simon Morlat 2014-04-11 14:47:38 +02:00
parent d49d26b922
commit c043f37402
3 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -767,15 +767,16 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
} }
@Override @Override
public synchronized void onLinphoneChatMessageStateChanged(final LinphoneChatMessage msg, final State state) { public synchronized void onLinphoneChatMessageStateChanged(LinphoneChatMessage msg, State state) {
final String finalMessage = msg.getText(); final LinphoneChatMessage finalMessage = msg;
final String finalImage = msg.getExternalBodyUrl(); final String finalImage = finalMessage.getExternalBodyUrl();
final State finalState=state;
if (LinphoneActivity.isInstanciated() && state != State.InProgress) { if (LinphoneActivity.isInstanciated() && state != State.InProgress) {
mHandler.post(new Runnable() { mHandler.post(new Runnable() {
@Override @Override
public void run() { public void run() {
if (finalMessage != null && !finalMessage.equals("")) { if (finalMessage != null && !finalMessage.equals("")) {
LinphoneActivity.instance().onMessageStateChanged(sipUri, finalMessage, state.toInt()); LinphoneActivity.instance().onMessageStateChanged(sipUri, finalMessage.getText(), finalState.toInt());
} else if (finalImage != null && !finalImage.equals("")) { } else if (finalImage != null && !finalImage.equals("")) {
if (latestImageMessages != null && latestImageMessages.containsValue(finalImage)) { if (latestImageMessages != null && latestImageMessages.containsValue(finalImage)) {
int id = -1; int id = -1;
@ -787,15 +788,15 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
} }
} }
if (id != -1) { if (id != -1) {
LinphoneActivity.instance().onImageMessageStateChanged(sipUri, id, state.toInt()); LinphoneActivity.instance().onImageMessageStateChanged(sipUri, id, finalState.toInt());
} }
} }
} }
if (lastSentMessagesBubbles != null && lastSentMessagesBubbles.size() > 0) { if (lastSentMessagesBubbles != null && lastSentMessagesBubbles.size() > 0) {
for (BubbleChat bubble : lastSentMessagesBubbles) { for (BubbleChat bubble : lastSentMessagesBubbles) {
if (bubble.getNativeMessageObject() == msg) { if (bubble.getNativeMessageObject() == finalMessage) {
bubble.updateStatusView(state); bubble.updateStatusView(finalState);
} }
} }
} }

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

@ -688,7 +688,7 @@ public class LinphoneManager implements LinphoneCoreListener {
private Vibrator mVibrator; private Vibrator mVibrator;
public void displayWarning(LinphoneCore lc, String message) {} public void displayWarning(LinphoneCore lc, String message) {}
public void authInfoRequested(LinphoneCore lc, String realm, String username) {} public void authInfoRequested(LinphoneCore lc, String realm, String username, String domain) {}
public void byeReceived(LinphoneCore lc, String from) {} public void byeReceived(LinphoneCore lc, String from) {}
public void displayMessage(LinphoneCore lc, String message) {} public void displayMessage(LinphoneCore lc, String message) {}
public void show(LinphoneCore lc) {} public void show(LinphoneCore lc) {}

2
submodules/linphone

@ -1 +1 @@
Subproject commit 643d39637bb0130d35275fbaaeb0b24d31122345 Subproject commit fd813601605e2f4e2cbd70e2cdb96806e3e78e41