Revision ef74c42f Classes/FolderViewController.m

b/Classes/FolderViewController.m
747 747 
- (void)refreshButtonPressed:(id)sender {
748 748 
    __block ActivityIndicatorView *activityIndicatorView = [ActivityIndicatorView activityIndicatorViewWithText:@"Loading..."
749 749 
                                                                                                   andAddToView:self.view];
750 
    [self.account.manager getObjects:self.container];
751 
    successObserver = [[NSNotificationCenter defaultCenter] addObserverForName:@"getObjectsSucceeded"
752 
                                                                        object:self.container
753 
                                                                         queue:[NSOperationQueue mainQueue]
754 
                                                                    usingBlock:^(NSNotification* notification)
755 
    {
750 
    [[self.account.manager getObjects:self.container] success:^(OpenStackRequest *request) {
756 751 
        [activityIndicatorView stopAnimatingAndRemoveFromSuperview];
757 752 
        [self reloadFolderViewControllers];
758 753 
        if ([UIDevice currentDevice].userInterfaceIdiom == UIUserInterfaceIdiomPad) {
759 
           if (self.selectedObjectViewController) {
760 
               [self.selectedObjectViewController reloadMetadataSection];
761 
           } else if ([self.folder isEqual:container.rootFolder]) {
762 
               [containersViewController.containerDetailViewController reloadMetadataSection];
763 
           } else if ([parentFolderViewController.folderDetailVC.navigationController.topViewController
764 
                       isEqual:parentFolderViewController.folderDetailVC]) {
765 
               [parentFolderViewController.folderDetailVC reloadMetadataSection];
766 
           }
754 
            if (self.selectedObjectViewController) {
755 
                [self.selectedObjectViewController reloadMetadataSection];
756 
            } else if ([self.folder isEqual:container.rootFolder]) {
757 
                [containersViewController.containerDetailViewController reloadMetadataSection];
758 
            } else if ([parentFolderViewController.folderDetailVC.navigationController.topViewController
759 
                        isEqual:parentFolderViewController.folderDetailVC]) {
760 
                [parentFolderViewController.folderDetailVC reloadMetadataSection];
761 
            }
767 762 
        }
768 
        [[NSNotificationCenter defaultCenter] removeObserver:successObserver];
769 
        [[NSNotificationCenter defaultCenter] removeObserver:failureObserver];
770 
    }];
771 
    failureObserver = [[NSNotificationCenter defaultCenter] addObserverForName:@"getObjectsFailed"
772 
                                                                        object:self.container
773 
                                                                         queue:[NSOperationQueue mainQueue]
774 
                                                                    usingBlock:^(NSNotification* notification)
775 
    {
763 
    } failure:^(OpenStackRequest *request) {
776 764 
        [activityIndicatorView stopAnimatingAndRemoveFromSuperview];
777 765 
        [self reloadData];
778 766 
        [self alert:@"Error" message:@"Failed to retrieve files from server."];
779 
        [[NSNotificationCenter defaultCenter] removeObserver:successObserver];
780 
        [[NSNotificationCenter defaultCenter] removeObserver:failureObserver];
781 767 
    }];
782 768 
}
783 769 

  		












Also available in:
  Unified diff