mirror/Spark
3
0
Fork 0
mirror of https://github.com/igniterealtime/Spark.git synced 2025-12-01 12:27:58 +00:00
Code Issues Projects Releases Wiki Activity

SPARK-1752: File transfer manager should always be initialized (#193)

Browse Source 
The file transfer manager should, if enabled, always get initialized.
The old code depended on a authentication to succeed. However, if that
occurred before the file transfer manager was invoked, initialization
would never occur.
This commit is contained in:
Guus der Kinderen
2016-08-15 21:42:57 +02:00
committed by wroot
parent c8ed22a386
commit 88d545056e
1 changed files with 24 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/java/org/jivesoftware/spark/filetransfer/SparkTransferManager.java
View File

@ -147,37 +147,12 @@ public class SparkTransferManager {
@Override
public void connected( XMPPConnection xmppConnection )
{
}
@Override
public void authenticated( XMPPConnection xmppConnection, boolean b )
{
transferManager = FileTransferManager.getInstanceFor( SparkManager.getConnection() );
final ContactList contactList = SparkManager.getWorkspace().getContactList();
// Create the listener
transferManager.addFileTransferListener( request -> SwingUtilities.invokeLater( () -> handleTransferRequest(request, contactList) ) );
// Add Send File to Chat Room
addSendFileButton();
contactList.addFileDropListener( ( files, component ) -> {
if (component instanceof ContactItem) {
ContactItem item = (ContactItem)component;
ChatRoom chatRoom = null;
for (File file : files) {
chatRoom = sendFile(file, item.getJID());
}
if (chatRoom != null) {
SparkManager.getChatManager().getChatContainer().activateChatRoom(chatRoom);
}
}
} );
}
public void connectionClosed() {
@ -198,6 +173,30 @@ public class SparkTransferManager {
}
});
final ContactList contactList = SparkManager.getWorkspace().getContactList();
// Create the listener
transferManager = FileTransferManager.getInstanceFor( SparkManager.getConnection() );
transferManager.addFileTransferListener( request -> SwingUtilities.invokeLater( () -> handleTransferRequest(request, contactList) ) );
// Add Send File to Chat Room
addSendFileButton();
contactList.addFileDropListener( ( files, component ) -> {
if (component instanceof ContactItem) {
ContactItem item = (ContactItem)component;
ChatRoom chatRoom = null;
for (File file : files) {
chatRoom = sendFile(file, item.getJID());
}
if (chatRoom != null) {
SparkManager.getChatManager().getChatContainer().activateChatRoom(chatRoom);
}
}
} );
try {
robot = new Robot();
selectionPanel = new ImageSelectionPanel();