Skip to content

BUG: Fix possible nil excpetion #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
allenhuang wants to merge 1 commit into
base: master
Choose a base branch
from
Open

BUG: Fix possible nil excpetion #24

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 29 additions & 29 deletions STCollapseTableView/STCollapseTableView.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ - (void)setupCollapseTableView

- (void)setDataSource:(id <UITableViewDataSource>)newDataSource
{
if (newDataSource != self.collapseDataSource)
if (newDataSource && newDataSource != self.collapseDataSource)
{
self.collapseDataSource = newDataSource;
[self.sectionsStates removeAllObjects];
Expand All @@ -91,7 +91,7 @@ - (void)setDataSource:(id <UITableViewDataSource>)newDataSource

- (void)setDelegate:(id<UITableViewDelegate>)newDelegate
{
if (newDelegate != self.collapseDelegate)
if (newDelegate && newDelegate != self.collapseDelegate)
{
self.collapseDelegate = newDelegate;
[super setDelegate:self.collapseDelegate?self:nil];
Expand All @@ -117,7 +117,7 @@ - (BOOL)respondsToSelector:(SEL)aSelector
{
return [self.collapseDelegate respondsToSelector:aSelector];
}

return [super respondsToSelector:aSelector] || [self.collapseDataSource respondsToSelector:aSelector] || [self.collapseDelegate respondsToSelector:aSelector];
}

Expand All @@ -127,27 +127,27 @@ - (void)openSection:(NSUInteger)sectionIndex animated:(BOOL)animated
{
return;
}

if ([[self.sectionsStates objectAtIndex:sectionIndex] boolValue])
{
return;
}

if (self.exclusiveSections)
{
NSUInteger openedSection = [self openedSection];

[self setSectionAtIndex:sectionIndex open:YES];
[self setSectionAtIndex:openedSection open:NO];

if(animated)
{
NSArray* indexPathsToInsert = [self indexPathsForRowsInSectionAtIndex:sectionIndex];
NSArray* indexPathsToDelete = [self indexPathsForRowsInSectionAtIndex:openedSection];

UITableViewRowAnimation insertAnimation;
UITableViewRowAnimation deleteAnimation;

if (openedSection == NSNotFound || sectionIndex < openedSection)
{
insertAnimation = UITableViewRowAnimationTop;
Expand All @@ -158,7 +158,7 @@ - (void)openSection:(NSUInteger)sectionIndex animated:(BOOL)animated
insertAnimation = UITableViewRowAnimationBottom;
deleteAnimation = UITableViewRowAnimationTop;
}

[self beginUpdates];
[self insertRowsAtIndexPaths:indexPathsToInsert withRowAnimation:insertAnimation];
[self deleteRowsAtIndexPaths:indexPathsToDelete withRowAnimation:deleteAnimation];
Expand All @@ -172,7 +172,7 @@ - (void)openSection:(NSUInteger)sectionIndex animated:(BOOL)animated
else
{
[self setSectionAtIndex:sectionIndex open:YES];

if (animated)
{
NSArray* indexPathsToInsert = [self indexPathsForRowsInSectionAtIndex:sectionIndex];
Expand All @@ -188,7 +188,7 @@ - (void)openSection:(NSUInteger)sectionIndex animated:(BOOL)animated
- (void)closeSection:(NSUInteger)sectionIndex animated:(BOOL)animated
{
[self setSectionAtIndex:sectionIndex open:NO];

if (animated)
{
NSArray* indexPathsToDelete = [self indexPathsForRowsInSectionAtIndex:sectionIndex];
Expand All @@ -206,9 +206,9 @@ - (void)toggleSection:(NSUInteger)sectionIndex animated:(BOOL)animated
{
return;
}

BOOL sectionIsOpen = [[self.sectionsStates objectAtIndex:sectionIndex] boolValue];

if (sectionIsOpen)
{
[self closeSection:sectionIndex animated:animated];
Expand All @@ -231,11 +231,11 @@ - (BOOL)isOpenSection:(NSUInteger)sectionIndex
- (void)setExclusiveSections:(BOOL)exclusiveSections
{
_exclusiveSections = exclusiveSections;

if (self.exclusiveSections)
{
NSInteger firstSection = NSNotFound;

for (NSUInteger index = 0 ; index < [self.sectionsStates count] ; index++)
{
if ([[self.sectionsStates objectAtIndex:index] boolValue])
Expand Down Expand Up @@ -272,17 +272,17 @@ - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger
- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
{
int nbSection = [self.collapseDataSource numberOfSectionsInTableView:tableView];

while (nbSection < [self.sectionsStates count])
{
[self.sectionsStates removeLastObject];
}

while (nbSection > [self.sectionsStates count])
{
[self.sectionsStates addObject:@NO];
}

return nbSection;
}

Expand All @@ -291,7 +291,7 @@ - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
- (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section
{
UIView* view = [self.collapseDelegate tableView:tableView viewForHeaderInSection:section];

if (self.shouldHandleHeadersTap)
{
NSArray* gestures = view.gestureRecognizers;
Expand All @@ -304,14 +304,14 @@ - (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger
break;
}
}

if (!tapGestureFound)
{
[view setTag:section];
[view addGestureRecognizer:[[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(handleTapGesture:)]];
}
}

return view;
}

Expand All @@ -332,16 +332,16 @@ - (NSArray*)indexPathsForRowsInSectionAtIndex:(NSUInteger)sectionIndex
{
return nil;
}

NSInteger numberOfRows = [self.collapseDataSource tableView:self numberOfRowsInSection:sectionIndex];

NSMutableArray* array = [[NSMutableArray alloc] init];

for (int i = 0 ; i < numberOfRows ; i++)
{
[array addObject:[NSIndexPath indexPathForRow:i inSection:sectionIndex]];
}

return array;
}

Expand All @@ -351,7 +351,7 @@ - (void)setSectionAtIndex:(NSUInteger)sectionIndex open:(BOOL)open
{
return;
}

[self.sectionsStates replaceObjectAtIndex:sectionIndex withObject:@(open)];
}

Expand All @@ -361,15 +361,15 @@ - (NSUInteger)openedSection
{
return NSNotFound;
}

for (NSUInteger index = 0 ; index < [self.sectionsStates count] ; index++)
{
if ([[self.sectionsStates objectAtIndex:index] boolValue])
{
return index;
}
}

return NSNotFound;
}

Expand Down