diff options
author | Christian Schneppe <christian@pix-art.de> | 2019-06-17 21:21:25 +0200 |
---|---|---|
committer | Christian Schneppe <christian@pix-art.de> | 2019-06-17 21:21:25 +0200 |
commit | 6b755c7a6a2e523b599cfebb12421213bc8a4cf8 (patch) | |
tree | 28f12319be182d7314ad7b59189e83890c0d8291 /src/main/java/de/pixart/messenger/http/HttpUploadConnection.java | |
parent | 35a37b737084bf91be07d006a6d545b4b0fb659d (diff) |
use socks instead of http proxy for http upload
http proxy doesn’t seem to work with onion v3
Diffstat (limited to 'src/main/java/de/pixart/messenger/http/HttpUploadConnection.java')
-rw-r--r-- | src/main/java/de/pixart/messenger/http/HttpUploadConnection.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/de/pixart/messenger/http/HttpUploadConnection.java b/src/main/java/de/pixart/messenger/http/HttpUploadConnection.java index 609ad65d3..0fa79ff8f 100644 --- a/src/main/java/de/pixart/messenger/http/HttpUploadConnection.java +++ b/src/main/java/de/pixart/messenger/http/HttpUploadConnection.java @@ -155,11 +155,13 @@ public class HttpUploadConnection implements Transferable { PowerManager.WakeLock wakeLock = mHttpConnectionManager.createWakeLock("http_upload_" + message.getUuid()); try { fileInputStream = new FileInputStream(file); + final String slotHostname = slot.getPutUrl().getHost(); + final boolean onionSlot = slotHostname != null && slotHostname.endsWith(".onion"); final int expectedFileSize = (int) file.getExpectedSize(); final int readTimeout = ((expectedFileSize / 2048) + Config.SOCKET_TIMEOUT) * 1000; //assuming a minimum transfer speed of 16kbit/s wakeLock.acquire(readTimeout); Log.d(Config.LOGTAG, "uploading to " + slot.getPutUrl().toString() + " w/ read timeout of " + readTimeout / 1000 + "s"); - if (mUseTor || message.getConversation().getAccount().isOnion()) { + if (mUseTor || message.getConversation().getAccount().isOnion() || onionSlot) { connection = (HttpURLConnection) slot.getPutUrl().openConnection(HttpConnectionManager.getProxy()); } else { connection = (HttpURLConnection) slot.getPutUrl().openConnection(); |