From 4e1aa8aa59d0a3d9c0deb1f57c9136a76535691e Mon Sep 17 00:00:00 2001
From: Andrew Grieve <agrieve@chromium.org>
Date: Tue, 13 Aug 2013 14:08:30 -0400
Subject: [PATCH] Fix data URI decoding in CordovaResourceApi

It was not URI-decoding first, and so was broken for non-base64-encoded
URIs.
---
 framework/src/org/apache/cordova/CordovaResourceApi.java     | 2 +-
 test/src/org/apache/cordova/test/CordovaResourceApiTest.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/framework/src/org/apache/cordova/CordovaResourceApi.java b/framework/src/org/apache/cordova/CordovaResourceApi.java
index cb857441..f03f1b55 100644
--- a/framework/src/org/apache/cordova/CordovaResourceApi.java
+++ b/framework/src/org/apache/cordova/CordovaResourceApi.java
@@ -315,7 +315,7 @@ public class CordovaResourceApi {
     }
     
     private OpenForReadResult readDataUri(Uri uri) {
-        String uriAsString = uri.toString().substring(5);
+        String uriAsString = uri.getSchemeSpecificPart();
         int commaPos = uriAsString.indexOf(',');
         if (commaPos == -1) {
             return null;
diff --git a/test/src/org/apache/cordova/test/CordovaResourceApiTest.java b/test/src/org/apache/cordova/test/CordovaResourceApiTest.java
index fdaf9727..1078a4ef 100644
--- a/test/src/org/apache/cordova/test/CordovaResourceApiTest.java
+++ b/test/src/org/apache/cordova/test/CordovaResourceApiTest.java
@@ -223,11 +223,11 @@ public class CordovaResourceApiTest extends ActivityInstrumentationTestCase2<Cor
     
     public void testDataUriPlain() throws IOException
     {
-        Uri uri = Uri.parse("data:text/plain;charset=utf-8,pass");
+        Uri uri = Uri.parse("data:text/plain;charset=utf-8,pa%20ss");
         OpenForReadResult readResult = resourceApi.openForRead(uri);
         assertEquals("text/plain", readResult.mimeType);
         String data = new Scanner(readResult.inputStream, "UTF-8").useDelimiter("\\A").next();
-        assertEquals("pass", data);
+        assertEquals("pa ss", data);
     }
     
     public void testDataUriBase64() throws IOException