diff --git a/CHANGES_BWI.md b/CHANGES_BWI.md index d3c5dd9ae..469ce643a 100644 --- a/CHANGES_BWI.md +++ b/CHANGES_BWI.md @@ -1,3 +1,29 @@ +Changes in BWI project 2.9.0 (2023-08-31) +=================================================== + +Upstream merge ✨: + +- v1.10.14 + +Features ✨: + +Improvements 🙌: +- Maintenance fixes (#4979, #4976) +- Maintenance ignore blocking (#4982) +- Maintenance adhoc messages (#4295) +- Maintenance time zone change (#5071) +- Huddle set correct rights (#5035, #4928) + +Bugfix 🐛: +- Crosssigning web + +Translations 🗣 : + +SDK API changes ⚠️: + +Build 🧱: + + Changes in BWI project 2.8.0 (2023-08-03) =================================================== diff --git a/Podfile b/Podfile index 4485d490e..5ad00a6d9 100644 --- a/Podfile +++ b/Podfile @@ -43,7 +43,7 @@ when String # specific MatrixSDK released version $matrixSDKVersionSpec = $matrixSDKVersion end -$matrixSDKVersionSpec = { :git => 'https://dl-gitlab.example.com/bwmessenger/bundesmessenger/bundesmessenger-ios-sdk', :tag => 'v2.9.0_rc3' } +$matrixSDKVersionSpec = { :git => 'https://dl-gitlab.example.com/bwmessenger/bundesmessenger/bundesmessenger-ios-sdk', :tag => 'v2.9.0' } # Method to import the MatrixSDK def import_MatrixSDK diff --git a/Riot/Assets/new_features.html b/Riot/Assets/new_features.html index c5ce541de..931f8fb08 100644 --- a/Riot/Assets/new_features.html +++ b/Riot/Assets/new_features.html @@ -26,6 +26,33 @@ +
+

+ Version 2.9.0 +

+ +

+ Neue Funktionen +

+

+ +

+ Verbesserungen +

+

+ +

+ Behobene Bugs +

+

+
+

Version 2.8.0 diff --git a/Riot/Modules/KeyVerification/Device/SelfVerifyWait/KeyVerificationSelfVerifyWaitViewController.swift b/Riot/Modules/KeyVerification/Device/SelfVerifyWait/KeyVerificationSelfVerifyWaitViewController.swift index 7636c3c2e..7baaaf89a 100644 --- a/Riot/Modules/KeyVerification/Device/SelfVerifyWait/KeyVerificationSelfVerifyWaitViewController.swift +++ b/Riot/Modules/KeyVerification/Device/SelfVerifyWait/KeyVerificationSelfVerifyWaitViewController.swift @@ -75,10 +75,16 @@ final class KeyVerificationSelfVerifyWaitViewController: UIViewController { self.registerThemeServiceDidChangeThemeNotification() self.update(theme: self.theme) + } + + // BWI resend verificationrequest after cancling QR Code crosssigning + override func viewDidAppear(_ animated: Bool) { + super.viewDidAppear(animated) self.viewModel.viewDelegate = self self.viewModel.process(viewAction: .loadData) } + override var preferredStatusBarStyle: UIStatusBarStyle { return self.theme.statusBarStyle diff --git a/bwi/NotificationTimes/NotificationTimesView.swift b/bwi/NotificationTimes/NotificationTimesView.swift index 2f1e4d977..77de78285 100644 --- a/bwi/NotificationTimes/NotificationTimesView.swift +++ b/bwi/NotificationTimes/NotificationTimesView.swift @@ -36,6 +36,10 @@ struct NotificationTimesView: View { @AppStorage("NotificationTimes_selectedDay") var selectedDay: Int = 0 @State var weekdays: [NotificationTimesWeekday] @State var hasChanges = false + + // MARK: Private + + @Environment(\.theme) private var theme var session: MXSession? @@ -83,6 +87,7 @@ struct NotificationTimesView: View { .disabled(!hasChanges) } } + .background(theme.colors.background) } private func onDoneButton() {