diff options
| -rw-r--r-- | AndroidManifest.xml | 6 | ||||
| -rw-r--r-- | src/com/android/browser/AccountsChangedReceiver.java | 89 | ||||
| -rw-r--r-- | src/com/android/browser/provider/BrowserProvider2.java | 7 |
3 files changed, 102 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 9751f96..7dab8b0 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -229,6 +229,12 @@ android:readPermission="com.android.browser.permission.READ_HISTORY_BOOKMARKS" android:exported="false" /> + <receiver android:name=".AccountsChangedReceiver"> + <intent-filter> + <action android:name="android.accounts.LOGIN_ACCOUNTS_CHANGED" /> + </intent-filter> + </receiver> + </application> </manifest> diff --git a/src/com/android/browser/AccountsChangedReceiver.java b/src/com/android/browser/AccountsChangedReceiver.java new file mode 100644 index 0000000..e5397a2 --- /dev/null +++ b/src/com/android/browser/AccountsChangedReceiver.java @@ -0,0 +1,89 @@ +/* + * Copyright (C) 2011 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.browser; + +import android.accounts.Account; +import android.accounts.AccountManager; +import android.content.BroadcastReceiver; +import android.content.ContentResolver; +import android.content.Context; +import android.content.Intent; +import android.database.Cursor; +import android.net.Uri; +import android.provider.BrowserContract; +import android.provider.BrowserContract.Accounts; +import android.provider.BrowserContract.Bookmarks; +import android.text.TextUtils; + +public class AccountsChangedReceiver extends BroadcastReceiver { + + private static final String[] PROJECTION = new String[] { + Accounts.ACCOUNT_NAME, + Accounts.ACCOUNT_TYPE, + }; + private static final String SELECTION = Accounts.ACCOUNT_NAME + " IS NOT NULL"; + private static final String DELETE_SELECTION = Accounts.ACCOUNT_NAME + "=? AND " + + Accounts.ACCOUNT_TYPE + "=?"; + + @Override + public void onReceive(Context context, Intent intent) { + new DeleteRemovedAccounts(context).start(); + } + + static class DeleteRemovedAccounts extends Thread { + Context mContext; + public DeleteRemovedAccounts(Context context) { + mContext = context; + } + + @Override + public void run() { + Account[] accounts = AccountManager.get(mContext).getAccounts(); + ContentResolver cr = mContext.getContentResolver(); + Cursor c = cr.query(Accounts.CONTENT_URI, PROJECTION, + SELECTION, null, null); + while (c.moveToNext()) { + String name = c.getString(0); + String type = c.getString(1); + if (!contains(accounts, name, type)) { + delete(cr, name, type); + } + } + cr.update(Accounts.CONTENT_URI, null, null, null); + } + + void delete(ContentResolver cr, String name, String type) { + // Pretend to be a sync adapter to delete the data and not mark + // it for deletion. Without this, the bookmarks will be marked to + // be deleted, which will propagate to the server if the account + // is added back. + Uri uri = Bookmarks.CONTENT_URI.buildUpon() + .appendQueryParameter(BrowserContract.CALLER_IS_SYNCADAPTER, "true") + .build(); + cr.delete(uri, DELETE_SELECTION, new String[] { name, type }); + } + + boolean contains(Account[] accounts, String name, String type) { + for (Account a : accounts) { + if (TextUtils.equals(a.name, name) + && TextUtils.equals(a.type, type)) { + return true; + } + } + return false; + } + } +} diff --git a/src/com/android/browser/provider/BrowserProvider2.java b/src/com/android/browser/provider/BrowserProvider2.java index 9f6e41c..936f131 100644 --- a/src/com/android/browser/provider/BrowserProvider2.java +++ b/src/com/android/browser/provider/BrowserProvider2.java @@ -17,6 +17,7 @@ package com.android.browser.provider; import android.accounts.Account; +import android.accounts.AccountManager; import android.app.SearchManager; import android.content.ContentResolver; import android.content.ContentUris; @@ -1582,6 +1583,12 @@ public class BrowserProvider2 extends SQLiteContentProvider { break; } + case ACCOUNTS: { + Account[] accounts = AccountManager.get(getContext()).getAccounts(); + mSyncHelper.onAccountsChanged(mDb, accounts); + break; + } + default: { throw new UnsupportedOperationException("Unknown update URI " + uri); } |