Merge branch 'releaseprep/v2.12.0' into 'release/v2.12.0'

Releaseprep/v2.12.0 See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!259
2026-04-17 15:09:31 +02:00 · 2023-11-27 14:37:30 +00:00
parent b8fa135c48 50b825589c
commit d808354782
4 changed files with 44 additions and 2 deletions
--- a/CHANGES_BWI.md
+++ b/CHANGES_BWI.md
@@ -1,3 +1,26 @@
+Changes in BWI project 2.12.0 (2023-11-21)
+===================================================
+
+Upstream merge ✨:
+
+Features ✨:
+
+Improvements 🙌:
+- Layout changes OIDC login (#5033)
+- Added restore key backup in settings (#5184)
+- Added federation icons for beta app (#5203, #5208, #5220)
+- Remove grey shield (#5236)
+- Tracking of decryption duration (#5265)
+
+Bugfix 🐛:
+- Fix empty chat bubble (#5297)
+
+Translations 🗣  :
+
+SDK API changes ⚠️:
+
+Build 🧱:
+
 Changes in BWI project 2.11.0 (2023-10-24)
 ===================================================

--- a/2
+++ b/2
@@ -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.12.0-RC03' }
+$matrixSDKVersionSpec = { :git => 'https://dl-gitlab.example.com/bwmessenger/bundesmessenger/bundesmessenger-ios-sdk', :tag => 'v2.12.0' }

 # Method to import the MatrixSDK
 def import_MatrixSDK
--- a/Riot/Assets/new_features.html
+++ b/Riot/Assets/new_features.html
@@ -26,6 +26,25 @@
    </style>
 </head>
 <body>
+    <div>
+        <p>
+        <b>Version 2.12.0</b>
+        </p>
+     
+        <p>
+        <b>Verbesserungen</b>
+        <ul>
+            <li/>Bei häufig auftretenden Entschlüsselungsproblemen kannst Du in den Einstellungen unter "Sicherheit" > "Von Sicherung wiederherstellen" deine Nachrichten wiederherstellen. In manchen Fällen kann es weiterhin zu Entschlüsselungsproblemen kommen.
+        </ul>
+        </p>
+        
+        <p>
+        <b>Behobene Bugs</b>
+        <ul>
+            <li/>Vereinzelnd wurden Nachrichten als leere Nachricht angezeigt, dies wurde behoben. Nachrichten mit diesem Problem sind nun wieder lesbar.
+        </ul>
+        </p>
+    </div>
    <div>
        <p>
        <b>Version 2.11.0</b>
--- a/bwi/PersonalNotes/PersonalNotesDefaultService.swift
+++ b/bwi/PersonalNotes/PersonalNotesDefaultService.swift
@@ -142,7 +142,7 @@ extension PersonalNotesDefaultService : PersonalNotesService {
    func setAsFavoriteIfNeeded() {
        if let room = self.session.room(withRoomId: self.personalNotesRoomId()) {
            if let accountData = room.accountData {
-                if accountData.tags[kMXRoomTagFavourite] == nil {
+                if accountData.tags == nil || accountData.tags[kMXRoomTagFavourite] == nil {
                    let tagOrder = self.session.tagOrderToBe(at: 0, from: UInt(NSNotFound), withTag: kMXRoomTagFavourite) ?? ""
                    room.replaceTag(kMXRoomTagFavourite, with: kMXRoomTagFavourite, withOrder: tagOrder) { (response) in
                        // check old settings