Merge "Prevent activity selection dialog spam"
diff --git a/src/com/android/browser/provider/BrowserProvider2.java b/src/com/android/browser/provider/BrowserProvider2.java
index 85d6d64..10b3821 100644
--- a/src/com/android/browser/provider/BrowserProvider2.java
+++ b/src/com/android/browser/provider/BrowserProvider2.java
@@ -65,6 +65,7 @@
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.util.Arrays;
import java.util.HashMap;
public class BrowserProvider2 extends SQLiteContentProvider {
@@ -578,13 +579,6 @@
return uri.getBooleanQueryParameter(BrowserContract.CALLER_IS_SYNCADAPTER, false);
}
- @Override
- public void notifyChange(boolean callerIsSyncAdapter) {
- ContentResolver resolver = getContext().getContentResolver();
- resolver.notifyChange(BrowserContract.AUTHORITY_URI, null, !callerIsSyncAdapter);
- resolver.notifyChange(LEGACY_AUTHORITY_URI, null, !callerIsSyncAdapter);
- }
-
@VisibleForTesting
public void setWidgetObserver(ContentObserver obs) {
mWidgetObserver = obs;
@@ -989,6 +983,7 @@
boolean callerIsSyncAdapter) {
final int match = URI_MATCHER.match(uri);
final SQLiteDatabase db = mOpenHelper.getWritableDatabase();
+ int deleted = 0;
switch (match) {
case BOOKMARKS_ID: {
selection = DatabaseUtils.concatenateWhere(selection,
@@ -1002,12 +997,12 @@
Object[] withAccount = getSelectionWithAccounts(uri, selection, selectionArgs);
selection = (String) withAccount[0];
selectionArgs = (String[]) withAccount[1];
- int deleted = deleteBookmarks(selection, selectionArgs, callerIsSyncAdapter);
+ deleted = deleteBookmarks(selection, selectionArgs, callerIsSyncAdapter);
pruneImages();
if (deleted > 0) {
refreshWidgets();
}
- return deleted;
+ break;
}
case HISTORY_ID: {
@@ -1018,9 +1013,9 @@
}
case HISTORY: {
filterSearchClient(selectionArgs);
- int deleted = db.delete(TABLE_HISTORY, selection, selectionArgs);
+ deleted = db.delete(TABLE_HISTORY, selection, selectionArgs);
pruneImages();
- return deleted;
+ break;
}
case SEARCHES_ID: {
@@ -1030,17 +1025,20 @@
// fall through
}
case SEARCHES: {
- return db.delete(TABLE_SEARCHES, selection, selectionArgs);
+ deleted = db.delete(TABLE_SEARCHES, selection, selectionArgs);
+ break;
}
case SYNCSTATE: {
- return mSyncHelper.delete(db, selection, selectionArgs);
+ deleted = mSyncHelper.delete(db, selection, selectionArgs);
+ break;
}
case SYNCSTATE_ID: {
String selectionWithId =
(SyncStateContract.Columns._ID + "=" + ContentUris.parseId(uri) + " ")
+ (selection == null ? "" : " AND (" + selection + ")");
- return mSyncHelper.delete(db, selectionWithId, selectionArgs);
+ deleted = mSyncHelper.delete(db, selectionWithId, selectionArgs);
+ break;
}
case LEGACY_ID: {
selection = DatabaseUtils.concatenateWhere(
@@ -1064,7 +1062,6 @@
}
Cursor c = qb.query(db, projection, selection, selectionArgs,
null, null, null);
- int deleted = 0;
while (c.moveToNext()) {
long id = c.getLong(0);
boolean isBookmark = c.getInt(1) != 0;
@@ -1081,10 +1078,17 @@
new String[] { Long.toString(id) });
}
}
- return deleted;
+ break;
+ }
+ default: {
+ throw new UnsupportedOperationException("Unknown delete URI " + uri);
}
}
- throw new UnsupportedOperationException("Unknown delete URI " + uri);
+ if (deleted > 0) {
+ postNotifyUri(uri);
+ postNotifyUri(LEGACY_AUTHORITY_URI);
+ }
+ return deleted;
}
long queryDefaultFolderId(String accountName, String accountType) {
@@ -1214,6 +1218,8 @@
}
if (id >= 0) {
+ postNotifyUri(uri);
+ postNotifyUri(LEGACY_AUTHORITY_URI);
return ContentUris.withAppendedId(uri, id);
} else {
return null;
@@ -1322,6 +1328,7 @@
values.remove(BookmarkColumns.USER_ENTERED);
}
}
+ int modified = 0;
switch (match) {
case BOOKMARKS_ID: {
selection = DatabaseUtils.concatenateWhere(selection,
@@ -1334,13 +1341,12 @@
Object[] withAccount = getSelectionWithAccounts(uri, selection, selectionArgs);
selection = (String) withAccount[0];
selectionArgs = (String[]) withAccount[1];
- int updated = updateBookmarksInTransaction(values, selection, selectionArgs,
+ modified = updateBookmarksInTransaction(values, selection, selectionArgs,
callerIsSyncAdapter);
- pruneImages();
- if (updated > 0) {
+ if (modified > 0) {
refreshWidgets();
}
- return updated;
+ break;
}
case HISTORY_ID: {
@@ -1350,14 +1356,14 @@
// fall through
}
case HISTORY: {
- int updated = updateHistoryInTransaction(values, selection, selectionArgs);
- pruneImages();
- return updated;
+ modified = updateHistoryInTransaction(values, selection, selectionArgs);
+ break;
}
case SYNCSTATE: {
- return mSyncHelper.update(mDb, values,
+ modified = mSyncHelper.update(mDb, values,
appendAccountToSelection(uri, selection), selectionArgs);
+ break;
}
case SYNCSTATE_ID: {
@@ -1365,8 +1371,9 @@
String selectionWithId =
(SyncStateContract.Columns._ID + "=" + ContentUris.parseId(uri) + " ")
+ (selection == null ? "" : " AND (" + selection + ")");
- return mSyncHelper.update(mDb, values,
+ modified = mSyncHelper.update(mDb, values,
selectionWithId, selectionArgs);
+ break;
}
case IMAGES: {
@@ -1374,23 +1381,104 @@
if (TextUtils.isEmpty(url)) {
throw new IllegalArgumentException("Images.URL is required");
}
+ if (!shouldUpdateImages(db, url, values)) {
+ return 0;
+ }
int count = db.update(TABLE_IMAGES, values, Images.URL + "=?",
new String[] { url });
if (count == 0) {
db.insertOrThrow(TABLE_IMAGES, Images.FAVICON, values);
count = 1;
}
- if (count > 0) {
+ if (getUrlCount(db, TABLE_BOOKMARKS, url) > 0) {
+ postNotifyUri(Bookmarks.CONTENT_URI);
refreshWidgets();
}
+ if (getUrlCount(db, TABLE_HISTORY, url) > 0) {
+ postNotifyUri(History.CONTENT_URI);
+ }
+ postNotifyUri(LEGACY_AUTHORITY_URI);
+ pruneImages();
return count;
}
case SEARCHES: {
- return db.update(TABLE_SEARCHES, values, selection, selectionArgs);
+ modified = db.update(TABLE_SEARCHES, values, selection, selectionArgs);
+ break;
+ }
+
+ default: {
+ throw new UnsupportedOperationException("Unknown update URI " + uri);
}
}
- throw new UnsupportedOperationException("Unknown update URI " + uri);
+ pruneImages();
+ if (modified > 0) {
+ postNotifyUri(uri);
+ postNotifyUri(LEGACY_AUTHORITY_URI);
+ }
+ return modified;
+ }
+
+ // We want to avoid sending out more URI notifications than we have to
+ // Thus, we check to see if the images we are about to store are already there
+ // This is used because things like a site's favion or touch icon is rarely
+ // changed, but the browser tries to update it every time the page loads.
+ // Without this, we will always send out 3 URI notifications per page load.
+ // With this, that drops to 0 or 1, depending on if the thumbnail changed.
+ private boolean shouldUpdateImages(
+ SQLiteDatabase db, String url, ContentValues values) {
+ final String[] projection = new String[] {
+ Images.FAVICON,
+ Images.THUMBNAIL,
+ Images.TOUCH_ICON,
+ };
+ Cursor cursor = db.query(TABLE_IMAGES, projection, Images.URL + "=?",
+ new String[] { url }, null, null, null);
+ byte[] nfavicon = values.getAsByteArray(Images.FAVICON);
+ byte[] nthumb = values.getAsByteArray(Images.THUMBNAIL);
+ byte[] ntouch = values.getAsByteArray(Images.TOUCH_ICON);
+ byte[] cfavicon = null;
+ byte[] cthumb = null;
+ byte[] ctouch = null;
+ try {
+ while (cursor.moveToNext()) {
+ if (nfavicon != null) {
+ cfavicon = cursor.getBlob(0);
+ if (!Arrays.equals(nfavicon, cfavicon)) {
+ return true;
+ }
+ }
+ if (nthumb != null) {
+ cthumb = cursor.getBlob(1);
+ if (!Arrays.equals(nthumb, cthumb)) {
+ return true;
+ }
+ }
+ if (ntouch != null) {
+ ctouch = cursor.getBlob(2);
+ if (!Arrays.equals(ntouch, ctouch)) {
+ return true;
+ }
+ }
+ }
+ } finally {
+ cursor.close();
+ }
+ return false;
+ }
+
+ int getUrlCount(SQLiteDatabase db, String table, String url) {
+ Cursor c = db.query(table, new String[] { "COUNT(*)" },
+ "url = ?", new String[] { url }, null, null, null);
+ try {
+ int count = 0;
+ if (c.moveToFirst()) {
+ count = c.getInt(0);
+ }
+ return count;
+ } finally {
+ c.close();
+ }
}
/**
diff --git a/src/com/android/browser/provider/SQLiteContentProvider.java b/src/com/android/browser/provider/SQLiteContentProvider.java
index a50894a..13acd3d 100644
--- a/src/com/android/browser/provider/SQLiteContentProvider.java
+++ b/src/com/android/browser/provider/SQLiteContentProvider.java
@@ -19,26 +19,27 @@
import android.content.ContentProvider;
import android.content.ContentProviderOperation;
import android.content.ContentProviderResult;
+import android.content.ContentResolver;
import android.content.ContentValues;
import android.content.Context;
import android.content.OperationApplicationException;
import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteOpenHelper;
-import android.database.sqlite.SQLiteTransactionListener;
import android.net.Uri;
import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Set;
/**
* General purpose {@link ContentProvider} base class that uses SQLiteDatabase for storage.
*/
-public abstract class SQLiteContentProvider extends ContentProvider
- implements SQLiteTransactionListener {
+public abstract class SQLiteContentProvider extends ContentProvider {
private static final String TAG = "SQLiteContentProvider";
private SQLiteOpenHelper mOpenHelper;
- private volatile boolean mNotifyChange;
+ private Set<Uri> mChangedUris;
protected SQLiteDatabase mDb;
private final ThreadLocal<Boolean> mApplyingBatch = new ThreadLocal<Boolean>();
@@ -53,6 +54,7 @@
public boolean onCreate() {
Context context = getContext();
mOpenHelper = getDatabaseHelper(context);
+ mChangedUris = new HashSet<Uri>();
return true;
}
@@ -80,10 +82,14 @@
boolean callerIsSyncAdapter);
/**
- * Called when the provider needs to notify the system of a change.
- * @param callerIsSyncAdapter true if the caller that caused the change was a sync adapter.
+ * Call this to add a URI to the list of URIs to be notified when the transaction
+ * is committed.
*/
- public abstract void notifyChange(boolean callerIsSyncAdapter);
+ protected void postNotifyUri(Uri uri) {
+ synchronized (mChangedUris) {
+ mChangedUris.add(uri);
+ }
+ }
public boolean isCallerSyncAdapter(Uri uri) {
return false;
@@ -104,12 +110,9 @@
boolean applyingBatch = applyingBatch();
if (!applyingBatch) {
mDb = mOpenHelper.getWritableDatabase();
- mDb.beginTransactionWithListener(this);
+ mDb.beginTransaction();
try {
result = insertInTransaction(uri, values, callerIsSyncAdapter);
- if (result != null) {
- mNotifyChange = true;
- }
mDb.setTransactionSuccessful();
} finally {
mDb.endTransaction();
@@ -118,9 +121,6 @@
onEndTransaction(callerIsSyncAdapter);
} else {
result = insertInTransaction(uri, values, callerIsSyncAdapter);
- if (result != null) {
- mNotifyChange = true;
- }
}
return result;
}
@@ -130,13 +130,10 @@
int numValues = values.length;
boolean callerIsSyncAdapter = isCallerSyncAdapter(uri);
mDb = mOpenHelper.getWritableDatabase();
- mDb.beginTransactionWithListener(this);
+ mDb.beginTransaction();
try {
for (int i = 0; i < numValues; i++) {
Uri result = insertInTransaction(uri, values[i], callerIsSyncAdapter);
- if (result != null) {
- mNotifyChange = true;
- }
mDb.yieldIfContendedSafely();
}
mDb.setTransactionSuccessful();
@@ -155,13 +152,10 @@
boolean applyingBatch = applyingBatch();
if (!applyingBatch) {
mDb = mOpenHelper.getWritableDatabase();
- mDb.beginTransactionWithListener(this);
+ mDb.beginTransaction();
try {
count = updateInTransaction(uri, values, selection, selectionArgs,
callerIsSyncAdapter);
- if (count > 0) {
- mNotifyChange = true;
- }
mDb.setTransactionSuccessful();
} finally {
mDb.endTransaction();
@@ -170,9 +164,6 @@
onEndTransaction(callerIsSyncAdapter);
} else {
count = updateInTransaction(uri, values, selection, selectionArgs, callerIsSyncAdapter);
- if (count > 0) {
- mNotifyChange = true;
- }
}
return count;
@@ -185,12 +176,9 @@
boolean applyingBatch = applyingBatch();
if (!applyingBatch) {
mDb = mOpenHelper.getWritableDatabase();
- mDb.beginTransactionWithListener(this);
+ mDb.beginTransaction();
try {
count = deleteInTransaction(uri, selection, selectionArgs, callerIsSyncAdapter);
- if (count > 0) {
- mNotifyChange = true;
- }
mDb.setTransactionSuccessful();
} finally {
mDb.endTransaction();
@@ -199,9 +187,6 @@
onEndTransaction(callerIsSyncAdapter);
} else {
count = deleteInTransaction(uri, selection, selectionArgs, callerIsSyncAdapter);
- if (count > 0) {
- mNotifyChange = true;
- }
}
return count;
}
@@ -213,7 +198,7 @@
int opCount = 0;
boolean callerIsSyncAdapter = false;
mDb = mOpenHelper.getWritableDatabase();
- mDb.beginTransactionWithListener(this);
+ mDb.beginTransaction();
try {
mApplyingBatch.set(true);
final int numOperations = operations.size();
@@ -246,31 +231,15 @@
}
}
- @Override
- public void onBegin() {
- onBeginTransaction();
- }
-
- @Override
- public void onCommit() {
- beforeTransactionCommit();
- }
-
- @Override
- public void onRollback() {
- // not used
- }
-
- protected void onBeginTransaction() {
- }
-
- protected void beforeTransactionCommit() {
- }
-
protected void onEndTransaction(boolean callerIsSyncAdapter) {
- if (mNotifyChange) {
- mNotifyChange = false;
- notifyChange(callerIsSyncAdapter);
+ Set<Uri> changed;
+ synchronized (mChangedUris) {
+ changed = new HashSet<Uri>(mChangedUris);
+ mChangedUris.clear();
+ }
+ ContentResolver resolver = getContext().getContentResolver();
+ for (Uri uri : changed) {
+ resolver.notifyChange(uri, null, !callerIsSyncAdapter);
}
}
}