Merge pull request #5196 from vector-im/steve/5194_generated_swift_header_imports

Improve generated Swift header imports

Riot/Model/Room/RoomPreviewData.m

@@ -16,7 +16,8 @@
  */
 
 #import "RoomPreviewData.h"
-#import <MatrixSDK-Swift.h>
+
+#import "GeneratedInterface-Swift.h"
 
 @implementation RoomPreviewData
 

Riot/Modules/Application/LegacyAppDelegate.m

@@ -2500,17 +2500,17 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
 
 - (void)checkLocalPrivateKeysInSession:(MXSession*)mxSession
 {
-    id<MXCryptoStore> cryptoStore = mxSession.crypto.store;
+    MXRecoveryService *recoveryService = mxSession.crypto.recoveryService;
     NSUInteger keysCount = 0;
-    if ([cryptoStore secretWithSecretId:MXSecretId.keyBackup])
+    if ([recoveryService hasSecretWithSecretId:MXSecretId.keyBackup])
     {
         keysCount++;
     }
-    if ([cryptoStore secretWithSecretId:MXSecretId.crossSigningUserSigning])
+    if ([recoveryService hasSecretWithSecretId:MXSecretId.crossSigningUserSigning])
     {
         keysCount++;
     }
-    if ([cryptoStore secretWithSecretId:MXSecretId.crossSigningSelfSigning])
+    if ([recoveryService hasSecretWithSecretId:MXSecretId.crossSigningSelfSigning])
     {
         keysCount++;
     }

Riot/Modules/Authentication/Views/AuthInputsView.h

@@ -17,7 +17,7 @@
 
 #import <MatrixKit/MatrixKit.h>
 
-#import "GeneratedInterface-Swift.h"
+@class TermsView;
 
 @interface AuthInputsView : MXKAuthInputsView <MXKCountryPickerViewControllerDelegate>
 

Riot/Modules/Authentication/Views/AuthInputsView.m

@@ -26,6 +26,8 @@
 
 #import "RiotNavigationController.h"
 
+#import "GeneratedInterface-Swift.h"
+
 @interface AuthInputsView ()
 {
     /**

Riot/Modules/Common/Recents/Model/RecentCellData.m

@@ -18,7 +18,6 @@
 #import "RecentCellData.h"
 
 #import "MXRoom+Riot.h"
-#import "MatrixSDK-Swift.h"
 
 #import "GeneratedInterface-Swift.h"
 

Riot/Modules/GlobalSearch/Files/CellData/FilesSearchCellData.m

@@ -18,6 +18,8 @@
 
 #import "FilesSearchCellData.h"
 
+#import "GeneratedInterface-Swift.h"
+
 @implementation FilesSearchCellData
 @synthesize roomId, senderDisplayName;
 @synthesize searchResult, title, message, date, shouldShowRoomDisplayName, roomDisplayName, attachment, isAttachmentWithThumbnail, attachmentIcon;

Riot/Modules/Room/CellData/RoomBubbleCellData.m

@@ -24,7 +24,6 @@
 #import "BubbleReactionsViewSizer.h"
 
 #import "GeneratedInterface-Swift.h"
-#import <MatrixKit/MXKSwiftHeader.h>
 
 static NSAttributedString *timestampVerticalWhitespace = nil;
 

Riot/Modules/Settings/Security/SecurityViewController.m

@@ -169,9 +169,8 @@ TableViewSectionsDelegate>
 
     if (self.mainSession.crypto.backup)
     {
-        MXDeviceInfo *deviceInfo = [self.mainSession.crypto.deviceList storedDevice:self.mainSession.matrixRestClient.credentials.userId
-                                                                           deviceId:self.mainSession.matrixRestClient.credentials.deviceId];
-
+        MXDeviceInfo *deviceInfo = [self.mainSession.crypto deviceWithDeviceId:self.mainSession.myDeviceId ofUser:self.mainSession.myUserId];
+        
         if (deviceInfo)
         {
             secureBackupSection = [[SettingsSecureBackupTableViewSection alloc] initWithRecoveryService:self.mainSession.crypto.recoveryService keyBackup:self.mainSession.crypto.backup userDevice:deviceInfo];

Riot/Modules/TabBar/MasterTabBarController.m

@@ -1021,7 +1021,7 @@
         return;
     }
     
-    NSArray<MXDeviceInfo*> *devices = [session.crypto.store devicesForUser:session.myUserId].allValues;
+    NSArray<MXDeviceInfo*> *devices = [session.crypto devicesForUser:session.myUserId].allValues;
     
     BOOL isUserHasOneUnverifiedDevice = NO;
     

changelog.d/5194.bugfix

@@ -0,0 +1 @@
+Improve generated Swift header imports.