github/cordova-android
github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2025-02-22 08:53:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cordova-android

Browse Source
This commit is contained in:
Joe Bowser 2012-11-02 13:33:13 -07:00
commit d5895c635a
1 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,6 +43,7 @@ import android.database.Cursor;
import android.net.Uri; import android.net.Uri;
import android.os.Environment; import android.os.Environment;
import android.provider.MediaStore; import android.provider.MediaStore;
import android.util.Log;
import android.webkit.MimeTypeMap; import android.webkit.MimeTypeMap;
//import android.app.Activity; //import android.app.Activity;
@ -317,8 +318,9 @@ public class FileUtils extends CordovaPlugin {
* @throws InvalidModificationException * @throws InvalidModificationException
* @throws EncodingException * @throws EncodingException
* @throws JSONException * @throws JSONException
* @throws FileExistsException
*/ */
private JSONObject transferTo(String fileName, String newParent, String newName, boolean move) throws JSONException, NoModificationAllowedException, IOException, InvalidModificationException, EncodingException { private JSONObject transferTo(String fileName, String newParent, String newName, boolean move) throws JSONException, NoModificationAllowedException, IOException, InvalidModificationException, EncodingException, FileExistsException {
fileName = stripFileProtocol(fileName); fileName = stripFileProtocol(fileName);
newParent = stripFileProtocol(newParent); newParent = stripFileProtocol(newParent);
@ -406,6 +408,16 @@ public class FileUtils extends CordovaPlugin {
throw new InvalidModificationException("Can't rename a file to a directory"); throw new InvalidModificationException("Can't rename a file to a directory");
} }
copyAction(srcFile, destFile);
return getEntry(destFile);
}
/**
* Moved this code into it's own method so moveTo could use it when the move is across file systems
*/
private void copyAction(File srcFile, File destFile)
throws FileNotFoundException, IOException {
FileInputStream istream = new FileInputStream(srcFile); FileInputStream istream = new FileInputStream(srcFile);
FileOutputStream ostream = new FileOutputStream(destFile); FileOutputStream ostream = new FileOutputStream(destFile);
FileChannel input = istream.getChannel(); FileChannel input = istream.getChannel();
@ -419,8 +431,6 @@ public class FileUtils extends CordovaPlugin {
input.close(); input.close();
output.close(); output.close();
} }
return getEntry(destFile);
} }
/** /**
@ -495,7 +505,7 @@ public class FileUtils extends CordovaPlugin {
* @throws InvalidModificationException * @throws InvalidModificationException
* @throws JSONException * @throws JSONException
*/ */
private JSONObject moveFile(File srcFile, File destFile) throws JSONException, InvalidModificationException { private JSONObject moveFile(File srcFile, File destFile) throws IOException, JSONException, InvalidModificationException {
// Renaming a file to an existing directory should fail // Renaming a file to an existing directory should fail
if (destFile.exists() && destFile.isDirectory()) { if (destFile.exists() && destFile.isDirectory()) {
throw new InvalidModificationException("Can't rename a file to a directory"); throw new InvalidModificationException("Can't rename a file to a directory");
@ -507,6 +517,12 @@ public class FileUtils extends CordovaPlugin {
// Now we have to do things the hard way // Now we have to do things the hard way
// 1) Copy all the old file // 1) Copy all the old file
// 2) delete the src file // 2) delete the src file
copyAction(srcFile, destFile);
if (destFile.exists()) {
srcFile.delete();
} else {
throw new IOException("moved failed");
}
} }
return getEntry(destFile); return getEntry(destFile);
@ -521,8 +537,10 @@ public class FileUtils extends CordovaPlugin {
* @throws JSONException * @throws JSONException
* @throws IOException * @throws IOException
* @throws InvalidModificationException * @throws InvalidModificationException
* @throws NoModificationAllowedException
* @throws FileExistsException
*/ */
private JSONObject moveDirectory(File srcDir, File destinationDir) throws JSONException, InvalidModificationException { private JSONObject moveDirectory(File srcDir, File destinationDir) throws IOException, JSONException, InvalidModificationException, NoModificationAllowedException, FileExistsException {
// Renaming a file to an existing directory should fail // Renaming a file to an existing directory should fail
if (destinationDir.exists() && destinationDir.isFile()) { if (destinationDir.exists() && destinationDir.isFile()) {
throw new InvalidModificationException("Can't rename a file to a directory"); throw new InvalidModificationException("Can't rename a file to a directory");
@ -546,6 +564,12 @@ public class FileUtils extends CordovaPlugin {
// Now we have to do things the hard way // Now we have to do things the hard way
// 1) Copy all the old files // 1) Copy all the old files
// 2) delete the src directory // 2) delete the src directory
copyDirectory(srcDir, destinationDir);
if (destinationDir.exists()) {
removeDirRecursively(srcDir);
} else {
throw new IOException("moved failed");
}
} }
return getEntry(destinationDir); return getEntry(destinationDir);