conform to FIRCollection

Author: morganchen12

FirebaseDatabaseUI/FUIArray.m

@@ -46,23 +46,20 @@ - (instancetype)initWithQuery:(FIRDatabaseQuery *)query {
     self.snapshots = [NSMutableArray array];
     self.query = query;
     self.handles = [NSMutableSet setWithCapacity:4];
-
-    [self initListeners];
   }
   return self;
 }
 
 #pragma mark - Memory management methods
 
 - (void)dealloc {
-  for (NSNumber *handle in _handles) {
-    [_query removeObserverWithHandle:handle.unsignedIntegerValue];
-  }
+  [self invalidate];
 }
 
 #pragma mark - Private API methods
 
-- (void)initListeners {
+- (void)observeQuery {
+  if (self.handles.count == 4) { /* don't duplicate observers */ return; }
   FIRDatabaseHandle handle;
   handle = [self.query observeEventType:FIRDataEventTypeChildAdded
       andPreviousSiblingKeyWithBlock:^(FIRDataSnapshot *snapshot, NSString *previousChildKey) {
@@ -144,6 +141,12 @@ - (void)initListeners {
   [_handles addObject:@(handle)];
 }
 
+- (void)invalidate {
+  for (NSNumber *handle in _handles) {
+    [_query removeObserverWithHandle:handle.unsignedIntegerValue];
+  }
+}
+
 - (NSUInteger)indexForKey:(NSString *)key {
   NSParameterAssert(key != nil);
 
@@ -165,7 +168,7 @@ - (NSUInteger)count {
   return [self.snapshots count];
 }
 
-- (FIRDataSnapshot *)objectAtIndex:(NSUInteger)index {
+- (FIRDataSnapshot *)snapshotAtIndex:(NSInteger)index {
   return (FIRDataSnapshot *)[self.snapshots objectAtIndex:index];
 }
 
@@ -174,7 +177,7 @@ - (FIRDatabaseReference *)refForIndex:(NSUInteger)index {
 }
 
 - (id)objectAtIndexedSubscript:(NSUInteger)index {
-  return [self objectAtIndex:index];
+  return [self snapshotAtIndex:index];
 }
 
 - (void)setObject:(id)obj atIndexedSubscript:(NSUInteger)index{

FirebaseDatabaseUI/FUICollection.h

@@ -38,6 +38,9 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (FIRDataSnapshot *)snapshotAtIndex:(NSInteger)index;
 
+- (void)observeQuery;
+- (void)invalidate;
+
 @end
 
 /**

FirebaseDatabaseUI/FUIDataSource.m

@@ -40,6 +40,7 @@ - (instancetype)initWithArray:(FUIArray *)array {
   if (self) {
     _array = array;
     _array.delegate = self;
+    [array observeQuery];
   }
   return self;
 }

FirebaseDatabaseUI/FUISortedArray.m

@@ -63,6 +63,7 @@ - (void)dealloc {
 }
 
 - (void)observeQuery {
+  if (self.handles.count == 4) { /* don't duplicate observers */ return; }
   FIRDatabaseHandle handle;
   handle = [self.query observeEventType:FIRDataEventTypeChildAdded
          andPreviousSiblingKeyWithBlock:^(FIRDataSnapshot *snapshot, NSString *previousChildKey) {