anotherim/anotherim-desktop
2
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix hide/show correct ContentItems

Browse source
This commit is contained in:
fiaxh 2018-11-07 17:42:48 +01:00
parent f60ebc2af6
commit 559bbc5ca3
1 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
libdino/src/service/content_item_store.vala
View file

@ -27,6 +27,8 @@ public class ContentItemStore : StreamInteractionModule, Object {
this.db = db; this.db = db;
stream_interactor.get_module(FileManager.IDENTITY).received_file.connect(insert_file_transfer); stream_interactor.get_module(FileManager.IDENTITY).received_file.connect(insert_file_transfer);
stream_interactor.get_module(MessageProcessor.IDENTITY).message_received.connect(announce_message);
stream_interactor.get_module(MessageProcessor.IDENTITY).message_sent.connect(announce_message);
} }
public void init(Conversation conversation, ContentItemCollection item_collection) { public void init(Conversation conversation, ContentItemCollection item_collection) {
@ -136,19 +138,28 @@ public class ContentItemStore : StreamInteractionModule, Object {
public void insert_message(Message message, Conversation conversation, bool hide = false) { public void insert_message(Message message, Conversation conversation, bool hide = false) {
MessageItem item = new MessageItem(message, conversation, -1); MessageItem item = new MessageItem(message, conversation, -1);
item.id = db.add_content_item(conversation, message.time, message.local_time, 1, message.id, hide); item.id = db.add_content_item(conversation, message.time, message.local_time, 1, message.id, hide);
if (!discard(item)) { }
if (collection_conversations.has_key(conversation)) {
collection_conversations.get(conversation).insert_item(item); private void announce_message(Message message, Conversation conversation) {
QueryBuilder select = db.content_item.select();
select.with(db.content_item.foreign_id, "=", message.id);
select.with(db.content_item.content_type, "=", 1);
foreach (Row row in select) {
MessageItem item = new MessageItem(message, conversation, row[db.content_item.id]);
if (!discard(item)) {
if (collection_conversations.has_key(conversation)) {
collection_conversations.get(conversation).insert_item(item);
}
new_item(item, conversation);
} }
new_item(item, conversation); break;
} }
} }
private void insert_file_transfer(FileTransfer file_transfer, Conversation conversation) { private void insert_file_transfer(FileTransfer file_transfer, Conversation conversation) {
FileItem item = new FileItem(file_transfer, -1); FileItem item = new FileItem(file_transfer, -1);
item.id = db.add_content_item(conversation, file_transfer.time, file_transfer.local_time, 2, file_transfer.id, false);
if (!discard(item)) { if (!discard(item)) {
item.id = db.add_content_item(conversation, file_transfer.time, file_transfer.local_time, 2, file_transfer.id, false);
if (collection_conversations.has_key(conversation)) { if (collection_conversations.has_key(conversation)) {
collection_conversations.get(conversation).insert_item(item); collection_conversations.get(conversation).insert_item(item);
} }