|
@@ -1424,11 +1424,7 @@
|
|
completion(nil, nil);
|
|
completion(nil, nil);
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
- if ([[NCManageDatabase sharedInstance] getAccountWithPredicate:[NSPredicate predicateWithFormat:@"account == %@", metadata.account]] == nil) {
|
|
|
|
- completion(nil, nil);
|
|
|
|
- return;
|
|
|
|
- }
|
|
|
|
- NSString *ocId = metadata.ocId;
|
|
|
|
|
|
+ tableMetadata *newMetadata = [[NCManageDatabase sharedInstance] copyObjectWithMetadata:metadata];
|
|
|
|
|
|
PHFetchResult *result = [PHAsset fetchAssetsWithLocalIdentifiers:@[metadata.assetLocalIdentifier] options:nil];
|
|
PHFetchResult *result = [PHAsset fetchAssetsWithLocalIdentifiers:@[metadata.assetLocalIdentifier] options:nil];
|
|
if (!result.count) {
|
|
if (!result.count) {
|
|
@@ -1482,12 +1478,6 @@
|
|
|
|
|
|
[[PHImageManager defaultManager] requestImageDataForAsset:asset options:options resultHandler:^(NSData *imageData, NSString *dataUTI, UIImageOrientation orientation, NSDictionary *info) {
|
|
[[PHImageManager defaultManager] requestImageDataForAsset:asset options:options resultHandler:^(NSData *imageData, NSString *dataUTI, UIImageOrientation orientation, NSDictionary *info) {
|
|
|
|
|
|
- tableMetadata *newMetadata = metadata;
|
|
|
|
- tableMetadata *metadataTmp = [[NCManageDatabase sharedInstance] getMetadataWithPredicate:[NSPredicate predicateWithFormat:@"ocId == %@", ocId]];
|
|
|
|
- if (metadataTmp != nil) {
|
|
|
|
- newMetadata = [[NCManageDatabase sharedInstance] copyObjectWithMetadata:metadataTmp];
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
NSError *error = nil;
|
|
NSError *error = nil;
|
|
NSString *extensionAsset = [[[asset valueForKey:@"filename"] pathExtension] uppercaseString];
|
|
NSString *extensionAsset = [[[asset valueForKey:@"filename"] pathExtension] uppercaseString];
|
|
NSString *fileName = metadata.fileNameView;
|
|
NSString *fileName = metadata.fileNameView;
|
|
@@ -1548,12 +1538,6 @@
|
|
|
|
|
|
if ([asset isKindOfClass:[AVURLAsset class]]) {
|
|
if ([asset isKindOfClass:[AVURLAsset class]]) {
|
|
|
|
|
|
- tableMetadata *newMetadata = metadata;
|
|
|
|
- tableMetadata *metadataTmp = [[NCManageDatabase sharedInstance] getMetadataWithPredicate:[NSPredicate predicateWithFormat:@"ocId == %@", ocId]];
|
|
|
|
- if (metadataTmp != nil) {
|
|
|
|
- newMetadata = [[NCManageDatabase sharedInstance] copyObjectWithMetadata:metadataTmp];
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
NSString *fileNamePath = [NSTemporaryDirectory() stringByAppendingString:newMetadata.fileNameView];
|
|
NSString *fileNamePath = [NSTemporaryDirectory() stringByAppendingString:newMetadata.fileNameView];
|
|
NSURL *fileNamePathURL = [[NSURL alloc] initFileURLWithPath:fileNamePath];
|
|
NSURL *fileNamePathURL = [[NSURL alloc] initFileURLWithPath:fileNamePath];
|
|
NSError *error = nil;
|
|
NSError *error = nil;
|