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

Backporting FileUtils fixes to 2.9

Browse Source
This commit is contained in:
Joe Bowser 2013-10-01 14:45:41 -07:00
parent 2cf79a1adb
commit 0e9b446a81
1 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
framework/src/org/apache/cordova/FileUtils.java
View File

@ -28,11 +28,9 @@ import android.util.Log;
import org.apache.cordova.api.CallbackContext; import org.apache.cordova.api.CallbackContext;
import org.apache.cordova.api.CordovaPlugin; import org.apache.cordova.api.CordovaPlugin;
import org.apache.cordova.api.PluginResult; import org.apache.cordova.api.PluginResult;
import org.apache.cordova.file.EncodingException; import org.apache.cordova.file.*;
import org.apache.cordova.file.FileExistsException;
import org.apache.cordova.file.InvalidModificationException;
import org.apache.cordova.file.NoModificationAllowedException;
import org.apache.cordova.file.TypeMismatchException;
import org.json.JSONArray; import org.json.JSONArray;
import org.json.JSONException; import org.json.JSONException;
import org.json.JSONObject; import org.json.JSONObject;
@ -490,11 +488,12 @@ public class FileUtils extends CordovaPlugin {
} }
} }
for (File file : srcDir.listFiles()) { for (File file : srcDir.listFiles()) {
if (file.isDirectory()) {
copyDirectory(file, destinationDir);
} else {
File destination = new File(destinationDir.getAbsoluteFile() + File.separator + file.getName()); File destination = new File(destinationDir.getAbsoluteFile() + File.separator + file.getName());
if (file.isDirectory()) {
copyDirectory(file, destination);
} else {
copyFile(file, destination); copyFile(file, destination);
} }
} }
@ -914,11 +913,6 @@ public class FileUtils extends CordovaPlugin {
return getEntry(new File(path)); return getEntry(new File(path));
} }
//--------------------------------------------------------------------------
// LOCAL METHODS
//--------------------------------------------------------------------------
/** /**
* Read the contents of a file. * Read the contents of a file.
* This is done in a background thread; the result is sent to the callback. * This is done in a background thread; the result is sent to the callback.
@ -950,7 +944,7 @@ public class FileUtils extends CordovaPlugin {
break; break;
default: // Base64. default: // Base64.
String contentType = FileHelper.getMimeType(filename, cordova); String contentType = FileHelper.getMimeType(filename, cordova);
byte[] base64 = Base64.encode(bytes, Base64.DEFAULT); byte[] base64 = Base64.encode(bytes, Base64.NO_WRAP);
String s = "data:" + contentType + ";base64," + new String(base64, "US-ASCII"); String s = "data:" + contentType + ";base64," + new String(base64, "US-ASCII");
result = new PluginResult(PluginResult.Status.OK, s); result = new PluginResult(PluginResult.Status.OK, s);
} }
@ -1024,12 +1018,21 @@ public class FileUtils extends CordovaPlugin {
rawData = data.getBytes(); rawData = data.getBytes();
} }
ByteArrayInputStream in = new ByteArrayInputStream(rawData); ByteArrayInputStream in = new ByteArrayInputStream(rawData);
try
{
FileOutputStream out = new FileOutputStream(filename, append); FileOutputStream out = new FileOutputStream(filename, append);
byte buff[] = new byte[rawData.length]; byte buff[] = new byte[rawData.length];
in.read(buff, 0, buff.length); in.read(buff, 0, buff.length);
out.write(buff, 0, rawData.length); out.write(buff, 0, rawData.length);
out.flush(); out.flush();
out.close(); out.close();
}
catch (NullPointerException e)
{
// This is a bug in the Android implementation of the Java Stack
NoModificationAllowedException realException = new NoModificationAllowedException(filename);
throw realException;
}
return rawData.length; return rawData.length;
} }