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

Fix starting private conversations with MUC members (#690)

Browse source 
At least for some users (?), the existing codepath was broken (the list
row would come back null and we'd bail out silently). All we actually
need is the JID, so it's easy enough to store this ourselves, fixing the
bug.

Also apply to kicking.

Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
This commit is contained in:
Alyssa Rosenzweig 2020-01-02 17:35:54 -05:00 committed by fiaxh
parent f3c952f8fc
commit 067184f00c
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
main/src/ui/occupant_menu/view.vala
View file

@ -15,6 +15,8 @@ public class View : Popover {
private ListBox invite_list; private ListBox invite_list;
private Box? jid_menu = null; private Box? jid_menu = null;
private Jid? selected_jid;
public View(StreamInteractor stream_interactor, Conversation conversation) { public View(StreamInteractor stream_interactor, Conversation conversation) {
this.stream_interactor = stream_interactor; this.stream_interactor = stream_interactor;
this.conversation = conversation; this.conversation = conversation;
@ -66,6 +68,7 @@ public class View : Popover {
} }
private void show_menu(Jid jid, string name_) { private void show_menu(Jid jid, string name_) {
selected_jid = jid;
stack.transition_type = StackTransitionType.SLIDE_LEFT; stack.transition_type = StackTransitionType.SLIDE_LEFT;
string name = name_; string name = name_;
@ -102,10 +105,9 @@ public class View : Popover {
} }
private void private_conversation_button_clicked() { private void private_conversation_button_clicked() {
ListRow? list_row = list.list_box.get_selected_row() as ListRow; if (selected_jid == null) return;
if (list_row == null) return;
Conversation conversation = stream_interactor.get_module(ConversationManager.IDENTITY).create_conversation(list_row.jid, list_row.conversation.account, Conversation.Type.GROUPCHAT_PM); Conversation conversation = stream_interactor.get_module(ConversationManager.IDENTITY).create_conversation(selected_jid, conversation.account, Conversation.Type.GROUPCHAT_PM);
stream_interactor.get_module(ConversationManager.IDENTITY).start_conversation(conversation); stream_interactor.get_module(ConversationManager.IDENTITY).start_conversation(conversation);
Application app = GLib.Application.get_default() as Application; Application app = GLib.Application.get_default() as Application;
@ -113,10 +115,9 @@ public class View : Popover {
} }
private void kick_button_clicked() { private void kick_button_clicked() {
ListRow? list_row = list.list_box.get_selected_row() as ListRow; if (selected_jid == null) return;
if (list_row == null) return;
stream_interactor.get_module(MucManager.IDENTITY).kick(conversation.account, conversation.counterpart, list_row.jid.resourcepart); stream_interactor.get_module(MucManager.IDENTITY).kick(conversation.account, conversation.counterpart, selected_jid.resourcepart);
} }
} }