diff options
author | Jorge Ruesga <jorge@ruesga.com> | 2015-03-20 03:16:23 +0100 |
---|---|---|
committer | Jorge Ruesga <jorge@ruesga.com> | 2015-03-20 03:16:23 +0100 |
commit | 9848795888cb2d9db9619921f24e47bcd1c6283c (patch) | |
tree | 877e1e7297889d153ce7d16ec59b0f4e80ac6077 | |
parent | 8c50ed4589a5cd8f0e9be40ee0cfe71adbd61b10 (diff) | |
download | android_packages_apps_Email-9848795888cb2d9db9619921f24e47bcd1c6283c.tar.gz android_packages_apps_Email-9848795888cb2d9db9619921f24e47bcd1c6283c.tar.bz2 android_packages_apps_Email-9848795888cb2d9db9619921f24e47bcd1c6283c.zip |
email: don't block extras database
This will call other setences (like delete accoutns) to block access. Just integrate
in the normal database transactions
Change-Id: I48d7028f2ceddcdfbc170acd1a1fe32f0322b6e6
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
-rw-r--r-- | src/com/android/email/provider/EmailProvider.java | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/src/com/android/email/provider/EmailProvider.java b/src/com/android/email/provider/EmailProvider.java index a2a8c4b6f..bbd0ff33a 100644 --- a/src/com/android/email/provider/EmailProvider.java +++ b/src/com/android/email/provider/EmailProvider.java @@ -738,7 +738,7 @@ public class EmailProvider extends ContentProvider notifyUI(UIPROVIDER_ALL_ACCOUNTS_NOTIFIER, null); // Delete account suggested contacts - mExtrasDatabase.delete(SuggestedContact.TABLE_NAME, + db.delete(SuggestedContact.TABLE_NAME, SuggestedContact.ACCOUNT_KEY + " = ?", new String[]{id}); } else if (match == MAILBOX_ID) { @@ -769,7 +769,7 @@ public class EmailProvider extends ContentProvider if (match == ACCOUNT) { // TODO extract account deleted // As a fallback clean all suggested contacts - mExtrasDatabase.delete(SuggestedContact.TABLE_NAME, null, null); + db.delete(SuggestedContact.TABLE_NAME, null, null); } break; case MESSAGE_MOVE: @@ -6066,14 +6066,8 @@ public class EmailProvider extends ContentProvider } // Update or insert every suggested contact - mExtrasDatabase.beginTransactionNonExclusive(); - try { - for (Address suggestedContact : suggestedContacts) { - addOrUpdateSuggestedContact(accountId, suggestedContact); - } - mExtrasDatabase.setTransactionSuccessful(); - } finally { - mExtrasDatabase.endTransaction(); + for (Address suggestedContact : suggestedContacts) { + addOrUpdateSuggestedContact(accountId, suggestedContact); } } @@ -6094,14 +6088,14 @@ public class EmailProvider extends ContentProvider ? emailAddress : address.getPersonal()); values.put(SuggestedContact.DISPLAY_NAME, address.toString()); values.put(SuggestedContact.LAST_SEEN, System.currentTimeMillis()); - long affectedRecords = mExtrasDatabase.update( + long affectedRecords = mDatabase.update( SuggestedContact.TABLE_NAME, values, where, args); // Insert if (affectedRecords == 0) { values.put(SuggestedContact.ACCOUNT_KEY, accountId); values.put(SuggestedContact.ADDRESS, emailAddress); - mExtrasDatabase.insertOrThrow(SuggestedContact.TABLE_NAME, null, values); + mDatabase.insertOrThrow(SuggestedContact.TABLE_NAME, null, values); } } catch (SQLException ex) { |