Merge pull request #108 from tipbit/is-deleted

Implement [CTCoreMessage isDeleted].
MailCore · Jun 2, 2013 · dd2ad74 · dd2ad74
2 parents 6bb4d1c + 905bf5a
commit dd2ad74
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 11 deletions.
diff --git a/Source/CTCoreMessage.h b/Source/CTCoreMessage.h
@@ -163,6 +163,11 @@
 */
 - (NSDate *)senderDate; 
 
+/**
+ Returns YES if the message is deleted.
+ */
+- (BOOL)isDeleted;
+
 /**
  Returns YES if the message is unread.
 */

diff --git a/Source/CTCoreMessage.m b/Source/CTCoreMessage.m
@@ -408,21 +408,20 @@ - (NSDate *)senderDate {
 }
 
 - (BOOL)isUnread {
-    struct mail_flags *flags = myMessage ? myMessage->msg_flags : NULL;
-    if (flags != NULL) {
-        BOOL flag_seen = (flags->fl_flags & MAIL_FLAG_SEEN);
-        return !flag_seen;
-    }
-    return NO;
+    return ![self isFlagSet:MAIL_FLAG_SEEN withDefault:YES];
+}
+
+- (BOOL)isDeleted {
+    return [self isFlagSet:MAIL_FLAG_DELETED withDefault:NO];
 }
 
 - (BOOL)isStarred {
+    return [self isFlagSet:MAIL_FLAG_FLAGGED withDefault:NO];
+}
+
+- (BOOL)isFlagSet:(NSUInteger)flag withDefault:(BOOL)def {
     struct mail_flags *flags = myMessage ? myMessage->msg_flags : NULL;
-    if (flags != NULL) {
-        BOOL flag_starred = (flags->fl_flags & MAIL_FLAG_FLAGGED);
-        return flag_starred;
-    }
-    return NO;
+    return flags == NULL ? def : flags->fl_flags & flag;
 }
 
 - (BOOL)isNew {