vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2025-12-14 06:51:08 +01:00
Code Issues Releases Wiki Activity

Bump "Error Prone" to 2.0.15

Browse source 
and fix a few things :)
This commit is contained in:
Florian Schmaus 2017-02-11 16:16:41 +01:00
parent ef0af66b21
commit 4c646436a5
246 changed files with 1122 additions and 124 deletions
Download patch file Download diff file Expand all files Collapse all files

4
smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FaultTolerantNegotiator.java
View file

@ -55,11 +55,13 @@ public class FaultTolerantNegotiator extends StreamNegotiator {
secondaryNegotiator.newStreamInitiation(from, streamID);
}
@Override
InputStream negotiateIncomingStream(Stanza streamInitiation) {
throw new UnsupportedOperationException("Negotiation only handled by create incoming " +
"stream method.");
}
@Override
public InputStream createIncomingStream(final StreamInitiation initiation) throws SmackException, XMPPErrorException, InterruptedException {
// This could be either an xep47 ibb 'open' iq or an xep65 streamhost iq
IQ initationSet = initiateIncomingStream(connection, initiation);
@ -79,6 +81,7 @@ public class FaultTolerantNegotiator extends StreamNegotiator {
}
}
@Override
public OutputStream createOutgoingStream(String streamID, Jid initiator, Jid target)
throws SmackException, XMPPException, InterruptedException {
OutputStream stream;
@ -92,6 +95,7 @@ public class FaultTolerantNegotiator extends StreamNegotiator {
return stream;
}
@Override
public String[] getNamespaces() {
String[] primary = primaryNegotiator.getNamespaces();
String[] secondary = secondaryNegotiator.getNamespaces();

4
smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransfer.java
View file

@ -292,12 +292,13 @@ public abstract class FileTransfer {
*/
cancelled("Cancelled");
private String status;
private final String status;
private Status(String status) {
this.status = status;
}
@Override
public String toString() {
return status;
}
@ -358,6 +359,7 @@ public abstract class FileTransfer {
return msg;
}
@Override
public String toString() {
return msg;
}

4
smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/IBBTransferNegotiator.java
View file

@ -58,6 +58,7 @@ public class IBBTransferNegotiator extends StreamNegotiator {
this.manager = InBandBytestreamManager.getByteStreamManager(connection);
}
@Override
public OutputStream createOutgoingStream(String streamID, Jid initiator,
Jid target) throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException {
InBandBytestreamSession session = this.manager.establishSession(target, streamID);
@ -65,6 +66,7 @@ public class IBBTransferNegotiator extends StreamNegotiator {
return session.getOutputStream();
}
@Override
public InputStream createIncomingStream(StreamInitiation initiation)
throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException {
/*
@ -87,10 +89,12 @@ public class IBBTransferNegotiator extends StreamNegotiator {
this.manager.ignoreBytestreamRequestOnce(streamID);
}
@Override
public String[] getNamespaces() {
return new String[] { DataPacketExtension.NAMESPACE };
}
@Override
InputStream negotiateIncomingStream(Stanza streamInitiation) throws NotConnectedException, InterruptedException {
// build In-Band Bytestream request
InBandBytestreamRequest request = new ByteStreamRequest(this.manager,

3
smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/IncomingFileTransfer.java
View file

@ -126,6 +126,7 @@ public class IncomingFileTransfer extends FileTransfer {
}
Thread transferThread = new Thread(new Runnable() {
@Override
public void run() {
try {
inputStream = negotiateStream();
@ -184,6 +185,7 @@ public class IncomingFileTransfer extends FileTransfer {
FutureTask<InputStream> streamNegotiatorTask = new FutureTask<InputStream>(
new Callable<InputStream>() {
@Override
public InputStream call() throws Exception {
return streamNegotiator
.createIncomingStream(recieveRequest.getStreamInitiation());
@ -220,6 +222,7 @@ public class IncomingFileTransfer extends FileTransfer {
return inputStream;
}
@Override
public void cancel() {
setStatus(Status.cancelled);
}

6
smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/OutgoingFileTransfer.java
View file

@ -174,6 +174,7 @@ public class OutgoingFileTransfer extends FileTransfer {
setFileInfo(fileName, fileSize);
this.callback = progress;
transferThread = new Thread(new Runnable() {
@Override
public void run() {
try {
OutgoingFileTransfer.this.outputStream = negotiateStream(
@ -192,7 +193,7 @@ public class OutgoingFileTransfer extends FileTransfer {
}
private void checkTransferThread() {
if (transferThread != null && transferThread.isAlive() || isDone()) {
if ((transferThread != null && transferThread.isAlive()) || isDone()) {
throw new IllegalStateException(
"File transfer in progress or has already completed.");
}
@ -225,6 +226,7 @@ public class OutgoingFileTransfer extends FileTransfer {
}
transferThread = new Thread(new Runnable() {
@Override
public void run() {
try {
outputStream = negotiateStream(file.getName(), file
@ -298,6 +300,7 @@ public class OutgoingFileTransfer extends FileTransfer {
setFileInfo(fileName, fileSize);
transferThread = new Thread(new Runnable() {
@Override
public void run() {
//Create packet filter
try {
@ -398,6 +401,7 @@ public class OutgoingFileTransfer extends FileTransfer {
return outputStream;
}
@Override
public void cancel() {
setStatus(Status.cancelled);
}