From 7f6cf3e4109426164c6fdd11aba0c69622e2353c Mon Sep 17 00:00:00 2001
From: Jeff Hamilton <jham@android.com>
Date: Fri, 17 Sep 2010 17:22:21 -0500
Subject: Add bookmarks to the current account.

Make sure to stuff newly created bookmarks
in the currently active account so that
they show up in the bookmarks UI and will
get synced properly.

Change-Id: I5677ddb8480957bc209d79cc41f7df02221ef66d
---
 src/com/android/browser/Bookmarks.java | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'src/com/android/browser/Bookmarks.java')

diff --git a/src/com/android/browser/Bookmarks.java b/src/com/android/browser/Bookmarks.java
index 532d7c0e9..0bccbed97 100644
--- a/src/com/android/browser/Bookmarks.java
+++ b/src/com/android/browser/Bookmarks.java
@@ -20,10 +20,12 @@ import android.content.ContentResolver;
 import android.content.ContentUris;
 import android.content.ContentValues;
 import android.content.Context;
+import android.content.SharedPreferences;
 import android.database.Cursor;
 import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.AsyncTask;
+import android.preference.PreferenceManager;
 import android.provider.BrowserContract;
 import android.provider.BrowserContract.Combined;
 import android.provider.BrowserContract.Images;
@@ -63,18 +65,23 @@ import java.io.ByteArrayOutputStream;
      *          This will usually be <code>true</code> except when bookmarks are
      *          added by a settings restore agent.
      */
-    /* package */ static void addBookmark(Context context, ContentResolver cr, String url,
+    /* package */ static void addBookmark(Context context, boolean showToast, String url,
             String name, Bitmap thumbnail, boolean retainIcon) {
         // Want to append to the beginning of the list
         ContentValues values = new ContentValues();
         Cursor cursor = null;
         try {
+            SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+            String accountType = prefs.getString(BrowserBookmarksPage.PREF_ACCOUNT_TYPE, null);
+            String accountName = prefs.getString(BrowserBookmarksPage.PREF_ACCOUNT_NAME, null);
+            values.put(BrowserContract.Bookmarks.ACCOUNT_TYPE, accountType);
+            values.put(BrowserContract.Bookmarks.ACCOUNT_NAME, accountName);
             values.put(BrowserContract.Bookmarks.TITLE, name);
             values.put(BrowserContract.Bookmarks.URL, url);
             values.put(BrowserContract.Bookmarks.IS_FOLDER, 0);
             values.put(BrowserContract.Bookmarks.THUMBNAIL,
                     bitmapToBytes(thumbnail));
-            cr.insert(BrowserContract.Bookmarks.CONTENT_URI, values);
+            context.getContentResolver().insert(BrowserContract.Bookmarks.CONTENT_URI, values);
         } catch (IllegalStateException e) {
             Log.e(LOGTAG, "addBookmark", e);
         } finally {
@@ -83,7 +90,7 @@ import java.io.ByteArrayOutputStream;
         if (retainIcon) {
             WebIconDatabase.getInstance().retainIconForPageUrl(url);
         }
-        if (context != null) {
+        if (showToast) {
             Toast.makeText(context, R.string.added_to_bookmarks,
                     Toast.LENGTH_LONG).show();
         }
-- 
cgit v1.2.3