felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-16 06:28:27 +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

4
Config/AppConfiguration.swift
View File

@@ -3,8 +3,8 @@
// Copyright 2020 Vector Creations Ltd
// Copyright (c) 2021 BWI GmbH
//
// 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 Foundation

3
Config/AppVersion.xcconfig
View File

@@ -16,5 +16,6 @@
//
// Version
MARKETING_VERSION = 2.24.0
MARKETING_VERSION = 2.25.0
CURRENT_PROJECT_VERSION = 20220714163152

25
Config/BuildSettings.swift
View File

@@ -2,8 +2,8 @@
// Copyright 2024 New Vector Ltd.
// Copyright 2020 Vector Creations 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 Foundation
@@ -441,4 +441,25 @@ final class BuildSettings: NSObject {
// MARK: - Alerts
static let showUnverifiedSessionsAlert = true
// MARK: - Sunset
/// Meta data about the app that will replaces this one with Matrix 2.0 support.
struct ReplacementApp {
/// The app's display name, used in marketing banners.
let name = "Element X"
/// A link that will be opened to tell the user more about the new app, Matrix 2.0 and the migration.
let learnMoreURL = URL(string: "https://element.io/app-for-productivity")!
/// The app's iTunes/product ID, used to show the App Store page in-app.
let productID = "1631335820"
/// A fallback URL that will be opened if there are any issues showing the App Store page in-app.
let appStoreURL = URL(string: "https://apps.apple.com/app/element-x-secure-chat-call/id1631335820")!
}
/// Information about the Matrix 2.0 compatible app that will replace this one in the future.
///
/// The presence of this setting acts as a feature flag to show marketing banners for the app
/// when it is detected that the homeserver is running Matrix 2.0. Set this to `nil` until you
/// are ready to migrate your users.
static let replacementApp: ReplacementApp? = .init()
}

4
Config/CommonConfiguration.swift
View File

@@ -3,8 +3,8 @@
// Copyright 2020 Vector Creations Ltd
// Copyright (c) 2021 BWI GmbH
//
// 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 Foundation

4
Config/Configurable.swift
View File

@@ -2,8 +2,8 @@
// Copyright 2024 New Vector Ltd.
// Copyright 2020 Vector Creations 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 Foundation

4
Config/MDMSettings.swift
View File

@@ -1,8 +1,8 @@
//
// Copyright 2023, 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 Foundation