Merge branch 'feature'

# Conflicts:
#	app/build.properties

Author: VREMSoftwareDevelopment

app/build.properties

@@ -1,5 +1,5 @@
 #Build Properties
-#Sat Nov 10 11:20:14 EST 2018
+#Sat Nov 10 12:07:43 EST 2018
 version_minor=0
 version_build=14
 version_patch=1

app/src/main/java/com/vrem/util/FileUtils.java

@@ -33,7 +33,9 @@ private FileUtils() {
 
     @NonNull
     public static String readFile(@NonNull Resources resources, @RawRes int id) {
-        try (InputStream inputStream = resources.openRawResource(id)) {
+        InputStream inputStream = null;
+        try {
+            inputStream = resources.openRawResource(id);
             int size = inputStream.available();
             byte[] bytes = new byte[size];
             int count = inputStream.read(bytes);
@@ -44,7 +46,14 @@ public static String readFile(@NonNull Resources resources, @RawRes int id) {
         } catch (Exception e) {
             // file is corrupted
             return StringUtils.EMPTY;
+        } finally {
+            if (inputStream != null) {
+                try {
+                    inputStream.close();
+                } catch (Exception e) {
+                    // do nothing
+                }
+            }
         }
-        // do nothing
     }
 }