1 files changed, 7 insertions, 17 deletions
diff --git a/Juick/ViewControllers/NewPostViewController.m b/Juick/ViewControllers/NewPostViewController.m
index 02d810b..7b80a52 100644
--- a/Juick/ViewControllers/NewPostViewController.m
+++ b/Juick/ViewControllers/NewPostViewController.m
@@ -31,35 +31,25 @@
     if (_replyTo != nil) {
         MessageInputView *inputView =  (MessageInputView *) self.inputAccessoryView;
         inputView.quoteText.text = _replyTo.text;
-        self.navigationController.visibleViewController.title = [NSString stringWithFormat:@"Reply to %@", _replyTo.user.uname];
+        self.title = [NSString stringWithFormat:@"Reply to %@", _replyTo.user.uname];
     } else {
-        self.navigationController.visibleViewController.title = @"Post";
+        self.title = @"Post";
     }
-    self.navigationController.visibleViewController.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemCancel
-                                                                                          target:self action:@selector(cancelCompose)];
-    self.navigationController.visibleViewController.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:@"Send" style:UIBarButtonItemStyleDone target:self action:@selector(doneCompose)];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardWillHide:) name:UIKeyboardWillHideNotification object:nil];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardDidShow:) name:UIKeyboardDidShowNotification object:nil];
     [self.textView becomeFirstResponder];
 }
 
-- (void) cancelCompose {
-    [self.textView resignFirstResponder];
-    [self.navigationController.visibleViewController.navigationController popViewControllerAnimated:YES];
-}
-
-- (void) doneCompose {
+- (IBAction)sendAction:(id)sender {
     if (_replyTo == nil) {
         [[APIClient sharedClient] postMessage:self.textView.text result:^(Message *msg, NSError *err) {
-            [self.navigationController.visibleViewController.navigationController popViewControllerAnimated:YES];
-            MessagesViewController *target = (MessagesViewController *)self.navigationController.visibleViewController;
-            [target refreshData:YES];
+            [self.navigationController popViewControllerAnimated:YES];
+            [(MessagesViewController *)self.navigationController.visibleViewController refreshData:YES];
         }];
     } else {
         [[APIClient sharedClient] postReplyToThread:_replyTo.mid inReplyTo:_replyTo.rid text:self.textView.text result:^(Message *msg, NSError *err) {
-            [self.navigationController.visibleViewController.navigationController popViewControllerAnimated:YES];
-            MessagesViewController *target = (MessagesViewController *)self.navigationController.visibleViewController;
-            [target refreshData:YES];
+            [self.navigationController popViewControllerAnimated:YES];
+            [(MessagesViewController *)self.navigationController.visibleViewController refreshData:YES];
         }];
     }
 }