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

Beginning MessageReference update to immutable object

Browse Source
This commit is contained in:
Valentin CAULIER 2015-03-16 16:29:42 +01:00
parent d528864a25
commit bf0333ba31
1 changed files with 56 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
k9mail/src/main/java/com/fsck/k9/activity/MessageReference.java
View File

@ -20,12 +20,29 @@ public class MessageReference implements Parcelable {
public String accountUuid; public String accountUuid;
public String folderName; public String folderName;
public String uid; public String uid;
public Flag flag = null; public Flag flag;
/** /**
* @deprecated MessageReference should be immutable now, and this way, it won't be possible to modify it anymore
*
* Initialize an empty MessageReference. * Initialize an empty MessageReference.
*/ */
@Deprecated
public MessageReference() { public MessageReference() {
this.accountUuid = null;
this.folderName = null;
this.uid = null;
this.flag = null;
}
/**
* Initialize a new MessageReference.
*/
public MessageReference(String accountUuid, String folderName, String uid, Flag flag) {
this.accountUuid = accountUuid;
this.folderName = folderName;
this.uid = uid;
this.flag = flag;
} }
// Version identifier for use when serializing. This will allow us to introduce future versions // Version identifier for use when serializing. This will allow us to introduce future versions
@ -34,7 +51,7 @@ public class MessageReference implements Parcelable {
private static final String IDENTITY_SEPARATOR = ":"; private static final String IDENTITY_SEPARATOR = ":";
/** /**
* Initialize a MessageReference from a seraialized identity. * Initialize a MessageReference from a serialized identity.
* @param identity Serialized identity. * @param identity Serialized identity.
* @throws MessagingException On missing or corrupted identity. * @throws MessagingException On missing or corrupted identity.
*/ */
@ -61,6 +78,9 @@ public class MessageReference implements Parcelable {
throw new MessagingException("Could not thaw message flag '" + flagString + "'", ie); throw new MessagingException("Could not thaw message flag '" + flagString + "'", ie);
} }
} }
else {
flag = null;
}
if (K9.DEBUG) if (K9.DEBUG)
Log.d(K9.LOG_TAG, "Thawed " + toString()); Log.d(K9.LOG_TAG, "Thawed " + toString());
@ -156,12 +176,17 @@ public class MessageReference implements Parcelable {
public static final Creator<MessageReference> CREATOR = new Creator<MessageReference>() { public static final Creator<MessageReference> CREATOR = new Creator<MessageReference>() {
@Override @Override
public MessageReference createFromParcel(Parcel source) { public MessageReference createFromParcel(Parcel source) {
MessageReference ref = new MessageReference(); MessageReference ref;
ref.uid = source.readString(); String uid = source.readString();
ref.accountUuid = source.readString(); String accountUuid = source.readString();
ref.folderName = source.readString(); String folderName = source.readString();
String flag = source.readString(); String flag = source.readString();
if (flag != null) ref.flag = Flag.valueOf(flag); if (flag != null){
ref = new MessageReference(uid, accountUuid, folderName, Flag.valueOf(flag));
}
else {
ref = new MessageReference(uid, accountUuid, folderName, null);
}
return ref; return ref;
} }
@ -183,4 +208,28 @@ public class MessageReference implements Parcelable {
dest.writeString(folderName); dest.writeString(folderName);
dest.writeString(flag == null ? null : flag.name()); dest.writeString(flag == null ? null : flag.name());
} }
public String getAccountUuid(){
return accountUuid;
}
public String getFolderName(){
return folderName;
}
public String getUid(){
return uid;
}
public MessageReference withModifiedUid(String newUid){
return new MessageReference(accountUuid, folderName, newUid, flag);
}
public MessageReference withModifiedFlag(Flag newFlag){
return new MessageReference(accountUuid, folderName, uid, newFlag);
}
public Flag getFlag(){
return flag;
}
} }