Skip to content

Commit a323409

Browse files
committed
Should also be able to dismiss the "share" activityViewController
1 parent 760dced commit a323409

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

src/ios/FileViewerPlugin.h

+2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@
44
@interface FileViewerPlugin : CDVPlugin
55
{
66
FileViewerPluginViewController* previewViewController;
7+
UIActivityViewController *activityViewController;
78
}
89

910
@property (retain, nonatomic) FileViewerPluginViewController* previewViewController;
11+
@property (retain, nonatomic) UIActivityViewController *activityViewController;
1012

1113
- (void)view:(CDVInvokedUrlCommand*)command;
1214
- (void)share:(CDVInvokedUrlCommand*)command;

src/ios/FileViewerPlugin.m

+6-5
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#import <Cordova/CDV.h>
33

44
@implementation FileViewerPlugin
5-
@synthesize previewViewController;
5+
@synthesize previewViewController, activityViewController;
66

77
- (void)view:(CDVInvokedUrlCommand*)command
88
{
@@ -22,6 +22,7 @@ - (void)view:(CDVInvokedUrlCommand*)command
2222
- (void)hide:(CDVInvokedUrlCommand*)command
2323
{
2424
[self.previewViewController.documentInteractionController dismissPreviewAnimated:YES];
25+
[self.activityViewController dismissModalViewControllerAnimated:YES];
2526
}
2627

2728
- (void)share:(CDVInvokedUrlCommand*)command
@@ -46,11 +47,11 @@ - (void)share:(CDVInvokedUrlCommand*)command
4647

4748
NSArray *activityItems = [NSArray arrayWithObjects:shareString, fileUrl, nil];
4849

49-
UIActivityViewController *activityViewController = [[UIActivityViewController alloc] initWithActivityItems:activityItems applicationActivities:nil];
50-
activityViewController.modalTransitionStyle = UIModalTransitionStyleCoverVertical;
51-
activityViewController.excludedActivityTypes = @[UIActivityTypePrint, UIActivityTypeCopyToPasteboard, UIActivityTypeAssignToContact, UIActivityTypeSaveToCameraRoll];
50+
self.activityViewController = [[UIActivityViewController alloc] initWithActivityItems:activityItems applicationActivities:nil];
51+
self.activityViewController.modalTransitionStyle = UIModalTransitionStyleCoverVertical;
52+
self.activityViewController.excludedActivityTypes = @[UIActivityTypePrint, UIActivityTypeCopyToPasteboard, UIActivityTypeAssignToContact, UIActivityTypeSaveToCameraRoll];
5253

53-
[[super viewController] presentViewController:activityViewController animated:YES completion:nil];
54+
[[super viewController] presentViewController:self.activityViewController animated:YES completion:nil];
5455
}
5556

5657
@end

0 commit comments

Comments
 (0)