browser: allow to load browser internal assets

The new webview classes avoid to load urls from local file schemes.
Just replace the load of internal browser assets (most_visited) from
loadUrl to loadData.

Signed-off-by: Jorge Ruesga <jorge@ruesga.com>

Change-Id: Iee633a1a3599a7e752e15452fa04e15baac2e256
Cherry-Picked: http://review.cyanogenmod.org/#/c/62126/3

2 files changed, 17 insertions, 9 deletions

diff --git a/src/com/android/browser/homepages/HomeProvider.java b/src/com/android/browser/homepages/HomeProvider.java
index dc55944..a1c1d85 100644
--- a/src/com/android/browser/homepages/HomeProvider.java
+++ b/src/com/android/browser/homepages/HomeProvider.java
@@ -41,6 +41,7 @@ public class HomeProvider extends ContentProvider {
     private static final String TAG = "HomeProvider";

     public static final String AUTHORITY = "com.android.browser.home";

     public static final String MOST_VISITED = "content://" + AUTHORITY + "/";

+    public static final String MOST_VISITED_URL = "about:most_visited";

 

     @Override

     public int delete(Uri uri, String selection, String[] selectionArgs) {

@@ -88,17 +89,24 @@ public class HomeProvider extends ContentProvider {
         }

     }

 

+    public static boolean isMostVisitedPage(String url) {

+        boolean useMostVisited = BrowserSettings.getInstance().useMostVisitedHomepage();

+        if (useMostVisited && url.startsWith("content://")) {

+            Uri uri = Uri.parse(url);

+            if (AUTHORITY.equals(uri.getAuthority())) {

+                return true;

+            }

+        }

+        return false;

+    }

+

     public static WebResourceResponse shouldInterceptRequest(Context context,

             String url) {

         try {

-            boolean useMostVisited = BrowserSettings.getInstance().useMostVisitedHomepage();

-            if (useMostVisited && url.startsWith("content://")) {

-                Uri uri = Uri.parse(url);

-                if (AUTHORITY.equals(uri.getAuthority())) {

-                    InputStream ins = context.getContentResolver()

-                            .openInputStream(uri);

-                    return new WebResourceResponse("text/html", "utf-8", ins);

-                }

+            if (isMostVisitedPage(url)) {

+                InputStream ins = context.getContentResolver()

+                        .openInputStream(Uri.parse(url + "/home"));

+                return new WebResourceResponse("text/html", "utf-8", ins);

             }

             boolean listFiles = BrowserSettings.getInstance().isDebugEnabled();

             if (listFiles && interceptFile(url)) {

diff --git a/src/com/android/browser/homepages/RequestHandler.java b/src/com/android/browser/homepages/RequestHandler.java
index 823935e..c73ec9a 100644
--- a/src/com/android/browser/homepages/RequestHandler.java
+++ b/src/com/android/browser/homepages/RequestHandler.java
@@ -54,7 +54,7 @@ public class RequestHandler extends Thread {
     OutputStream mOutput;

 

     static {

-        sUriMatcher.addURI(HomeProvider.AUTHORITY, "/", INDEX);

+        sUriMatcher.addURI(HomeProvider.AUTHORITY, "home", INDEX);

         sUriMatcher.addURI(HomeProvider.AUTHORITY, "res/*/*", RESOURCE);

     }