Bug 839580 - getOpenURIIntent uses an API level 16 method. r=bnicholson

mobile/android/base/GeckoAppShell.java

@@ -86,6 +86,7 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Locale;
 import java.util.NoSuchElementException;
 import java.util.StringTokenizer;
 import java.util.concurrent.SynchronousQueue;
@@ -1004,6 +1005,25 @@ public class GeckoAppShell
         }
     }
 
+    /**
+     * Return a <code>Uri</code> instance which is equivalent to <code>u</code>,
+     * but with a guaranteed-lowercase scheme as if the API level 16 method
+     * <code>u.normalizeScheme</code> had been called.
+     *
+     * @param u the <code>Uri</code> to normalize.
+     * @return a <code>Uri</code>, which might be <code>u</code>.
+     */
+    static Uri normalizeUriScheme(final Uri u) {
+        final String scheme = u.getScheme();
+        final String lower  = scheme.toLowerCase(Locale.US);
+        if (lower.equals(scheme)) {
+            return u;
+        }
+
+        // Otherwise, return a new URI with a normalized scheme.
+        return u.buildUpon().scheme(lower).build();
+    }
+
     /**
      * Given a URI, a MIME type, an Android intent "action", and a title,
      * produce an intent which can be used to start an activity to open
@@ -1042,23 +1062,23 @@ public class GeckoAppShell
                                         context.getResources().getString(R.string.share_title)); 
         }
 
+        final Uri uri = normalizeUriScheme(Uri.parse(targetURI));
         if (mimeType.length() > 0) {
             Intent intent = getIntentForActionString(action);
-            intent.setDataAndType(Uri.parse(targetURI), mimeType);
+            intent.setDataAndType(uri, mimeType);
             return intent;
         }
 
-        final Uri uri = Uri.parse(targetURI);
         if (!isUriSafeForScheme(uri)) {
             return null;
         }
-        
+
         final String scheme = uri.getScheme();
         final Intent intent = getIntentForActionString(action);
 
         // Start with the original URI. If we end up modifying it,
         // we'll overwrite it.
-        intent.setDataAndNormalize(uri);
+        intent.setData(uri);
 
         // Have a special handling for the SMS, as the message body
         // is not extracted from the URI automatically.
@@ -1093,10 +1113,9 @@ public class GeckoAppShell
 
         // Form a new URI without the body field in the query part, and
         // push that into the new Intent.
-        final String prefix = targetURI.substring(0, targetURI.indexOf('?'));
         final String newQuery = resultQuery.length() > 0 ? "?" + resultQuery : "";
-        final Uri pruned = Uri.parse(prefix + newQuery);
-        intent.setDataAndNormalize(pruned);
+        final Uri pruned = uri.buildUpon().encodedQuery(newQuery).build();
+        intent.setData(pruned);
 
         return intent;
     }