Revision 3a8071d4 Classes/EditMetadataViewController.m

b/Classes/EditMetadataViewController.m
69 69
    [metadataValue release];
70 70
    [userInputMetaKey release];
71 71
    [userInputMetaValue release];
72
    [activityIndicatorView release];
72 73
    [super dealloc];
73 74
}
74 75

  
......
237 238
                    return;
238 239
                } else {
239 240
                    activityMessage = @"Saving metadata...";
241
                    [activityIndicatorView release];
240 242
                    activityIndicatorView = [[ActivityIndicatorView alloc] initWithFrame:[ActivityIndicatorView frameForText:activityMessage] text:activityMessage];
241 243
                    [activityIndicatorView addToView:self.view];
242 244
                    
......
249 251
            }
250 252
            
251 253
            activityMessage = @"Saving metadata";
254
            [activityIndicatorView release];
252 255
            activityIndicatorView = [[ActivityIndicatorView alloc] initWithFrame:[ActivityIndicatorView frameForText:activityMessage] text:activityMessage];
253 256
            [activityIndicatorView addToView:self.view];
254

  
255 257
            [[self.account.manager writeObjectMetadata:container object:object] 
256 258
             success:^(OpenStackRequest *request) {
257 259
                 self.metadataKey = userInputMetaKey;
258 260
                 self.metadataValue = userInputMetaValue;
259 261
                 removeMetadataEnabled = YES;
260 262
                 [self.tableView reloadData];
261
                 [activityIndicatorView removeFromSuperviewAndRelease];
263
                 [activityIndicatorView removeFromSuperview];
262 264
                 [self.tableView deselectRowAtIndexPath:indexPath animated:YES];
263 265
                 if (objectIsContainer) {
264 266
                     container.metadata = object.metadata;
......
268 270
             failure:^(OpenStackRequest *request) { 
269 271
                 [object.metadata removeObjectForKey:userInputMetaKey];
270 272
                 [object.metadata setObject:metadataValue forKey:metadataKey];
271
                 [activityIndicatorView removeFromSuperviewAndRelease];
273
                 [activityIndicatorView removeFromSuperview];
272 274
                 [self.tableView deselectRowAtIndexPath:indexPath animated:YES];
273 275
                 [self alert:@"There was a problem saving the metadata." request:request];
274 276
             }];
......
276 278
            break;
277 279
        case kDeleteMetadata:
278 280
            activityMessage = @"Deleting metadata";
281
            [activityIndicatorView release];
279 282
            activityIndicatorView = [[ActivityIndicatorView alloc] initWithFrame:[ActivityIndicatorView frameForText:activityMessage] text:activityMessage];
280 283
            [activityIndicatorView addToView:self.view];
281 284

  
282 285
            [object.metadata removeObjectForKey:metadataKey];
283 286
            [[self.account.manager writeObjectMetadata:container object:object] 
284 287
             success:^(OpenStackRequest *request) {
285
                 [activityIndicatorView removeFromSuperviewAndRelease];
288
                 [activityIndicatorView removeFromSuperview];
286 289
                 [self.tableView deselectRowAtIndexPath:indexPath animated:YES];
287 290
                 self.metadataKey = @"";
288 291
                 self.metadataValue = @"";
......
295 298
             }
296 299
             failure:^(OpenStackRequest *request) {
297 300
                 [object.metadata setObject:metadataValue forKey:metadataKey];
298
                 [activityIndicatorView removeFromSuperviewAndRelease];
301
                 [activityIndicatorView removeFromSuperview];
299 302
                 [self.tableView deselectRowAtIndexPath:indexPath animated:YES];
300 303
                 [self alert:@"There was a problem saving the metadata." request:request];
301 304

  
......
310 313
{
311 314
    if (buttonIndex == 1) {
312 315
        NSString *activityMessage = @"Applying permissions...";
313
        
316
        [activityIndicatorView release];
314 317
        activityIndicatorView = [[ActivityIndicatorView alloc] initWithFrame:[ActivityIndicatorView frameForText:activityMessage] text:activityMessage];
315 318
        [activityIndicatorView addToView:self.view];
316 319
        
......
359 362
         newFolder.sharing = folderViewController.folder.sharing;
360 363
         newFolder.metadata = object.metadata;
361 364
         [folderViewController.folder.folders setObject:newFolder forKey:newFolder.name];
362
         [activityIndicatorView removeFromSuperviewAndRelease];
365
         [activityIndicatorView removeFromSuperview];
363 366
         [newFolder release];
364 367
         self.metadataKey = userInputMetaKey;
365 368
         self.metadataValue = userInputMetaValue;
......
377 380
     failure:^(OpenStackRequest *request) {
378 381
         [object.metadata removeObjectForKey:userInputMetaKey];
379 382
         [object.metadata setObject:metadataValue forKey:metadataKey];
380
         [activityIndicatorView removeFromSuperviewAndRelease];
383
         [activityIndicatorView removeFromSuperview];
381 384
         [self.tableView deselectRowAtIndexPath:[self.tableView indexPathForSelectedRow] animated:YES];
382 385
         [self.tableView reloadData];
383 386
         [self alert:@"There was a problem saving the metadata." request:request];

Also available in: Unified diff