From 463b0daccecd8421ee6c9d8d9d41e0357425f5c0 Mon Sep 17 00:00:00 2001 From: Jorge Ruesga Date: Tue, 20 Nov 2012 00:05:35 +0100 Subject: [PATCH] CMFileManager: Fix ReadCommand incompatible buffer Replace Reader buffer for InputStream buffer for avoid incomplatible char[] -> byte[] conversion. Change-Id: Ic916f55e5b0be96d1b4ffef36ddd5d5858ea3fdc --- .../filemanager/commands/java/ReadCommand.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/com/cyanogenmod/filemanager/commands/java/ReadCommand.java b/src/com/cyanogenmod/filemanager/commands/java/ReadCommand.java index 5aa4b96a9..3a7490a4b 100644 --- a/src/com/cyanogenmod/filemanager/commands/java/ReadCommand.java +++ b/src/com/cyanogenmod/filemanager/commands/java/ReadCommand.java @@ -24,9 +24,9 @@ import com.cyanogenmod.filemanager.console.InsufficientPermissionsException; import com.cyanogenmod.filemanager.console.NoSuchFileOrDirectory; -import java.io.BufferedReader; +import java.io.BufferedInputStream; import java.io.File; -import java.io.FileReader; +import java.io.FileInputStream; /** * A class for read a file. @@ -121,12 +121,12 @@ public void execute() */ private void read(File file) { // Read the file - BufferedReader br = null; + BufferedInputStream bis = null; try { - br = new BufferedReader(new FileReader(file), getBufferSize()); + bis = new BufferedInputStream(new FileInputStream(file), getBufferSize()); int read = 0; - char[] data = new char[getBufferSize()]; - while ((read = br.read(data, 0, getBufferSize())) != -1) { + byte[] data = new byte[getBufferSize()]; + while ((read = bis.read(data, 0, getBufferSize())) != -1) { if (this.mAsyncResultListener != null) { byte[] readData = new byte[read]; System.arraycopy(data, 0, readData, 0, read); @@ -154,8 +154,8 @@ private void read(File file) { } finally { try { - if (br != null) { - br.close(); + if (bis != null) { + bis.close(); } } catch (Throwable _throw) {/**NON BLOCK**/} }