am 6c15d943: Merge "Don\'t mix up loader managers" into honeycomb

* commit '6c15d943c2a5b4bfb4178d85acf0f415cb2fd6af':
  Don't mix up loader managers
This commit is contained in:
Makoto Onuki 2011-02-01 16:04:42 -08:00 committed by Android Git Automerger
commit 1cedfc8e5c

View File

@ -96,9 +96,6 @@ public class MoveMessageToDialog extends DialogFragment implements DialogInterfa
@Override @Override
public void onDestroy() { public void onDestroy() {
LoaderManager lm = getActivity().getLoaderManager();
lm.destroyLoader(ActivityHelper.GLOBAL_LOADER_ID_MOVE_TO_DIALOG_MESSAGE_CHECKER);
lm.destroyLoader(ActivityHelper.GLOBAL_LOADER_ID_MOVE_TO_DIALOG_MAILBOX_LOADER);
mDestroyed = true; mDestroyed = true;
super.onDestroy(); super.onDestroy();
} }
@ -117,7 +114,7 @@ public class MoveMessageToDialog extends DialogFragment implements DialogInterfa
new MailboxesAdapter.EmptyCallback()); new MailboxesAdapter.EmptyCallback());
builder.setSingleChoiceItems(mAdapter, -1, this); builder.setSingleChoiceItems(mAdapter, -1, this);
activity.getLoaderManager().initLoader( getLoaderManager().initLoader(
ActivityHelper.GLOBAL_LOADER_ID_MOVE_TO_DIALOG_MESSAGE_CHECKER, ActivityHelper.GLOBAL_LOADER_ID_MOVE_TO_DIALOG_MESSAGE_CHECKER,
null, new MessageCheckerCallback()); null, new MessageCheckerCallback());
@ -178,7 +175,7 @@ public class MoveMessageToDialog extends DialogFragment implements DialogInterfa
return; return;
} }
mAccountId = accountId; mAccountId = accountId;
getActivity().getLoaderManager().initLoader( getLoaderManager().initLoader(
ActivityHelper.GLOBAL_LOADER_ID_MOVE_TO_DIALOG_MAILBOX_LOADER, ActivityHelper.GLOBAL_LOADER_ID_MOVE_TO_DIALOG_MAILBOX_LOADER,
null, new MailboxesLoaderCallbacks()); null, new MailboxesLoaderCallbacks());
} }