ADHOC/replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

MessageView: Bug 2097855, observer on prevNextCursor unregistered twice.

Browse Source
This commit is contained in:
Mihai Preda 2009-09-03 15:27:55 +02:00
parent 67650c8bf7
commit 4f11b50de5
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/com/android/email/activity/MessageView.java
View File

@ -366,9 +366,9 @@ public class MessageView extends Activity implements OnClickListener {
if (mMessage != null) {
startPresenceCheck();
// get a new next/prev cursor, but only if we already had one
// get a new next/prev cursor, but only if mailbox is set
// (otherwise it's "too soon" and other pathways will cause it to be loaded)
if (mLoadPrevNextTask == null && mPrevNextCursor != null) {
if (mLoadPrevNextTask == null && mMailboxId != -1) {
mLoadPrevNextTask = new LoadPrevNextTask(mMailboxId);
mLoadPrevNextTask.execute();
}
@ -379,10 +379,14 @@ public class MessageView extends Activity implements OnClickListener {
public void onPause() {
super.onPause();
mController.removeResultCallback(mControllerCallback);
// Manage the next/prev cursor
closePrevNextCursor();
}
private void closePrevNextCursor() {
if (mPrevNextCursor != null) {
mPrevNextCursor.unregisterContentObserver(mNextPrevObserver);
mPrevNextCursor.deactivate();
mPrevNextCursor.close();
mPrevNextCursor = null;
}
}
@ -416,12 +420,7 @@ public class MessageView extends Activity implements OnClickListener {
mMessageContentView.destroy();
mMessageContentView = null;
}
// Destroy the next/prev cursor if we're holding one
// Note, the observer was already unregistered in onPause()
if (mPrevNextCursor != null) {
mPrevNextCursor.close();
mPrevNextCursor = null;
}
// the next/prev cursor was closed in onPause()
}
private void onDelete() {
@ -970,10 +969,7 @@ public class MessageView extends Activity implements OnClickListener {
return;
}
// replace the older cursor if there is one
if (mPrevNextCursor != null) {
mPrevNextCursor.unregisterContentObserver(MessageView.this.mNextPrevObserver);
mPrevNextCursor.close();
}
closePrevNextCursor();
mPrevNextCursor = cursor;
mPrevNextCursor.registerContentObserver(MessageView.this.mNextPrevObserver);
repositionPrevNextCursor();