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

changes after review of macdonst, download returns FileEntry

Browse Source
This commit is contained in:
Alexander Keller 2011-11-29 08:39:57 +01:00
parent 8904c67fb5
commit 75963c88d5
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
framework/src/com/phonegap/FileTransfer.java
View File

@ -99,9 +99,9 @@ public class FileTransfer extends Plugin {
Log.d(LOG_TAG, "****** About to return a result from upload"); Log.d(LOG_TAG, "****** About to return a result from upload");
return new PluginResult(PluginResult.Status.OK, r.toJSONObject()); return new PluginResult(PluginResult.Status.OK, r.toJSONObject());
} else if (action.equals("download")) { } else if (action.equals("download")) {
String r = download(file, server); JSONObject r = download(file, server);
Log.d(LOG_TAG, "****** About to return a result from download"); Log.d(LOG_TAG, "****** About to return a result from download");
return new PluginResult(PluginResult.Status.OK, r); return new PluginResult(PluginResult.Status.OK, r, "window.localFileSystem._castEntry");
} else { } else {
return new PluginResult(PluginResult.Status.INVALID_ACTION); return new PluginResult(PluginResult.Status.INVALID_ACTION);
} }
@ -371,13 +371,16 @@ public class FileTransfer extends Plugin {
* *
* @param server URL of the server to receive the file * @param server URL of the server to receive the file
* @param file Full path of the file on the file system * @param file Full path of the file on the file system
* @return String containing the path to the downloaded file * @return JSONObject the downloaded file
*/ */
public String download(String filePath, String sourceUrl) throws IOException { public JSONObject download(String filePath, String sourceUrl) throws IOException {
try { try {
File file = new File(filePath); File file = new File(filePath);
// create needed directories
file.getParentFile().mkdirs(); file.getParentFile().mkdirs();
// connect to server
URL url = new URL(sourceUrl); URL url = new URL(sourceUrl);
HttpURLConnection connection = (HttpURLConnection) url.openConnection(); HttpURLConnection connection = (HttpURLConnection) url.openConnection();
connection.setRequestMethod("GET"); connection.setRequestMethod("GET");
@ -388,23 +391,32 @@ public class FileTransfer extends Plugin {
InputStream inputStream = connection.getInputStream(); InputStream inputStream = connection.getInputStream();
byte[] buffer = new byte[1024]; byte[] buffer = new byte[1024];
int len1 = 0; int bytesRead = 0;
FileOutputStream outputStream = new FileOutputStream(file); FileOutputStream outputStream = new FileOutputStream(file);
while ( (len1 = inputStream.read(buffer)) > 0 ) { // write bytes to file
outputStream.write(buffer,0, len1); while ( (bytesRead = inputStream.read(buffer)) > 0 ) {
outputStream.write(buffer,0, bytesRead);
} }
outputStream.close(); outputStream.close();
Log.d(LOG_TAG, "Saved file: " + filePath); Log.d(LOG_TAG, "Saved file: " + filePath);
} catch (IOException e) {
// create FileEntry object
JSONObject entry = new JSONObject();
entry.put("isFile", file.isFile());
entry.put("isDirectory", file.isDirectory());
entry.put("name", file.getName());
entry.put("fullPath", file.getAbsolutePath());
return entry;
} catch (Exception e) {
Log.d(LOG_TAG, e.getMessage(), e); Log.d(LOG_TAG, e.getMessage(), e);
throw new IOException("Error while downloading"); throw new IOException("Error while downloading");
} }
return filePath;
} }
/** /**