AtaraxiaDev/cryptomator-android
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Close buffer and null-check response body

Browse Source
This commit is contained in:
Julian Raufelder 2022-02-11 12:11:21 +01:00
parent a651b273fb
commit d9801662dd
No known key found for this signature in database
GPG Key ID: 17EE71F6634E381D
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
data/src/main/java/org/cryptomator/data/repository/UpdateCheckRepositoryImpl.java
View File

@ -38,6 +38,7 @@ import okhttp3.OkHttpClient;
import okhttp3.Request;
import okhttp3.Response;
import okio.BufferedSink;
import okio.BufferedSource;
import okio.Okio;
@Singleton
@ -112,20 +113,20 @@ public class UpdateCheckRepositoryImpl implements UpdateCheckRepository {
final Response response = httpClient.newCall(request).execute();
if (response.isSuccessful()) {
final BufferedSink sink = Okio.buffer(Okio.sink(file));
sink.writeAll(response.body().source());
sink.flush();
sink.close();
if (response.isSuccessful() && response.body() != null) {
try (BufferedSource source = response.body().source(); BufferedSink sink = Okio.buffer(Okio.sink(file))) {
sink.writeAll(source);
sink.flush();
String apkSha256 = calculateSha256(file);
String apkSha256 = calculateSha256(file);
if (!apkSha256.equals(entity.getApkSha256())) {
file.delete();
throw new HashMismatchUpdateCheckException(String.format( //
"Sha of calculated hash (%s) doesn't match the specified one (%s)", //
apkSha256, //
entity.getApkSha256()));
if (!apkSha256.equals(entity.getApkSha256())) {
file.delete();
throw new HashMismatchUpdateCheckException(String.format( //
"Sha of calculated hash (%s) doesn't match the specified one (%s)", //
apkSha256, //
entity.getApkSha256()));
}
}
} else {
throw new GeneralUpdateErrorException("Failed to load update file, status code is not correct: " + response.code());
@ -174,7 +175,7 @@ public class UpdateCheckRepositoryImpl implements UpdateCheckRepository {
}
private LatestVersion toLatestVersion(Response response) throws IOException, GeneralUpdateErrorException {
if (response.isSuccessful()) {
if (response.isSuccessful() && response.body() != null) {
return new LatestVersion(response.body().string());
} else {
throw new GeneralUpdateErrorException("Failed to update. Wrong status code in response from server: " + response.code());
@ -182,7 +183,7 @@ public class UpdateCheckRepositoryImpl implements UpdateCheckRepository {
}
private UpdateCheck toUpdateCheck(Response response, LatestVersion latestVersion) throws IOException, GeneralUpdateErrorException {
if (response.isSuccessful()) {
if (response.isSuccessful() && response.body() != null) {
final String releaseNote = response.body().string();
return new UpdateCheckImpl(releaseNote, latestVersion);
} else {