Ticket #925: ticket#925.diff

Classes/BlogsViewController.h

@@ -20 +20 @@
     Blog *currentBlog;
     QuickPhotoButton *quickPhotoButton, *readerButton;
     QuickPhotoUploadProgressController *uploadController;
-    Post *quickPicturePost;
     UILabel *uploadLabel;
     IBOutlet UITableView *tableView;
     WPWebViewController *readerViewController;

Classes/BlogsViewController.m

@@ -94 +94 @@
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(showBlogWithoutAnimation) name:@"NewBlogAdded" object:nil];
 
     //quick photo upload notifications
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(mediaDidUploadSuccessfully:) name:ImageUploadSuccessful object:nil];
-        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(mediaUploadFailed:) name:ImageUploadFailed object:nil];
         [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(postDidUploadSuccessfully:) name:@"PostUploaded" object:nil];
         [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(postUploadFailed:) name:@"PostUploadFailed" object:nil];
     
@@ -644 +642 @@
     }
 }
 
-- (void)uploadQuickPhoto:(Post *)post{
-    
-    appDelegate.isUploadingPost = YES;
-    
-    quickPicturePost = post;
+- (void)uploadQuickPhoto:(Post *)post {
     if (post != nil) {
         //remove the quick photo button w/ sexy animation
         CGRect frame = quickPhotoButton.frame;
@@ -676 +670 @@
         uploadController.view.frame = CGRectMake(frame.origin.x, self.view.bounds.size.height - 83, frame.size.width, frame.size.height);
         
         [UIView commitAnimations];
- 
-        //upload the image
-        [[post.media anyObject] performSelector:@selector(upload) withObject:nil];
     }
 }
 
@@ -698 +689 @@
     [UIView commitAnimations];
 }
 
-- (void)mediaDidUploadSuccessfully:(NSNotification *)notification {
-    
-    Media *media = (Media *)[notification object];
-    [media save];
-    quickPicturePost.content = [NSString stringWithFormat:@"%@\n\n%@", [media html], quickPicturePost.content];
-    [quickPicturePost upload];    
-}
-
-- (void)mediaUploadFailed:(NSNotification *)notification {
-    appDelegate.isUploadingPost = NO;
-    [self showQuickPhotoButton: NO];
-    UIAlertView *alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Quick Photo Failed", @"")
-                                                    message:NSLocalizedString(@"Sorry, the photo upload failed. The post has been saved as a Local Draft.", @"")
-                                                   delegate:self
-                                          cancelButtonTitle:NSLocalizedString(@"OK", @"")
-                                          otherButtonTitles:nil];
-    [alert show];
-    [alert release];
-}
-
 - (void)postDidUploadSuccessfully:(NSNotification *)notification {
     appDelegate.isUploadingPost = NO;
     [UIView beginAnimations:nil context:nil]; 
@@ -755 +726 @@
         self.currentBlog = nil;
     [quickPhotoButton release]; quickPhotoButton = nil;
     self.tableView = nil;
-    [quickPicturePost release];
     [uploadController release];
     [readerViewController release]; 
     [super dealloc];

Classes/QuickPhotoViewController.h

@@ -12 +12 @@
 #import "Post.h"
 #import "QuickPicturePreviewView.h"
 #import "BlogsViewController.h"
+#import "WordPressAppDelegate.h"
 
 #define QPVCBlogForQuickPhoto @"blogForQuickPhoto"
 
 @interface QuickPhotoViewController : UIViewController<UIImagePickerControllerDelegate,UINavigationControllerDelegate,BlogSelectorButtonDelegate,QuickPicturePreviewViewDelegate> {
+        WordPressAppDelegate *appDelegate;
     Post *post;
     BlogsViewController *blogsViewController;
 }

Classes/Post.h

@@ -10 +10 @@
 #import "Category.h"
 #import "Coordinate.h"
 #import "AbstractPost.h"
+#import "Media.h"
 
-@interface Post :  AbstractPost  
-{
+@interface Post :  AbstractPost {
+    WordPressAppDelegate *appDelegate;
 }
 
 #pragma mark -
@@ -54 +55 @@
 + (Post *)findWithBlog:(Blog *)blog andPostID:(NSNumber *)postID;
 // Takes the NSDictionary from a XMLRPC call and creates or updates a post
 + (Post *)createOrReplaceFromDictionary:(NSDictionary *)postInfo forBlog:(Blog *)blog;
+// Set up NSNotificationCenter observers
+- (void)instantiateNotificationObservers;
 
 @end
+ No newline at end of file

Classes/QuickPhotoViewController.m

@@ -71 +71 @@
     [FileLogger log:@"%@ %@", self, NSStringFromSelector(_cmd)];
     [super viewDidLoad];
     
+    appDelegate = (WordPressAppDelegate *)[[UIApplication sharedApplication] delegate];
+    
     self.titleTextField.placeholder = NSLocalizedString(@"Title (optional)", @"Quick Photo title");
     [self.blogSelector loadBlogsForType:BlogSelectorButtonTypeQuickPhoto];
     self.blogSelector.delegate = self;
@@ -166 +168 @@
 #pragma mark Custom methods
 
 - (void)postInBackground {
-
+    [[post.media anyObject] performSelector:@selector(upload) withObject:nil];
+    
     [post save];
-
 }
 
 - (void)post {
@@ -183 +185 @@
     post.content = contentTextView.text;
     post.specialType = @"QuickPhoto";
     post.postFormat = @"image";
-
+    [post instantiateNotificationObservers];
+    
+    appDelegate.isUploadingPost = YES;
+    
     [self performSelectorOnMainThread:@selector(postInBackground) withObject:nil waitUntilDone:YES];
     [self.navigationController popViewControllerAnimated:YES];
     [blogsViewController uploadQuickPhoto: post];
-    
 }
 
 - (void)dismiss {

Classes/Post.m

@@ -22 +22 @@
 @dynamic categories;
 @synthesize specialType;
 
+- (id)init {
+    if (self = [super init]) {
+        appDelegate = (WordPressAppDelegate *)[[UIApplication sharedApplication] delegate];
+    }
+    
+    return self;
+}
+
 - (void)dealloc {
     self.specialType = nil;
     [super dealloc];
@@ -268 +276 @@
     return NO;
 }
 
+#pragma mark - QuickPhoto
+- (void)instantiateNotificationObservers {
+    if ([[self specialType] isEqualToString:@"QuickPhoto"]) {
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(mediaDidUploadSuccessfully:) name:ImageUploadSuccessful object:nil];        
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(mediaUploadFailed:) name:ImageUploadFailed object:nil];
+    }
+}
+
+- (void)mediaDidUploadSuccessfully:(NSNotification *)notification {
+    Media *media = (Media *)[notification object];
+    [media save];
+
+    self.content = [NSString stringWithFormat:@"%@\n\n%@", [media html], self.content];
+    [self upload];
+
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+}
+
+- (void)mediaUploadFailed:(NSNotification *)notification {
+    appDelegate.isUploadingPost = NO;
+
+    UIAlertView *alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Quick Photo Failed", @"")
+                                                    message:NSLocalizedString(@"Sorry, the photo upload failed. The post has been saved as a Local Draft.", @"")
+                                                   delegate:self
+                                          cancelButtonTitle:NSLocalizedString(@"OK", @"")
+                                          otherButtonTitles:nil];
+    [alert show];
+    [alert release];
+    
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+}
+
 @end