From 9740a18219f3844313b0cd21285c3a97795a9588 Mon Sep 17 00:00:00 2001
From: Christophe Deschamps <christophe.deschamps.work@gmail.com>
Date: Thu, 24 Feb 2022 15:57:21 +0100
Subject: [PATCH] Do not save photos and videos taken from Linphone if auto
 save to gallery is off

---
 Classes/ChatConversationView.m | 7 +++++--
 Classes/ImagePickerView.m      | 7 ++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/Classes/ChatConversationView.m b/Classes/ChatConversationView.m
index bf7d86be8..b7570c1c4 100644
--- a/Classes/ChatConversationView.m
+++ b/Classes/ChatConversationView.m
@@ -988,9 +988,11 @@ static UICompositeViewDescription *compositeDescription = nil;
 		});
 	}];
 	
-	if (![info valueForKey:UIImagePickerControllerReferenceURL]) {
+	BOOL saveToGallery = [ConfigManager.instance lpConfigBoolForKeyWithKey:@"auto_write_to_gallery_preference"];
+
+	if (![info valueForKey:UIImagePickerControllerReferenceURL] && saveToGallery) {
 			[self writeVideoToGallery:mediaURL];
-		}
+	}
 }
 
 + (void)writeMediaToGallery:(NSString *)name fileType:(NSString *)fileType {
@@ -1077,6 +1079,7 @@ static UICompositeViewDescription *compositeDescription = nil;
 }
 
 -(void) writeVideoToGallery:(NSURL *)url {
+	
 	NSString *localIdentifier;
 	PHFetchResult<PHAssetCollection *> *assetCollections = [PHAssetCollection fetchAssetCollectionsWithType:PHAssetCollectionTypeAlbum subtype:PHAssetCollectionSubtypeAlbumRegular options:nil];
 	for (PHAssetCollection *assetCollection in assetCollections) {
diff --git a/Classes/ImagePickerView.m b/Classes/ImagePickerView.m
index ab1850f74..41b49d666 100644
--- a/Classes/ImagePickerView.m
+++ b/Classes/ImagePickerView.m
@@ -183,13 +183,13 @@ static UICompositeViewDescription *compositeDescription = nil;
 				PHFetchResult<PHAsset *> *phFetchResult = [PHAsset fetchAssetsWithALAssetURLs:@[alassetURL] options:nil];
 				phasset = [phFetchResult firstObject];
 			}
-			
+			BOOL saveToGallery = [ConfigManager.instance lpConfigBoolForKeyWithKey:@"auto_write_to_gallery_preference"];
 			UIImage *image = [info objectForKey:UIImagePickerControllerEditedImage] ? [info objectForKey:UIImagePickerControllerEditedImage] : [info objectForKey:UIImagePickerControllerOriginalImage];
-			if (!phasset) {
+			if (!phasset && saveToGallery) {
 				[self writeImageToGallery:image];
 				return;
 			}
-			[self passImageToDelegate:image PHAssetId:[phasset localIdentifier]];
+			[self passImageToDelegate:image PHAssetId:saveToGallery ? [phasset localIdentifier] : nil];
 		}
 	});
 	
@@ -197,6 +197,7 @@ static UICompositeViewDescription *compositeDescription = nil;
 
 
 -(void) writeImageToGallery:(UIImage *)image {
+	
 	NSString *localIdentifier;
 	[SVProgressHUD show];