Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix handling of deleted photos on iOS #1556

Merged
merged 3 commits into from
Nov 13, 2023
Merged

Fix handling of deleted photos on iOS #1556

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7217b9c
Fix crash on iOS when images are deleted
brsaylor2 Mar 16, 2021
5fb496d
Update selection when assets are removed from collection
brsaylor2 Mar 17, 2021
dd79a0f
Update counts in footer when collection changes
brsaylor2 Mar 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
133 changes: 89 additions & 44 deletions ios/QBImagePicker/QBImagePicker/QBAssetsViewController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,15 +417,31 @@ - (void)photoLibraryDidChange:(PHChange *)changeInstance
if ([insertedIndexes count]) {
[self.collectionView insertItemsAtIndexPaths:[insertedIndexes qb_indexPathsFromIndexesWithSection:0]];
}

NSIndexSet *changedIndexes = [collectionChanges changedIndexes];
if ([changedIndexes count]) {
[self.collectionView reloadItemsAtIndexPaths:[changedIndexes qb_indexPathsFromIndexesWithSection:0]];
}
} completion:NULL];

NSIndexSet *changedIndexes = [collectionChanges changedIndexes];
if ([changedIndexes count]) {
[self.collectionView reloadItemsAtIndexPaths:[changedIndexes qb_indexPathsFromIndexesWithSection:0]];
}
}

[self resetCachedAssets];

// Update the selection to remove any assets that have been removed from the collection
NSMutableSet *removedAssets = [NSMutableSet new];
for (PHAsset *asset in self.imagePickerController.selectedAssets) {
if(![self.fetchResult containsObject:asset]) {
[removedAssets addObject:asset];
}
}
[self removeAssetsFromSelection:removedAssets];

// Update the footer to show the current photo/video counts
NSArray<UICollectionReusableView *> *footers =
[self.collectionView visibleSupplementaryViewsOfKind:UICollectionElementKindSectionFooter];
if (footers.count) {
[self updateFooterView:footers[0]];
}
}
});
}
Expand Down Expand Up @@ -507,57 +523,60 @@ - (UICollectionReusableView *)collectionView:(UICollectionView *)collectionView
UICollectionReusableView *footerView = [collectionView dequeueReusableSupplementaryViewOfKind:UICollectionElementKindSectionFooter
withReuseIdentifier:@"FooterView"
forIndexPath:indexPath];
[self updateFooterView:footerView];

// Number of assets
UILabel *label = (UILabel *)[footerView viewWithTag:1];
return footerView;
}

NSBundle *bundle = self.imagePickerController.assetBundle;
NSUInteger numberOfPhotos = [self.fetchResult countOfAssetsWithMediaType:PHAssetMediaTypeImage];
NSUInteger numberOfVideos = [self.fetchResult countOfAssetsWithMediaType:PHAssetMediaTypeVideo];
return nil;
}

switch (self.imagePickerController.mediaType) {
case QBImagePickerMediaTypeAny:
{
NSString *format;
if (numberOfPhotos == 1) {
if (numberOfVideos == 1) {
format = NSLocalizedStringFromTableInBundle(@"assets.footer.photo-and-video", @"QBImagePicker", bundle, nil);
} else {
format = NSLocalizedStringFromTableInBundle(@"assets.footer.photo-and-videos", @"QBImagePicker", bundle, nil);
}
} else if (numberOfVideos == 1) {
format = NSLocalizedStringFromTableInBundle(@"assets.footer.photos-and-video", @"QBImagePicker", bundle, nil);
- (void)updateFooterView:(UICollectionReusableView *)footerView {
// Number of assets
UILabel *label = (UILabel *)[footerView viewWithTag:1];

NSBundle *bundle = self.imagePickerController.assetBundle;
NSUInteger numberOfPhotos = [self.fetchResult countOfAssetsWithMediaType:PHAssetMediaTypeImage];
NSUInteger numberOfVideos = [self.fetchResult countOfAssetsWithMediaType:PHAssetMediaTypeVideo];

switch (self.imagePickerController.mediaType) {
case QBImagePickerMediaTypeAny:
{
NSString *format;
if (numberOfPhotos == 1) {
if (numberOfVideos == 1) {
format = NSLocalizedStringFromTableInBundle(@"assets.footer.photo-and-video", @"QBImagePicker", bundle, nil);
} else {
format = NSLocalizedStringFromTableInBundle(@"assets.footer.photos-and-videos", @"QBImagePicker", bundle, nil);
format = NSLocalizedStringFromTableInBundle(@"assets.footer.photo-and-videos", @"QBImagePicker", bundle, nil);
}

label.text = [NSString stringWithFormat:format, numberOfPhotos, numberOfVideos];
} else if (numberOfVideos == 1) {
format = NSLocalizedStringFromTableInBundle(@"assets.footer.photos-and-video", @"QBImagePicker", bundle, nil);
} else {
format = NSLocalizedStringFromTableInBundle(@"assets.footer.photos-and-videos", @"QBImagePicker", bundle, nil);
}
break;

case QBImagePickerMediaTypeImage:
{
NSString *key = (numberOfPhotos == 1) ? @"assets.footer.photo" : @"assets.footer.photos";
NSString *format = NSLocalizedStringFromTableInBundle(key, @"QBImagePicker", bundle, nil);

label.text = [NSString stringWithFormat:format, numberOfPhotos];
}
break;
label.text = [NSString stringWithFormat:format, numberOfPhotos, numberOfVideos];
}
break;

case QBImagePickerMediaTypeVideo:
{
NSString *key = (numberOfVideos == 1) ? @"assets.footer.video" : @"assets.footer.videos";
NSString *format = NSLocalizedStringFromTableInBundle(key, @"QBImagePicker", bundle, nil);
case QBImagePickerMediaTypeImage:
{
NSString *key = (numberOfPhotos == 1) ? @"assets.footer.photo" : @"assets.footer.photos";
NSString *format = NSLocalizedStringFromTableInBundle(key, @"QBImagePicker", bundle, nil);

label.text = [NSString stringWithFormat:format, numberOfVideos];
}
break;
label.text = [NSString stringWithFormat:format, numberOfPhotos];
}
break;

return footerView;
}
case QBImagePickerMediaTypeVideo:
{
NSString *key = (numberOfVideos == 1) ? @"assets.footer.video" : @"assets.footer.videos";
NSString *format = NSLocalizedStringFromTableInBundle(key, @"QBImagePicker", bundle, nil);

return nil;
label.text = [NSString stringWithFormat:format, numberOfVideos];
}
break;
}
}


Expand Down Expand Up @@ -653,6 +672,32 @@ - (void)collectionView:(UICollectionView *)collectionView didDeselectItemAtIndex
}
}

- (void)removeAssetsFromSelection:(NSSet *)assets
{
if (assets.count == 0) {
return;
}

QBImagePickerController *imagePickerController = self.imagePickerController;
NSMutableOrderedSet *selectedAssets = imagePickerController.selectedAssets;

// Remove assets from set
[selectedAssets minusSet:assets];

self.lastSelectedItemIndexPath = nil;

[self updateDoneButtonState];

if (self.imagePickerController.showsNumberOfSelectedAssets) {
[self updateSelectionInfo];

if (selectedAssets.count == 0) {
// Hide toolbar
[self.navigationController setToolbarHidden:YES animated:YES];
}
}
}


#pragma mark - UICollectionViewDelegateFlowLayout

Expand Down