summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/com/android/email/activity/setup/AccountCheckSettingsFragment.java2
-rw-r--r--src/com/android/email/provider/EmailProvider.java2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/email/activity/setup/AccountCheckSettingsFragment.java b/src/com/android/email/activity/setup/AccountCheckSettingsFragment.java
index ce37d4d66..2b786b5ff 100644
--- a/src/com/android/email/activity/setup/AccountCheckSettingsFragment.java
+++ b/src/com/android/email/activity/setup/AccountCheckSettingsFragment.java
@@ -193,6 +193,8 @@ public class AccountCheckSettingsFragment extends Fragment {
Utility.cancelTaskInterrupt(mAccountCheckTask);
mAccountCheckTask = null;
}
+ // Make doubly sure that the dialog is gone before we're removed from the fragment manager
+ recoverAndDismissCheckingDialog();
}
/**
diff --git a/src/com/android/email/provider/EmailProvider.java b/src/com/android/email/provider/EmailProvider.java
index 103ac6749..c8b134090 100644
--- a/src/com/android/email/provider/EmailProvider.java
+++ b/src/com/android/email/provider/EmailProvider.java
@@ -4523,6 +4523,7 @@ public class EmailProvider extends ContentProvider {
final int r = context.getContentResolver().delete(
ContentUris.withAppendedId(Message.SYNCED_CONTENT_URI, msg.mId), null, null);
notifyUIFolder(mailbox.mId, mailbox.mAccountKey);
+ notifyUIMessage(msg.mId);
return r;
}
Mailbox trashMailbox =
@@ -4534,6 +4535,7 @@ public class EmailProvider extends ContentProvider {
values.put(MessageColumns.MAILBOX_KEY, trashMailbox.mId);
final int r = uiUpdateMessage(uri, values, true);
notifyUIFolder(mailbox.mId, mailbox.mAccountKey);
+ notifyUIMessage(msg.mId);
return r;
}