From a8f065f2a17cd1f5d208dae6bd0258159d434dca Mon Sep 17 00:00:00 2001 From: Fan Liu Date: Sun, 26 Oct 2014 03:50:58 +0800 Subject: [PATCH] Change the CalendarUnit for iOS 8.0 --- SSZipArchive/SSZipArchive.m | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/SSZipArchive/SSZipArchive.m b/SSZipArchive/SSZipArchive.m index f900339e..d73700f5 100644 --- a/SSZipArchive/SSZipArchive.m +++ b/SSZipArchive/SSZipArchive.m @@ -378,7 +378,11 @@ - (BOOL)open { - (void)zipInfo:(zip_fileinfo*)zipInfo setDate:(NSDate*)date { NSCalendar *currentCalendar = [NSCalendar currentCalendar]; +#ifdef __IPHONE_8_0 + uint flags = NSCalendarUnitYear | NSCalendarUnitMonth | NSCalendarUnitDay | NSCalendarUnitHour | NSCalendarUnitMinute | NSCalendarUnitSecond; +#else uint flags = NSYearCalendarUnit | NSMonthCalendarUnit | NSDayCalendarUnit | NSHourCalendarUnit | NSMinuteCalendarUnit | NSSecondCalendarUnit; +#endif NSDateComponents *components = [currentCalendar components:flags fromDate:date]; zipInfo->tmz_date.tm_sec = (unsigned int)components.second; zipInfo->tmz_date.tm_min = (unsigned int)components.minute; @@ -506,7 +510,11 @@ + (NSDate *)_dateWithMSDOSFormat:(UInt32)msdosDateTime { static NSCalendar *gregorian; static dispatch_once_t onceToken; dispatch_once(&onceToken, ^{ - gregorian = [[NSCalendar alloc] initWithCalendarIdentifier:NSGregorianCalendar]; +#ifdef __IPHONE_8_0 + gregorian = [[NSCalendar alloc] initWithCalendarIdentifier:NSCalendarIdentifierGregorian]; +#else + gregorian = [[NSCalendar alloc] initWithCalendarIdentifier:NSGregorianCalendar]; +#endif }); NSDateComponents *components = [[NSDateComponents alloc] init];