CB-2406: Moving Ian Clelland's Binary Data support to FileUtils.java

Author: infil00p

src/android/FileUtils.java

@@ -15,17 +15,16 @@ Licensed to the Apache Software Foundation (ASF) under one
        KIND, either express or implied.  See the License for the
        specific language governing permissions and limitations
        under the License.
-*/
+ */
 package org.apache.cordova.core;
 
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.Environment;
 import android.provider.MediaStore;
+import android.util.Base64;
 import android.util.Log;
 
-import org.apache.commons.codec.binary.Base64;
-import org.apache.cordova.DirectoryManager;
 import org.apache.cordova.api.CallbackContext;
 import org.apache.cordova.api.CordovaPlugin;
 import org.apache.cordova.api.PluginResult;
@@ -135,7 +134,7 @@ else if (action.equals("readAsBinaryString")) {
                 this.readFileAs(args.getString(0), start, end, callbackContext, null, PluginResult.MESSAGE_TYPE_BINARYSTRING);
             }
             else if (action.equals("write")) {
-                long fileSize = this.write(args.getString(0), args.getString(1), args.getInt(2));
+                long fileSize = this.write(args.getString(0), args.getString(1), args.getInt(2), args.getBoolean(3));
                 callbackContext.sendPluginResult(new PluginResult(PluginResult.Status.OK, fileSize));
             }
             else if (action.equals("truncate")) {
@@ -951,7 +950,7 @@ public void run() {
                             break;
                         default: // Base64.
                             String contentType = FileHelper.getMimeType(filename, cordova);
-                            byte[] base64 = Base64.encodeBase64(bytes);
+                            byte[] base64 = Base64.encode(bytes, Base64.DEFAULT);
                             String s = "data:" + contentType + ";base64," + new String(base64, "US-ASCII");
                             result = new PluginResult(PluginResult.Status.OK, s);
                     }
@@ -1000,11 +999,12 @@ private byte[] readAsBinaryHelper(String filename, int start, int end) throws IO
      * @param filename			The name of the file.
      * @param data				The contents of the file.
      * @param offset			The position to begin writing the file.
+     * @param isBinary          True if the file contents are base64-encoded binary data
      * @throws FileNotFoundException, IOException
      * @throws NoModificationAllowedException
      */
     /**/
-    public long write(String filename, String data, int offset) throws FileNotFoundException, IOException, NoModificationAllowedException {
+    public long write(String filename, String data, int offset, boolean isBinary) throws FileNotFoundException, IOException, NoModificationAllowedException {
         if (filename.startsWith("content://")) {
             throw new NoModificationAllowedException("Couldn't write to file given its content URI");
         }
@@ -1017,7 +1017,12 @@ public long write(String filename, String data, int offset) throws FileNotFoundE
             append = true;
         }
 
-        byte[] rawData = data.getBytes();
+        byte[] rawData;
+        if (isBinary) {
+            rawData = Base64.decode(data, Base64.DEFAULT);
+        } else {
+            rawData = data.getBytes();
+        }
         ByteArrayInputStream in = new ByteArrayInputStream(rawData);
         FileOutputStream out = new FileOutputStream(filename, append);
         byte buff[] = new byte[rawData.length];