commit cc4bc5e7d0725fc7812da90bf48d6621aedc595a
author Vivek Sekhar <vsekhar@codeaurora.org> Tue May 13 12:46:37 2014 -0700
committer Vivek Sekhar <vsekhar@codeaurora.org> Tue May 13 12:46:37 2014 -0700
tree c1f9c018bbfc7bc2757cf5e6a481cd709c07faf8
parent 107f74f823da6f840496e661d2351eca62d3b822

Fix schemes that can be downloaded

Change-Id: I4a2b75a6ce923e7176f4f0b17fbaae5b1c5ef543

src/com/android/browser/Controller.java

diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java
index 1d535a4..406c73c 100644
--- a/src/com/android/browser/Controller.java
+++ b/src/com/android/browser/Controller.java
@@ -1462,6 +1462,8 @@
             menu.setGroupVisible(R.id.ANCHOR_MENU,
                     type == WebView.HitTestResult.SRC_ANCHOR_TYPE
                             || type == WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE);
+            menu.findItem(R.id.save_link_context_menu_id).setEnabled(
+                UrlUtils.isDownloadableScheme(extra));
         }
         // Setup custom handling depending on the type
         switch (type) {

src/com/android/browser/FetchUrlMimeType.java

diff --git a/src/com/android/browser/FetchUrlMimeType.java b/src/com/android/browser/FetchUrlMimeType.java
index fbd8be7..0e8398a 100644
--- a/src/com/android/browser/FetchUrlMimeType.java
+++ b/src/com/android/browser/FetchUrlMimeType.java
@@ -124,9 +124,11 @@
                 }
             }
         } catch (IllegalArgumentException ex) {
-            request.abort();
+            if (request != null)
+                request.abort();
         } catch (IOException ex) {
-            request.abort();
+            if (request != null)
+                request.abort();
         } finally {
             client.close();
         }

src/com/android/browser/UrlUtils.java

diff --git a/src/com/android/browser/UrlUtils.java b/src/com/android/browser/UrlUtils.java
index ff78647..d00e8c3 100755
--- a/src/com/android/browser/UrlUtils.java
+++ b/src/com/android/browser/UrlUtils.java
@@ -22,11 +22,18 @@
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.HashSet;
+import java.util.Arrays;
 
 /**
  * Utility methods for Url manipulation
  */
 public class UrlUtils {
+    public static final String[] DOWNLOADABLE_SCHEMES_VALUES = new String[]
+        { "data", "filesystem", "http", "https" };
+
+    private static final HashSet<String> DOWNLOADABLE_SCHEMES =
+        new HashSet<String>(Arrays.asList(DOWNLOADABLE_SCHEMES_VALUES));
 
     static final Pattern ACCEPTED_URI_SCHEMA = Pattern.compile(
             "(?i)" + // switch on case insensitive matching
@@ -89,6 +96,18 @@
         return smartUrlFilter(url, true);
     }
 
+    public static boolean isDownloadableScheme(Uri uri) {
+        return DOWNLOADABLE_SCHEMES.contains(uri.getScheme());
+    }
+
+    public static boolean isDownloadableScheme(String uri) {
+        try {
+            return isDownloadableScheme(Uri.parse(uri));
+        } catch (Exception e) {
+            return false;
+        }
+    }
+
     /**
      * Attempts to determine whether user input is a URL or search
      * terms.  Anything with a space is passed to search if canBeSearch is true.