[MB-1642] support for inbox filtering

Airship/Common/UADefaultMessageCenter.h

@@ -45,6 +45,11 @@
  */
 @property (nonatomic, strong) UADefaultMessageCenterStyle *style;
 
+/**
+ * An optional predicate for filtering messages.
+ */
+@property (nonatomic, strong) NSPredicate *filter;
+
 /**
  * Display the message center.
  *

Airship/Common/UADefaultMessageCenter.m

@@ -53,6 +53,7 @@ - (void)display:(BOOL)animated {
     if (!self.splitViewController) {
 
         self.splitViewController = [[UADefaultMessageCenterSplitViewController alloc] initWithNibName:nil bundle:nil];
+        self.splitViewController.filter = self.filter;
 
         UADefaultMessageCenterListViewController *lvc = self.splitViewController.listViewController;
 

Airship/Common/UADefaultMessageCenterListViewController.h

@@ -39,6 +39,11 @@
  */
 @property (nonatomic, strong) UADefaultMessageCenterStyle *style;
 
+/**
+ * An optional predicate for filtering messages.
+ */
+@property (nonatomic, strong) NSPredicate *filter;
+
 /**
  * Block that will be invoked when a message view controller receives a closeWindow message
  * from the webView.

Airship/Common/UADefaultMessageCenterListViewController.m

@@ -199,9 +199,14 @@ - (void)refreshStateChanged:(UIRefreshControl *)sender {
 }
 
 // Note: since the message list is refreshed with new model objects when reloaded,
-// we can't reliably hold onto any single instance. This method is merely for convenience.
+// we can't reliably hold onto any single instance. This method is mostly for convenience.
 - (NSArray *)messages {
-    return [UAirship inbox].messageList.messages;
+    NSArray *allMessages = [UAirship inbox].messageList.messages;
+    if (self.filter) {
+        return [allMessages filteredArrayUsingPredicate:self.filter];
+    } else {
+        return allMessages;
+    }
 }
 
 - (UIColor *)defaultTintColor {
@@ -355,6 +360,9 @@ - (void)displayMessage:(UAInboxMessage *)message {
     //otherwise, push over a new message view
     else {
         mvc = [[UADefaultMessageCenterMessageViewController alloc] initWithNibName:@"UADefaultMessageCenterMessageViewController" bundle:[UAirship resources]];
+
+        mvc.filter = self.filter;
+
         mvc.closeBlock = ^(BOOL animated){
             // Call the close block if present
             if (self.closeBlock) {

Airship/Common/UADefaultMessageCenterMessageViewController.h

@@ -39,6 +39,11 @@
  */
 @property (nonatomic, strong) UAInboxMessage *message;
 
+/**
+ * An optional predicate for filtering messages.
+ */
+@property (nonatomic, strong) NSPredicate *filter;
+
 /**
  * Block that will be invoked when this class receives a closeWindow message from the webView.
  */

Airship/Common/UADefaultMessageCenterMessageViewController.m

@@ -111,9 +111,14 @@ - (void)viewWillDisappear:(BOOL)animated {
 }
 
 // Note: since the message list is refreshed with new model objects when reloaded,
-// we can't reliably hold onto any single instance. This method is merely for convenience.
+// we can't reliably hold onto any single instance. This method is mostly for convenience.
 - (NSArray *)messages {
-    return [UAirship inbox].messageList.messages;
+    NSArray *allMessages = [UAirship inbox].messageList.messages;
+    if (self.filter) {
+        return [allMessages filteredArrayUsingPredicate:self.filter];
+    } else {
+        return allMessages;
+    }
 }
 
 #pragma mark -

Airship/Common/UADefaultMessageCenterSplitViewController.h

@@ -34,6 +34,11 @@
  */
 @interface UADefaultMessageCenterSplitViewController : UISplitViewController
 
+/**
+ * An optional predicate for filtering messages.
+ */
+@property (nonatomic, strong) NSPredicate *filter;
+
 /**
  * The style to apply to the message center
  */

Airship/Common/UADefaultMessageCenterSplitViewController.m

@@ -34,6 +34,7 @@
 @interface UADefaultMessageCenterSplitViewController ()
 
 @property(nonatomic, strong) UADefaultMessageCenterListViewController *listViewController;
+@property(nonatomic, strong) UADefaultMessageCenterMessageViewController *messageViewController;
 @property (nonatomic, strong) UINavigationController *listNav;
 @property (nonatomic, strong) UINavigationController *messageNav;
 
@@ -46,12 +47,13 @@ - (void)configure {
     UADefaultMessageCenterListViewController *lvc;
     lvc = [[UADefaultMessageCenterListViewController alloc] initWithNibName:@"UADefaultMessageCenterListViewController"
                                                                      bundle:[UAirship resources]];
-
     UADefaultMessageCenterMessageViewController *mvc;
     mvc = [[UADefaultMessageCenterMessageViewController alloc] initWithNibName:@"UADefaultMessageCenterMessageViewController"
                                                                         bundle:[UAirship resources]];
 
+
     self.listViewController = lvc;
+    self.messageViewController = mvc;
 
     self.listNav = [[UINavigationController alloc] initWithRootViewController:lvc];
     self.messageNav = [[UINavigationController alloc] initWithRootViewController:mvc];
@@ -114,6 +116,12 @@ - (void)setStyle:(UADefaultMessageCenterStyle *)style {
     }
 }
 
+- (void)setFilter:(NSPredicate *)filter {
+    _filter = filter;
+    self.listViewController.filter = filter;
+    self.messageViewController.filter = filter;
+}
+
 - (void)setTitle:(NSString *)title {
     [super setTitle:title];
     self.listViewController.title = title;

Airship/Inbox/UAInboxMessageList.h

@@ -97,6 +97,16 @@ extern NSString * const UAInboxMessageListUpdatedNotification;
 - (nullable UADisposable *)retrieveMessageListWithSuccessBlock:(nullable UAInboxMessageListCallbackBlock)successBlock
                                               withFailureBlock:(nullable UAInboxMessageListCallbackBlock)failureBlock;
 
+/**
+ * Returns the list of messages on disk as an NSArray, filtered by the supplied predicate.
+ * @param predicate The predicate to use as a filter over messages.
+ */
+#if __has_feature(objc_generics)
+- (NSArray<UAInboxMessage *> *)messagesFilteredUsingPredicate:(NSPredicate *)predicate;
+#else
+- (NSArray *)messagesFilteredUsingPredicate:(NSPredicate *)predicate;
+#endif
+
 /**
  * Returns the number of messages currently in the inbox.
  * @return The message count as an integer.

Airship/Inbox/UAInboxMessageList.m

@@ -67,7 +67,7 @@ + (instancetype)messageListWithUser:(UAUser *)user client:(UAInboxAPIClient *)cl
     return [[UAInboxMessageList alloc] initWithUser:user client:client config:config];
 }
 
-#pragma mark Custom setters
+#pragma mark Accessors
 
 - (void)setMessages:(NSArray *)messages {
     @synchronized(self) {
@@ -96,6 +96,16 @@ - (NSArray *)messages {
     }
 }
 
+#if __has_feature(objc_generics)
+- (NSArray<UAInboxMessage *> *)messagesFilteredUsingPredicate:(NSPredicate *)predicate {
+#else
+- (NSArray *)messagesFilteredUsingPredicate:(NSPredicate *)predicate {
+#endif
+    @synchronized(self) {
+        return [_messages filteredArrayUsingPredicate:predicate];
+    }
+}
+
 #pragma mark NSNotificationCenter helper methods
 
 - (void)sendMessageListWillUpdateNotification {