Merge pull request #625 from compositeprimes/master

Fix crash in NICollectionViewModel/TableViewModel
jverkoey · Sep 30, 2015 · 54d2146 · 54d2146
2 parents f052a33 + 3386b29
commit 54d2146
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 8 deletions.
diff --git a/src/collections/src/NICollectionViewModel+Private.h b/src/collections/src/NICollectionViewModel+Private.h
@@ -25,6 +25,7 @@
 - (void)_resetCompiledData;
 - (void)_compileDataWithListArray:(NSArray *)listArray;
 - (void)_compileDataWithSectionedArray:(NSArray *)sectionedArray;
+- (void)_setSectionsWithArray:(NSArray *)sectionsArray;
 
 @end
 

diff --git a/src/collections/src/NICollectionViewModel.m b/src/collections/src/NICollectionViewModel.m
@@ -59,7 +59,7 @@ - (id)init {
 
 
 - (void)_resetCompiledData {
-  self.sections = nil;
+  [self _setSectionsWithArray:nil];
   self.sectionIndexTitles = nil;
   self.sectionPrefixToSectionIndex = nil;
 }
@@ -70,7 +70,7 @@ - (void)_compileDataWithListArray:(NSArray *)listArray {
   if (nil != listArray) {
     NICollectionViewModelSection* section = [NICollectionViewModelSection section];
     section.rows = listArray;
-    self.sections = [NSArray arrayWithObject:section];
+    [self _setSectionsWithArray:@[ section ]];
   }
 }
 
@@ -132,7 +132,11 @@ - (void)_compileDataWithSectionedArray:(NSArray *)sectionedArray {
   currentSectionRows = nil;
 
   // Update the compiled information for this data source.
-  self.sections = sections;
+  [self _setSectionsWithArray:sections];
+}
+
+- (void)_setSectionsWithArray:(NSArray *)sectionsArray {
+  self.sections = sectionsArray;
 }
 
 #pragma mark - UICollectionViewDataSource

diff --git a/src/collections/src/NIMutableCollectionViewModel.m b/src/collections/src/NIMutableCollectionViewModel.m
@@ -121,6 +121,14 @@ - (NICollectionViewModelSection *)_insertSectionAtIndex:(NSUInteger)index {
   return section;
 }
 
+- (void)_setSectionsWithArray:(NSArray *)sectionsArray {
+  if ([sectionsArray isKindOfClass:[NSMutableArray class]]) {
+    self.sections = (NSMutableArray *)sectionsArray;
+  } else {
+    self.sections = [sectionsArray mutableCopy];
+  }
+}
+
 @end
 
 

diff --git a/src/models/src/NIMutableTableViewModel.m b/src/models/src/NIMutableTableViewModel.m
@@ -99,7 +99,7 @@ - (void)updateSectionIndex {
 
 - (NITableViewModelSection *)_appendSection {
   if (nil == self.sections) {
-    self.sections = [NSMutableArray array];
+    [self _setSectionsWithArray:[NSMutableArray array]];
   }
   NITableViewModelSection* section = nil;
   section = [[NITableViewModelSection alloc] init];
@@ -110,7 +110,7 @@ - (NITableViewModelSection *)_appendSection {
 
 - (NITableViewModelSection *)_insertSectionAtIndex:(NSUInteger)index {
   if (nil == self.sections) {
-    self.sections = [NSMutableArray array];
+    [self _setSectionsWithArray:[NSMutableArray array]];
   }
   NITableViewModelSection* section = nil;
   section = [[NITableViewModelSection alloc] init];
@@ -120,6 +120,14 @@ - (NITableViewModelSection *)_insertSectionAtIndex:(NSUInteger)index {
   return section;
 }
 
+- (void)_setSectionsWithArray:(NSArray *)sectionsArray {
+  if ([sectionsArray isKindOfClass:[NSMutableArray class]]) {
+    self.sections = (NSMutableArray *)sectionsArray;
+  } else {
+    self.sections = [sectionsArray mutableCopy];
+  }
+}
+
 #pragma mark - UITableViewDataSource
 
 

diff --git a/src/models/src/NITableViewModel+Private.h b/src/models/src/NITableViewModel+Private.h
@@ -26,6 +26,7 @@
 - (void)_compileDataWithListArray:(NSArray *)listArray;
 - (void)_compileDataWithSectionedArray:(NSArray *)sectionedArray;
 - (void)_compileSectionIndex;
+- (void)_setSectionsWithArray:(NSArray *)sectionsArray;
 
 @end
 

diff --git a/src/models/src/NITableViewModel.m b/src/models/src/NITableViewModel.m
@@ -65,7 +65,7 @@ - (id)init {
 
 
 - (void)_resetCompiledData {
-  self.sections = nil;
+  [self _setSectionsWithArray:nil];
   self.sectionIndexTitles = nil;
   self.sectionPrefixToSectionIndex = nil;
 }
@@ -76,7 +76,7 @@ - (void)_compileDataWithListArray:(NSArray *)listArray {
   if (nil != listArray) {
     NITableViewModelSection* section = [NITableViewModelSection section];
     section.rows = [listArray mutableCopy];
-    self.sections = [NSMutableArray arrayWithObject:section];
+    [self _setSectionsWithArray:@[ section ]];
   }
 }
 
@@ -138,7 +138,7 @@ - (void)_compileDataWithSectionedArray:(NSArray *)sectionedArray {
   currentSectionRows = nil;
 
   // Update the compiled information for this data source.
-  self.sections = sections;
+  [self _setSectionsWithArray:sections];
 }
 
 - (void)_compileSectionIndex {
@@ -222,6 +222,10 @@ - (void)_compileSectionIndex {
   self.sectionPrefixToSectionIndex = sectionPrefixToSectionIndex;
 }
 
+- (void)_setSectionsWithArray:(NSArray *)sectionsArray {
+  self.sections = sectionsArray;
+}
+
 #pragma mark - UITableViewDataSource