public/cordova-android
public/cordova-android
9
0
Fork 0
forked from github/cordova-android
Code Pull Requests Activity

Merge branch 'master' of github.com:phonegap/phonegap-android

Browse Source
This commit is contained in:
stevengill 2010-12-16 13:29:52 -08:00
commit 46f0bf60c4
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
framework/src/com/phonegap/FileUtils.java
View File

@ -15,6 +15,8 @@ import org.json.JSONArray;
import org.json.JSONException; import org.json.JSONException;
import org.json.JSONObject; import org.json.JSONObject;
import android.net.Uri;
import com.phonegap.api.Plugin; import com.phonegap.api.Plugin;
import com.phonegap.api.PluginResult; import com.phonegap.api.PluginResult;
@ -191,7 +193,7 @@ public class FileUtils extends Plugin {
*/ */
public String readAsText(String filename, String encoding) throws FileNotFoundException, IOException { public String readAsText(String filename, String encoding) throws FileNotFoundException, IOException {
byte[] bytes = new byte[1000]; byte[] bytes = new byte[1000];
BufferedInputStream bis = new BufferedInputStream(new FileInputStream(filename), 1024); BufferedInputStream bis = new BufferedInputStream(getPathFromUri(filename), 1024);
ByteArrayOutputStream bos = new ByteArrayOutputStream(); ByteArrayOutputStream bos = new ByteArrayOutputStream();
int numRead = 0; int numRead = 0;
while ((numRead = bis.read(bytes, 0, 1000)) >= 0) { while ((numRead = bis.read(bytes, 0, 1000)) >= 0) {
@ -209,7 +211,7 @@ public class FileUtils extends Plugin {
*/ */
public String readAsDataURL(String filename) throws FileNotFoundException, IOException { public String readAsDataURL(String filename) throws FileNotFoundException, IOException {
byte[] bytes = new byte[1000]; byte[] bytes = new byte[1000];
BufferedInputStream bis = new BufferedInputStream(new FileInputStream(filename), 1024); BufferedInputStream bis = new BufferedInputStream(getPathFromUri(filename), 1024);
ByteArrayOutputStream bos = new ByteArrayOutputStream(); ByteArrayOutputStream bos = new ByteArrayOutputStream();
int numRead = 0; int numRead = 0;
while ((numRead = bis.read(bytes, 0, 1000)) >= 0) { while ((numRead = bis.read(bytes, 0, 1000)) >= 0) {
@ -282,4 +284,20 @@ public class FileUtils extends Plugin {
return raf.length(); return raf.length();
} }
/**
* Get an input stream based on file path or content:// uri
*
* @param path
* @return an input stream
* @throws FileNotFoundException
*/
private InputStream getPathFromUri(String path) throws FileNotFoundException {
if (path.startsWith("content")) {
Uri uri = Uri.parse(path);
return ctx.getContentResolver().openInputStream(uri);
}
else {
return new FileInputStream(path);
}
}
} }