More checks

Author: martinwork

app/src/main/java/com/samsung/microbit/utils/FileUtils.java

@@ -196,31 +196,6 @@ public static long fileSizeFromUri( Uri uri, Context ctx) {
         return -1;
     }
 
-    public static String runtimeMemory() {
-        Runtime runtime = Runtime.getRuntime();
-        long totalMemory = runtime.totalMemory();
-        long maxMemory = runtime.maxMemory();
-        long freeMemory = runtime.freeMemory();
-        return "memory: total" + totalMemory + "; max " + maxMemory + "; free " + freeMemory;
-    }
-
-    public static byte[] newBytes(final int size) {
-        Log.d( TAG, "newBytes(" + size + ") " + runtimeMemory());
-        if ( size <= 0) {
-            return null;
-        }
-
-        byte[] bytes = null;
-        try {
-            bytes = new byte[size];
-        }  catch ( Exception e) {
-            bytes = null;
-        }  catch ( OutOfMemoryError oom) {
-            bytes = null;
-        }
-        return bytes;
-    }
-
     public static byte[] readBytesFromInputStream(InputStream is, final int size) {
         if ( size <= 0) {
             return null;
@@ -241,40 +216,75 @@ public static byte[] readBytesFromInputStream(InputStream is, final int size) {
             }
         }  catch ( Exception e) {
             bytes = null;
+            Log.e( TAG, "readBytesFromInputStream Exception");
+            e.printStackTrace();
         }
         return bytes;
     }
 
     public static byte[] readBytesFromFile( File file) {
         byte[] bytes = null;
         try {
-            int size = (int) file.length();
+            long size = file.length();
+            if ( size > Integer.MAX_VALUE) {
+                Log.e( TAG, "readBytesFromFile too big");
+                return null;
+            }
             if ( size <= 0) {
+                Log.e( TAG, "readBytesFromFile size unknown");
                 return null;
             }
             FileInputStream is = new FileInputStream( file);
-            bytes = readBytesFromInputStream(is, size);
+            bytes = readBytesFromInputStream(is, (int) size);
             is.close();
         }  catch ( Exception e){
             bytes = null;
+            Log.e( TAG, "readBytesFromFile Exception");
+            e.printStackTrace();
         }
         return bytes;
     }
 
     public static byte[] readBytesFromUri( Uri uri, Context ctx) {
         byte[] bytes = null;
         try {
-            int size = (int) fileSizeFromUri( uri, ctx);
+            long size = fileSizeFromUri( uri, ctx);
+            if ( size > Integer.MAX_VALUE) {
+                Log.e( TAG, "readBytesFromUri too big");
+                return null;
+            }
             if ( size <= 0) {
+                Log.e( TAG, "readBytesFromUri size unknown");
                 return null;
             }
             InputStream is = ctx.getContentResolver().openInputStream( uri);
             if ( is != null) {
-                bytes = readBytesFromInputStream( is, size);
+                bytes = readBytesFromInputStream( is, (int) size);
                 is.close();
             }
         }  catch ( Exception e){
             bytes = null;
+            Log.e( TAG, "readBytesFromFile Exception");
+            e.printStackTrace();
+        }
+        return bytes;
+    }
+
+    public static byte[] newBytes(final int size) {
+        if ( size <= 0) {
+            return null;
+        }
+
+        byte[] bytes = null;
+        try {
+            bytes = new byte[size];
+        }  catch ( Exception e) {
+            bytes = null;
+            Log.e( TAG, "newBytes(" + size + ") Exception");
+            e.printStackTrace();
+        }  catch ( OutOfMemoryError oom) {
+            bytes = null;
+            Log.e( TAG, "newBytes(" + size + ") OutOfMemoryError");
         }
         return bytes;
     }