1
0
mirror of https://github.com/moparisthebest/k-9 synced 2025-01-13 14:48:04 -05:00

Fixed issue 589

This commit is contained in:
Bao-Long Nguyen-Trong 2009-11-13 08:14:10 +00:00
parent ff2be7e643
commit 27caf93e11

View File

@ -426,54 +426,52 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
String extraSubject = intent.getStringExtra(Intent.EXTRA_SUBJECT); String extraSubject = intent.getStringExtra(Intent.EXTRA_SUBJECT);
String extraText = intent.getStringExtra(Intent.EXTRA_TEXT); String extraText = intent.getStringExtra(Intent.EXTRA_TEXT);
String[] extraEmail = intent.getStringArrayExtra(Intent.EXTRA_EMAIL);
String[] extraBcc = intent.getStringArrayExtra(Intent.EXTRA_BCC);
String[] extraCc = intent.getStringArrayExtra(Intent.EXTRA_CC);
String addressList = new String();
// Cache array size, as per Google's recommendations.
int arraySize;
int i;
mSubjectView.setText(extraSubject); mSubjectView.setText(extraSubject);
mMessageContentView.setText(extraText); mMessageContentView.setText(extraText);
String[] extraEmail = intent.getStringArrayExtra(Intent.EXTRA_EMAIL);
String[] extraCc = intent.getStringArrayExtra(Intent.EXTRA_CC);
String[] extraBcc = intent.getStringArrayExtra(Intent.EXTRA_BCC);
String addressList;
// Cache array size, as per Google's recommendations.
int arraySize;
int i;
addressList = "";
if (extraEmail != null) { if (extraEmail != null) {
arraySize = extraEmail.length; arraySize = extraEmail.length;
if (arraySize > 1){ if (arraySize > 1) {
for (i=0; i < (arraySize-1); i++) { for (i=0; i < arraySize; i++) {
addressList += extraEmail[i]+", "; addressList += extraEmail[i]+", ";
} }
addressList += extraEmail[arraySize-1];
} }
} }
mToView.setText(addressList); mToView.setText(addressList);
addressList = "";
if (extraBcc != null) {
arraySize = extraBcc.length;
if (arraySize > 1) {
for (i=0; i < (arraySize-1); i++) {
addressList += extraBcc[i]+", ";
}
addressList += extraBcc[arraySize-1];
}
}
mBccView.setText(addressList);
addressList = ""; addressList = "";
if (extraCc != null) {
if (extraCc != null){
arraySize = extraCc.length; arraySize = extraCc.length;
if (arraySize > 1){ if (arraySize > 1) {
for (i=0; i < (arraySize-1); i++) { for (i=0; i < arraySize; i++) {
addressList += extraCc[i]+", "; addressList += extraCc[i]+", ";
} }
addressList += extraCc[arraySize-1];
} }
} }
mCcView.setText(addressList); mCcView.setText(addressList);
addressList = ""; addressList = "";
if (extraBcc != null) {
arraySize = extraBcc.length;
if (arraySize > 1) {
for (i=0; i < arraySize; i++) {
addressList += extraBcc[i]+", ";
}
}
}
mBccView.setText(addressList);
} else { } else {
mAccount = (Account) intent.getSerializableExtra(EXTRA_ACCOUNT); mAccount = (Account) intent.getSerializableExtra(EXTRA_ACCOUNT);
mFolder = (String) intent.getStringExtra(EXTRA_FOLDER); mFolder = (String) intent.getStringExtra(EXTRA_FOLDER);