From a2538b55e3fd584975df9ff6da8f911379ff62d0 Mon Sep 17 00:00:00 2001
From: Isira Seneviratne <isirasen96@gmail.com>
Date: Thu, 14 May 2020 19:30:50 +0530
Subject: [PATCH] Use try-with resources in installFile().

---
 .../edu/berkeley/boinc/client/Monitor.java    | 23 ++++++++-----------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/android/BOINC/app/src/main/java/edu/berkeley/boinc/client/Monitor.java b/android/BOINC/app/src/main/java/edu/berkeley/boinc/client/Monitor.java
index b8170a377c..feb1946028 100644
--- a/android/BOINC/app/src/main/java/edu/berkeley/boinc/client/Monitor.java
+++ b/android/BOINC/app/src/main/java/edu/berkeley/boinc/client/Monitor.java
@@ -722,23 +722,24 @@ public class Monitor extends Service {
 
         // If file is executable, cpu architecture has to be evaluated
         // and assets directory select accordingly
-        String source;
+        final String source;
         if (executable)
             source = getAssetsDirForCpuArchitecture() + file;
         else
             source = file;
 
-        try {
+        final File target;
+        if (!targetFile.isEmpty()) {
+            target = new File(boincWorkingDir + targetFile);
+        } else {
+            target = new File(boincWorkingDir + file);
+        }
+
+        try (InputStream asset = getApplicationContext().getAssets().open(source);
+             OutputStream targetData = new FileOutputStream(target)) {
             if (Logging.ERROR)
                 Log.d(Logging.TAG, "installing: " + source);
 
-            File target;
-            if (!targetFile.isEmpty()) {
-                target = new File(boincWorkingDir + targetFile);
-            } else {
-                target = new File(boincWorkingDir + file);
-            }
-
             // Check path and create it
             File installDir = new File(boincWorkingDir);
             if (!installDir.exists()) {
@@ -771,13 +772,9 @@ public class Monitor extends Service {
             }
 
             // Copy file from the asset manager to clientPath
-            InputStream asset = getApplicationContext().getAssets().open(source);
-            OutputStream targetData = new FileOutputStream(target);
             while ((count = asset.read(b)) != -1) {
                 targetData.write(b, 0, count);
             }
-            asset.close();
-            targetData.close();
 
             success = true; //copy succeeded without exception