move NSUserActitivy update code into UserActivityService

Signed-off-by: Finn Behrens <[email protected]>

Author: kloenk

Riot/Managers/Activities/UserActivities.m

@@ -14,24 +14,18 @@
 // limitations under the License.
 //
 
-#ifndef UserActivities_h
-#define UserActivities_h
+#ifndef UserActivityService_h
+#define UserActivityService_h
 
-#import <Foundation/Foundation.h>
+/// MXUserActivityTypes identifes user activities
+typedef NSString *const UserActivityType NS_TYPED_EXTENSIBLE_ENUM;
 
-/**
- NSUserActivity types for rooms
- */
-FOUNDATION_EXPORT NSString *const kUserActivityTypeMatrixRoom;
+static UserActivityType const MXUserActivityTypeRoom = @"org.matrix.room";
 
-/**
- UserInfo field for the room id
- */
-FOUNDATION_EXPORT NSString *const kUserActivityInfoRoomId;
+/// MXUserActivityFields identifies fields in the userInfo of a UserActivity
+typedef NSString *const UserActivityField NS_TYPED_EXTENSIBLE_ENUM;
 
-/**
- UserInfo field for the user id
- */
-FOUNDATION_EXPORT NSString *const kUserActivityInfoUserId;
+static UserActivityField const UserActivityFieldRoom = @"roomID";
+static UserActivityField const UserActivityFieldUser = @"userID";
 
-#endif /* UserActivities_h */
+#endif /* UserActivityService_h */

Riot/Managers/Activities/UserActivities.h …anagers/Activities/UserActivityService.hRiot/Managers/Activities/UserActivities.h renamed to Riot/Managers/Activities/UserActivityService.h Riot/Managers/Activities/UserActivities.h renamed to Riot/Managers/Activities/UserActivityService.h

@@ -15,15 +15,12 @@
 //
 
 import Foundation
+import CoreSpotlight
 import MatrixSDK
 
 @objcMembers
 class UserActivityService: NSObject {
 
-    // MARK: - Constants
-    
-    // TODO: Move constants in here from UserActivities.m
-    
     // MARK: - Properties
 
     #warning("This is initialised lazily so currently only observes left rooms if RoomViewController has been presented.")
@@ -39,12 +36,46 @@ class UserActivityService: NSObject {
 
     // MARK: - Public
 
-    func update(_ activity: NSUserActivity, from room: MXRoom) {
-        // TODO: Convert objc code into here.
+    func update(_ userActivity: NSUserActivity, from room: MXRoom) {
+        userActivity.title = room.summary.displayname
+        
+        userActivity.requiredUserInfoKeys = [ UserActivityField.room.rawValue ]
+        var userInfo = [String: Any]()
+        userInfo[UserActivityField.room.rawValue] = room.roomId
+        if room.isDirect {
+            userInfo[UserActivityField.user.rawValue] = room.directUserId
+        }
+        userActivity.userInfo = userInfo
+        
+        // TODO: if we add more userActivities, a `org.matrix.room` prefix should probably be added
+        userActivity.persistentIdentifier = room.roomId
+        
+        userActivity.isEligibleForHandoff = true
+        userActivity.isEligibleForSearch = true
+        userActivity.isEligibleForPrediction = true
+        
+        var contentAttributes: CSSearchableItemAttributeSet
+        if #available(iOS 14.0, *) {
+            contentAttributes = CSSearchableItemAttributeSet(contentType: UTType.item)
+        } else {
+            contentAttributes = CSSearchableItemAttributeSet(itemContentType: "public.item")
+        }
+        
+        contentAttributes.title = room.summary.displayname
+        contentAttributes.displayName = room.summary.displayname
+        contentAttributes.contentDescription = room.summary.lastMessage.text
+        // TODO: contentAttributes.thumbnailURL
+        contentAttributes.domainIdentifier = room.roomId
+        contentAttributes.relatedUniqueIdentifier = room.summary.lastMessage.eventId
+        // TODO: contentAttributes.weakRelatedUniqueIdentifier (is this needed? does it break anything else?)
+        contentAttributes.instantMessageAddresses = [ room.roomId ]
+        
+        userActivity.contentAttributeSet = contentAttributes
     }
 
     func didLeaveRoom(_ notification: Notification) {
         guard let roomId = notification.userInfo?[kMXSessionNotificationRoomIdKey] as? String else { return }
-        // TODO: Remove the room from spotlight
+        NSUserActivity.deleteSavedUserActivities(withPersistentIdentifiers: [roomId], completionHandler: { })
+        CSSearchableIndex.default().deleteSearchableItems(withDomainIdentifiers: [roomId], completionHandler: nil)
     }
 }

Riot/Managers/Activities/UserActivityService.swift

@@ -55,11 +55,11 @@
 #import "MXSession+Riot.h"
 #import "MXRoom+Riot.h"
 
+#import "UserActivityService.h"
+
 #import "Riot-Swift.h"
 #import "PushNotificationService.h"
 
-#import "UserActivities.h"
-
 //#define MX_CALL_STACK_OPENWEBRTC
 #ifdef MX_CALL_STACK_OPENWEBRTC
 #import <MatrixOpenWebRTCWrapper/MatrixOpenWebRTCWrapper.h>
@@ -747,9 +747,9 @@ - (BOOL)application:(UIApplication *)application continueUserActivity:(NSUserAct
     {
         continueUserActivity = [self handleUniversalLink:userActivity];
     }
-    else if ([userActivity.activityType isEqualToString:kUserActivityTypeMatrixRoom])
+    else if ([userActivity.activityType isEqualToString:MXUserActivityTypeRoom])
     {
-        NSString *roomID = userActivity.userInfo[kUserActivityInfoRoomId];
+        NSString *roomID = userActivity.userInfo[UserActivityFieldRoom];
         if (!roomID)
             return continueUserActivity;
 
@@ -762,7 +762,7 @@ - (BOOL)application:(UIApplication *)application continueUserActivity:(NSUserAct
         INInteraction *interaction = userActivity.interaction;
 
         // roomID provided by Siri intent
-        NSString *roomID = userActivity.userInfo[kUserActivityInfoRoomId];
+        NSString *roomID = userActivity.userInfo[UserActivityFieldRoom];
 
         // We've launched from calls history list
         if (!roomID)

Riot/Modules/Application/LegacyAppDelegate.m

@@ -129,11 +129,10 @@
 #import "SecurityViewController.h"
 
 #import "TypingUserInfo.h"
+#import "UserActivityService.h"
 
 #import "MXSDKOptions.h"
 
-#import "UserActivities.h"
-
 #import "Riot-Swift.h"
 
 NSNotificationName const RoomCallTileTappedNotification = @"RoomCallTileTappedNotification";
@@ -614,7 +613,7 @@ - (void)viewWillAppear:(BOOL)animated
                                                                                           category:AnalyticsNoficationsCategory];
     }
 
-    [self becomeCurrentActivity];
+    [self updateUserActivity];
 }
 
 - (void)viewWillDisappear:(BOOL)animated
@@ -2035,51 +2034,17 @@ - (void)setupActions {
     roomInputView.actionsBar.actionItems = actionItems;
 }
 
-- (void)becomeCurrentActivity
+- (void)updateUserActivity
 {
     if (!self.userActivity) {
-        self.userActivity = [[NSUserActivity alloc] initWithActivityType:kUserActivityTypeMatrixRoom];
+        self.userActivity = [[NSUserActivity alloc] initWithActivityType:MXUserActivityTypeRoom];
     }
 
-    // TODO: Move everything else into the method called below
     [UserActivityService.shared update:self.userActivity from:self.roomDataSource.room];
 
-    self.userActivity.title = self.roomDataSource.room.summary.displayname;
-    self.userActivity.requiredUserInfoKeys = [[NSSet alloc] initWithObjects:kUserActivityInfoRoomId, nil];
-    
-    // user info
-    NSMutableDictionary *userInfo = [[NSMutableDictionary alloc] init];
-    [userInfo setObject:self.roomDataSource.roomId forKey:kUserActivityInfoRoomId];
-    if ([self.roomDataSource.room isDirect]) {
-        [userInfo setObject:self.roomDataSource.room.directUserId forKey:kUserActivityInfoUserId];
-    }
-    self.userActivity.userInfo = userInfo;
-    
     // TODO: add a NSUserActivityDelegate to save the current text in the userinfo of the activity
     // self.userActivity.delegate = self;
     // self.userActivity.needsSave = true;
-    self.userActivity.persistentIdentifier = self.roomDataSource.roomId;
-    
-    self.userActivity.eligibleForHandoff = true;
-    self.userActivity.eligibleForSearch = true;
-    self.userActivity.eligibleForPrediction = true;
-    
-    CSSearchableItemAttributeSet *contentAttribute;
-    if (@available(iOS 14.0, *)) {
-        contentAttribute = [[CSSearchableItemAttributeSet alloc] initWithContentType:UTTypeItem];
-    } else {
-        contentAttribute = [[CSSearchableItemAttributeSet alloc] initWithItemContentType:@"public.item"];
-    }
-    
-    contentAttribute.title = self.roomDataSource.room.summary.displayname;
-    contentAttribute.displayName = self.roomDataSource.room.summary.displayname;
-    contentAttribute.contentDescription = self.roomDataSource.room.summary.lastMessage.text;
-    
-    // TODO: contentAttribute.thumbnailURL =
-    // TODO: accountHandles of everyone in the room
-    contentAttribute.instantMessageAddresses = [[NSArray alloc] initWithObjects:self.roomDataSource.roomId, nil];
-    
-    self.userActivity.contentAttributeSet = contentAttribute;
 }
 
 - (void)roomInputToolbarViewPresentStickerPicker

Riot/Modules/Room/RoomViewController.m

@@ -45,3 +45,4 @@
 #import "GroupDetailsViewController.h"
 #import "RoomInputToolbarView.h"
 #import "NSArray+Element.h"
+#import "UserActivityService.h"