Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2024-11-22 06:12:05 +01:00
Code Issues Releases Wiki Activity

Fix FileTransferManager invoking request listeners

Browse source 
those need to be called asynchronously.

Also add a small API for that.
This commit is contained in:
Florian Schmaus 2014-08-26 12:40:55 +02:00
parent 856b4a6090
commit 191c4429da
2 changed files with 39 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
smack-core/src/main/java/org/jivesoftware/smack/util/Async.java Normal file
View file

@ -0,0 +1,26 @@
/**
*
* Copyright 2014 Florian Schmaus
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jivesoftware.smack.util;
public class Async {
public static void go(Runnable runnable) {
Thread thread = new Thread(runnable);
thread.setDaemon(true);
thread.start();
}
}

16
smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferManager.java
View file

@ -26,6 +26,7 @@ import org.jivesoftware.smack.filter.PacketTypeFilter;
import org.jivesoftware.smack.packet.IQ;
import org.jivesoftware.smack.packet.Packet;
import org.jivesoftware.smack.packet.XMPPError;
import org.jivesoftware.smack.util.Async;
import org.jivesoftware.smackx.si.packet.StreamInitiation;
import org.jxmpp.util.XmppStringUtils;
@ -76,9 +77,18 @@ public class FileTransferManager extends Manager {
connection.addPacketListener(new PacketListener() {
public void processPacket(Packet packet) {
StreamInitiation si = (StreamInitiation) packet;
FileTransferRequest request = new FileTransferRequest(FileTransferManager.this, si);
for (FileTransferListener listener : listeners) {
listener.fileTransferRequest(request);
final FileTransferRequest request = new FileTransferRequest(FileTransferManager.this, si);
for (final FileTransferListener listener : listeners) {
// Those listeners need to be called asynchronously, in
// order to not block further processing of incoming
// stanzas. They also may send further requests, whose
// responses are not processed if we do not call them
// asynchronously.
Async.go(new Runnable() {
public void run() {
listener.fileTransferRequest(request);
}
});
}
}
}, new AndFilter(new PacketTypeFilter(StreamInitiation.class), IQTypeFilter.SET));