try with resources

Signed-off-by: Alex Knop <knopalex@msu.edu>

Author: alexknop

app/src/main/java/com/owncloud/android/operations/UploadFileOperation.java

@@ -988,7 +988,8 @@ private RemoteOperationResult normalUpload(OwnCloudClient client) {
 
             // Initialize channel and fileLock in try-with-resources
             try (
-                FileChannel channel = new RandomAccessFile(mFile.getStoragePath(), "rw").getChannel();
+                RandomAccessFile randomAccessFile = new RandomAccessFile(mFile.getStoragePath(), "rw");
+                FileChannel channel = randomAccessFile.getChannel();
                 FileLock fileLock = channel.tryLock()
             ) {
                 if (fileLock == null) {
@@ -1003,8 +1004,9 @@ private RemoteOperationResult normalUpload(OwnCloudClient client) {
                     if (result.isSuccess()) {
                         if (temporalFile.length() == originalFile.length()) {
                             // Acquire lock on temporary file
-                            try (FileChannel tempChannel = new RandomAccessFile(temporalFile.getAbsolutePath(), "rw").getChannel();
-                                 FileLock tempFileLock = tempChannel.tryLock()) {
+                            try (RandomAccessFile randomAccessTemporalFile = new RandomAccessFile(temporalFile.getAbsolutePath(), "rw");
+                                FileChannel tempChannel = randomAccessTemporalFile.getChannel();
+                                FileLock tempFileLock = tempChannel.tryLock()) {
                                 if (tempFileLock != null) {
                                     // Use the temporary channel for the upload
                                     size = tempChannel.size();
@@ -1551,8 +1553,10 @@ private void move(File sourceFile, File targetFile) throws IOException {
                     // try to copy and then delete
                     targetFile.createNewFile();
                     try (
-                        FileChannel inChannel = new FileInputStream(sourceFile).getChannel();
-                        FileChannel outChannel = new FileOutputStream(targetFile).getChannel()
+                        FileInputStream fis = new FileInputStream(sourceFile);
+                        FileOutputStream fos = new FileOutputStream(targetFile);
+                        FileChannel inChannel = fis.getChannel();
+                        FileChannel outChannel = fos.getChannel()
                     ) {
                         inChannel.transferTo(0, inChannel.size(), outChannel);
                         sourceFile.delete();