Replace use of NSData API deprecated in iOS 8

indragiek · indragiek · commit 1ac9a4d9d46a · 2014-10-13T23:48:32.000-06:00
-[NSData dataWithContentsOfMappedFile:] was deprecated in iOS 8.
-[NSData dataWithContentsOfURL:options:error] with
NSDataReadingMappedIfSafe has been around since iOS 5, so this is a
backward compatible change.
diff --git a/FastImageCache/FICImageTable.m b/FastImageCache/FICImageTable.m
@@ -507,7 +507,7 @@ - (BOOL)canAccessEntryData {
                 _canAccessData = YES;
             } else {
                 // we are locked, so try to access data.
-                _canAccessData = [NSData dataWithContentsOfMappedFile:_filePath] != nil;
+                _canAccessData = [NSData dataWithContentsOfURL:[NSURL fileURLWithPath:_filePath] options:NSDataReadingMappedAlways error:NULL] != nil;
             }
         }
     }
@@ -687,7 +687,7 @@ - (void)saveMetadata {
 
 - (void)_loadMetadata {
     NSString *metadataFilePath = [[_filePath stringByDeletingPathExtension] stringByAppendingPathExtension:FICImageTableMetadataFileExtension];
-    NSData *metadataData = [NSData dataWithContentsOfMappedFile:metadataFilePath];
+    NSData *metadataData = [NSData dataWithContentsOfURL:[NSURL fileURLWithPath:metadataFilePath] options:NSDataReadingMappedAlways error:nil];
     if (metadataData != nil) {
         NSDictionary *metadataDictionary = (NSDictionary *)[NSPropertyListSerialization propertyListWithData:metadataData options:0 format:NULL error:NULL];
         NSDictionary *formatDictionary = [metadataDictionary objectForKey:FICImageTableFormatKey];

Original file line number	Diff line number	Diff line change
`@@ -507,7 +507,7 @@ - (BOOL)canAccessEntryData {`
`507`	`507`	`_canAccessData = YES;`
`508`	`508`	`} else {`
`509`	`509`	`// we are locked, so try to access data.`
`510`		`- _canAccessData = [NSData dataWithContentsOfMappedFile:_filePath] != nil;`
	`510`	`+ _canAccessData = [NSData dataWithContentsOfURL:[NSURL fileURLWithPath:_filePath] options:NSDataReadingMappedAlways error:NULL] != nil;`
`511`	`511`	`}`
`512`	`512`	`}`
`513`	`513`	`}`
`@@ -687,7 +687,7 @@ - (void)saveMetadata {`
`687`	`687`
`688`	`688`	`- (void)_loadMetadata {`
`689`	`689`	`NSString *metadataFilePath = [[_filePath stringByDeletingPathExtension] stringByAppendingPathExtension:FICImageTableMetadataFileExtension];`
`690`		`- NSData *metadataData = [NSData dataWithContentsOfMappedFile:metadataFilePath];`
	`690`	`+ NSData *metadataData = [NSData dataWithContentsOfURL:[NSURL fileURLWithPath:metadataFilePath] options:NSDataReadingMappedAlways error:nil];`
`691`	`691`	`if (metadataData != nil) {`
`692`	`692`	`NSDictionary metadataDictionary = (NSDictionary )[NSPropertyListSerialization propertyListWithData:metadataData options:0 format:NULL error:NULL];`
`693`	`693`	`NSDictionary *formatDictionary = [metadataDictionary objectForKey:FICImageTableFormatKey];`