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

http-file-upload: make order of parameters more logical

Browse source
This commit is contained in:
Florian Schmaus 2020-04-08 14:33:09 +02:00
parent e2d393d00d
commit 10aee6c787
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
smack-experimental/src/main/java/org/jivesoftware/smackx/httpfileupload/HttpFileUploadManager.java
View file

@ -264,7 +264,7 @@ public final class HttpFileUploadManager extends Manager {
final long fileSize = file.length(); final long fileSize = file.length();
// Construct the FileInputStream first to make sure we can actually read the file. // Construct the FileInputStream first to make sure we can actually read the file.
final FileInputStream fis = new FileInputStream(file); final FileInputStream fis = new FileInputStream(file);
upload(listener, fileSize, fis, slot); upload(fis, fileSize, slot, listener);
return slot.getGetUrl(); return slot.getGetUrl();
} }
@ -308,7 +308,7 @@ public final class HttpFileUploadManager extends Manager {
Objects.requireNonNull(fileName, "Filename Stream cannot be null"); Objects.requireNonNull(fileName, "Filename Stream cannot be null");
Objects.requireNonNull(fileSize, "Filesize Stream cannot be null"); Objects.requireNonNull(fileSize, "Filesize Stream cannot be null");
final Slot slot = requestSlot(fileName, fileSize, "application/octet-stream"); final Slot slot = requestSlot(fileName, fileSize, "application/octet-stream");
upload(listener, fileSize, inputStream, slot); upload(inputStream, fileSize, slot, listener);
return slot.getGetUrl(); return slot.getGetUrl();
} }
@ -431,8 +431,7 @@ public final class HttpFileUploadManager extends Manager {
setTlsContext(sslContext); setTlsContext(sslContext);
} }
private void upload(UploadProgressListener listener, long fileSize, InputStream iStream, Slot slot) throws IOException { private void upload(InputStream iStream, long fileSize, Slot slot, UploadProgressListener listener) throws IOException {
final URL putUrl = slot.getPutUrl(); final URL putUrl = slot.getPutUrl();
final HttpURLConnection urlConnection = (HttpURLConnection) putUrl.openConnection(); final HttpURLConnection urlConnection = (HttpURLConnection) putUrl.openConnection();