Skip to content

Fixed crash in case if allowedFileTypes is not empty #30

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
undersun81 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixed crash in case if allowedFileTypes is not empty #30

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
787c95a
Fixed crash in case if allowedFileTypes is not empty
undersun81 Aug 4, 2017
1cbcc05
sort by file name
undersun81 Aug 25, 2017
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
16 changes: 14 additions & 2 deletions ODB Classes/ODBTableViewController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,11 +183,23 @@ - (BOOL)listDirectoryAtPath:(NSString *)path {
if (files) {
self.currentFiles = nil;
self.currentFiles = [NSMutableArray arrayWithCapacity:files.count];
for (NSString *file in files) {
if (self.allowedFileTypes.count == 0 || [self.allowedFileTypes containsObject:[file pathExtension]]) {
for (NSDictionary *file in files) {
BOOL isFolder = [file[ODBFileKeys.kDropboxFileType] isEqualToString: ODBFileKeys.kDropboxFileTypeFolder];
NSString* fileExtension = [file[ODBFileKeys.kDropboxFileName] pathExtension];
Copy link
Copy Markdown

@iceman201 iceman201 May 15, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think only

                for (NSDictionary *file in files) {
                    if (self.allowedFileTypes.count == 0 || [self.allowedFileTypes containsObject:[file valueForKey:@"type"]]) {
                        [self.currentFiles addObject:file];
                    }
                }

would work

if (self.allowedFileTypes.count == 0 || isFolder || [self.allowedFileTypes containsObject:fileExtension]) {
[self.currentFiles addObject:file];
}
}

// Sort by file name
[self.currentFiles sortUsingComparator: ^NSComparisonResult(id obj1, id obj2) {
NSDictionary* file1 = (NSDictionary*)obj1;
NSDictionary* file2 = (NSDictionary*)obj2;

NSString* name1 = file1[ODBFileKeys.kDropboxFileName];
NSString* name2 = file2[ODBFileKeys.kDropboxFileName];
return [name1 compare: name2 options:NSCaseInsensitiveSearch];
}];

[self refreshTable];
} else {
Expand Down