goldcollection
/
muwire
mirror of https://github.com/zlatinb/muwire
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix deleting of messages

reproducible
Zlatin Balevsky 2021-05-02 09:07:34 +01:00
parent 9c905c041c
commit d3555db803
No known key found for this signature in database
GPG Key ID: A72832072D525E41
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/main/groovy/com/muwire/core/messenger/Messenger.groovy
View File

@ -245,12 +245,10 @@ class Messenger {
}
}
public synchronized void onUIMessageDeleteEvent(UIMessageDeleteEvent e) {
switch(e.folder) {
case INBOX : deleteFromFolder(e.message, inboxMessages, folders.get(INBOX)); break;
case OUTBOX : deleteFromFolder(e.message, outboxMessages, folders.get(OUTBOX)); break;
case SENT : deleteFromFolder(e.message, sentMessages, folders.get(SENT)); break
}
synchronized void onUIMessageDeleteEvent(UIMessageDeleteEvent e) {
def file = folders.get(e.folder)
def set = messages.get(file)
deleteFromFolder(e.message, set, file)
}
private void deleteFromFolder(MWMessage message, Set<MWMessage> set, File file) {

2
core/src/main/groovy/com/muwire/core/messenger/UIMessageDeleteEvent.groovy
View File

@ -4,5 +4,5 @@ import com.muwire.core.Event
class UIMessageDeleteEvent extends Event {
MWMessage message
int folder
String folder
}

2
gui/griffon-app/controllers/com/muwire/gui/MessageFolderController.groovy
View File

@ -62,7 +62,7 @@ class MessageFolderController {
return
MWMessage msg = model.messageHeaders.get(row).message
model.deleteMessage(msg)
model.core.eventBus.publish(new UIMessageDeleteEvent(message : msg, folder : model.folderIdx))
model.core.eventBus.publish(new UIMessageDeleteEvent(message : msg, folder : model.name))
}
@ControllerAction