Fixing new uiactivities for ipad.

clients/ios/Classes/StoryPageControl.h

@@ -53,6 +53,7 @@
 @property (nonatomic) IBOutlet UIButton *buttonPrevious;
 @property (nonatomic) IBOutlet UIButton *buttonNext;
 @property (nonatomic) IBOutlet UIButton *buttonText;
+@property (nonatomic) IBOutlet UIButton *buttonSend;
 @property (nonatomic) UIBarButtonItem *buttonBack;
 @property (nonatomic) IBOutlet UIBarButtonItem *buttonAction;
 @property (nonatomic) IBOutlet UIToolbar *bottomPlaceholderToolbar;

clients/ios/Classes/StoryPageControl.m

@@ -40,6 +40,7 @@
 @synthesize buttonNext;
 @synthesize buttonAction;
 @synthesize buttonText;
+@synthesize buttonSend;
 @synthesize fontSettingsButton;
 @synthesize originalStoryButton;
 @synthesize subscribeButton;
@@ -698,9 +699,13 @@
     if (currentPage.pageIndex >= 0) {
         [buttonText setEnabled:YES];
         [buttonText setAlpha:1];
+        [buttonSend setEnabled:YES];
+        [buttonSend setAlpha:1];
     } else {
         [buttonText setEnabled:NO];
         [buttonText setAlpha:.4];
+        [buttonSend setEnabled:NO];
+        [buttonSend setAlpha:.4];
     }
     
     if (currentPage.inTextView) {
@@ -802,7 +807,11 @@
 }
 
 - (IBAction)openSendToDialog:(id)sender {
-    [UIActivitiesControl showActivitiesInView:self];
+    if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
+        [UIActivitiesControl showActivitiesInView:appDelegate.masterContainerViewController];
+    } else {
+        [UIActivitiesControl showActivitiesInView:self];
+    }
 }
 
 - (void)markStoryAsSaved {

clients/ios/Classes/StoryPageControl.xib

@@ -4729,6 +4729,14 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 					</object>
 					<int key="connectionID">84</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">buttonSend</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="855602748"/>
+					</object>
+					<int key="connectionID">88</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchOutletConnection" key="connection">
 						<string key="label">delegate</string>
@@ -4887,7 +4895,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">87</int>
+			<int key="maxID">88</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -6325,6 +6333,7 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 						<string key="buttonAction">UIBarButtonItem</string>
 						<string key="buttonNext">UIButton</string>
 						<string key="buttonPrevious">UIButton</string>
+						<string key="buttonSend">UIButton</string>
 						<string key="buttonText">UIButton</string>
 						<string key="circularProgressView">THCircularProgressView</string>
 						<string key="fontSettingsButton">UIBarButtonItem</string>
@@ -6363,6 +6372,10 @@ AAgAAAAIAAIACAACAAAAAgAAAAEAAQABAAE</bytes>
 							<string key="name">buttonPrevious</string>
 							<string key="candidateClassName">UIButton</string>
 						</object>
+						<object class="IBToOneOutletInfo" key="buttonSend">
+							<string key="name">buttonSend</string>
+							<string key="candidateClassName">UIButton</string>
+						</object>
 						<object class="IBToOneOutletInfo" key="buttonText">
 							<string key="name">buttonText</string>
 							<string key="candidateClassName">UIButton</string>

clients/ios/Classes/UIActivitiesControl.h

@@ -10,6 +10,8 @@
 
 @interface UIActivitiesControl : NSObject
 
+@property (nonatomic, retain) UIPopoverController *popover;
+
 + (void)showActivitiesInView:(UIViewController *)vc;
 + (void)showActivitiesInView:(UIViewController *)vc withUrl:(NSURL *)url;
 

clients/ios/Classes/UIActivitiesControl.m

@@ -105,16 +105,7 @@
     
     shareSheet.excludedActivityTypes = @[UIActivityTypePostToWeibo,UIActivityTypeAssignToContact];
     
-    if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
+    [vc presentViewController:shareSheet animated:YES completion:nil];
-        UIPopoverController *popover = [[UIPopoverController alloc]
-                                        initWithContentViewController:shareSheet];
-        [popover presentPopoverFromRect:appDelegate.masterContainerViewController.view.frame
-                                 inView:appDelegate.masterContainerViewController.view
-               permittedArrowDirections:UIPopoverArrowDirectionAny
-                               animated:YES];
-    } else {
-        [vc presentViewController:shareSheet animated:YES completion:nil];
-    }
 }
 
 @end