moparisthebest
/
k-9
mirror of https://github.com/moparisthebest/k-9
1
0
Fork 0
Code Issues Releases Wiki Activity

Remove duplicate code from onCompose. make starting message composition without an account actually work

This commit is contained in:
Jesse Vincent 2009-12-27 17:22:44 +00:00
parent 0a2d9b9c9f
commit 6c383256a2
1 changed files with 20 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/com/fsck/k9/activity/MessageCompose.java
View File

@ -252,6 +252,26 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
setContentView(R.layout.message_compose);
Intent intent = getIntent();
mAccount = (Account) intent.getSerializableExtra(EXTRA_ACCOUNT);
if (mAccount == null)
{
mAccount = Preferences.getPreferences(this).getDefaultAccount();
}
if (mAccount == null)
{
/*
* There are no accounts set up. This should not have happened. Prompt the
* user to set up an account as an acceptable bailout.
*/
startActivity(new Intent(this, Accounts.class));
mDraftNeedsSaving = false;
finish();
return;
}
mAddressAdapter = new EmailAddressAdapter(this);
mAddressValidator = new EmailAddressValidator();
@ -341,7 +361,6 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
mSourceMessageProcessed = savedInstanceState.getBoolean(STATE_KEY_SOURCE_MESSAGE_PROCED, false);
}
Intent intent = getIntent();
String action = intent.getAction();
@ -350,18 +369,6 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
/*
* Someone has clicked a mailto: link. The address is in the URI.
*/
mAccount = Preferences.getPreferences(this).getDefaultAccount();
if (mAccount == null)
{
/*
* There are no accounts set up. This should not have happened. Prompt the
* user to set up an account as an acceptable bailout.
*/
startActivity(new Intent(this, Accounts.class));
mDraftNeedsSaving = false;
finish();
return;
}
if (intent.getData() != null)
{
Uri uri = intent.getData();
@ -389,19 +396,6 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
* The Intent should contain an EXTRA_STREAM with the data to attach.
*/
mAccount = Preferences.getPreferences(this).getDefaultAccount();
if (mAccount == null)
{
/*
* There are no accounts set up. This should not have happened. Prompt the
* user to set up an account as an acceptable bailout.
*/
startActivity(new Intent(this, Accounts.class));
mDraftNeedsSaving = false;
finish();
return;
}
String text = intent.getStringExtra(Intent.EXTRA_TEXT);
if (text != null)
{
@ -478,7 +472,6 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
}
else
{
mAccount = (Account) intent.getSerializableExtra(EXTRA_ACCOUNT);
mFolder = (String) intent.getStringExtra(EXTRA_FOLDER);
mSourceMessageUid = (String) intent.getStringExtra(EXTRA_MESSAGE);
}