Просмотр исходного кода

fix e2e: file input stream overwrote tmpFile

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
tobiasKaminsky 7 лет назад
Родитель
Сommit
16d578cde1
1 измененных файлов с 2 добавлено и 1 удалено
  1. 2 1
      src/main/java/com/owncloud/android/operations/DownloadFileOperation.java

+ 2 - 1
src/main/java/com/owncloud/android/operations/DownloadFileOperation.java

@@ -201,9 +201,10 @@ public class DownloadFileOperation extends RemoteOperation {
                 byte[] authenticationTag = EncryptionUtils.decodeStringToBase64Bytes(metadata.getFiles()
                 byte[] authenticationTag = EncryptionUtils.decodeStringToBase64Bytes(metadata.getFiles()
                         .get(mFile.getEncryptedFileName()).getAuthenticationTag());
                         .get(mFile.getEncryptedFileName()).getAuthenticationTag());
 
 
-                try (FileOutputStream fileOutputStream = new FileOutputStream(tmpFile)){
+                try {
                     byte[] decryptedBytes = EncryptionUtils.decryptFile(tmpFile, key, iv, authenticationTag);
                     byte[] decryptedBytes = EncryptionUtils.decryptFile(tmpFile, key, iv, authenticationTag);
 
 
+                    FileOutputStream fileOutputStream = new FileOutputStream(tmpFile);
                     fileOutputStream.write(decryptedBytes);
                     fileOutputStream.write(decryptedBytes);
                 } catch (Exception e) {
                 } catch (Exception e) {
                     return new RemoteOperationResult(e);
                     return new RemoteOperationResult(e);