diff --git a/CHANGES_BWI.md b/CHANGES_BWI.md index c107588ba..d3c5dd9ae 100644 --- a/CHANGES_BWI.md +++ b/CHANGES_BWI.md @@ -1,3 +1,27 @@ +Changes in BWI project 2.8.0 (2023-08-03) +=================================================== + +Upstream merge ✨: + +- v1.10.14 + +Features ✨: +- New show participants toggle for polls (#4393) + +Improvements 🙌: +- Migration progress information (#4905) +- Additional information for maintance (#4295) +- Poll history information (#4484) +- Notification times (#3580) + +Bugfix 🐛: + +Translations 🗣 : + +SDK API changes ⚠️: + +Build 🧱: + Changes in BWI project 2.7.0 (2023-07-04) =================================================== @@ -27,7 +51,7 @@ Bugfix 🐛: - Show app logo in pin code screen (#4828) - Update "all chats" filter on logout/login (#4573) -Translations 🗣 : +Translations 🗣 : - English translations passphrase (#4706) SDK API changes ⚠️: diff --git a/Config/BWIBuildSettings.swift b/Config/BWIBuildSettings.swift index c99e06206..d554f6246 100644 --- a/Config/BWIBuildSettings.swift +++ b/Config/BWIBuildSettings.swift @@ -504,7 +504,7 @@ class BWIBuildSettings: NSObject { var passwordIndicatorOnLogin = true // MARK: Displays the element base version on the settings screen - var elementBaseVersion = "1.10.12" + var elementBaseVersion = "1.10.14" var showElementBaseVersion = true diff --git a/Podfile b/Podfile index ce5fc9a89..b4f86dfff 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 => 'v0.26.12_bwi_beta_4905' } +$matrixSDKVersionSpec = { :git => 'https://dl-gitlab.example.com/bwmessenger/bundesmessenger/bundesmessenger-ios-sdk', :tag => 'v0.26.12_bwi_beta_3' } # Method to import the MatrixSDK def import_MatrixSDK diff --git a/Riot/Assets/new_features.html b/Riot/Assets/new_features.html index ef84e86ac..6d167f25b 100644 --- a/Riot/Assets/new_features.html +++ b/Riot/Assets/new_features.html @@ -26,6 +26,33 @@ +
+

+ Version 2.8.0 +

+ +

+ Neue Funktionen +

+

+ +

+ Verbesserungen +

+

+ +

+ Behobene Bugs +

+

+

Version 2.7.0 diff --git a/bwi/ServerMaintenance/ServerDowntime.swift b/bwi/ServerMaintenance/ServerDowntime.swift index e44fa0280..254284e8a 100644 --- a/bwi/ServerMaintenance/ServerDowntime.swift +++ b/bwi/ServerMaintenance/ServerDowntime.swift @@ -23,7 +23,7 @@ struct ServerDowntime : Codable { let endTime: String let type: String let description: String - let blocking: Bool + let blocking: Bool? private enum CodingKeys: String, CodingKey { case warningStartTime = "warning_start_time" diff --git a/bwi/ServerMaintenance/ServerDowntimeDefaultService.swift b/bwi/ServerMaintenance/ServerDowntimeDefaultService.swift index ce41bb019..a9c5b36dd 100644 --- a/bwi/ServerMaintenance/ServerDowntimeDefaultService.swift +++ b/bwi/ServerMaintenance/ServerDowntimeDefaultService.swift @@ -313,7 +313,7 @@ extension ServerDowntimeDefaultService : ServerDowntimeService { return false } - return downTime.blocking + return downTime.blocking ?? false } @objc func saveCurrentStatus() {