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

Feature/7555 migration part 3

Browse Source
This commit is contained in:
Arnfried Griesert
2026-03-17 13:55:15 +00:00
committed by SDE GitLab
parent 4515ab49e4
commit 585f4a852d
14 changed files with 283 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Config/BWIBuildSettings.swift
View File

@@ -684,6 +684,15 @@ class BWIBuildSettings: NSObject {
@UserDefault(key: UserDefaultsKeys.didBuMXMigrationInfoLevelKey, defaultValue: 0, storage: RiotSettings.defaults)
var didShowBuMXMigrationInfoLevel
// Migration level already shown (BWI #8123)
var isManagedViaMDM: Bool {
guard let managedConfig = UserDefaults.standard.dictionary(forKey: "com.apple.configuration.managed"),
let value = managedConfig["install_bumx_via_mdm"] as? Bool else {
return false
}
return value
}
// shows the grey/green/red shield for the room avatar / user avatar
var showEncryptionStatusBadgeOnAvatar = false

28
Riot.xcodeproj/xcshareddata/xcschemes/Riot.xcscheme
View File

@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1200"
LastUpgradeVersion = "1430"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForTesting = "NO"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
@@ -26,10 +26,7 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
disableMainThreadChecker = "YES"
codeCoverageEnabled = "YES"
onlyGenerateCoverageForSpecifiedTargets = "YES">
shouldUseLaunchSchemeArgsEnv = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
@@ -39,26 +36,7 @@
ReferencedContainer = "container:Riot.xcodeproj">
</BuildableReference>
</MacroExpansion>
<CodeCoverageTargets>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "57B13CC4586E9D43ED24DE1E"
BuildableName = "Element.app"
BlueprintName = "Riot"
ReferencedContainer = "container:Riot.xcodeproj">
</BuildableReference>
</CodeCoverageTargets>
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "287703423C2C302524E92C03"
BuildableName = "RiotTests.xctest"
BlueprintName = "RiotTests"
ReferencedContainer = "container:Riot.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
</TestAction>
<LaunchAction

13
Riot/Assets/de.lproj/Bwi.strings
View File

@@ -750,18 +750,21 @@
// MARK: migration to new client
// Banner
"bwi_mobile_dialog_m_banner_title" = "Wechsel zum BundesMessengerX";
"bwi_mobile_dialog_m1_banner_text" = "Das ist eine neue, technisch optimierte App vom BuM. Du kannst sie jetzt schon ausprobieren, bevor bald alle wechseln müssen.";
"bwi_mobile_dialog_m1_banner_text_prefix" = "Das ist eine neue, technisch optimierte App vom BuM. Du kannst sie jetzt schon ausprobieren, bevor bald alle wechseln müssen.";
"bwi_mobile_dialog_m1_banner_text_bold" = " Alle deine Kontakte und Nachrichten bleiben dabei erhalten.";
"bwi_mobile_dialog_m2_banner_text_prefix" = "Das ist eine neue, technisch optimierte App vom BuM. Du hast nur noch";
"bwi_mobile_dialog_m2_banner_text_bold" = " wenige Tage";
"bwi_mobile_dialog_m2_banner_text_suffix" = " Zeit zu wechseln. Alle deine Kontakte und Nachrichten bleiben dabei erhalten.";
"bwi_mobile_dialog_mdm_banner_text_prefix" = "Das ist eine neue, technisch optimierte App vom BuM, welche dir bald von deinem Admin zur Verfügung gestellt wird.";
"bwi_mobile_dialog_mdm_banner_text_bold" = " Alle deine Kontakte und Nachrichten bleiben dabei bestehen, halte dafür deine Login Daten bereit.";
"bwi_mobile_dialog_m_banner_button2" = "Erfahre mehr";
"bwi_mobile_dialog_m_banner_button1" = "Später erinnern";
// Sheet page 1
"bwi_mobile_dialog_m_more_title" = "BundesMessengerX";
"bwi_mobile_dialog_m1_more_text_1" = "Diese App wird bald abgeschaltet und durch eine neue technisch optimierte App ersetzt ";
"bwi_mobile_dialog_m1_more_text_1" = "Der BuM wird bald abgeschaltet und durch durch den BuMX ersetzt. Dies ist eine neue, technisch optimierte App ";
"bwi_mobile_dialog_m3_more_text_1" = "Der BuM wurde nun abgeschaltet und durch den BuMX ersetzt. Dies ist eine neue, technisch optimierte App, welche dir von deinem Admin zur Verfügung gestellt wird ";
"bwi_mobile_dialog_m1_more_text_2" = "(alle deine Kontakte und Nachrichten bleiben erhalten).";
"bwi_mobile_dialog_m1_more_text_3" = "\n\nDich erwartet u.a.:";
"bwi_mobile_dialog_m1_more_text_bullet_1" = "schnellere Performance";
@@ -777,7 +780,11 @@
"bwi_mobile_dialog_m_more_button" = "Neue App herunterladen";
"bwi_mobile_dialog_m_more_success" = "Benutzername kopiert";
"bwi_a11y_close_button" = "Ansicht schließen";
// Migration Success
"bwi_mobile_dialog_m3_success_change_title" = "Wechsel erfolgreich 🎉";
"bwi_mobile_dialog_m3_success_text" = "Diese App kannst du nun löschen.";
"bwi_all_common_close" = "Schließen";
"bwi_all_common_got_it" = "Verstanden";
// MARK: owner handling
"room_member_power_level_owner_in" = "Inhaber von %@";

28
Riot/Assets/en.lproj/Bwi.strings
View File

@@ -663,23 +663,27 @@
// MARK: migration to new client
// Banner
"bwi_mobile_dialog_m_banner_title" = "Change to BundesMessengerX";
"bwi_mobile_dialog_m1_banner_text" = "This is a new technically optimized app from BuM. You can try it out now before everyone has to switch soon.";
"bwi_mobile_dialog_m1_banner_text_prefix" = "This is a new, technically optimized app from BuM. You can try it out now before everyone has to switch soon. ";
"bwi_mobile_dialog_m1_banner_text_bold" = " All your contacts and messages will be retained.";
"bwi_mobile_dialog_m2_banner_text_prefix" = "This is a new technically optimized app from BuM. You only have";
"bwi_mobile_dialog_m2_banner_text_prefix" = "This is a new, technically optimized app from BuM. You only have";
"bwi_mobile_dialog_m2_banner_text_bold" = " a few days";
"bwi_mobile_dialog_m2_banner_text_suffix" = " to switch. All your contacts and messages will be retained.";
"bwi_mobile_dialog_mdm_banner_text_prefix" = "This is a new, technically optimized app from BuM, which will soon be made available to you by your administrator.";
"bwi_mobile_dialog_mdm_banner_text_bold" = " All your contacts and messages will remain intact, so please have your login details ready.";
"bwi_mobile_dialog_m_banner_button2" = "Learn more";
"bwi_mobile_dialog_m_banner_button1" = "Remember later";
// Sheet page 1
"bwi_mobile_dialog_m_more_title" = "BundesMessengerX";
"bwi_mobile_dialog_m1_more_text_1" = "This app will soon be shut down and replaced by a new technically optimized app ";
"bwi_mobile_dialog_m1_more_text_2" = "(all your contacts and messages will remain).";
"bwi_mobile_dialog_m1_more_text_3" = "\n\nAmong other things, you can expect:";
"bwi_mobile_dialog_m1_more_text_bullet_1" = "faster performance";
"bwi_mobile_dialog_m1_more_text_bullet_2" = "improved design";
"bwi_mobile_dialog_m1_more_text_bullet_3" = "new functions, such as pinning messages";
"bwi_mobile_dialog_m1_more_text_bullet_4" = "optimized accessibility";
"bwi_mobile_dialog_m1_more_text_1" = "BuM will soon be switched off and replaced by BumX. This is a new, technically optimized app ";
"bwi_mobile_dialog_m3_more_text_1" = "BuM has been switched off and replaced by BumX. This is a new, technically optimized app ";
"bwi_mobile_dialog_m1_more_text_2" = "(all your contacts and messages will be retained).";
"bwi_mobile_dialog_m1_more_text_3" = "\n\nYou can expect:";
"bwi_mobile_dialog_m1_more_text_bullet_1" = "Faster performance";
"bwi_mobile_dialog_m1_more_text_bullet_2" = "Improved design";
"bwi_mobile_dialog_m1_more_text_bullet_3" = "New functions, such as pinning messages";
"bwi_mobile_dialog_m1_more_text_bullet_4" = "Optimized accessibility";
// Sheet page 2
"bwi_mobile_dialog_m_more2_title" = "Change now:";
@@ -689,7 +693,11 @@
"bwi_mobile_dialog_m_more_button" = "Download new app";
"bwi_mobile_dialog_m_more_success" = "user name copied";
"bwi_a11y_close_button" = "Close window";
// Migration Success
"bwi_mobile_dialog_m3_success_change_title" = "Switch successful 🎉";
"bwi_mobile_dialog_m3_success_text" = "You can now delete this app.";
"bwi_all_common_close" = "Close";
"bwi_all_common_got_it" = "Got it";
// MARK: owner handling
"room_member_power_level_owner_in" = "Owner in %@";

58
Riot/Generated/BWIStrings.swift
View File

@@ -131,10 +131,6 @@ public class BWIL10n: NSObject {
public static var bumAutheticationTitle: String {
return BWIL10n.tr("Bwi", "bum_authetication_title")
}
/// Ansicht schließen
public static var bwiA11yCloseButton: String {
return BWIL10n.tr("Bwi", "bwi_a11y_close_button")
}
/// Barrierefreiheitserklärung
public static var bwiAccessibilityDeclarationButtonTitle: String {
return BWIL10n.tr("Bwi", "bwi_accessibility_declaration_button_title")
@@ -143,6 +139,14 @@ public class BWIL10n: NSObject {
public static var bwiActivateLabsAlertTitle: String {
return BWIL10n.tr("Bwi", "bwi_activate_labs_alert_title")
}
/// Schließen
public static var bwiAllCommonClose: String {
return BWIL10n.tr("Bwi", "bwi_all_common_close")
}
/// Verstanden
public static var bwiAllCommonGotIt: String {
return BWIL10n.tr("Bwi", "bwi_all_common_got_it")
}
/// Wir brauchen Deine Hilfe, um Fehler im %@ besser analysieren zu können. Dazu würden wir gerne anonymisierte Diagnosedaten erfassen. Es werden keine Daten an Dritte übermittelt. Details findest Du in der Datenschutzerklärung.\n\nFalls Du nicht mehr mithelfen möchtest, kannst Du dies in den Einstellungen jederzeit wieder deaktivieren.\n\nMöchtest du bei der Fehler-Analyse unterstützen?
public static func bwiAnalyticsAlertBody(_ p1: String) -> String {
return BWIL10n.tr("Bwi", "bwi_analytics_alert_body", p1)
@@ -307,7 +311,15 @@ public class BWIL10n: NSObject {
public static var bwiMdmLogoutMessage: String {
return BWIL10n.tr("Bwi", "bwi_mdm_logout_message")
}
/// Diese App wird bald abgeschaltet und durch eine neue technisch optimierte App ersetzt
/// Alle deine Kontakte und Nachrichten bleiben dabei erhalten.
public static var bwiMobileDialogM1BannerTextBold: String {
return BWIL10n.tr("Bwi", "bwi_mobile_dialog_m1_banner_text_bold")
}
/// Das ist eine neue, technisch optimierte App vom BuM. Du kannst sie jetzt schon ausprobieren, bevor bald alle wechseln müssen.
public static var bwiMobileDialogM1BannerTextPrefix: String {
return BWIL10n.tr("Bwi", "bwi_mobile_dialog_m1_banner_text_prefix")
}
/// Der BuM wird bald abgeschaltet und durch durch den BuMX ersetzt. Dies ist eine neue, technisch optimierte App
public static var bwiMobileDialogM1MoreText1: String {
return BWIL10n.tr("Bwi", "bwi_mobile_dialog_m1_more_text_1")
}
@@ -335,6 +347,30 @@ public class BWIL10n: NSObject {
public static var bwiMobileDialogM1MoreTextBullet4: String {
return BWIL10n.tr("Bwi", "bwi_mobile_dialog_m1_more_text_bullet_4")
}
/// wenige Tage
public static var bwiMobileDialogM2BannerTextBold: String {
return BWIL10n.tr("Bwi", "bwi_mobile_dialog_m2_banner_text_bold")
}
/// Das ist eine neue, technisch optimierte App vom BuM. Du hast nur noch
public static var bwiMobileDialogM2BannerTextPrefix: String {
return BWIL10n.tr("Bwi", "bwi_mobile_dialog_m2_banner_text_prefix")
}
/// Zeit zu wechseln. Alle deine Kontakte und Nachrichten bleiben dabei erhalten.
public static var bwiMobileDialogM2BannerTextSuffix: String {
return BWIL10n.tr("Bwi", "bwi_mobile_dialog_m2_banner_text_suffix")
}
/// Der BuM wurde nun abgeschaltet und durch den BuMX ersetzt. Dies ist eine neue, technisch optimierte App, welche dir von deinem Admin zur Verfügung gestellt wird
public static var bwiMobileDialogM3MoreText1: String {
return BWIL10n.tr("Bwi", "bwi_mobile_dialog_m3_more_text_1")
}
/// Wechsel erfolgreich 🎉
public static var bwiMobileDialogM3SuccessChangeTitle: String {
return BWIL10n.tr("Bwi", "bwi_mobile_dialog_m3_success_change_title")
}
/// Diese App kannst du nun löschen.
public static var bwiMobileDialogM3SuccessText: String {
return BWIL10n.tr("Bwi", "bwi_mobile_dialog_m3_success_text")
}
/// Später erinnern
public static var bwiMobileDialogMBannerButton1: String {
return BWIL10n.tr("Bwi", "bwi_mobile_dialog_m_banner_button1")
@@ -375,13 +411,13 @@ public class BWIL10n: NSObject {
public static var bwiMobileDialogMMoreTitle: String {
return BWIL10n.tr("Bwi", "bwi_mobile_dialog_m_more_title")
}
/// Das ist eine neue, technisch optimierte App vom BuM. Du kannst sie jetzt schon ausprobieren, bevor bald alle wechseln müssen.
public static var bwiMobileMdialogM1BannerText: String {
return BWIL10n.tr("Bwi", "bwi_mobileMdialog_m1_banner_text")
/// Alle deine Kontakte und Nachrichten bleiben dabei bestehen, halte dafür deine Login Daten bereit.
public static var bwiMobileDialogMdmBannerTextBold: String {
return BWIL10n.tr("Bwi", "bwi_mobile_dialog_mdm_banner_text_bold")
}
/// Alle deine Kontakte und Nachrichten bleiben dabei erhalten.
public static var bwiMobileMdialogM1BannerTextBold: String {
return BWIL10n.tr("Bwi", "bwi_mobileMdialog_m1_banner_text_bold")
/// Das ist eine neue, technisch optimierte App vom BuM, welche dir bald von deinem Admin zur Verfügung gestellt wird.
public static var bwiMobileDialogMdmBannerTextPrefix: String {
return BWIL10n.tr("Bwi", "bwi_mobile_dialog_mdm_banner_text_prefix")
}
/// Meine Notizen
public static var bwiNotesRoomTitle: String {

4
Riot/Managers/KeyValueStorage/Extensions/Keychain.swift
View File

@@ -9,6 +9,7 @@ import Foundation
import KeychainAccess
/// Extension on Keychain to get/set booleans
#if !S_BUM_APP
extension Keychain {
public func set(_ value: Bool, key: String, ignoringAttributeSynchronizable: Bool = true) throws {
@@ -23,4 +24,5 @@ extension Keychain {
return value == true.description
}
}
}
#endif

8
Riot/Managers/PushNotification/PushNotificationService.m
View File

@@ -90,9 +90,17 @@ Matrix session observer used to detect new opened sessions.
{
self.registrationForRemoteNotificationsCompletion = completion;
// BWI #7555 migration part 3
if([[BWIBuildSettings shared] BuMXMigrationInfoLevel] < 2) {
dispatch_async(dispatch_get_main_queue(), ^{
// Even after we unregistered from Apples push service we must make sure that
// the app will not register again. After reaching migration level 3 this app should neither show
// remote notifications any more nor register for new notifications.
[[UIApplication sharedApplication] registerForRemoteNotifications];
});
}
// BWI #7555 END
}
- (void)didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken

7
Riot/Modules/Home/AllChats/AllChatsCoordinator.swift
View File

@@ -775,6 +775,13 @@ class AllChatsCoordinator: NSObject, SplitViewMasterCoordinatorProtocol {
// BWI #7564 add migration level
if let migrationLevel = wellknown?.migrationInfoLevel() {
BWIBuildSettings.shared.BuMXMigrationInfoLevel = migrationLevel
// BWI #7555 migration part 3
if migrationLevel == 3 {
// Inform Apple that this app on this device can be ignored
UIApplication.shared.unregisterForRemoteNotifications()
}
// BWI #7564 END
}
// BWI #7564 END
self.bwiCheckForMatomoPromt()

16
Riot/Modules/Home/AllChats/AllChatsViewController.swift
View File

@@ -285,6 +285,21 @@ class AllChatsViewController: HomeViewController {
NotificationCenter.default.addObserver(self, selector: #selector(self.spaceListDidChange), name: MXSpaceService.didBuildSpaceGraph, object: nil)
set(tableHeadeView: self.bannerView)
// BWI #7555 migration part 3
if BWIBuildSettings.shared.BuMXMigrationInfoLevel == 3 {
let migrationInfoView = MigrationInfoView(username: "") {
return self.mainSession.myUser.username()
}.environmentObject(BWIThemeService.shared).interactiveDismissDisabled(true)
let hostingViewController = UIHostingController(rootView: migrationInfoView)
if hostingViewController.popoverPresentationController != nil {
hostingViewController.modalPresentationStyle = .popover
}
hostingViewController.isModalInPresentation = true
self.navigationController?.present(hostingViewController, animated: false, completion: nil)
}
// BWI #7555 END
}
override func viewDidAppear(_ animated: Bool) {
@@ -317,6 +332,7 @@ class AllChatsViewController: HomeViewController {
}
AppDelegate.theDelegate().checkAppVersion()
}
func presentFederationIntroductionSheet() {

12
RiotSwiftUI/Modules/Authentication/Login/View/AuthenticationLoginScreen.swift
View File

@@ -21,6 +21,10 @@ struct AuthenticationLoginScreen: View {
/// This must be manually set back to `false` when the text field finishes editing.
@State private var isPasswordFocused = false
// BWI #7555 migration part 3
@State private var showMigrationView = BWIBuildSettings.shared.BuMXMigrationInfoLevel == 3
// BWI #7555 END
// MARK: Public
@ObservedObject var viewModel: AuthenticationLoginViewModel.Context
@@ -110,6 +114,13 @@ struct AuthenticationLoginScreen: View {
.background(theme.colors.background.ignoresSafeArea())
.alert(item: $viewModel.alertInfo) { $0.alert }
.accentColor(theme.colors.accent)
// BWI #7555 migration part 3
.sheet(isPresented: $showMigrationView) {
MigrationInfoView(username: "", getUserName: nil)
.environmentObject(BWIThemeService.shared)
.interactiveDismissDisabled(true)
}
// BWI #7555 END
}
/// The header containing a Welcome Back title.
@@ -163,6 +174,7 @@ struct AuthenticationLoginScreen: View {
Button(action: submit) {
Text(getCustomText(text: .submit))
}
.disabled(BWIBuildSettings.shared.BuMXMigrationInfoLevel > 2) // BWI #7555 migration part 3
.buttonStyle(PrimaryActionButtonStyle())
.disabled(!viewModel.viewState.canSubmit)
.accessibilityIdentifier("nextButton")

11
bwi/FeatureBanner/FeatureBannerView.swift
View File

@@ -91,11 +91,12 @@ protocol FeatureBannerDelegate {
}
func didPressShowDetails() {
let migrationInfoView = MigrationInfoView(username: username).environmentObject(BWIThemeService.shared).interactiveDismissDisabled(true)
let migrationInfoView = MigrationInfoView(username: username, getUserName: nil).environmentObject(BWIThemeService.shared).interactiveDismissDisabled(true)
let hostingViewController = UIHostingController(rootView: migrationInfoView)
if hostingViewController.popoverPresentationController != nil {
hostingViewController.modalPresentationStyle = .popover
}
hostingViewController.isModalInPresentation = true
hostingController.parent?.present(hostingViewController, animated: true, completion: nil)
}
@@ -155,8 +156,12 @@ struct FeatureBannerView: View {
var advertisementText: some View {
VStack {
VStack {
if BWIBuildSettings.shared.BuMXMigrationInfoLevel == 1 {
Text(BWIL10n.bwiMobileDialogM1BannerText) +
if BWIBuildSettings.shared.isManagedViaMDM {
Text(BWIL10n.bwiMobileDialogMdmBannerTextPrefix) +
Text(BWIL10n.bwiMobileDialogMdmBannerTextBold)
.bold()
} else if BWIBuildSettings.shared.BuMXMigrationInfoLevel == 1 {
Text(BWIL10n.bwiMobileDialogM1BannerTextPrefix) +
Text(BWIL10n.bwiMobileDialogM1BannerTextBold)
.bold()
} else {

116
bwi/FeatureBanner/MigrationInfoView.swift
View File

@@ -23,16 +23,25 @@ struct MigrationInfoView: View {
@State private var selectedTab = 1
@EnvironmentObject var themeService: BWIThemeService
@State var redrawKey = UUID()
@State var migrationFinished = SharedKeychain.load(account: "migration_finished") == "true"
let username: String
let getUserName: (() -> String?)?
var body: some View {
TabView(selection: $selectedTab) {
if migrationFinished {
MigrationSuccessView()
.tag(1)
} else {
MigrationInfoViewOne()
.tag(1)
MigrationInfoViewTwo(username: username)
if !username.isEmpty || getUserName != nil {
MigrationInfoViewTwo(username: username, getUserName: getUserName)
.tag(2)
}
}
}
.id(redrawKey)
.tabViewStyle(.page)
.tabViewStyle(.page(indexDisplayMode: .always))
@@ -58,7 +67,8 @@ struct MigrationInfoView: View {
.foregroundColor(Color(themeService.theme.colors.tertiaryContent))
.padding(20)
}
.accessibilityLabel(BWIL10n.bwiA11yCloseButton)
.accessibilityLabel(BWIL10n.bwiAllCommonClose)
.isHidden(BWIBuildSettings.shared.BuMXMigrationInfoLevel > 2)
}
Spacer()
HStack() {
@@ -90,6 +100,18 @@ struct MigrationInfoView: View {
}
.opacity(selectedTab == 2 ? 0 : 1)
}
.isHidden(migrationFinished || BWIBuildSettings.shared.isManagedViaMDM)
if BWIBuildSettings.shared.isManagedViaMDM && BWIBuildSettings.shared.BuMXMigrationInfoLevel < 3 {
Button {
dismissView()
} label: {
Text(BWIL10n.bwiAllCommonGotIt)
.foregroundColor(Color(ThemeService.shared().theme.backgroundColor))
}
.buttonStyle(PrimaryActionButtonStyle())
.padding()
}
}
}
.onAppear {
@@ -149,10 +171,25 @@ struct MigrationInfoViewOne: View {
.lineLimit(nil)
.fixedSize(horizontal: false, vertical: true)
.padding(.bottom, 20)
if BWIBuildSettings.shared.isManagedViaMDM {
if BWIBuildSettings.shared.BuMXMigrationInfoLevel == 3 {
Text(BWIL10n.bwiMobileDialogM3MoreText1) +
Text(BWIL10n.bwiMobileDialogM1MoreText2).bold() +
Text(BWIL10n.bwiMobileDialogM1MoreText3)
} else {
Text(BWIL10n.bwiMobileDialogM1MoreText3)
}
} else {
if BWIBuildSettings.shared.BuMXMigrationInfoLevel < 3 {
Text(BWIL10n.bwiMobileDialogM1MoreText1) +
Text(BWIL10n.bwiMobileDialogM1MoreText2).bold() +
Text(BWIL10n.bwiMobileDialogM1MoreText3)
} else {
Text(BWIL10n.bwiMobileDialogM3MoreText1) +
Text(BWIL10n.bwiMobileDialogM1MoreText2).bold() +
Text(BWIL10n.bwiMobileDialogM1MoreText3)
}
}
VStack(alignment: .leading) {
HStack(alignment: .top) {
Text("•")
@@ -178,15 +215,29 @@ struct MigrationInfoViewOne: View {
.fixedSize(horizontal: false, vertical: true)
.padding(EdgeInsets(top: 10, leading: 30, bottom: 0, trailing: 30))
.accessibilityElement(children: .ignore)
.accessibilityLabel(
BWIL10n.bwiMobileDialogMMoreTitle + ". " +
.accessibilityLabel(accessibilityLabel)
}
var accessibilityLabel: String {
if BWIBuildSettings.shared.BuMXMigrationInfoLevel < 3 && !BWIBuildSettings.shared.isManagedViaMDM {
return BWIL10n.bwiMobileDialogMMoreTitle + ". " +
BWIL10n.bwiMobileDialogM1MoreText1 +
BWIL10n.bwiMobileDialogM1MoreText2 +
BWIL10n.bwiMobileDialogM1MoreText3 + ", " +
BWIL10n.bwiMobileDialogM1MoreTextBullet1 + ", " +
BWIL10n.bwiMobileDialogM1MoreTextBullet2 + ", " +
BWIL10n.bwiMobileDialogM1MoreTextBullet3 + ", " +
BWIL10n.bwiMobileDialogM1MoreTextBullet4)
BWIL10n.bwiMobileDialogM1MoreTextBullet4
} else {
return BWIL10n.bwiMobileDialogMMoreTitle + ". " +
BWIL10n.bwiMobileDialogM3MoreText1 +
BWIL10n.bwiMobileDialogM1MoreText2 +
BWIL10n.bwiMobileDialogM1MoreText3 + ", " +
BWIL10n.bwiMobileDialogM1MoreTextBullet1 + ", " +
BWIL10n.bwiMobileDialogM1MoreTextBullet2 + ", " +
BWIL10n.bwiMobileDialogM1MoreTextBullet3 + ", " +
BWIL10n.bwiMobileDialogM1MoreTextBullet4
}
}
}
@@ -194,6 +245,8 @@ struct MigrationInfoViewOne: View {
// MARK: Migraion Info View two
struct MigrationInfoViewTwo: View {
let username: String
let getUserName: (() -> String?)?
@State var lazyLoadedUserName: String? = nil
@State var showSuccessToast: Bool = false
@EnvironmentObject var themeService: BWIThemeService
@@ -228,7 +281,9 @@ struct MigrationInfoViewTwo: View {
}
.frame(minHeight: geo.size.height)
.frame(width: geo.size.width)
.onAppear {
lazyLoadedUserName = username.isEmpty ? getUserName?() : username
}
}
.frame(width: geo.size.width, height: geo.size.height)
}
@@ -246,7 +301,7 @@ struct MigrationInfoViewTwo: View {
HStack() {
Text("1.")
Button(action: {
UIPasteboard.general.string = username
UIPasteboard.general.string = lazyLoadedUserName ?? ""
guard !showSuccessToast else { return }
withAnimation {
showSuccessToast = true
@@ -311,3 +366,48 @@ struct MigrationInfoViewTwo: View {
.transition(.opacity)
}
}
// MARK: Migraion Success View
struct MigrationSuccessView: View {
@EnvironmentObject var themeService: BWIThemeService
var body: some View {
GeometryReader { geo in
ScrollView(.vertical) {
VStack(alignment: .center, spacing: 20) {
VStack() {
Image("bumx_logo")
.resizable()
.frame(width: 200, height: 200)
.clipShape(.rect(cornerRadius: 36))
.overlay(
RoundedRectangle(cornerRadius: 36)
.stroke(.gray, lineWidth: 0.4)
)
.accessibilityHidden(true)
}
.frame(height: geo.size.height * 0.35, alignment: .center)
.padding(EdgeInsets(top: 56, leading: 30, bottom: 10, trailing: 30))
VStack {
Text(BWIL10n.bwiMobileDialogM3SuccessChangeTitle)
.font(.title)
.bold()
.padding(.bottom, 20)
Text(BWIL10n.bwiMobileDialogM3SuccessText)
.fixedSize(horizontal: false, vertical: true)
.padding(EdgeInsets(top: 10, leading: 30, bottom: 0, trailing: 30))
}
Spacer()
}
.frame(minHeight: geo.size.height)
.frame(width: geo.size.width)
}
.frame(width: geo.size.width, height: geo.size.height)
}
}
}

6
bwi/MigrationAssistent/MigrationAssistant.swift
View File

@@ -43,4 +43,10 @@ import MatrixSDK
return returnValue
}
// BWI #7555 migration part 3
func loadFinishedFlag() -> String? {
return SharedKeychain.load(account: "migration_finished")
}
// BWI #7555 END
}

5
project.yml
View File

@@ -77,3 +77,8 @@ packages:
SwiftJWT:
url: https://github.com/Kitura/Swift-JWT
version: 4.0.2
settings:
base:
SWIFT_ENABLE_EXPLICIT_MODULES: NO
_EXPERIMENTAL_SWIFT_EXPLICIT_MODULES: NO