Able to filter events

RussellXY · Aug 4, 2014 · 19b287f · 19b287f
1 parent 996a14b
commit 19b287f
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/iBurn/BRCEventsFilterTableViewController.m b/iBurn/BRCEventsFilterTableViewController.m
@@ -121,6 +121,7 @@ - (void)viewWillDisappear:(BOOL)animated
     NSArray *filteredArray = [self filteredTypes];
     [[NSUserDefaults standardUserDefaults] setSelectedEventTypes:filteredArray];
     [[NSUserDefaults standardUserDefaults] setShowExpiredEvents:self.showExpiredEvents];
+    [self updateFilteredViews];
 }
 
 - (NSArray *)filteredTypes
@@ -142,13 +143,16 @@ - (void)updateFilteredViews
         if ([object isKindOfClass:[BRCEventObject class]]) {
             BRCEventObject *eventObject = (BRCEventObject*)object;
             BOOL eventHasEnded = eventObject.hasEnded;
-#warning eventMatchesTypeFilter filter won't work because containsObject compares pointers not values
-            //BOOL eventMatchesTypeFilter = [filteredArray containsObject:@(eventObject.eventType)];
-            if (showExpiredEvents) {
-                return YES;
-            } else {
-                return !eventHasEnded;
+            BOOL eventMatchesTypeFilter = [filteredArray containsObject:@(eventObject.eventType)];
+
+            if ((eventMatchesTypeFilter || [filteredArray count] == 0)) {
+                if (showExpiredEvents) {
+                    return YES;
+                } else {
+                    return !eventHasEnded;
+                }
             }
+
         }
         return NO;
     };