You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by pu...@apache.org on 2015/10/20 00:22:19 UTC

[1/2] cordova-plugin-file git commit: Fail with FileError.ENCODING_ERR on encoding exception.

Repository: cordova-plugin-file
Updated Branches:
  refs/heads/master 5f88e0110 -> 0f8c893e1


Fail with FileError.ENCODING_ERR on encoding exception.


Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/commit/c378dc61
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/tree/c378dc61
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/diff/c378dc61

Branch: refs/heads/master
Commit: c378dc61e69c905b09c793711959f3b687ecb078
Parents: d9ed7d5
Author: vladimir <vl...@elitebook>
Authored: Wed Oct 7 09:09:52 2015 -0500
Committer: vladimir <vl...@elitebook>
Committed: Wed Oct 7 09:09:52 2015 -0500

----------------------------------------------------------------------
 src/windows/FileProxy.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/blob/c378dc61/src/windows/FileProxy.js
----------------------------------------------------------------------
diff --git a/src/windows/FileProxy.js b/src/windows/FileProxy.js
index f62cdc8..2a0ef15 100644
--- a/src/windows/FileProxy.js
+++ b/src/windows/FileProxy.js
@@ -561,7 +561,12 @@ module.exports = {
 
                 return stream.readAsync(buffer, readSize, Windows.Storage.Streams.InputStreamOptions.none);
             }).done(function(buffer) {
-                win(Windows.Security.Cryptography.CryptographicBuffer.convertBinaryToString(encoding, buffer));
+            	try {
+            		win(Windows.Security.Cryptography.CryptographicBuffer.convertBinaryToString(encoding, buffer));
+                }
+                catch (e) {
+                	fail(FileError.ENCODING_ERR);
+                }
             },function() {
                 fail(FileError.NOT_FOUND_ERR);
             });


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


[2/2] cordova-plugin-file git commit: Merge branch 'CB-9763' of https://github.com/vldmrrr/cordova-plugin-file

Posted by pu...@apache.org.
Merge branch 'CB-9763' of https://github.com/vldmrrr/cordova-plugin-file


Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/commit/0f8c893e
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/tree/0f8c893e
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/diff/0f8c893e

Branch: refs/heads/master
Commit: 0f8c893e12d2bfebb1a964e33a8b150a774bf915
Parents: 5f88e01 c378dc6
Author: Jesse MacFadyen <pu...@gmail.com>
Authored: Mon Oct 19 15:22:00 2015 -0700
Committer: Jesse MacFadyen <pu...@gmail.com>
Committed: Mon Oct 19 15:22:00 2015 -0700

----------------------------------------------------------------------
 src/windows/FileProxy.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-file/blob/0f8c893e/src/windows/FileProxy.js
----------------------------------------------------------------------


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org