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

Merge pull request #3786 from nextcloud/trywith-resources

 ui:activity: Properly close InputStreamReader.
Andy Scherzinger 6 лет назад
Родитель
Сommit
628c80fa9d

+ 9 - 8
src/main/java/com/owncloud/android/ui/activity/LogHistoryActivity.java

@@ -218,14 +218,15 @@ public class LogHistoryActivity extends ToolbarActivity {
                     File file = new File(mLogPath,logFileName[i]);
                     if (file.exists()) {
                         // Check if FileReader is ready
-                        final InputStreamReader inputStreamReader = new InputStreamReader(new FileInputStream(file),
-                                                                                          Charset.forName("UTF-8"));
-                        if (inputStreamReader.ready()) {
-                            br = new BufferedReader(inputStreamReader);
-                            while ((line = br.readLine()) != null) {
-                                // Append the log info
-                                text.append(line);
-                                text.append('\n');
+                        try (InputStreamReader inputStreamReader = new InputStreamReader(new FileInputStream(file),
+                                                                                         Charset.forName("UTF-8"))) {
+                            if (inputStreamReader.ready()) {
+                                br = new BufferedReader(inputStreamReader);
+                                while ((line = br.readLine()) != null) {
+                                    // Append the log info
+                                    text.append(line);
+                                    text.append('\n');
+                                }
                             }
                         }
                     }