Remove post dialog and start app directly

j3k0 · Aug 13, 2019 · 796ab52 · 796ab52
1 parent ce53001
commit 796ab52
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 47 deletions.
diff --git a/src/ios/OpenWithPlugin.m b/src/ios/OpenWithPlugin.m
@@ -228,11 +228,10 @@ - (void) checkForFileToShare {
     }
     NSDictionary *dict = (NSDictionary*)object;
     NSData *data = dict[@"data"];
-    NSString *text = dict[@"text"];
     NSString *name = dict[@"name"];
     self.backURL = dict[@"backURL"];
     NSString *type = [self mimeTypeFromUti:dict[@"uti"]];
-    if (![data isKindOfClass:NSData.class] || ![text isKindOfClass:NSString.class]) {
+    if (![data isKindOfClass:NSData.class]) {
         [self debug:@"[checkForFileToShare] Data content is invalid"];
         return;
     }
@@ -246,16 +245,14 @@ - (void) checkForFileToShare {
 
     // Send to javascript
     [self debug:[NSString stringWithFormat:
-        @"[checkForFileToShare] Sharing text \"%@\" and a %d bytes image",
-        text, data.length]];
+                 @"[checkForFileToShare] Sharing a %lu bytes image", (unsigned long)data.length]];
 
     NSString *uri = [NSString stringWithFormat: @"shareextension://index=0,name=%@,type=%@",
         name, type];
     CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:@{
         @"action": @"SEND",
         @"exit": @YES,
         @"items": @[@{
-            @"text" : text,
             @"base64": [data convertToBase64],
             @"type": type,
             @"utis": utis,

diff --git a/src/ios/ShareExtension/MainInterface.storyboard b/src/ios/ShareExtension/MainInterface.storyboard
diff --git a/src/ios/ShareExtension/ShareExtension-Info.plist b/src/ios/ShareExtension/ShareExtension-Info.plist
@@ -22,6 +22,8 @@
 	<string>__BUNDLE_VERSION__</string>
 	<key>NSExtension</key>
 	<dict>
+		<key>NSExtensionPrincipalClass</key>
+		<string>ShareViewController</string>
 		<key>NSExtensionAttributes</key>
 		<dict>
 			<key>NSExtensionActivationRule</key>
@@ -39,8 +41,6 @@
       <key>NSExtensionActivationDictionaryVersion</key>
       <integer>2</integer>
 		</dict>
-		<key>NSExtensionMainStoryboard</key>
-		<string>MainInterface</string>
 		<key>NSExtensionPointIdentifier</key>
 		<string>com.apple.share-services</string>
 	</dict>

diff --git a/src/ios/ShareExtension/ShareViewController.m b/src/ios/ShareExtension/ShareViewController.m
@@ -31,7 +31,7 @@
 #import <Social/Social.h>
 #import "ShareViewController.h"
 
-@interface ShareViewController : SLComposeServiceViewController {
+@interface ShareViewController : UIViewController {
     int _verbosityLevel;
     NSUserDefaults *_userDefaults;
     NSString *_backURL;
@@ -66,6 +66,13 @@ - (void) info:(NSString*)message { [self log:VERBOSITY_INFO message:message]; }
 - (void) warn:(NSString*)message { [self log:VERBOSITY_WARN message:message]; }
 - (void) error:(NSString*)message { [self log:VERBOSITY_ERROR message:message]; }
 
+-(void) viewDidLoad {
+    [super viewDidLoad];
+    printf("did load");
+    [self debug:@"[viewDidLoad]"];
+    [self submit];
+}
+
 - (void) setup {
     self.userDefaults = [[NSUserDefaults alloc] initWithSuiteName:SHAREEXT_GROUP_IDENTIFIER];
     self.verbosityLevel = [self.userDefaults integerForKey:@"verbosityLevel"];
@@ -104,10 +111,10 @@ - (void) openURL:(nonnull NSURL *)url {
     }
 }
 
-- (void) didSelectPost {
+- (void) submit {
 
     [self setup];
-    [self debug:@"[didSelectPost]"];
+    [self debug:@"[submit]"];
 
     // This is called after the user selects Post. Do the upload of contentText and/or NSExtensionContext attachments.
     for (NSItemProvider* itemProvider in ((NSExtensionItem*)self.extensionContext.inputItems[0]).attachments) {
@@ -140,7 +147,6 @@ - (void) didSelectPost {
                     uti = SHAREEXT_UNIFORM_TYPE_IDENTIFIER;
                 }
                 NSDictionary *dict = @{
-                    @"text": self.contentText,
                     @"backURL": self.backURL,
                     @"data" : data,
                     @"uti": uti,