Fix filenames when sending as file

This commit is contained in:
Ilya Laktyushin
2019-11-05 17:18:44 +04:00
parent c173c66e37
commit b93aa41ee9
2 changed files with 15 additions and 4 deletions

View File

@@ -135,11 +135,19 @@
- (NSString *)fileName
{
if (self.backingAsset != nil)
return [self.backingAsset valueForKey:@"filename"];
else if (self.backingLegacyAsset != nil)
if (self.backingAsset != nil) {
NSString *fileName = [self.backingAsset valueForKey:@"filename"];
if (fileName == nil) {
NSArray *resources = [PHAssetResource assetResourcesForAsset:self.backingAsset];
PHAssetResource *resource = resources.firstObject;
if (resource != nil) {
fileName = resource.originalFilename;
}
}
return fileName;
} else if (self.backingLegacyAsset != nil) {
return self.backingLegacyAsset.defaultRepresentation.filename;
}
return nil;
}

View File

@@ -295,6 +295,9 @@
if (!found)
fileName = asset.fileName;
}
if (fileName == nil) {
fileName = asset.fileName;
}
if (iosMajorVersion() >= 10 && [dataUTI rangeOfString:@"heic"].location != NSNotFound)
{