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

Merge branch 'master' of git.linphone.org:linphone-android into bellesip

Browse source 
Conflicts:
	submodules/externals/exosip
	submodules/linphone
This commit is contained in:
Yann Diorcet 2013-02-12 10:38:57 +01:00
commit 7d0dd35a2e
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -521,10 +521,11 @@ 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()); byte[] rawImage = LinphoneActivity.instance().getChatStorage().getRawImageFromMessage(id);
Bitmap bm = BitmapFactory.decodeByteArray(rawImage, 0, rawImage.length);
displayImageMessage(id, bm, String.valueOf(System.currentTimeMillis()), true, null, messagesLayout); displayImageMessage(id, bm, String.valueOf(System.currentTimeMillis()), true, null, messagesLayout);
} }
scrollToEnd(); scrollToEnd();
@ -533,7 +534,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 94dc35278fbbaf0f5df0140ff9ef764e14a45951 Subproject commit 922851412eddf866d48ebcd9ad7231be39e5231f