diff options
Diffstat (limited to 'libdino/src/service/file_manager.vala')
| -rw-r--r-- | libdino/src/service/file_manager.vala | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libdino/src/service/file_manager.vala b/libdino/src/service/file_manager.vala index 5e59aee1..964278a5 100644 --- a/libdino/src/service/file_manager.vala +++ b/libdino/src/service/file_manager.vala @@ -76,9 +76,10 @@ public class FileManager : StreamInteractionModule, Object { file_transfer.account = conversation.account; file_transfer.counterpart = conversation.counterpart; if (conversation.type_.is_muc_semantic()) { - file_transfer.ourpart = stream_interactor.get_module(MucManager.IDENTITY).get_own_jid(conversation.counterpart, conversation.account) ?? conversation.account.bare_jid; - } else { - file_transfer.ourpart = conversation.account.full_jid; + file_transfer.ourpart = stream_interactor.get_module(MucManager.IDENTITY).get_own_jid(conversation.counterpart, conversation.account); + } + if (file_transfer.ourpart == null) { + file_transfer.ourpart = stream_interactor.get_account_full_jid(conversation.account); } file_transfer.direction = FileTransfer.DIRECTION_SENT; file_transfer.time = new DateTime.now_utc(); @@ -362,7 +363,7 @@ public class FileManager : StreamInteractionModule, Object { file_transfer.ourpart = from; file_transfer.direction = FileTransfer.DIRECTION_SENT; } else { - file_transfer.ourpart = conversation.account.full_jid; + file_transfer.ourpart = stream_interactor.get_account_full_jid(conversation.account); file_transfer.direction = FileTransfer.DIRECTION_RECEIVED; } } |