felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-17 23:18:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed additional merge issues

Browse Source
This commit is contained in:
Arnfried Griesert
2023-06-12 06:08:33 +02:00
parent 1c0ef0ca52
commit b4f6992e56
7 changed files with 42 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Config/BWIBuildSettings.swift
View File

@@ -621,4 +621,7 @@ class BWIBuildSettings: NSObject {
// MARK: Sessions Manager
var enableNewSessionManagerByDefault = false
// MARK: Voice Broadcast
var enableLabFeatureVoiceBroadcasts = false
}

19
Riot/Modules/Application/LegacyAppDelegate.m
View File

@@ -2562,6 +2562,7 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
{
MXLogDebug(@"[AppDelegate] showLaunchAnimation");
/* bwi: 4782 removed by nv
UIView *launchLoadingView;
if (MXSDKOptions.sharedInstance.enableStartupProgress)
{
@@ -2569,15 +2570,8 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
{
launchLoadingView = [BUMLaunchLoadingViewController makeView];
} else {
if (MXSDKOptions.sharedInstance.enableStartupProgress)
{
MXSession *mainSession = self.mxSessions.firstObject;
launchLoadingView = [LaunchLoadingView instantiateWithStartupProgress:mainSession.startupProgress];
}
else
{
launchLoadingView = [LaunchLoadingView instantiateWithStartupProgress:nil];
}
MXSession *mainSession = self.mxSessions.firstObject;
launchLoadingView = [LaunchLoadingView instantiateWithStartupProgress:mainSession.startupProgress];
[(LaunchLoadingView *) launchLoadingView updateWithTheme:ThemeService.shared.theme];
}
@@ -2586,7 +2580,9 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
[window addSubview:launchLoadingView];
}
*/
/* bwi: 4782 - new code from nv
MXSession *mainSession = self.mxSessions.firstObject;
LaunchLoadingView *launchLoadingView = [LaunchLoadingView instantiateWithStartupProgress:mainSession.startupProgress];
@@ -2596,8 +2592,9 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
[window addSubview:launchLoadingView];
launchAnimationContainerView = launchLoadingView;
launchAnimationContainerView = launchLoadingView;
*/
[MXSDKOptions.sharedInstance.profiler startMeasuringTaskWithName:MXTaskProfileNameStartupLaunchScreen];
}
}

3
Riot/Modules/Authentication/AuthenticationCoordinator.swift
View File

@@ -635,8 +635,7 @@ final class AuthenticationCoordinator: NSObject, AuthenticationCoordinatorProtoc
loadingViewController.modalPresentationStyle = .fullScreen
navigationRouter.setRootModule(loadingViewController)
} else {
let startupProgress: MXSessionStartupProgress? = MXSDKOptions.sharedInstance().enableStartupProgress ? session?.startupProgress : nil
let loadingViewController = LaunchLoadingViewController(startupProgress: startupProgress)
let loadingViewController = LaunchLoadingViewController(startupProgress: session?.startupProgress)
loadingViewController.modalPresentationStyle = .fullScreen
// Replace the navigation stack with the loading animation

3
Riot/Modules/Authentication/Legacy/LegacyAuthenticationCoordinator.swift
View File

@@ -121,8 +121,7 @@ final class LegacyAuthenticationCoordinator: NSObject, AuthenticationCoordinator
loadingViewController.modalPresentationStyle = .fullScreen
navigationRouter.setRootModule(loadingViewController)
} else {
let startupProgress: MXSessionStartupProgress? = MXSDKOptions.sharedInstance().enableStartupProgress ? session?.startupProgress : nil
let loadingViewController = LaunchLoadingViewController(startupProgress: startupProgress)
let loadingViewController = LaunchLoadingViewController(startupProgress: session?.startupProgress)
loadingViewController.modalPresentationStyle = .fullScreen
// Replace the navigation stack with the loading animation

2
Riot/Modules/SetPinCode/EnterPinCode/EnterPinCodeViewController.swift
View File

@@ -88,7 +88,9 @@ final class EnterPinCodeViewController: UIViewController {
inactiveLogoImageView.isHidden = true
}
// BWI: accessibility description
/* bwi: 4782
digitButtonReset.vc_setupAccessibilityTraitsButton(withTitle: BWIL10n.pinProtectionResetButtonAccessibilityLabel, hint: BWIL10n.pinProtectionResetButtonAccessibilityHint, isEnabled: true)
*/
}
override func viewWillAppear(_ animated: Bool) {

1
Riot/Modules/Settings/SettingsViewController.m
View File

@@ -755,7 +755,6 @@ ChangePasswordCoordinatorBridgePresenterDelegate>
{
[sectionLabs addRowWithTag:LABS_ENABLE_LIVE_LOCATION_SHARING];
}
*/
[sectionLabs addRowWithTag:LABS_ENABLE_NEW_SESSION_MANAGER];
/* bwi: disabled for our apps
[sectionLabs addRowWithTag:LABS_ENABLE_NEW_CLIENT_INFO_FEATURE];

30
RiotSwiftUI/Modules/Room/TimelinePoll/Coordinator/TimelinePollCoordinator.swift
View File

@@ -29,6 +29,7 @@ final class TimelinePollCoordinator: Coordinator, Presentable, PollAggregatorDel
// MARK: Private
private let navigationRouter: NavigationRouterType?
private let parameters: TimelinePollCoordinatorParameters
private let selectedAnswerIdentifiersSubject = PassthroughSubject<[String], Never>()
@@ -43,10 +44,11 @@ final class TimelinePollCoordinator: Coordinator, Presentable, PollAggregatorDel
// MARK: - Setup
init(parameters: TimelinePollCoordinatorParameters) throws {
init(parameters: TimelinePollCoordinatorParameters, navigationRouter: NavigationRouterType? = nil) throws {
self.parameters = parameters
viewModel = TimelinePollViewModel(timelinePollDetailsState: .loading)
self.navigationRouter = navigationRouter
viewModel = TimelinePollViewModel(timelinePollDetailsState: .loading)
try pollAggregator = PollAggregator(session: parameters.session, room: parameters.room, pollEvent: parameters.pollEvent, delegate: self)
viewModel.completion = { [weak self] result in
@@ -55,6 +57,9 @@ final class TimelinePollCoordinator: Coordinator, Presentable, PollAggregatorDel
switch result {
case .selectedAnswerOptionsWithIdentifiers(let identifiers):
self.selectedAnswerIdentifiersSubject.send(identifiers)
case .showParticipants:
self.showParticipantsView()
}
}
@@ -104,6 +109,23 @@ final class TimelinePollCoordinator: Coordinator, Presentable, PollAggregatorDel
}
}
func showParticipantsView() {
if let navigationRouter = navigationRouter, let poll = pollAggregator.poll {
let parameters = PollParticipantDetailsCoordinatorParameters(room: parameters.room, poll: poll)
let coordinator = PollParticipantDetailsCoordinator(parameters: parameters)
add(childCoordinator: coordinator)
if navigationRouter.modules.isEmpty == false {
navigationRouter.push(coordinator, animated: true, popCompletion: nil)
} else {
navigationRouter.setRootModule(coordinator, popCompletion: nil)
}
coordinator.start()
}
}
// MARK: - PollAggregatorDelegate
func pollAggregatorDidUpdateData(_ aggregator: PollAggregator) {
@@ -142,7 +164,8 @@ extension TimelinePollDetails {
text: pollAnswerOption.text,
count: pollAnswerOption.count,
winner: pollAnswerOption.isWinner,
selected: pollAnswerOption.isCurrentUserSelection)
selected: pollAnswerOption.isCurrentUserSelection,
voters:pollAnswerOption.voters)
}
self.init(id: poll.id,
@@ -152,6 +175,7 @@ extension TimelinePollDetails {
startDate: poll.startDate,
totalAnswerCount: poll.totalAnswerCount,
type: poll.kind.timelinePollType,
showParticipants: poll.showParticipants,
eventType: eventType,
maxAllowedSelections: poll.maxAllowedSelections,
hasBeenEdited: poll.hasBeenEdited,