Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/android.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÁlvaro Brey <alvaro.brey@nextcloud.com>2022-10-27 17:40:53 +0300
committerÁlvaro Brey <alvaro.brey@nextcloud.com>2022-10-28 11:37:42 +0300
commitebeff0c49653fc9ae3a14270541d23444fbc57cc (patch)
tree06354a8c445d8aed6c6461574e540bc09eef275b
parente4a922b913fed661888c40f5b6280cb17584285c (diff)
UploadFileOperation: ensure channel is closed
Triggers strict mode warnings Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
-rw-r--r--app/src/main/java/com/owncloud/android/operations/UploadFileOperation.java11
1 files changed, 10 insertions, 1 deletions
diff --git a/app/src/main/java/com/owncloud/android/operations/UploadFileOperation.java b/app/src/main/java/com/owncloud/android/operations/UploadFileOperation.java
index 8df66d0412..330d768f9b 100644
--- a/app/src/main/java/com/owncloud/android/operations/UploadFileOperation.java
+++ b/app/src/main/java/com/owncloud/android/operations/UploadFileOperation.java
@@ -738,6 +738,8 @@ public class UploadFileOperation extends SyncOperation {
File originalFile = new File(mOriginalStoragePath);
File expectedFile = null;
FileLock fileLock = null;
+ FileChannel channel = null;
+
long size;
try {
@@ -768,7 +770,6 @@ public class UploadFileOperation extends SyncOperation {
final Long creationTimestamp = FileUtil.getCreationTimestamp(originalFile);
- FileChannel channel = null;
try {
channel = new RandomAccessFile(mFile.getStoragePath(), "rw").getChannel();
fileLock = channel.tryLock();
@@ -859,6 +860,14 @@ public class UploadFileOperation extends SyncOperation {
}
}
+ if (channel != null) {
+ try {
+ channel.close();
+ } catch (IOException e) {
+ Log_OC.w(TAG, "Failed to close file channel");
+ }
+ }
+
if (temporalFile != null && !originalFile.equals(temporalFile)) {
temporalFile.delete();
}