diff options
| author | John Reck <jreck@google.com> | 2011-05-26 16:41:54 -0700 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2011-05-26 16:41:54 -0700 |
| commit | 749542ee3500a9060b0961de968f2634269f2845 (patch) | |
| tree | 6c89efaffc4e572d619a4aa01e97cb220bdc1a51 /src/com/android/browser/provider | |
| parent | 9b8cd1e564984874f2a6f5cc9bdc68cda8aa15ce (diff) | |
| download | packages_apps_browser-749542ee3500a9060b0961de968f2634269f2845.zip packages_apps_browser-749542ee3500a9060b0961de968f2634269f2845.tar.gz packages_apps_browser-749542ee3500a9060b0961de968f2634269f2845.tar.bz2 | |
Remove no longer needed sync settings/code
Now that we support multiple accounts, remove a bunch of
single-account management stuff
Change-Id: I2ae60f0a510ace48e14c97763145d4e5dd523dd1
Diffstat (limited to 'src/com/android/browser/provider')
| -rw-r--r-- | src/com/android/browser/provider/BrowserProvider2.java | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/src/com/android/browser/provider/BrowserProvider2.java b/src/com/android/browser/provider/BrowserProvider2.java index a8739ca..a44f050 100644 --- a/src/com/android/browser/provider/BrowserProvider2.java +++ b/src/com/android/browser/provider/BrowserProvider2.java @@ -944,10 +944,6 @@ public class BrowserProvider2 extends SQLiteContentProvider { && projection == null) { projection = Browser.HISTORY_PROJECTION; } - if (match == LEGACY) { - uri = BookmarkUtils.addAccountInfo(getContext(), - uri.buildUpon()).build(); - } String[] args = createCombinedQuery(uri, projection, qb); if (selectionArgs == null) { selectionArgs = args; @@ -996,19 +992,6 @@ public class BrowserProvider2 extends SQLiteContentProvider { selection = DatabaseUtils.concatenateWhere(selection, Bookmarks.IS_DELETED + "=0 AND " + Bookmarks.IS_FOLDER + "=0"); - SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext()); - String accountType = prefs.getString(BrowserBookmarksPage.PREF_ACCOUNT_TYPE, null); - String accountName = prefs.getString(BrowserBookmarksPage.PREF_ACCOUNT_NAME, null); - if (!TextUtils.isEmpty(accountName) && !TextUtils.isEmpty(accountType)) { - selection = DatabaseUtils.concatenateWhere(selection, - Bookmarks.ACCOUNT_TYPE + "=? AND " + Bookmarks.ACCOUNT_NAME + "=? "); - selectionArgs = DatabaseUtils.appendSelectionArgs(selectionArgs, - new String[] { accountType, accountName }); - } else { - selection = DatabaseUtils.concatenateWhere(selection, - Bookmarks.ACCOUNT_TYPE + " IS NULL AND " + - Bookmarks.ACCOUNT_NAME + " IS NULL "); - } Cursor c = mOpenHelper.getReadableDatabase().query(TABLE_BOOKMARKS, SUGGEST_PROJECTION, selection, selectionArgs, null, null, DEFAULT_BOOKMARKS_SORT_ORDER, null); @@ -1148,8 +1131,6 @@ public class BrowserProvider2 extends SQLiteContentProvider { String[] projection = new String[] { Combined._ID, Combined.IS_BOOKMARK, Combined.URL }; SQLiteQueryBuilder qb = new SQLiteQueryBuilder(); - uri = BookmarkUtils.addAccountInfo(getContext(), uri.buildUpon()) - .build(); String[] args = createCombinedQuery(uri, projection, qb); if (selectionArgs == null) { selectionArgs = args; @@ -1219,14 +1200,6 @@ public class BrowserProvider2 extends SQLiteContentProvider { values.remove(BookmarkColumns.DATE); values.remove(BookmarkColumns.VISITS); values.remove(BookmarkColumns.USER_ENTERED); - SharedPreferences prefs = PreferenceManager - .getDefaultSharedPreferences(getContext()); - String accountType = prefs.getString( - BrowserBookmarksPage.PREF_ACCOUNT_TYPE, null); - String accountName = prefs.getString( - BrowserBookmarksPage.PREF_ACCOUNT_NAME, null); - values.put(Bookmarks.ACCOUNT_TYPE, accountType); - values.put(Bookmarks.ACCOUNT_NAME, accountName); values.put(Bookmarks.IS_FOLDER, 0); } } |