From 7c8db0ea4483f4cbf0de4ee591b41f14040ec822 Mon Sep 17 00:00:00 2001 From: William Shen Date: Wed, 23 Nov 2011 10:39:20 -0800 Subject: [PATCH 1/6] fixing redundant assignment of variable --- framework/src/com/phonegap/ContactAccessorSdk5.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/framework/src/com/phonegap/ContactAccessorSdk5.java b/framework/src/com/phonegap/ContactAccessorSdk5.java index 4e1ca9f6..4f625062 100644 --- a/framework/src/com/phonegap/ContactAccessorSdk5.java +++ b/framework/src/com/phonegap/ContactAccessorSdk5.java @@ -1603,10 +1603,8 @@ public class ContactAccessorSdk5 extends ContactAccessor { } } catch (RemoteException e) { Log.e(LOG_TAG, e.getMessage(), e); - newId = null; } catch (OperationApplicationException e) { Log.e(LOG_TAG, e.getMessage(), e); - newId = null; } return newId; } From cd5bf6195e3a78ac000f089664481f56a8956e07 Mon Sep 17 00:00:00 2001 From: William Shen Date: Wed, 23 Nov 2011 10:52:43 -0800 Subject: [PATCH 2/6] cleaning up handling of exceptions. removing unnecessary exception declaration in FileUtils. removing try-catch that should not have been done in HttpHandler --- framework/src/com/phonegap/FileUtils.java | 2 +- framework/src/com/phonegap/HttpHandler.java | 31 ++++++++++----------- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/framework/src/com/phonegap/FileUtils.java b/framework/src/com/phonegap/FileUtils.java index 00aa9ce3..5f948566 100755 --- a/framework/src/com/phonegap/FileUtils.java +++ b/framework/src/com/phonegap/FileUtils.java @@ -531,7 +531,7 @@ public class FileUtils extends Plugin { * @throws NoModificationAllowedException * @throws InvalidModificationException */ - private JSONObject moveDirectory(File srcDir, File destinationDir) throws JSONException, FileExistsException, NoModificationAllowedException, InvalidModificationException { + private JSONObject moveDirectory(File srcDir, File destinationDir) throws JSONException, InvalidModificationException { // Renaming a file to an existing directory should fail if (destinationDir.exists() && destinationDir.isFile()) { throw new InvalidModificationException("Can't rename a file to a directory"); diff --git a/framework/src/com/phonegap/HttpHandler.java b/framework/src/com/phonegap/HttpHandler.java index 156d5a2c..78b8df50 100755 --- a/framework/src/com/phonegap/HttpHandler.java +++ b/framework/src/com/phonegap/HttpHandler.java @@ -20,6 +20,7 @@ package com.phonegap; import java.io.EOFException; import java.io.FileOutputStream; +import java.io.IOException; import java.io.InputStream; import org.apache.http.HttpEntity; @@ -56,27 +57,25 @@ public class HttpHandler { return entity; } - private void writeToDisk(HttpEntity entity, String file) throws EOFException + private void writeToDisk(HttpEntity entity, String file) throws IllegalStateException, IOException /** * writes a HTTP entity to the specified filename and location on disk */ { int i=0; String FilePath="/sdcard/" + file; - try { - InputStream in = entity.getContent(); - byte buff[] = new byte[1024]; - FileOutputStream out= - new FileOutputStream(FilePath); - do { - int numread = in.read(buff); - if (numread <= 0) - break; - out.write(buff, 0, numread); - i++; - } while (true); - out.flush(); - out.close(); - } catch (Exception e) { e.printStackTrace(); } + InputStream in = entity.getContent(); + byte buff[] = new byte[1024]; + FileOutputStream out= + new FileOutputStream(FilePath); + do { + int numread = in.read(buff); + if (numread <= 0) + break; + out.write(buff, 0, numread); + i++; + } while (true); + out.flush(); + out.close(); } } From 7a6a59383bf2e6e67a6b49cd89ac0aa5f243e868 Mon Sep 17 00:00:00 2001 From: William Shen Date: Wed, 23 Nov 2011 11:03:14 -0800 Subject: [PATCH 3/6] removed a couple extra semicolons --- framework/src/com/phonegap/ContactAccessorSdk5.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/framework/src/com/phonegap/ContactAccessorSdk5.java b/framework/src/com/phonegap/ContactAccessorSdk5.java index 4f625062..9e9cee20 100644 --- a/framework/src/com/phonegap/ContactAccessorSdk5.java +++ b/framework/src/com/phonegap/ContactAccessorSdk5.java @@ -1054,7 +1054,7 @@ public class ContactAccessorSdk5 extends ContactAccessor { if (organizations != null) { for (int i=0; i Date: Wed, 23 Nov 2011 11:25:53 -0800 Subject: [PATCH 4/6] removed unused import --- framework/src/com/phonegap/HttpHandler.java | 1 - 1 file changed, 1 deletion(-) diff --git a/framework/src/com/phonegap/HttpHandler.java b/framework/src/com/phonegap/HttpHandler.java index 78b8df50..3893d2a9 100755 --- a/framework/src/com/phonegap/HttpHandler.java +++ b/framework/src/com/phonegap/HttpHandler.java @@ -18,7 +18,6 @@ */ package com.phonegap; -import java.io.EOFException; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; From 729d141c3f19ade38c5ae3618071f2b932c51125 Mon Sep 17 00:00:00 2001 From: wshen Date: Thu, 1 Dec 2011 09:42:23 -0800 Subject: [PATCH 5/6] removed FileExistsException that is not needed --- framework/src/com/phonegap/FileUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/src/com/phonegap/FileUtils.java b/framework/src/com/phonegap/FileUtils.java index 5f948566..33f847df 100755 --- a/framework/src/com/phonegap/FileUtils.java +++ b/framework/src/com/phonegap/FileUtils.java @@ -329,7 +329,7 @@ public class FileUtils extends Plugin { * @throws EncodingException * @throws JSONException */ - private JSONObject transferTo(String fileName, JSONObject newParent, String newName, boolean move) throws JSONException, FileExistsException, NoModificationAllowedException, IOException, InvalidModificationException, EncodingException { + private JSONObject transferTo(String fileName, JSONObject newParent, String newName, boolean move) throws JSONException, NoModificationAllowedException, IOException, InvalidModificationException, EncodingException { // Check for invalid file name if (newName != null && newName.contains(":")) { throw new EncodingException("Bad file name"); From 1dfc65facee1fa75601025368e0fc8399bc50aac Mon Sep 17 00:00:00 2001 From: wshen Date: Thu, 1 Dec 2011 10:04:49 -0800 Subject: [PATCH 6/6] removed FileExistsException that is not needed --- framework/src/com/phonegap/FileUtils.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/framework/src/com/phonegap/FileUtils.java b/framework/src/com/phonegap/FileUtils.java index de20405c..9bc0d0a9 100755 --- a/framework/src/com/phonegap/FileUtils.java +++ b/framework/src/com/phonegap/FileUtils.java @@ -322,14 +322,13 @@ public class FileUtils extends Plugin { * @param newName for the file directory to be called, if null use existing file name * @param move if false do a copy, if true do a move * @return a Entry object - * @throws FileExistsException * @throws NoModificationAllowedException * @throws IOException * @throws InvalidModificationException * @throws EncodingException * @throws JSONException */ - private JSONObject transferTo(String fileName, JSONObject newParent, String newName, boolean move) throws JSONException, FileExistsException, NoModificationAllowedException, IOException, InvalidModificationException, EncodingException { + private JSONObject transferTo(String fileName, JSONObject newParent, String newName, boolean move) throws JSONException, NoModificationAllowedException, IOException, InvalidModificationException, EncodingException { // Check for invalid file name if (newName != null && newName.contains(":")) { throw new EncodingException("Bad file name");