Revision 3a8071d4 Classes/StorageObjectViewController.m
b/Classes/StorageObjectViewController.m | ||
---|---|---|
648 | 648 |
#pragma mark Action Sheet Delegate |
649 | 649 |
|
650 | 650 |
- (void)deleteObjectRow { |
651 |
[self.folder.objects removeObjectForKey:self.object.name]; |
|
651 | 652 |
[self.folderViewController.tableView deleteRowsAtIndexPaths:[NSArray arrayWithObject:selectedIndexPath] withRowAnimation:UITableViewRowAnimationLeft]; |
652 | 653 |
} |
653 | 654 |
|
... | ... | |
657 | 658 |
// delete the file and pop out |
658 | 659 |
|
659 | 660 |
NSString *activityMessage = @"Deleting file"; |
660 |
|
|
661 |
[activityIndicatorView release]; |
|
661 | 662 |
activityIndicatorView = [[ActivityIndicatorView alloc] initWithFrame:[ActivityIndicatorView frameForText:activityMessage] text:activityMessage]; |
662 | 663 |
[activityIndicatorView addToView:self.view]; |
663 | 664 |
|
664 | 665 |
|
665 | 666 |
[[self.account.manager deleteObject:self.container object:self.object] |
666 | 667 |
success:^(OpenStackRequest *request) { |
667 |
[activityIndicatorView removeFromSuperviewAndRelease];
|
|
668 |
[activityIndicatorView removeFromSuperview]; |
|
668 | 669 |
performingAction = NO; |
669 |
[self.folder.objects removeObjectForKey:self.object.name]; |
|
670 |
|
|
671 | 670 |
if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone) { |
672 | 671 |
[self.navigationController popViewControllerAnimated:YES]; |
673 | 672 |
if (account.shared) |
... | ... | |
676 | 675 |
if (!account.shared) |
677 | 676 |
[self.folderViewController setDetailViewController]; |
678 | 677 |
else |
679 |
if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) |
|
680 |
[self.folderViewController refreshButtonPressed:nil]; |
|
678 |
[self.folderViewController refreshButtonPressed:nil]; |
|
681 | 679 |
} |
680 |
if (self.folder.objects.count == 1) |
|
681 |
[self.folder.objects removeObjectForKey:self.object.name]; |
|
682 | 682 |
|
683 | 683 |
if ([self.folder.objects count] + [self.folder.folders count] == 0) { |
684 | 684 |
[self.folderViewController.tableView reloadData]; |
... | ... | |
688 | 688 |
} |
689 | 689 |
} |
690 | 690 |
failure:^(OpenStackRequest *request) { |
691 |
[activityIndicatorView removeFromSuperviewAndRelease];
|
|
691 |
[activityIndicatorView removeFromSuperview]; |
|
692 | 692 |
[self hideToolbarActivityMessage]; |
693 | 693 |
performingAction = NO; |
694 | 694 |
[self alert:@"There was a problem deleting this file." request:request]; |
... | ... | |
758 | 758 |
else { |
759 | 759 |
object.publicURI = @"TRUE"; |
760 | 760 |
} |
761 |
|
|
761 |
[activityIndicatorView release]; |
|
762 | 762 |
activityIndicatorView = [[ActivityIndicatorView alloc] initWithFrame:[ActivityIndicatorView frameForText:activityMessage] text:activityMessage]; |
763 | 763 |
[activityIndicatorView addToView:self.view scrollOffset:self.tableView.contentOffset.y]; |
764 | 764 |
|
... | ... | |
769 | 769 |
if (objectIsPublic) { |
770 | 770 |
[[self.account.manager getObjectInfo:container object:object version:versionID] |
771 | 771 |
success:^(OpenStackRequest *request) { |
772 |
[activityIndicatorView removeFromSuperviewAndRelease];
|
|
772 |
[activityIndicatorView removeFromSuperview]; |
|
773 | 773 |
object.publicURI = [request.responseHeaders objectForKey:@"X-Object-Public"]; |
774 | 774 |
NSIndexPath *publicURICellIndexPath = [NSIndexPath indexPathForRow:1 inSection:publicLinkSection]; |
775 | 775 |
[self.tableView insertRowsAtIndexPaths:[NSArray arrayWithObject:publicURICellIndexPath] |
776 | 776 |
withRowAnimation:UITableViewRowAnimationBottom]; |
777 | 777 |
} |
778 | 778 |
failure:^(OpenStackRequest *request) { |
779 |
[activityIndicatorView removeFromSuperviewAndRelease];
|
|
779 |
[activityIndicatorView removeFromSuperview]; |
|
780 | 780 |
[self alert:@"There was a problem retrieving the public link from the server." request:request]; |
781 | 781 |
}]; |
782 | 782 |
} |
783 | 783 |
else { |
784 |
[activityIndicatorView removeFromSuperviewAndRelease];
|
|
784 |
[activityIndicatorView removeFromSuperview]; |
|
785 | 785 |
[self.tableView deleteRowsAtIndexPaths:[NSArray arrayWithObject:publicURICellIndexPath] |
786 | 786 |
withRowAnimation:UITableViewRowAnimationTop]; |
787 | 787 |
} |
788 | 788 |
} |
789 | 789 |
failure:^(OpenStackRequest *request) { |
790 |
[activityIndicatorView removeFromSuperviewAndRelease];
|
|
790 |
[activityIndicatorView removeFromSuperview]; |
|
791 | 791 |
objectIsPublic = !objectIsPublic; |
792 | 792 |
objectIsPublicSwitch.on = !objectIsPublicSwitch.on; |
793 | 793 |
object.publicURI = oldPubicURI; |
... | ... | |
817 | 817 |
[documentInteractionController release]; |
818 | 818 |
[actionSelectedIndexPath release]; |
819 | 819 |
[versionID release]; |
820 |
|
|
820 |
[activityIndicatorView release]; |
|
821 | 821 |
[super dealloc]; |
822 | 822 |
} |
823 | 823 |
|
... | ... | |
826 | 826 |
|
827 | 827 |
- (void)reloadMetadataSection { |
828 | 828 |
NSString *activityMessage = @"Loading metadata..."; |
829 |
[activityIndicatorView release]; |
|
829 | 830 |
activityIndicatorView = [[ActivityIndicatorView alloc] initWithFrame:[ActivityIndicatorView frameForText:activityMessage] text:activityMessage]; |
830 | 831 |
[activityIndicatorView addToView:self.view]; |
831 | 832 |
[[self.account.manager getObjectInfo:container object:object version:versionID] |
832 | 833 |
success:^(OpenStackRequest *request) { |
833 |
[activityIndicatorView removeFromSuperviewAndRelease];
|
|
834 |
[activityIndicatorView removeFromSuperview];
|
|
834 | 835 |
object.metadata = [NSMutableDictionary dictionary]; |
835 | 836 |
for (NSString *header in request.responseHeaders) { |
836 | 837 |
NSString *metadataKey; |
837 | 838 |
NSString *metadataValue; |
838 | 839 |
if ([header rangeOfString:@"X-Object-Meta-"].location != NSNotFound) { |
839 |
metadataKey = [header substringFromIndex:14];
|
|
840 |
metadataValue = [request.responseHeaders objectForKey:header];
|
|
840 |
metadataKey = [NSString decodeFromPercentEscape:[header substringFromIndex:14]];
|
|
841 |
metadataValue = [NSString decodeFromPercentEscape:[request.responseHeaders objectForKey:header]];
|
|
841 | 842 |
[object.metadata setObject:metadataValue forKey:metadataKey]; |
842 | 843 |
} |
843 | 844 |
} |
... | ... | |
845 | 846 |
[self.tableView reloadSections:metadataSections withRowAnimation:UITableViewRowAnimationFade]; |
846 | 847 |
} |
847 | 848 |
failure:^(OpenStackRequest *request) { |
848 |
[activityIndicatorView removeFromSuperviewAndRelease];
|
|
849 |
[activityIndicatorView removeFromSuperview]; |
|
849 | 850 |
[self alert:@"There was a problem retrieving the object's metadata." request:request]; |
850 | 851 |
}]; |
851 | 852 |
} |
Also available in: Unified diff