moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2024-11-23 18:02:15 -05:00
Code Issues Releases Wiki Activity

Merge pull request #76 from sunglim/string_util

Browse Source 
Added StringUtils.isNullOrEmpty().
This commit is contained in:
Andrew Chen 2011-11-02 10:50:52 -07:00
commit b5dca5cf68
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/fsck/k9/helper/StringUtils.java Normal file
View File

@ -0,0 +1,9 @@
package com.fsck.k9.helper;
public final class StringUtils {
public static boolean isNullOrEmpty(String string){
return string == null || string.length() == 0;
}
}

15
src/com/fsck/k9/mail/Address.java
View File

@ -12,6 +12,7 @@ import android.util.Log;
import com.fsck.k9.K9; import com.fsck.k9.K9;
import com.fsck.k9.helper.Contacts; import com.fsck.k9.helper.Contacts;
import com.fsck.k9.helper.Utility; import com.fsck.k9.helper.Utility;
import com.fsck.k9.helper.StringUtils;
import org.apache.james.mime4j.codec.EncoderUtil; import org.apache.james.mime4j.codec.EncoderUtil;
import org.apache.james.mime4j.dom.address.Mailbox; import org.apache.james.mime4j.dom.address.Mailbox;
import org.apache.james.mime4j.dom.address.MailboxList; import org.apache.james.mime4j.dom.address.MailboxList;
@ -60,7 +61,7 @@ public class Address {
Rfc822Token token = tokens[0]; Rfc822Token token = tokens[0];
mAddress = token.getAddress(); mAddress = token.getAddress();
String name = token.getName(); String name = token.getName();
if ((name != null) && !("".equals(name))) { if (!StringUtils.isNullOrEmpty(name)) {
/* /*
* Don't use the "personal" argument if "address" is of the form: * Don't use the "personal" argument if "address" is of the form:
* James Bond <james.bond@mi6.uk> * James Bond <james.bond@mi6.uk>
@ -111,11 +112,11 @@ public class Address {
*/ */
public static Address[] parseUnencoded(String addressList) { public static Address[] parseUnencoded(String addressList) {
List<Address> addresses = new ArrayList<Address>(); List<Address> addresses = new ArrayList<Address>();
if ((addressList != null) && !("".equals(addressList))) { if (!StringUtils.isNullOrEmpty(addressList)) {
Rfc822Token[] tokens = Rfc822Tokenizer.tokenize(addressList); Rfc822Token[] tokens = Rfc822Tokenizer.tokenize(addressList);
for (Rfc822Token token : tokens) { for (Rfc822Token token : tokens) {
String address = token.getAddress(); String address = token.getAddress();
if ((address != null) && !("".equals(address))) { if (!StringUtils.isNullOrEmpty(address)) {
addresses.add(new Address(token.getAddress(), token.getName(), false)); addresses.add(new Address(token.getAddress(), token.getName(), false));
} }
} }
@ -131,7 +132,7 @@ public class Address {
* @return An array of 0 or more Addresses. * @return An array of 0 or more Addresses.
*/ */
public static Address[] parse(String addressList) { public static Address[] parse(String addressList) {
if (addressList == null || addressList.length() == 0) { if (StringUtils.isNullOrEmpty(addressList)) {
return EMPTY_ADDRESS_ARRAY; return EMPTY_ADDRESS_ARRAY;
} }
List<Address> addresses = new ArrayList<Address>(); List<Address> addresses = new ArrayList<Address>();
@ -168,7 +169,7 @@ public class Address {
@Override @Override
public String toString() { public String toString() {
if (mPersonal != null && !mPersonal.equals("")) { if (!StringUtils.isNullOrEmpty(mPersonal)) {
return Utility.quoteAtoms(mPersonal) + " <" + mAddress + ">"; return Utility.quoteAtoms(mPersonal) + " <" + mAddress + ">";
} else { } else {
return mAddress; return mAddress;
@ -190,7 +191,7 @@ public class Address {
} }
public String toEncodedString() { public String toEncodedString() {
if (mPersonal != null && !mPersonal.equals("")) { if (!StringUtils.isNullOrEmpty(mPersonal)) {
return EncoderUtil.encodeAddressDisplayName(mPersonal) + " <" + mAddress + ">"; return EncoderUtil.encodeAddressDisplayName(mPersonal) + " <" + mAddress + ">";
} else { } else {
return mAddress; return mAddress;
@ -256,7 +257,7 @@ public class Address {
} }
} }
return ((mPersonal != null) && (mPersonal.length() > 0)) ? mPersonal : mAddress; return (!StringUtils.isNullOrEmpty(mPersonal)) ? mPersonal : mAddress;
} }
public static CharSequence toFriendly(Address[] addresses) { public static CharSequence toFriendly(Address[] addresses) {