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

chore: FOSS Merge 1.27.11 (MESSENGER-7276)

Browse Source 
Merge commit 'af0b6d4be985d9f26e5111d3fa01389c7321949f' into feature/7276_FOSS_Merge_1_27_11

# Conflicts:
#	Config/AppVersion.xcconfig
#	Gemfile.lock
#	IDETemplateMacros.plist
#	Podfile
#	Podfile.lock
#	README.md
#	Riot/Modules/Authentication/AuthenticationCoordinator.swift
#	Riot/Modules/Room/CellData/RoomBubbleCellData.m
#	Riot/target.yml
#	RiotNSE/NotificationService.swift
#	RiotSwiftUI/Modules/Authentication/ServerSelection/AuthenticationServerSelectionModels.swift
#	RiotSwiftUI/Modules/Authentication/ServerSelection/AuthenticationServerSelectionViewModel.swift
#	RiotSwiftUI/Modules/Authentication/ServerSelection/Coordinator/AuthenticationServerSelectionCoordinator.swift
#	RiotSwiftUI/Modules/Authentication/ServerSelection/View/AuthenticationServerSelectionScreen.swift
#	RiotSwiftUI/Modules/Room/CompletionSuggestion/Service/CompletionSuggestionService.swift
#	fastlane/Fastfile
This commit is contained in:
Frank Rotermund
2025-05-16 14:06:20 +02:00
parent 66f0fcb9ae 17ceee7628
commit 67df1a3e95
1482 changed files with 6390 additions and 3080 deletions
Download Patch File Download Diff File Expand all files Collapse all files
RiotSwiftUI/Modules/Authentication/ServerSelection/AuthenticationServerSelectionViewModel.swift
+11 -6
View File
@@ -1,8 +1,8 @@
//
// Copyright 2021-2024 New Vector Ltd.
//
// SPDX-License-Identifier: AGPL-3.0-only
// Please see LICENSE in the repository root for full details.
// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
// Please see LICENSE files in the repository root for full details.
//
import SwiftUI
@@ -42,6 +42,8 @@ class AuthenticationServerSelectionViewModel: AuthenticationServerSelectionViewM
Task { await callback?(.dismiss) }
case .clearFooterError:
Task { await clearFooterError() }
case .downloadReplacementApp(let replacementApp):
Task { await callback?(.downloadReplacementApp(replacementApp)) }
}
}
@@ -49,12 +51,15 @@ class AuthenticationServerSelectionViewModel: AuthenticationServerSelectionViewM
switch type {
case .footerMessage(let message):
withAnimation {
state.footerErrorMessage = message
state.footerError = .message(message)
}
case .openURLAlert:
state.bindings.alertInfo = AlertInfo(id: .openURLAlert, title: VectorL10n.roomMessageUnableOpenLinkErrorMessage)
case .openInvalidServerInfo: break
case .requiresReplacementApp:
withAnimation {
state.footerError = .sunsetBanner
}
}
}
@@ -69,7 +74,7 @@ class AuthenticationServerSelectionViewModel: AuthenticationServerSelectionViewM
/// Clear any errors shown in the text field footer.
@MainActor private func clearFooterError() {
guard state.footerErrorMessage != nil else { return }
withAnimation { state.footerErrorMessage = nil }
guard state.footerError != nil else { return }
withAnimation { state.footerError = nil }
}
}