MESSENGER-2762 Initial Merge

Riot/Modules/TabBar/MasterTabBarController.h

@@ -1,6 +1,7 @@
 /*
  Copyright 2017 Vector Creations Ltd
  Copyright 2020 New Vector Ltd
+ Copyright (c) 2021 BWI GmbH
  
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -24,10 +25,14 @@
 #import "RoomsViewController.h"
 #import "GroupsViewController.h"
 
-#define TABBAR_HOME_INDEX         0
-#define TABBAR_FAVOURITES_INDEX   1
-#define TABBAR_PEOPLE_INDEX       2
-#define TABBAR_ROOMS_INDEX        3
+#import "RoomViewController.h"
+#import "ContactDetailsViewController.h"
+#import "GroupDetailsViewController.h"
+
+#define TABBAR_FAVOURITES_INDEX   0
+#define TABBAR_PEOPLE_INDEX       1
+#define TABBAR_ROOMS_INDEX        2
+#define TABBAR_HOME_INDEX         3
 #define TABBAR_GROUPS_INDEX       4
 #define TABBAR_COUNT              5
 
@@ -128,6 +133,13 @@ typedef NS_ENUM(NSUInteger, MasterTabBarIndex) {
  */
 - (void)refreshTabBarBadges;
 
+/**
+ Present the 4S setup flow.
+ 
+  @param session the matrix session.
+ */
+- (void)presentSecureBackupSetupForMatrixSession:(MXSession*)session;
+
 /**
  Verify the current device if needed.
  
@@ -150,9 +162,15 @@ typedef NS_ENUM(NSUInteger, MasterTabBarIndex) {
 - (void)filterRoomsWithParentId:(NSString*)roomParentId
                 inMatrixSession:(MXSession*)mxSession;
 
+
+- (void)bwiOnUnlockedByPin;
+
 // Reference to the current onboarding flow. It is always nil unless the flow is being presented.
 @property (nonatomic, readonly) OnboardingCoordinatorBridgePresenter *onboardingCoordinatorBridgePresenter;
 
+// Reference to the current splash VC. It is not nil only when the splash screen is displayed.
+@property (nonatomic, readonly) UIViewController *splashViewController;
+
 @property (nonatomic, readonly) HomeViewController *homeViewController;
 @property (nonatomic, readonly) FavouritesViewController *favouritesViewController;
 @property (nonatomic, readonly) PeopleViewController *peopleViewController;