Combine size checks

Author: martinwork

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

@@ -226,12 +226,8 @@ public static byte[] readBytesFromFile( File file) {
         byte[] bytes = null;
         try {
             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");
+            if ( size <= 0 || size > Integer.MAX_VALUE) {
+                Log.e( TAG, "readBytesFromFile error - size");
                 return null;
             }
             FileInputStream is = new FileInputStream( file);
@@ -249,12 +245,8 @@ public static byte[] readBytesFromUri( Uri uri, Context ctx) {
         byte[] bytes = null;
         try {
             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");
+            if ( size <= 0 || size > Integer.MAX_VALUE) {
+                Log.e( TAG, "readBytesFromUri error - size");
                 return null;
             }
             InputStream is = ctx.getContentResolver().openInputStream( uri);