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

Fixed chat room when clicking on chat message notification

Browse source
This commit is contained in:
Sylvain Berfini 2017-11-30 11:48:53 +01:00
parent 9a3ddc12e9
commit d5bc42deda
2 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/android/org/linphone/LinphoneManager.java
View file

@ -1130,9 +1130,9 @@ public class LinphoneManager implements CoreListener, SensorEventListener, Accou
if (!mServiceContext.getResources().getBoolean(R.bool.disable_chat_message_notification)) { if (!mServiceContext.getResources().getBoolean(R.bool.disable_chat_message_notification)) {
if (!cr.canHandleParticipants() || (cr.getNbParticipants() == 1 && getString(R.string.dummy_group_chat_subject).equals(cr.getSubject()))) { if (!cr.canHandleParticipants() || (cr.getNbParticipants() == 1 && getString(R.string.dummy_group_chat_subject).equals(cr.getSubject()))) {
if (contact != null) { if (contact != null) {
LinphoneService.instance().displayMessageNotification(from.asStringUriOnly(), contact.getFullName(), contact.getThumbnailUri(), textMessage); LinphoneService.instance().displayMessageNotification(cr.getPeerAddress().asStringUriOnly(), contact.getFullName(), contact.getThumbnailUri(), textMessage);
} else { } else {
LinphoneService.instance().displayMessageNotification(from.asStringUriOnly(), from.getUsername(), null, textMessage); LinphoneService.instance().displayMessageNotification(cr.getPeerAddress().asStringUriOnly(), from.getUsername(), null, textMessage);
} }
} else { } else {
String subject = cr.getSubject(); String subject = cr.getSubject();

5
src/android/org/linphone/activities/LinphoneActivity.java
View file

@ -913,11 +913,6 @@ public class LinphoneActivity extends LinphoneGenericActivity implements OnClick
return statusFragment; return statusFragment;
} }
public void removeFromChatList(String sipUri) {
ChatRoom chatroom = LinphoneManager.getLc().getChatRoomFromUri(sipUri);
chatroom.deleteHistory();
}
public void updateMissedChatCount() { public void updateMissedChatCount() {
displayMissedChats(getUnreadMessageCount()); displayMissedChats(getUnreadMessageCount());
} }