Switch the history management over to the new provider.

Also fix up a bunch of bugs causing things like
thumbnails to not be stored properly.

Change-Id: I5758ee108734d9b50e741822dcbe86b7cc834e8e

1 files changed, 12 insertions, 12 deletions

diff --git a/src/com/android/browser/DownloadTouchIcon.java b/src/com/android/browser/DownloadTouchIcon.java
index 2816f58..1442683 100644
--- a/src/com/android/browser/DownloadTouchIcon.java
+++ b/src/com/android/browser/DownloadTouchIcon.java
@@ -16,6 +16,13 @@
 
 package com.android.browser;
 
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpHost;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.params.HttpClientParams;
+import org.apache.http.conn.params.ConnRouteParams;
+
 import android.app.Activity;
 import android.content.ContentResolver;
 import android.content.ContentUris;
@@ -23,21 +30,14 @@ import android.content.ContentValues;
 import android.database.Cursor;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
-import android.net.http.AndroidHttpClient;
 import android.net.Proxy;
+import android.net.http.AndroidHttpClient;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Message;
-import android.provider.Browser;
+import android.provider.BrowserContract;
 import android.webkit.WebView;
 
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpHost;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.params.HttpClientParams;
-import org.apache.http.conn.params.ConnRouteParams;
-
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -102,7 +102,7 @@ class DownloadTouchIcon extends AsyncTask<String, Void, Void> {
     public Void doInBackground(String... values) {
         if (mContentResolver != null) {
             mCursor = Bookmarks.queryBookmarksForUrl(mContentResolver,
-                    mOriginalUrl, mUrl, true);
+                    mOriginalUrl, mUrl);
         }
 
         boolean inBookmarksDatabase = mCursor != null && mCursor.getCount() > 0;
@@ -180,13 +180,13 @@ class DownloadTouchIcon extends AsyncTask<String, Void, Void> {
         final ByteArrayOutputStream os = new ByteArrayOutputStream();
         icon.compress(Bitmap.CompressFormat.PNG, 100, os);
         ContentValues values = new ContentValues();
-        values.put(Browser.BookmarkColumns.TOUCH_ICON,
+        values.put(BrowserContract.Bookmarks.TOUCH_ICON,
                 os.toByteArray());
 
         if (mCursor.moveToFirst()) {
             do {
                 mContentResolver.update(ContentUris.withAppendedId(
-                        Browser.BOOKMARKS_URI, mCursor.getInt(0)),
+                        BrowserContract.Bookmarks.CONTENT_URI, mCursor.getLong(0)),
                         values, null, null);
             } while (mCursor.moveToNext());
         }