From: Rafal Walczyna Date: Mon, 4 Jan 2021 09:44:44 +0000 (+0100) Subject: [Common] Moved ArrayToString function to utils X-Git-Tag: submit/tizen/20210128.113801~36 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F65%2F250765%2F1;p=platform%2Fcore%2Fapi%2Fwebapi-plugins.git [Common] Moved ArrayToString function to utils [Verification] TCT-auto filesystem 100% passrate. Change-Id: I323c80ef353ceef5723b423bed4a0ee4f9844656 Signed-off-by: Rafal Walczyna --- diff --git a/src/filesystem/js/common.js b/src/filesystem/js/common.js index f1aa9b46..8ba82079 100644 --- a/src/filesystem/js/common.js +++ b/src/filesystem/js/common.js @@ -22,20 +22,6 @@ var validator_ = privUtils_.validator; var types_ = validator_.Types; var native_ = new xwalk.utils.NativeManager(extension); -/* - * Pass array-like object of numbers (Array, Uint8Array, etc.), returns string. - * Each char has codepoint equal to value from array cropped with & 0xFF - * Useful for passing data through crosswalk. - */ -function ArrayToString(data) { - var output = ''; - var len = data.length; - for (var i = 0; i < len; i++) { - output += String.fromCharCode(data[i] & 0xff); // conversion to octet - } - return output; -} - function SetReadOnlyProperty(obj, n, v) { Object.defineProperty(obj, n, { value: v, writable: false }); } diff --git a/src/filesystem/js/file_handle.js b/src/filesystem/js/file_handle.js index c8d4e42a..04bc6eac 100644 --- a/src/filesystem/js/file_handle.js +++ b/src/filesystem/js/file_handle.js @@ -379,7 +379,7 @@ FileHandle.prototype.writeBlob = function() { ); } - var encodedData = ArrayToString(blobToUint8Array(args.blob)); + var encodedData = privUtils_.ArrayToString(blobToUint8Array(args.blob)); var data = { id: this.id, data: encodedData }; var result = native_.callSync('FileHandleWriteData', data); if (native_.isFailure(result)) { @@ -419,7 +419,7 @@ FileHandle.prototype.writeBlobNonBlocking = function() { return; } - var encodedData = ArrayToString(blobToUint8Array(args.blob)); + var encodedData = privUtils_.ArrayToString(blobToUint8Array(args.blob)); var data = { id: this.id, data: encodedData, blocking: false }; var callback = function(result) { if (native_.isFailure(result)) { @@ -543,7 +543,7 @@ FileHandle.prototype.writeData = function() { 'FileHandle state is read-only' ); } - var encodedData = ArrayToString(args.data); + var encodedData = privUtils_.ArrayToString(args.data); var data = { id: this.id, data: encodedData }; var result = native_.callSync('FileHandleWriteData', data); @@ -584,7 +584,7 @@ FileHandle.prototype.writeDataNonBlocking = function() { return; } - var encodedData = ArrayToString(args.data); + var encodedData = privUtils_.ArrayToString(args.data); var data = { id: this.id, data: encodedData, blocking: false }; diff --git a/src/filesystem/js/file_stream.js b/src/filesystem/js/file_stream.js index cd89d988..b701e35a 100644 --- a/src/filesystem/js/file_stream.js +++ b/src/filesystem/js/file_stream.js @@ -309,7 +309,7 @@ function writeBytes() { var data = { location: commonFS_.toRealPath(this._file.fullPath), offset: this.position, - data: ArrayToString(args.byteData), + data: privUtils_.ArrayToString(args.byteData), truncate: this._truncate }; diff --git a/src/utils/utils_api.js b/src/utils/utils_api.js index 76a2d670..dee5a3d9 100644 --- a/src/utils/utils_api.js +++ b/src/utils/utils_api.js @@ -385,6 +385,20 @@ Utils.prototype.printDeprecationWarningFor = function(name, replacement) { } }; +/* + * Pass array-like object of numbers (Array, Uint8Array, etc.), returns string. + * Each char has codepoint equal to value from array cropped with & 0xFF + * Useful for passing data through crosswalk. + */ +Utils.prototype.ArrayToString = function(data) { + var output = ''; + var len = data.length; + for (var i = 0; i < len; i++) { + output += String.fromCharCode(data[i] & 0xff); // conversion to octet + } + return output; +}; + /* * Create new array-like object of numbers: UTF-16 char codes from string. * As type pass Array, Uint8Array, etc.