From 787c95a7052009aa095cac1ec809b32902085e3d Mon Sep 17 00:00:00 2001 From: Andrii Ianovskyi Date: Sat, 5 Aug 2017 01:50:35 +0300 Subject: [PATCH 1/2] Fixed crash in case if allowedFileTypes is not empty --- ODB Classes/ODBTableViewController.m | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ODB Classes/ODBTableViewController.m b/ODB Classes/ODBTableViewController.m index 9c4e239..2ae4d0a 100644 --- a/ODB Classes/ODBTableViewController.m +++ b/ODB Classes/ODBTableViewController.m @@ -183,8 +183,10 @@ - (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]; + if (self.allowedFileTypes.count == 0 || isFolder || [self.allowedFileTypes containsObject:fileExtension]) { [self.currentFiles addObject:file]; } } From 1cbcc05785c8ac9a26605cbf48619338b43474e3 Mon Sep 17 00:00:00 2001 From: Andrii Ianovskyi Date: Fri, 25 Aug 2017 22:59:21 +0300 Subject: [PATCH 2/2] sort by file name --- ODB Classes/ODBTableViewController.m | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/ODB Classes/ODBTableViewController.m b/ODB Classes/ODBTableViewController.m index 2ae4d0a..5da9407 100644 --- a/ODB Classes/ODBTableViewController.m +++ b/ODB Classes/ODBTableViewController.m @@ -190,6 +190,16 @@ - (BOOL)listDirectoryAtPath:(NSString *)path { [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 {