TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-08-25 20:07:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve network reliability during resumable uploads.

Browse Source
This commit is contained in:
Greyson Parrelli
2020-10-13 17:37:14 -04:00
parent 322c139c26
commit 84ec6dd458
10 changed files with 52 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/PushServiceSocket.java
View File

@@ -1108,25 +1108,10 @@ public class PushServiceSocket {
.connectTimeout(soTimeoutMillis, TimeUnit.MILLISECONDS)
.readTimeout(soTimeoutMillis, TimeUnit.MILLISECONDS)
.build();
final HttpUrl endpointUrl = HttpUrl.get(connectionHolder.url);
final HttpUrl signedHttpUrl;
try {
signedHttpUrl = HttpUrl.get(signedUrl);
} catch (IllegalArgumentException e) {
Log.w(TAG, "Server returned a malformed signed url: " + signedUrl);
throw new IOException("Server returned a malformed signed url", e);
}
final HttpUrl.Builder urlBuilder = new HttpUrl.Builder().scheme(endpointUrl.scheme())
.host(endpointUrl.host())
.port(endpointUrl.port())
.encodedPath(endpointUrl.encodedPath())
.addEncodedPathSegments(signedHttpUrl.encodedPath().substring(1))
.encodedQuery(signedHttpUrl.encodedQuery())
.encodedFragment(signedHttpUrl.encodedFragment());
Request.Builder request = new Request.Builder().url(urlBuilder.build())
Request.Builder request = new Request.Builder().url(buildConfiguredUrl(connectionHolder, signedUrl))
.post(RequestBody.create(null, ""));
for (Map.Entry<String, String> header : headers.entrySet()) {
if (!header.getKey().equalsIgnoreCase("host")) {
request.header(header.getKey(), header.getValue());
@@ -1186,7 +1171,7 @@ public class PushServiceSocket {
return file.getTransmittedDigest();
}
Request.Builder request = new Request.Builder().url(resumableUrl)
Request.Builder request = new Request.Builder().url(buildConfiguredUrl(connectionHolder, resumableUrl))
.put(file)
.addHeader("Content-Range", resumeInfo.contentRange);
@@ -1229,7 +1214,7 @@ public class PushServiceSocket {
final long offset;
final String contentRange;
Request.Builder request = new Request.Builder().url(resumableUrl)
Request.Builder request = new Request.Builder().url(buildConfiguredUrl(connectionHolder, resumableUrl))
.put(RequestBody.create(null, ""))
.addHeader("Content-Range", String.format(Locale.US, "bytes */%d", contentLength));
@@ -1279,6 +1264,25 @@ public class PushServiceSocket {
return new ResumeInfo(contentRange, offset);
}
private static HttpUrl buildConfiguredUrl(ConnectionHolder connectionHolder, String url) throws IOException {
final HttpUrl endpointUrl = HttpUrl.get(connectionHolder.url);
final HttpUrl resumableHttpUrl;
try {
resumableHttpUrl = HttpUrl.get(url);
} catch (IllegalArgumentException e) {
throw new IOException("Malformed URL!", e);
}
return new HttpUrl.Builder().scheme(endpointUrl.scheme())
.host(endpointUrl.host())
.port(endpointUrl.port())
.encodedPath(endpointUrl.encodedPath())
.addEncodedPathSegments(resumableHttpUrl.encodedPath().substring(1))
.encodedQuery(resumableHttpUrl.encodedQuery())
.encodedFragment(resumableHttpUrl.encodedFragment())
.build();
}
private String makeServiceRequest(String urlFragment, String method, String jsonBody)
throws NonSuccessfulResponseCodeException, PushNetworkException
{