iOS10以下で画像・動画の保存に失敗する件の修正。

Author: TakayukiHoshi1984

dConnectDevicePlugin/dConnectDeviceHost/dConnectDeviceHost/Classes/profile/DPHostMediaStreamRecording/Recorders/DPHostStreamRecorder.m

@@ -225,26 +225,18 @@ - (void)saveMovieFileForCompletionHandler:(void (^)(NSURL *assetURL, NSError *er
                  return;
              }
              __block NSURL *fileUrl = self.writer.outputURL;
-             __block NSString *localId = nil;
-             PHFetchResult *collectonResuts = [PHCollectionList fetchTopLevelUserCollectionsWithOptions:nil];
-             __block PHAssetCollection *assetCollection = nil;
-             [collectonResuts enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
-                 assetCollection = obj;
-             }];
+             __block PHObjectPlaceholder *placeHolder;
              [[PHPhotoLibrary sharedPhotoLibrary] performChanges:^{
                  PHAssetChangeRequest *assetRequest = [PHAssetChangeRequest creationRequestForAssetFromVideoAtFileURL:fileUrl];
-                 PHAssetCollectionChangeRequest *collectonRequest = [PHAssetCollectionChangeRequest changeRequestForAssetCollection:assetCollection];
-                 PHObjectPlaceholder *placeHolder = [assetRequest placeholderForCreatedAsset];
-                 [collectonRequest addAssets:@[placeHolder]];
-                 localId = placeHolder.localIdentifier;
+                 placeHolder = [assetRequest placeholderForCreatedAsset];
              }   completionHandler:^(BOOL success, NSError *error) {
                  if (error) {
                      completionHandler(nil, [DPHostUtils throwsErrorCode:DConnectMessageErrorCodeUnknown message:error.localizedDescription]);
                      return;
                  }
                  NSError *err = nil;
                  [[NSFileManager defaultManager] removeItemAtURL:fileUrl error:&err];
-                 completionHandler([NSURL URLWithString:localId], err);
+                 completionHandler([NSURL URLWithString:placeHolder.localIdentifier], err);
              }];
          }];
     };

dConnectDevicePlugin/dConnectDeviceHost/dConnectDeviceHost/Classes/profile/DPHostMediaStreamRecording/Recorders/Photo/DPHostCameraRecorder.m

@@ -287,9 +287,9 @@ __block void (^takephotoBlock) (void) = ^(void){
              NSData* imageData = UIImageJPEGRepresentation(fixJpeg, 1.0f);
              CGImageSourceRef fixSource = CGImageSourceCreateWithData((__bridge CFDataRef) imageData, NULL);
              NSString *tmpName = NSProcessInfo.processInfo.globallyUniqueString;
-             __block NSURL *tmpUrl = [NSURL URLWithString:[NSString stringWithFormat:@"file://%@%@.jpg", NSTemporaryDirectory(), tmpName]];
-             
+             __block NSURL *tmpUrl = [NSURL URLWithString:[NSString stringWithFormat:@"file://%@%@.jpeg", NSTemporaryDirectory(), tmpName]];
              CGImageDestinationRef destination = CGImageDestinationCreateWithURL((__bridge CFURLRef) tmpUrl, kUTTypeJPEG, 1, nil);
+
              CGImageDestinationAddImageFromSource(destination, fixSource, 0, (__bridge CFDictionaryRef) meta);
              CGImageDestinationFinalize(destination);
              if (source) {
@@ -301,28 +301,19 @@ __block void (^takephotoBlock) (void) = ^(void){
              if (destination) {
                  CFRelease(destination);
              }
-             __block NSString *localId = nil;
-             PHFetchResult *collectonResuts = [PHCollectionList fetchTopLevelUserCollectionsWithOptions:nil];
-             __block PHAssetCollection *assetCollection = nil;
-             [collectonResuts enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
-                 assetCollection = obj;
-             }];
-             
+             __block PHObjectPlaceholder *placeHolder;
              [[PHPhotoLibrary sharedPhotoLibrary] performChanges:^{
                  PHAssetChangeRequest *assetRequest = [PHAssetChangeRequest creationRequestForAssetFromImageAtFileURL:tmpUrl];
-                 PHAssetCollectionChangeRequest *collectonRequest = [PHAssetCollectionChangeRequest changeRequestForAssetCollection:assetCollection];
-                 PHObjectPlaceholder *placeHolder = [assetRequest placeholderForCreatedAsset];
-                 [collectonRequest addAssets:@[placeHolder]];
-                 localId = placeHolder.localIdentifier;
+                 placeHolder = [assetRequest placeholderForCreatedAsset];
              }   completionHandler:^(BOOL success, NSError *error) {
-                 if (error) {
+                 if (!success) {
                      err = [DPHostUtils throwsErrorCode:DConnectMessageErrorCodeUnknown message:error.localizedDescription];
                      completionHandler(nil, err);
                      return;
                  }
                  [[NSFileManager defaultManager] removeItemAtURL:tmpUrl error:&err];
 
-                 completionHandler([NSURL URLWithString:localId], err);
+                 completionHandler([NSURL URLWithString:placeHolder.localIdentifier], err);
              }];
 
          }];