/issues/5009 - Fixed share extension setup and cleaned up code.

element-hq · Oct 18, 2021 · aa790b2 · aa790b2
1 parent d7ab735
commit aa790b2
Show file tree

Hide file tree

Showing 4 changed files with 242 additions and 447 deletions.
diff --git a/Riot/Modules/Room/RoomViewController.m b/Riot/Modules/Room/RoomViewController.m
@@ -3201,8 +3201,7 @@ - (void)showAdditionalActionsMenuForEvent:(MXEvent*)selectedEvent inCell:(id<MXK
             NSExtensionItem *item = [[NSExtensionItem alloc] init];
             item.attachments = @[[[NSItemProvider alloc] initWithItem:selectedComponent.textMessage typeIdentifier:(__bridge NSString *)kUTTypeText]];
 
-            self.shareManager = [[ShareManager alloc] initWithShareExtensionContext:nil
-                                                                     extensionItems:@[item]];
+            self.shareManager = [[ShareManager alloc] initWithItems:@[item]];
 
             MXWeakify(self);
             [self.shareManager setCompletionCallback:^(ShareManagerResult result) {
@@ -3414,8 +3413,7 @@ - (void)showAdditionalActionsMenuForEvent:(MXEvent*)selectedEvent inCell:(id<MXK
                     NSExtensionItem *item = [[NSExtensionItem alloc] init];
                     item.attachments = @[[[NSItemProvider alloc] initWithItem:fileURL typeIdentifier:attachmentTypeToIdentifier[@(attachment.type)]]];
 
-                    self.shareManager = [[ShareManager alloc] initWithShareExtensionContext:nil
-                                                                             extensionItems:@[item]];
+                    self.shareManager = [[ShareManager alloc] initWithItems:@[item]];
 
                     MXWeakify(self);
                     [self.shareManager setCompletionCallback:^(ShareManagerResult result) {

diff --git a/RiotShareExtension/ShareExtensionRootViewController.m b/RiotShareExtension/ShareExtensionRootViewController.m
@@ -32,45 +32,36 @@ @interface ShareExtensionRootViewController ()
 
 @implementation ShareExtensionRootViewController
 
-- (instancetype)init
+- (void)viewDidLoad
 {
-    if(self = [super init]) {
-
-        [ThemeService.shared setThemeId:RiotSettings.shared.userInterfaceTheme];
-
-        _shareManager = [[ShareManager alloc] initWithShareExtensionContext:self.extensionContext
-                                                                               extensionItems:self.extensionContext.inputItems];
-
-        MXWeakify(self);
-        [_shareManager setCompletionCallback:^(ShareManagerResult result) {
-            MXStrongifyAndReturnIfNil(self);
-
-            switch (result)
-            {
-                case ShareManagerResultFinished:
-                    [self.extensionContext completeRequestReturningItems:nil completionHandler:nil];
-                    [self _dismiss];
-                    break;
-                case ShareManagerResultCancelled:
-                    [self.extensionContext cancelRequestWithError:[NSError errorWithDomain:@"MXUserCancelErrorDomain" code:4201 userInfo:nil]];
-                    [self _dismiss];
-                    break;
-                case ShareManagerResultFailed:
-                    [self.extensionContext cancelRequestWithError:[NSError errorWithDomain:@"MXFailureErrorDomain" code:500 userInfo:nil]];
-                    [self _dismiss];
-                    break;
-                default:
-                    break;
-            }
-        }];
-    }
+    [super viewDidLoad];
 
-    return self;
-}
-
-- (void)viewWillAppear:(BOOL)animated
-{
-    [super viewWillAppear:animated];
+    [ThemeService.shared setThemeId:RiotSettings.shared.userInterfaceTheme];
+
+    _shareManager = [[ShareManager alloc] initWithItems:self.extensionContext.inputItems];
+
+    MXWeakify(self);
+    [_shareManager setCompletionCallback:^(ShareManagerResult result) {
+        MXStrongifyAndReturnIfNil(self);
+
+        switch (result)
+        {
+            case ShareManagerResultFinished:
+                [self.extensionContext completeRequestReturningItems:nil completionHandler:nil];
+                [self _dismiss];
+                break;
+            case ShareManagerResultCancelled:
+                [self.extensionContext cancelRequestWithError:[NSError errorWithDomain:@"MXUserCancelErrorDomain" code:4201 userInfo:nil]];
+                [self _dismiss];
+                break;
+            case ShareManagerResultFailed:
+                [self.extensionContext cancelRequestWithError:[NSError errorWithDomain:@"MXFailureErrorDomain" code:500 userInfo:nil]];
+                [self _dismiss];
+                break;
+            default:
+                break;
+        }
+    }];
 
     [self presentViewController:self.shareManager.mainViewController animated:YES completion:nil];
 }

diff --git a/RiotShareExtension/Shared/ShareManager.h b/RiotShareExtension/Shared/ShareManager.h
@@ -16,6 +16,8 @@
 
 #import <MatrixKit/MatrixKit.h>
 
+NS_ASSUME_NONNULL_BEGIN
+
 typedef NS_ENUM(NSUInteger, ShareManagerResult) {
     ShareManagerResultFinished,
     ShareManagerResultCancelled,
@@ -26,8 +28,7 @@ typedef NS_ENUM(NSUInteger, ShareManagerResult) {
 
 @property (nonatomic, copy) void (^completionCallback)(ShareManagerResult);
 
-- (instancetype)initWithShareExtensionContext:(NSExtensionContext *)shareExtensionContext
-                               extensionItems:(NSArray<NSExtensionItem *> *)extensionItems;
+- (instancetype)initWithItems:(NSArray<NSExtensionItem *> *)items;
 
 - (UIViewController *)mainViewController;
 
@@ -39,3 +40,5 @@ typedef NS_ENUM(NSUInteger, ShareManagerResult) {
 @property BOOL isLoaded;
 
 @end
+
+NS_ASSUME_NONNULL_END