From 4f3a8bb77afb6939c289b140fe01b5a29bdab412 Mon Sep 17 00:00:00 2001 From: Jan Niklas Grabowski Date: Mon, 13 Oct 2025 13:41:57 +0200 Subject: [PATCH 1/4] fix: pipeline error (MESSENGER-7665) --- CHANGES_BWI.md | 12 ++++++++++++ Config/AppVersion.xcconfig | 2 +- Riot/Assets/de.lproj/Bwi.strings | 4 ++-- Riot/Assets/new_features.html | 2 +- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/CHANGES_BWI.md b/CHANGES_BWI.md index bae86dfc8..6ada4a405 100644 --- a/CHANGES_BWI.md +++ b/CHANGES_BWI.md @@ -1,3 +1,15 @@ +Changes in BWI project 2.26.1 (2025-10-13) +=================================================== + +Upstream merge ✨: +- v1.11.31 + +Improvements 🙌: +- MESSENGER-7564 text changes migration banner + +Bugfix 🐛: +- MESSENGER-7665 fix pipeline + Changes in BWI project 2.26.0 (2025-10-02) =================================================== diff --git a/Config/AppVersion.xcconfig b/Config/AppVersion.xcconfig index 94c661017..87ecae12b 100644 --- a/Config/AppVersion.xcconfig +++ b/Config/AppVersion.xcconfig @@ -17,5 +17,5 @@ // Version -MARKETING_VERSION = 2.26.0 +MARKETING_VERSION = 2.26.1 CURRENT_PROJECT_VERSION = 20220714163152 diff --git a/Riot/Assets/de.lproj/Bwi.strings b/Riot/Assets/de.lproj/Bwi.strings index e8e8df2e3..87cffc563 100644 --- a/Riot/Assets/de.lproj/Bwi.strings +++ b/Riot/Assets/de.lproj/Bwi.strings @@ -750,8 +750,8 @@ // MARK: migration to new client // Banner "bwi_mobile_dialog_m_banner_title" = "Wechsel zum BundesMessengerX"; -"bwi_mobileMdialog_m1_banner_text" = "Das ist eine neue, technisch optimierte App vom BuM. Du kannst sie jetzt schon ausprobieren, bevor bald alle umsteigen müssen."; -"bwi_mobileMdialog_m1_banner_text_bold" = " Alle deine Kontakte und Nachrichten bleiben erhalten."; +"bwi_mobileMdialog_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_mobileMdialog_m1_banner_text_bold" = " Alle deine Kontakte und Nachrichten bleiben dabei erhalten."; "bwi_mobile_dialog_m_banner_button2" = "Erfahre mehr"; "bwi_mobile_dialog_m_banner_button1" = "Später erinnern"; diff --git a/Riot/Assets/new_features.html b/Riot/Assets/new_features.html index 745905a54..0c8e3cb02 100644 --- a/Riot/Assets/new_features.html +++ b/Riot/Assets/new_features.html @@ -28,7 +28,7 @@

- Version 2.26.0 + Version 2.26.1

Behobene Bugs From 1b9e95f8d292b2dbced91d241be4818d6f4099b7 Mon Sep 17 00:00:00 2001 From: Jan Niklas Grabowski Date: Mon, 13 Oct 2025 14:26:30 +0200 Subject: [PATCH 2/4] fix: use version number 2.26.0 (MESSENGER-7665) --- Config/AppVersion.xcconfig | 2 +- Riot/Assets/new_features.html | 2 +- Riot/Generated/BWIStrings.swift | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Config/AppVersion.xcconfig b/Config/AppVersion.xcconfig index 87ecae12b..94c661017 100644 --- a/Config/AppVersion.xcconfig +++ b/Config/AppVersion.xcconfig @@ -17,5 +17,5 @@ // Version -MARKETING_VERSION = 2.26.1 +MARKETING_VERSION = 2.26.0 CURRENT_PROJECT_VERSION = 20220714163152 diff --git a/Riot/Assets/new_features.html b/Riot/Assets/new_features.html index 0c8e3cb02..745905a54 100644 --- a/Riot/Assets/new_features.html +++ b/Riot/Assets/new_features.html @@ -28,7 +28,7 @@

- Version 2.26.1 + Version 2.26.0

Behobene Bugs diff --git a/Riot/Generated/BWIStrings.swift b/Riot/Generated/BWIStrings.swift index 5faff94c8..4511fc74d 100644 --- a/Riot/Generated/BWIStrings.swift +++ b/Riot/Generated/BWIStrings.swift @@ -371,11 +371,11 @@ 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 umsteigen müssen. + /// 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 erhalten. + /// Alle deine Kontakte und Nachrichten bleiben dabei erhalten. public static var bwiMobileMdialogM1BannerTextBold: String { return BWIL10n.tr("Bwi", "bwi_mobileMdialog_m1_banner_text_bold") } From 16f3a6bfa3def74224fff2841c59e748335f5142 Mon Sep 17 00:00:00 2001 From: Jan Niklas Grabowski Date: Wed, 15 Oct 2025 14:09:22 +0200 Subject: [PATCH 3/4] fix: share button appearing in document preview and update element version number (MESSENGER-7666) --- Config/BWIBuildSettings.swift | 2 +- .../Modules/MatrixKit/Controllers/MXKPreviewViewController.m | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Config/BWIBuildSettings.swift b/Config/BWIBuildSettings.swift index 3b07bf08e..9d3394813 100644 --- a/Config/BWIBuildSettings.swift +++ b/Config/BWIBuildSettings.swift @@ -481,7 +481,7 @@ class BWIBuildSettings: NSObject { var passwordIndicatorOnLogin = true // MARK: Displays the element base version on the settings screen - var elementBaseVersion = "1.27.11" + var elementBaseVersion = "1.11.31" var showElementBaseVersion = true diff --git a/Riot/Modules/MatrixKit/Controllers/MXKPreviewViewController.m b/Riot/Modules/MatrixKit/Controllers/MXKPreviewViewController.m index 2f1d2d182..e7b6eec9e 100644 --- a/Riot/Modules/MatrixKit/Controllers/MXKPreviewViewController.m +++ b/Riot/Modules/MatrixKit/Controllers/MXKPreviewViewController.m @@ -76,6 +76,11 @@ Please see LICENSE in the repository root for full details. } } +- (void)viewDidLoad +{ + self.view.backgroundColor = UIColor.clearColor; +} + - (IBAction)doneAction:(id)sender { [self dismissViewControllerAnimated:YES completion:^{ From 2d83a7616a96ceaf6b058fa0ccc7414239707700 Mon Sep 17 00:00:00 2001 From: Jan Niklas Grabowski Date: Wed, 15 Oct 2025 16:47:04 +0200 Subject: [PATCH 4/4] refactor: refactoring (MESSENGER-7666) --- Riot/Modules/MatrixKit/Controllers/MXKPreviewViewController.m | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Riot/Modules/MatrixKit/Controllers/MXKPreviewViewController.m b/Riot/Modules/MatrixKit/Controllers/MXKPreviewViewController.m index e7b6eec9e..75ef50f4b 100644 --- a/Riot/Modules/MatrixKit/Controllers/MXKPreviewViewController.m +++ b/Riot/Modules/MatrixKit/Controllers/MXKPreviewViewController.m @@ -76,10 +76,6 @@ Please see LICENSE in the repository root for full details. } } -- (void)viewDidLoad -{ - self.view.backgroundColor = UIColor.clearColor; -} - (IBAction)doneAction:(id)sender {