Remove old AppDelegate imports.

Riot/Managers/Analytics/Analytics.m

@@ -16,7 +16,6 @@
 
 #import "Analytics.h"
 
-#import "AppDelegate.h"
 #import "Riot-Swift.h"
 
 // All metrics are store under a Piwik category called "Metrics".

Riot/Managers/BugReport/RageShakeManager.m

@@ -19,7 +19,6 @@
 
 #import "RageShakeManager.h"
 
-#import "AppDelegate.h"
 #import "BugReportViewController.h"
 
 #import <MatrixKit/MatrixKit.h>

Riot/Modules/Authentication/AuthenticationViewController.m

@@ -18,7 +18,6 @@
 
 #import "AuthenticationViewController.h"
 
-#import "AppDelegate.h"
 #import "Riot-Swift.h"
 #import "MXSession+Riot.h"
 

Riot/Modules/BugReport/BugReportViewController.m

@@ -16,7 +16,6 @@
 
 #import "BugReportViewController.h"
 
-#import "AppDelegate.h"
 #import "Riot-Swift.h"
 
 #import "GBDeviceInfo_iOS.h"

Riot/Modules/Call/CallViewController.m

@@ -18,7 +18,6 @@
 
 #import "CallViewController.h"
 
-#import "AppDelegate.h"
 #import "Riot-Swift.h"
 
 #import "AvatarGenerator.h"

Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m

@@ -26,8 +26,6 @@
 #import "MXRoom+Riot.h"
 #import "MXSession+Riot.h"
 
-#import "AppDelegate.h"
-
 #import "Riot-Swift.h"
 
 #define RECENTSDATASOURCE_SECTION_DIRECTORY     0x01

Riot/Modules/Common/Recents/RecentsViewController.m

@@ -32,7 +32,6 @@
 #import "DirectoryRecentTableViewCell.h"
 #import "RoomIdOrAliasTableViewCell.h"
 
-#import "AppDelegate.h"
 #import "Riot-Swift.h"
 
 @interface RecentsViewController ()

Riot/Modules/Common/WebViewController/WebViewViewController.m

@@ -15,7 +15,6 @@
  */
 
 #import "WebViewViewController.h"
-#import "AppDelegate.h"
 #import "Riot-Swift.h"
 
 @interface WebViewViewController ()

Riot/Modules/Communities/GroupsViewController.m

@@ -19,7 +19,6 @@
 #import "GroupTableViewCell.h"
 #import "GroupInviteTableViewCell.h"
 
-#import "AppDelegate.h"
 #import "Riot-Swift.h"
 
 @interface GroupsViewController ()

Riot/Modules/Communities/Home/GroupHomeViewController.m

@@ -17,7 +17,6 @@
 
 #import "GroupHomeViewController.h"
 
-#import "AppDelegate.h"
 #import "Riot-Swift.h"
 
 #import "ThemeService.h"

Riot/Modules/Communities/Members/GroupParticipantsViewController.m

@@ -16,7 +16,6 @@
 
 #import "GroupParticipantsViewController.h"
 
-#import "AppDelegate.h"
 #import "Riot-Swift.h"
 
 #import "Contact.h"

Riot/Modules/Communities/Rooms/GroupRoomsViewController.m

@@ -16,7 +16,6 @@
 
 #import "GroupRoomsViewController.h"
 
-#import "AppDelegate.h"
 #import "Riot-Swift.h"
 
 #import "GroupRoomTableViewCell.h"

Riot/Modules/Communities/TabDetail/GroupDetailsViewController.m

@@ -20,7 +20,6 @@
 #import "GroupParticipantsViewController.h"
 #import "GroupRoomsViewController.h"
 
-#import "AppDelegate.h"
 #import "Riot-Swift.h"
 
 @interface GroupDetailsViewController ()

Riot/Modules/Contacts/ContactsTableViewController.m

@@ -20,7 +20,6 @@
 
 #import "UIViewController+RiotSearch.h"
 
-#import "AppDelegate.h"
 #import "Riot-Swift.h"
 
 #define CONTACTS_TABLEVC_LOCALCONTACTS_BITWISE 0x01

Riot/Modules/Contacts/Details/ContactDetailsViewController.m

@@ -18,7 +18,6 @@
 
 #import "ContactDetailsViewController.h"
 
-#import "AppDelegate.h"
 #import "Riot-Swift.h"
 #import "MXSession+Riot.h"
 

Riot/Modules/EncryptionInfo/EncryptionInfoView.m

@@ -20,8 +20,6 @@
 #import "ThemeService.h"
 #import "Riot-Swift.h"
 
-#import "AppDelegate.h"
-
 @interface EncryptionInfoView() <KeyVerificationCoordinatorBridgePresenterDelegate>
 {
     KeyVerificationCoordinatorBridgePresenter *keyVerificationCoordinatorBridgePresenter;

Riot/Modules/Favorites/FavouritesViewController.m

@@ -16,8 +16,6 @@
 
 #import "FavouritesViewController.h"
 
-#import "AppDelegate.h"
-
 #import "RecentsDataSource.h"
 #import "Riot-Swift.h"
 

Riot/Modules/GlobalSearch/Files/HomeFilesSearchViewController.m

@@ -17,7 +17,6 @@
 
 #import "HomeFilesSearchViewController.h"
 
-#import "AppDelegate.h"
 #import "Riot-Swift.h"
 
 #import "HomeViewController.h"

Riot/Modules/GlobalSearch/Messages/HomeMessagesSearchViewController.m

@@ -17,7 +17,6 @@
 
 #import "HomeMessagesSearchViewController.h"
 
-#import "AppDelegate.h"
 #import "Riot-Swift.h"
 
 #import "HomeViewController.h"

Riot/Modules/GlobalSearch/Rooms/DirectoryViewController.m

@@ -19,7 +19,6 @@
 
 #import "PublicRoomsDirectoryDataSource.h"
 
-#import "AppDelegate.h"
 #import "Riot-Swift.h"
 
 @interface DirectoryViewController ()

Riot/Modules/GlobalSearch/UnifiedSearchViewController.m

@@ -31,7 +31,6 @@
 #import "HomeFilesSearchViewController.h"
 #import "FilesSearchCellData.h"
 
-#import "AppDelegate.h"
 #import "Riot-Swift.h"
 
 #import "GBDeviceInfo_iOS.h"

Riot/Modules/Home/Fallback/AuthFallBackViewController.m

@@ -15,8 +15,7 @@
  */
 
 #import "AuthFallBackViewController.h"
-#import "AppDelegate.h"
+#import "Riot-Swift.h"
-
 
 // Generic method to make a bridge between JS and the WKWebView
 NSString *FallBackViewControllerJavascriptSendObjectMessage = @"window.sendObjectMessage = function(parameters) {   \

Riot/Modules/Home/HomeViewController.m

@@ -17,7 +17,6 @@
 
 #import "HomeViewController.h"
 
-#import "AppDelegate.h"
 #import "Riot-Swift.h"
 
 #import "RecentsDataSource.h"

Riot/Modules/Integrations/IntegrationManagerViewController.m

@@ -19,7 +19,6 @@
 
 #import "WidgetManager.h"
 
-#import "AppDelegate.h"
 #import "Riot-Swift.h"
 
 NSString *const kIntegrationManagerMainScreen = nil;

Riot/Modules/Integrations/WidgetPicker/WidgetPickerViewController.m

@@ -16,8 +16,6 @@
 
 #import "WidgetPickerViewController.h"
 
-#import "AppDelegate.h"
-
 #import "WidgetManager.h"
 #import "WidgetViewController.h"
 #import "IntegrationManagerViewController.h"

Riot/Modules/Integrations/Widgets/WidgetViewController.m

@@ -17,7 +17,6 @@
 
 #import "WidgetViewController.h"
 
-#import "AppDelegate.h"
 #import "IntegrationManagerViewController.h"
 #import "Riot-Swift.h"
 

Riot/Modules/KeyVerification/Device/SelfVerifyWait/KeyVerificationSelfVerifyWaitViewModel.swift

@@ -155,11 +155,11 @@ final class KeyVerificationSelfVerifyWaitViewModel: KeyVerificationSelfVerifyWai
     
     private func registerKeyVerificationManagerNewRequestNotification(for verificationManager: MXKeyVerificationManager) {
         NotificationCenter.default.addObserver(self, selector: #selector(keyVerificationManagerNewRequestNotification(notification:)), name: .MXKeyVerificationManagerNewRequest, object: verificationManager)
-        AppDelegate.the()?.handleSelfVerificationRequest = false
+        AppDelegate.theDelegate().handleSelfVerificationRequest = false
     }
     
     private func unregisterKeyVerificationManagerNewRequestNotification() {
-        AppDelegate.the()?.handleSelfVerificationRequest = true
+        AppDelegate.theDelegate().handleSelfVerificationRequest = true
         NotificationCenter.default.removeObserver(self, name: .MXKeyVerificationManagerNewRequest, object: nil)
     }
     

Riot/Modules/MediaPicker/Library/MediaAlbumContentViewController.m

@@ -17,8 +17,6 @@
 
 #import "MediaAlbumContentViewController.h"
 
-#import "AppDelegate.h"
-
 #import <MobileCoreServices/MobileCoreServices.h>
 
 #import "Riot-Swift.h"

Riot/Modules/MediaPicker/MediaPickerViewController.m

@@ -17,7 +17,6 @@
 
 #import "MediaPickerViewController.h"
 
-#import "AppDelegate.h"
 #import "Riot-Swift.h"
 
 #import <Photos/Photos.h>

Riot/Modules/People/PeopleViewController.m

@@ -21,8 +21,6 @@
 
 #import "RageShakeManager.h"
 
-#import "AppDelegate.h"
-
 #import "RecentsDataSource.h"
 #import "RecentTableViewCell.h"
 #import "InviteRecentTableViewCell.h"

Riot/Modules/PublicRoomList/DataSources/PublicRoomsDirectoryDataSource.m

@@ -19,7 +19,6 @@
 
 #import "PublicRoomTableViewCell.h"
 
-#import "AppDelegate.h"
 #import "Riot-Swift.h"
 
 #pragma mark - Constants definitions

Riot/Modules/Room/Attachements/AttachmentsViewController.m

@@ -17,7 +17,6 @@
 
 #import "AttachmentsViewController.h"
 
-#import "AppDelegate.h"
 #import "Riot-Swift.h"
 
 @interface AttachmentsViewController ()

Riot/Modules/Room/Files/RoomFilesViewController.m

@@ -19,7 +19,6 @@
 
 #import "FilesSearchTableViewCell.h"
 
-#import "AppDelegate.h"
 #import "Riot-Swift.h"
 
 #import "AttachmentsViewController.h"

Riot/Modules/Room/Members/Detail/RoomMemberDetailsViewController.m

@@ -18,7 +18,6 @@
 
 #import "RoomMemberDetailsViewController.h"
 
-#import "AppDelegate.h"
 #import "Riot-Swift.h"
 
 #import "RoomMemberTitleView.h"

Riot/Modules/Room/Members/RoomParticipantsViewController.m

@@ -19,7 +19,6 @@
 
 #import "RoomMemberDetailsViewController.h"
 
-#import "AppDelegate.h"
 #import "Riot-Swift.h"
 
 #import "Contact.h"

Riot/Modules/Room/RoomViewController.m

@@ -21,8 +21,6 @@
 #import "RoomDataSource.h"
 #import "RoomBubbleCellData.h"
 
-#import "AppDelegate.h"
-
 #import "RoomInputToolbarView.h"
 #import "DisabledRoomInputToolbarView.h"
 
@@ -4525,7 +4523,7 @@
         {
             // The room has an active jitsi widget
             // Show it in the banner if the user is not already in
-            AppDelegate *appDelegate = [AppDelegate theDelegate];
+            LegacyAppDelegate *appDelegate = [AppDelegate theDelegate];
             if ([appDelegate.jitsiViewController.widget.widgetId isEqualToString:jitsiWidget.widgetId])
             {
                 if ([self checkUnsentMessages] == NO)

Riot/Modules/Room/Search/Files/RoomFilesSearchViewController.m

@@ -24,7 +24,6 @@
 #import "FilesSearchCellData.h"
 #import "FilesSearchTableViewCell.h"
 
-#import "AppDelegate.h"
 #import "Riot-Swift.h"
 
 @interface RoomFilesSearchViewController ()

Riot/Modules/Room/Search/Messages/RoomMessagesSearchViewController.m

@@ -26,7 +26,6 @@
 #import "RoomIncomingAttachmentBubbleCell.h"
 #import "RoomIncomingTextMsgBubbleCell.h"
 
-#import "AppDelegate.h"
 #import "Riot-Swift.h"
 
 @interface RoomMessagesSearchViewController ()

Riot/Modules/Room/Search/RoomSearchViewController.m

@@ -22,7 +22,6 @@
 #import "RoomFilesSearchViewController.h"
 #import "FilesSearchCellData.h"
 
-#import "AppDelegate.h"
 #import "Riot-Swift.h"
 
 @interface RoomSearchViewController ()

Riot/Modules/Room/Settings/RoomSettingsViewController.m

@@ -28,7 +28,6 @@
 #import "MXRoom+Riot.h"
 #import "MXRoomSummary+Riot.h"
 
-#import "AppDelegate.h"
 #import "Riot-Swift.h"
 
 #import "RoomMemberDetailsViewController.h"

Riot/Modules/RoomKeyRequest/RoomKeyRequestViewController.m

@@ -16,7 +16,6 @@
 
 #import "RoomKeyRequestViewController.h"
 
-#import "AppDelegate.h"
 #import "Riot-Swift.h"
 
 @interface RoomKeyRequestViewController () <KeyVerificationCoordinatorBridgePresenterDelegate>

Riot/Modules/Rooms/DirectoryPicker/DirectoryServerPickerViewController.m

@@ -18,7 +18,6 @@
 #import "DirectoryServerTableViewCell.h"
 #import "DirectoryServerDetailTableViewCell.h"
 
-#import "AppDelegate.h"
 #import "Riot-Swift.h"
 
 @interface DirectoryServerPickerViewController ()

Riot/Modules/Rooms/RoomsViewController.m

@@ -16,8 +16,6 @@
 
 #import "RoomsViewController.h"
 
-#import "AppDelegate.h"
-
 #import "RecentsDataSource.h"
 
 #import "DirectoryServerPickerViewController.h"

Riot/Modules/Settings/DeactivateAccount/DeactivateAccountViewController.m

@@ -18,7 +18,6 @@
 
 #import "ThemeService.h"
 #import "Riot-Swift.h"
-#import "AppDelegate.h"
 
 #pragma mark - Defines & Constants
 

Riot/Modules/Settings/Language/LanguagePickerViewController.m

@@ -16,7 +16,6 @@
 
 #import "LanguagePickerViewController.h"
 
-#import "AppDelegate.h"
 #import "Riot-Swift.h"
 
 @interface LanguagePickerViewController ()

Riot/Modules/Settings/PhoneCountry/CountryPickerViewController.m

@@ -16,7 +16,6 @@
 
 #import "CountryPickerViewController.h"
 
-#import "AppDelegate.h"
 #import "Riot-Swift.h"
 
 @interface CountryPickerViewController ()

Riot/Modules/Settings/Security/ManageSession/ManageSessionViewController.m

@@ -20,7 +20,6 @@
 
 #import <OLMKit/OLMKit.h>
 
-#import "AppDelegate.h"
 #import "AvatarGenerator.h"
 
 #import "ThemeService.h"

Riot/Modules/Settings/Security/SecurityViewController.m

@@ -22,7 +22,6 @@
 
 #import <OLMKit/OLMKit.h>
 
-#import "AppDelegate.h"
 #import "AvatarGenerator.h"
 
 #import "ThemeService.h"

Riot/Modules/Settings/SettingsViewController.m

@@ -22,7 +22,6 @@
 
 #import <OLMKit/OLMKit.h>
 
-#import "AppDelegate.h"
 #import "AvatarGenerator.h"
 
 #import "BugReportViewController.h"

Riot/Modules/StartChat/StartChatViewController.m

@@ -17,7 +17,6 @@
 
 #import "StartChatViewController.h"
 
-#import "AppDelegate.h"
 #import "Riot-Swift.h"
 #import "MXSession+Riot.h"
 

Riot/Modules/TabBar/MasterTabBarController.m

@@ -22,7 +22,6 @@
 #import "RecentsDataSource.h"
 #import "GroupsDataSource.h"
 
-#import "AppDelegate.h"
 
 #import "MXRoom+Riot.h"
 #import "MXSession+Riot.h"

Riot/Modules/UserDevices/UsersDevicesViewController.m

@@ -17,7 +17,6 @@
 
 #import "UsersDevicesViewController.h"
 
-#import "AppDelegate.h"
 #import "Riot-Swift.h"
 
 @interface UsersDevicesViewController () <KeyVerificationCoordinatorBridgePresenterDelegate>