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

Fix for NPE introduced in r3258.

Browse Source
This commit is contained in:
Andrew Chen 2011-02-04 15:41:39 +00:00 committed by Jesse Vincent
parent 40bdf99925
commit 66f6999c53
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/com/fsck/k9/activity/MessageReference.java
View File

@ -47,19 +47,30 @@ public class MessageReference implements Serializable
{ {
// Split the identity, stripping away the first two characters representing the version and delimiter. // Split the identity, stripping away the first two characters representing the version and delimiter.
StringTokenizer tokens = new StringTokenizer(identity.substring(2), IDENTITY_SEPARATOR, false); StringTokenizer tokens = new StringTokenizer(identity.substring(2), IDENTITY_SEPARATOR, false);
if (tokens.countTokens() == 4) if (tokens.countTokens() >= 3)
{ {
accountUuid = Utility.base64Decode(tokens.nextToken()); accountUuid = Utility.base64Decode(tokens.nextToken());
folderName = Utility.base64Decode(tokens.nextToken()); folderName = Utility.base64Decode(tokens.nextToken());
uid = Utility.base64Decode(tokens.nextToken()); uid = Utility.base64Decode(tokens.nextToken());
flag = Flag.valueOf(tokens.nextToken());
if (tokens.hasMoreTokens())
{
final String flagString = tokens.nextToken();
try
{
flag = Flag.valueOf(flagString);
} catch (IllegalArgumentException ie)
{
throw new MessagingException("Could not thaw message flag '" + flagString + "'", ie);
}
}
if (K9.DEBUG) if (K9.DEBUG)
Log.d(K9.LOG_TAG, "Thawed " + toString()); Log.d(K9.LOG_TAG, "Thawed " + toString());
} }
else else
{ {
throw new MessagingException("Invalid token in " + IDENTITY_SEPARATOR + " identity."); throw new MessagingException("Invalid MessageReference in " + identity + " identity.");
} }
} }
} }
@ -80,8 +91,11 @@ public class MessageReference implements Serializable
refString.append(Utility.base64Encode(folderName)); refString.append(Utility.base64Encode(folderName));
refString.append(IDENTITY_SEPARATOR); refString.append(IDENTITY_SEPARATOR);
refString.append(Utility.base64Encode(uid)); refString.append(Utility.base64Encode(uid));
refString.append(IDENTITY_SEPARATOR); if (flag != null)
refString.append(flag.name()); {
refString.append(IDENTITY_SEPARATOR);
refString.append(flag.name());
}
return refString.toString(); return refString.toString();
} }