am a15503a4
: Merge branch \'readonly-p4-donut\' into donut
Merge commit 'a15503a4a6cf46e810bde4aedc846680ed288c1c' * commit 'a15503a4a6cf46e810bde4aedc846680ed288c1c': AI 149578: Fixed possible NullPointerException in MessageCompose.
This commit is contained in:
commit
372c12bfbb
@ -211,6 +211,7 @@ public class MessageCompose extends Activity implements OnClickListener, OnFocus
|
||||
try {
|
||||
Intent i = new Intent(context, MessageCompose.class);
|
||||
i.putExtra(EXTRA_ACCOUNT, account);
|
||||
i.putExtra(EXTRA_FOLDER, account.getDraftsFolderName());
|
||||
context.startActivity(i);
|
||||
} catch (ActivityNotFoundException anfe) {
|
||||
// Swallow it - this is usually a race condition, especially under automated test.
|
||||
@ -1249,7 +1250,7 @@ public class MessageCompose extends Activity implements OnClickListener, OnFocus
|
||||
setNewMessageFocus();
|
||||
|
||||
mSourceMessageProcessed = true;
|
||||
mDraftNeedsSaving = false;
|
||||
mDraftNeedsSaving = mFolder != null && !mFolder.equals(mAccount.getDraftsFolderName());
|
||||
}
|
||||
|
||||
/**
|
||||
|
Loading…
Reference in New Issue
Block a user