/issues/5009 - Moved files around, cleaned up imports and logs.

Riot/Modules/Room/RoomViewController.m

@@ -108,7 +108,7 @@
 #import "AvatarGenerator.h"
 #import "Tools.h"
 #import "WidgetManager.h"
-#import "ShareExtensionManager.h"
+#import "ShareManager.h"
 
 #import "GBDeviceInfo_iOS.h"
 
@@ -252,7 +252,7 @@ @interface RoomViewController () <UISearchBarDelegate, UIGestureRecognizerDelega
 @property (nonatomic, strong) VoiceMessageController *voiceMessageController;
 @property (nonatomic, strong) SpaceDetailPresenter *spaceDetailPresenter;
 
-@property (nonatomic, strong) ShareExtensionManager *shareExtensionManager;
+@property (nonatomic, strong) ShareManager *shareManager;
 
 @end
 
@@ -3170,17 +3170,17 @@ - (void)showAdditionalActionsMenuForEvent:(MXEvent*)selectedEvent inCell:(id<MXK
             NSExtensionItem *item = [[NSExtensionItem alloc] init];
             item.attachments = @[[[NSItemProvider alloc] initWithItem:selectedComponent.textMessage typeIdentifier:(__bridge NSString *)kUTTypeText]];
 
-            self.shareExtensionManager = [[ShareExtensionManager alloc] initWithShareExtensionContext:nil
-                                                                                       extensionItems:@[item]];
+            self.shareManager = [[ShareManager alloc] initWithShareExtensionContext:nil
+                                                                     extensionItems:@[item]];
 
             MXWeakify(self);
-            [self.shareExtensionManager setCompletionCallback:^(ShareExtensionManagerResult result) {
+            [self.shareManager setCompletionCallback:^(ShareManagerResult result) {
                 MXStrongifyAndReturnIfNil(self);
                 [attachment onShareEnded];
                 [self dismissViewControllerAnimated:YES completion:nil];
             }];
 
-            [self presentViewController:self.shareExtensionManager.mainViewController animated:YES completion:nil];
+            [self presentViewController:self.shareManager.mainViewController animated:YES completion:nil];
         }]];
 
         if (!isJitsiCallEvent)
@@ -3383,17 +3383,17 @@ - (void)showAdditionalActionsMenuForEvent:(MXEvent*)selectedEvent inCell:(id<MXK
                     NSExtensionItem *item = [[NSExtensionItem alloc] init];
                     item.attachments = @[[[NSItemProvider alloc] initWithItem:fileURL typeIdentifier:attachmentTypeToIdentifier[@(attachment.type)]]];
 
-                    self.shareExtensionManager = [[ShareExtensionManager alloc] initWithShareExtensionContext:nil
-                                                                                               extensionItems:@[item]];
+                    self.shareManager = [[ShareManager alloc] initWithShareExtensionContext:nil
+                                                                             extensionItems:@[item]];
 
                     MXWeakify(self);
-                    [self.shareExtensionManager setCompletionCallback:^(ShareExtensionManagerResult result) {
+                    [self.shareManager setCompletionCallback:^(ShareManagerResult result) {
                         MXStrongifyAndReturnIfNil(self);
                         [attachment onShareEnded];
                         [self dismissViewControllerAnimated:YES completion:nil];
                     }];
 
-                    [self presentViewController:self.shareExtensionManager.mainViewController animated:YES completion:nil];
+                    [self presentViewController:self.shareManager.mainViewController animated:YES completion:nil];
                 } failure:^(NSError *error) {
                     [self showError:error];
                     [self stopActivityIndicator];

Riot/target.yml

@@ -66,8 +66,7 @@ targets:
       excludes:
         - "Modules/Room/EmojiPicker/Data/EmojiMart/EmojiJSONStore.swift"
         - "**/*.strings" # Exclude all strings files
-    - path: ../RiotShareExtension/Managers
-    - path: ../RiotShareExtension/Modules
+    - path: ../RiotShareExtension/Shared
 
     # Add separately localizable files
     # Once a language has enough translations (>80%), it must be declared here

RiotShareExtension/Modules/Main/ShareExtensionRootViewController.m → RiotShareExtension/ShareExtensionRootViewController.m

@@ -15,8 +15,7 @@
  */
 
 #import "ShareExtensionRootViewController.h"
-#import "ShareViewController.h"
-#import "ShareExtensionManager.h"
+#import "ShareManager.h"
 #import "ThemeService.h"
 
 #ifdef IS_SHARE_EXTENSION
@@ -27,7 +26,7 @@
 
 @interface ShareExtensionRootViewController ()
 
-@property (nonatomic, strong, readonly) ShareExtensionManager *shareExtensionManager;
+@property (nonatomic, strong, readonly) ShareManager *shareManager;
 
 @end
 
@@ -39,24 +38,24 @@ - (instancetype)init
 
         [ThemeService.shared setThemeId:RiotSettings.shared.userInterfaceTheme];
 
-        _shareExtensionManager = [[ShareExtensionManager alloc] initWithShareExtensionContext:self.extensionContext
+        _shareManager = [[ShareManager alloc] initWithShareExtensionContext:self.extensionContext
                                                                                extensionItems:self.extensionContext.inputItems];
 
         MXWeakify(self);
-        [_shareExtensionManager setCompletionCallback:^(ShareExtensionManagerResult result) {
+        [_shareManager setCompletionCallback:^(ShareManagerResult result) {
             MXStrongifyAndReturnIfNil(self);
 
             switch (result)
             {
-                case ShareExtensionManagerResultFinished:
+                case ShareManagerResultFinished:
                     [self.extensionContext completeRequestReturningItems:nil completionHandler:nil];
                     [self _dismiss];
                     break;
-                case ShareExtensionManagerResultCancelled:
+                case ShareManagerResultCancelled:
                     [self.extensionContext cancelRequestWithError:[NSError errorWithDomain:@"MXUserCancelErrorDomain" code:4201 userInfo:nil]];
                     [self _dismiss];
                     break;
-                case ShareExtensionManagerResultFailed:
+                case ShareManagerResultFailed:
                     [self.extensionContext cancelRequestWithError:[NSError errorWithDomain:@"MXFailureErrorDomain" code:500 userInfo:nil]];
                     [self _dismiss];
                     break;
@@ -73,7 +72,7 @@ - (void)viewWillAppear:(BOOL)animated
 {
     [super viewWillAppear:animated];
 
-    [self presentViewController:self.shareExtensionManager.mainViewController animated:YES completion:nil];
+    [self presentViewController:self.shareManager.mainViewController animated:YES completion:nil];
 }
 
 #pragma mark - Private
@@ -83,9 +82,9 @@ - (void)_dismiss
     [self dismissViewControllerAnimated:true completion:^{
         [self.presentingViewController dismissViewControllerAnimated:false completion:nil];
 
-//        // FIXME: Share extension memory usage increase when launched several times and then crash due to some memory leaks.
-//        // For now, we force the share extension to exit and free memory.
-//        [NSException raise:@"Kill the app extension" format:@"Free memory used by share extension"];
+        // FIXME: Share extension memory usage increase when launched several times and then crash due to some memory leaks.
+        // For now, we force the share extension to exit and free memory.
+        [NSException raise:@"Kill the app extension" format:@"Free memory used by share extension"];
     }];
 }
 

RiotShareExtension/Modules/Share/Listing/RoomsListViewController.m → RiotShareExtension/Shared/RoomsListViewController.m

@@ -14,13 +14,12 @@
  limitations under the License.
  */
 
+#import <MatrixKit/MatrixKit.h>
+
 #import "RoomsListViewController.h"
 #import "RecentRoomTableViewCell.h"
-#import "NSBundle+MatrixKit.h"
-#import "ShareExtensionManager.h"
 #import "RecentCellData.h"
 #import "ThemeService.h"
-#import <MatrixKit/MatrixKit.h>
 
 #ifdef IS_SHARE_EXTENSION
 #import "RiotShareExtension-Swift.h"

RiotShareExtension/Modules/Share/DataSources/ShareDataSource.m → RiotShareExtension/Shared/ShareDataSource.m

@@ -15,7 +15,6 @@
  */
 
 #import "ShareDataSource.h"
-#import "ShareExtensionManager.h"
 #import "RecentRoomTableViewCell.h"
 
 @interface ShareDataSource ()

RiotShareExtension/Managers/ShareExtensionManager.h → RiotShareExtension/Shared/ShareManager.h

@@ -16,17 +16,15 @@
 
 #import <MatrixKit/MatrixKit.h>
 
-@class ShareExtensionManager;
-
-typedef NS_ENUM(NSUInteger, ShareExtensionManagerResult) {
-    ShareExtensionManagerResultFinished,
-    ShareExtensionManagerResultCancelled,
-    ShareExtensionManagerResultFailed
+typedef NS_ENUM(NSUInteger, ShareManagerResult) {
+    ShareManagerResultFinished,
+    ShareManagerResultCancelled,
+    ShareManagerResultFailed
 };
 
-@interface ShareExtensionManager : NSObject
+@interface ShareManager : NSObject
 
-@property (nonatomic, copy) void (^completionCallback)(ShareExtensionManagerResult);
+@property (nonatomic, copy) void (^completionCallback)(ShareManagerResult);
 
 - (instancetype)initWithShareExtensionContext:(NSExtensionContext *)shareExtensionContext
                                extensionItems:(NSArray<NSExtensionItem *> *)extensionItems;
@@ -36,7 +34,7 @@ typedef NS_ENUM(NSUInteger, ShareExtensionManagerResult) {
 @end
 
 
-@interface NSItemProvider (ShareExtensionManager)
+@interface NSItemProvider (ShareManager)
 
 @property BOOL isLoaded;