fix try with resources statements

Signed-off-by: Alex Knop <[email protected]>

Author: alexknop

app/src/androidTest/java/com/owncloud/android/ScreenshotsIT.java

@@ -52,17 +52,18 @@ public static void beforeScreenshot() {
 
     @Test
     public void gridViewScreenshot() {
-        ActivityScenario.launch(FileDisplayActivity.class);
+        try (ActivityScenario<FileDisplayActivity> ignored = ActivityScenario.launch(FileDisplayActivity.class)) {
 
-        onView(anyOf(withText(R.string.action_switch_grid_view), withId(R.id.switch_grid_view_button))).perform(click());
+            onView(anyOf(withText(R.string.action_switch_grid_view), withId(R.id.switch_grid_view_button))).perform(click());
 
-        shortSleep();
+            shortSleep();
 
-        Screengrab.screenshot("01_gridView");
+            Screengrab.screenshot("01_gridView");
 
-        onView(anyOf(withText(R.string.action_switch_list_view), withId(R.id.switch_grid_view_button))).perform(click());
+            onView(anyOf(withText(R.string.action_switch_list_view), withId(R.id.switch_grid_view_button))).perform(click());
 
-        Assert.assertTrue(true); // if we reach this, everything is ok
+            Assert.assertTrue(true); // if we reach this, everything is ok
+        }
     }
 
     @Test
@@ -77,61 +78,66 @@ public void listViewScreenshot() {
             assertTrue(result.isSuccess());
         }
 
-        ActivityScenario.launch(FileDisplayActivity.class);
+        try (ActivityScenario<FileDisplayActivity> ignored = ActivityScenario.launch(FileDisplayActivity.class)) {
 
-        // go into work folder
-        onView(withId(R.id.list_root)).perform(RecyclerViewActions.actionOnItemAtPosition(0, click()));
+            // go into work folder
+            onView(withId(R.id.list_root)).perform(RecyclerViewActions.actionOnItemAtPosition(0, click()));
 
-        Screengrab.screenshot("02_listView");
+            Screengrab.screenshot("02_listView");
 
-        Assert.assertTrue(true); // if we reach this, everything is ok
+            Assert.assertTrue(true); // if we reach this, everything is ok
+        }
     }
 
     @Test
     public void drawerScreenshot() {
-        ActivityScenario.launch(FileDisplayActivity.class);
+        try (ActivityScenario<FileDisplayActivity> ignored = ActivityScenario.launch(FileDisplayActivity.class)) {
 
-        onView(withId(R.id.drawer_layout)).perform(DrawerActions.open());
+            onView(withId(R.id.drawer_layout)).perform(DrawerActions.open());
 
-        Screengrab.screenshot("03_drawer");
+            Screengrab.screenshot("03_drawer");
 
-        onView(withId(R.id.drawer_layout)).perform(DrawerActions.close());
+            onView(withId(R.id.drawer_layout)).perform(DrawerActions.close());
 
-        Assert.assertTrue(true); // if we reach this, everything is ok
+            Assert.assertTrue(true); // if we reach this, everything is ok
+        }
     }
 
     @Test
     public void multipleAccountsScreenshot() {
-        ActivityScenario.launch(FileDisplayActivity.class);
+        try (ActivityScenario<FileDisplayActivity> ignored = ActivityScenario.launch(FileDisplayActivity.class)) {
 
-        onView(withId(R.id.switch_account_button)).perform(click());
+            onView(withId(R.id.switch_account_button)).perform(click());
 
-        Screengrab.screenshot("04_accounts");
+            Screengrab.screenshot("04_accounts");
 
-        pressBack();
+            pressBack();
 
-        Assert.assertTrue(true); // if we reach this, everything is ok
+            Assert.assertTrue(true); // if we reach this, everything is ok
+        }
     }
 
     @Test
     public void autoUploadScreenshot() {
-        ActivityScenario.launch(SyncedFoldersActivity.class);
+        try (ActivityScenario<SyncedFoldersActivity> ignored = ActivityScenario.launch(SyncedFoldersActivity.class)) {
 
-        Screengrab.screenshot("05_autoUpload");
+            Screengrab.screenshot("05_autoUpload");
 
-        Assert.assertTrue(true); // if we reach this, everything is ok
+            Assert.assertTrue(true); // if we reach this, everything is ok
+        }
     }
 
     @Test
     public void davdroidScreenshot() {
-        ActivityScenario.launch(SettingsActivity.class);
+        try (ActivityScenario<SettingsActivity> ignored = ActivityScenario.launch(SettingsActivity.class)) {
 
-        onData(PreferenceMatchers.withTitle(R.string.prefs_category_more)).perform(ViewActions.scrollTo());
+            onData(PreferenceMatchers.withTitle(R.string.prefs_category_more)).perform(ViewActions.scrollTo());
 
-        shortSleep();
+            shortSleep();
 
-        Screengrab.screenshot("06_davdroid");
+            Screengrab.screenshot("06_davdroid");
 
-        Assert.assertTrue(true); // if we reach this, everything is ok
+            Assert.assertTrue(true); // if we reach this, everything is ok
+        }
     }
 }

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

@@ -982,8 +982,8 @@ private RemoteOperationResult normalUpload(OwnCloudClient client) {
             final Long creationTimestamp = FileUtil.getCreationTimestamp(originalFile);
 
             // Initialize channel and fileLock in try-with-resources
-            try (
-                FileChannel channel = new RandomAccessFile(mFile.getStoragePath(), "rw").getChannel();
+            try (RandomAccessFile randomAccessFile = new RandomAccessFile(mFile.getStoragePath(), "rw");
+                FileChannel channel = randomAccessFile.getChannel();
                 FileLock fileLock = channel.tryLock()
             ) {
                 if (fileLock == null) {
@@ -998,7 +998,8 @@ 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();
+                            try (RandomAccessFile randomAccessFile = new RandomAccessFile(temporalFile.getAbsolutePath(), "rw");
+                                FileChannel tempChannel = randomAccessFile.getChannel();
                                  FileLock tempFileLock = tempChannel.tryLock()) {
                                 if (tempFileLock != null) {
                                     // Use the temporary channel for the upload
@@ -1546,8 +1547,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();