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

Fixed issue in chats list

Browse source
This commit is contained in:
Sylvain Berfini 2018-11-27 13:27:01 +01:00
parent 82dabdf27d
commit fa0849f0c3
2 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/src/main/java/org/linphone/chat/ChatRoomViewHolder.java
View file

@ -73,18 +73,16 @@ public class ChatRoomViewHolder extends RecyclerView.ViewHolder implements View.
ChatMessage lastMessage = mRoom.getLastMessageInHistory(); ChatMessage lastMessage = mRoom.getLastMessageInHistory();
if (lastMessage != null) { if (lastMessage != null) {
String text = lastMessage.getTextContent(); String messageContent = "";
if (text != null && text.length() > 0) {
lastMessageView.setText(getSender(mRoom) + text);
}
date.setText(LinphoneUtils.timestampToHumanDate(mContext, mRoom.getLastUpdateTime(), R.string.messages_list_date_format));
String files = "";
for (Content c : lastMessage.getContents()) { for (Content c : lastMessage.getContents()) {
if (c.isFile() || c.isFileTransfer()) { if (c.isFile() || c.isFileTransfer()) {
files += c.getName() + " "; messageContent += c.getName() + " ";
} else if (c.isText()) {
messageContent = c.getStringBuffer() + " " + messageContent;
} }
} }
lastMessageView.setText(getSender(mRoom) + files); lastMessageView.setText(getSender(mRoom) + messageContent);
date.setText(LinphoneUtils.timestampToHumanDate(mContext, mRoom.getLastUpdateTime(), R.string.messages_list_date_format));
} else { } else {
date.setText(""); date.setText("");
lastMessageView.setText(""); lastMessageView.setText("");

2
app/src/main/res/raw/linphonerc_factory
View file

@ -67,5 +67,5 @@ lime_v2=1
x3dh_server_url=http://54.37.202.229:8082/flexisip-account-manager/x3dh-25519.php x3dh_server_url=http://54.37.202.229:8082/flexisip-account-manager/x3dh-25519.php
lime_update_threshold=86400 lime_update_threshold=86400
max_nb_device_per_participant=255 max_nb_device_per_participant=255
allow_message_in_unsafe_chatroom=0 allow_message_in_unsafe_chatroom=1
unsafe_if_sas_refused=1 unsafe_if_sas_refused=1