Merge pull request slackhq#264 from slackhq/bug-fixes

Bug Fixes

Author: farhadn

Examples/Messenger-Shared/MessageViewController.m

@@ -194,18 +194,23 @@ - (void)simulateUserTyping:(id)sender
 - (void)didLongPressCell:(UIGestureRecognizer *)gesture
 {
 #ifdef __IPHONE_8_0
-    UIAlertController *alertController = [UIAlertController alertControllerWithTitle:nil message:nil preferredStyle:UIAlertControllerStyleActionSheet];
-    alertController.modalPresentationStyle = UIModalPresentationPopover;
-    alertController.popoverPresentationController.sourceView = gesture.view.superview;
-    alertController.popoverPresentationController.sourceRect = gesture.view.frame;
-    
-    [alertController addAction:[UIAlertAction actionWithTitle:@"Edit Message" style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) {
+    if ([UIAlertController class]) {
+        UIAlertController *alertController = [UIAlertController alertControllerWithTitle:nil message:nil preferredStyle:UIAlertControllerStyleActionSheet];
+        alertController.modalPresentationStyle = UIModalPresentationPopover;
+        alertController.popoverPresentationController.sourceView = gesture.view.superview;
+        alertController.popoverPresentationController.sourceRect = gesture.view.frame;
+        
+        [alertController addAction:[UIAlertAction actionWithTitle:@"Edit Message" style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) {
+            [self editCellMessage:gesture];
+        }]];
+        
+        [alertController addAction:[UIAlertAction actionWithTitle:@"Cancel" style:UIAlertActionStyleCancel handler:NULL]];
+        
+        [self.navigationController presentViewController:alertController animated:YES completion:nil];
+    }
+    else {
         [self editCellMessage:gesture];
-    }]];
-    
-    [alertController addAction:[UIAlertAction actionWithTitle:@"Cancel" style:UIAlertActionStyleCancel handler:NULL]];
-    
-    [self.navigationController presentViewController:alertController animated:YES completion:nil];
+    }
 #else
     [self editCellMessage:gesture];
 #endif

Source/Classes/SLKTextViewController.m

@@ -700,23 +700,16 @@ - (void)editText:(NSString *)text
     // Caches the current text, in case the user cancels the edition
     [self slk_cacheTextToDisk:self.textView.text];
 
-    if (!SLK_IS_LANDSCAPE) {
-        [self.textView setText:text];
-    }
-    
     [self.textInputbar beginTextEditing];
 
-    // Setting the text after calling -beginTextEditing is safer when on landscape orientation
-    if (SLK_IS_LANDSCAPE) {
-        [self.textView setText:text];
-    }
+    // Setting the text after calling -beginTextEditing is safer
+    [self.textView setText:text];
 
     [self.textView slk_scrollToCaretPositonAnimated:YES];
 
     // Brings up the keyboard if needed
     [self presentKeyboard:YES];
 }
-
 - (void)didCommitTextEditing:(id)sender
 {
     if (!self.textInputbar.isEditing) {