Merge branch 'release/v2.16.0' into develop

2026-04-17 15:09:31 +02:00 · 2024-03-15 09:44:58 +01:00
parent cd7b5eeb95 732e5670db
commit 089fdf18d1
5 changed files with 66 additions and 4 deletions
--- a/CHANGES_BWI.md
+++ b/CHANGES_BWI.md
@@ -1,3 +1,37 @@
+Changes in BWI project 2.16.0 (2024-03-13)
+===================================================
+
+Upstream merge ✨:
+- v1.11.6
+
+Features ✨:
+- Use new iOS Fotopicker (#5365)
+
+Improvements 🙌:
+- Federation Announcement (#5706)
+- Federation explanation for avatars (disabled) (#5610)
+- Federation Introduction (disabled) (#5660)
+- Show ACL related status events in timeline (disabled) (#5575)
+- Matomo Events for federation (disabled) (#5393)
+- Success message when federating a room (disabled) (#5578)
+- Remove "Remind later" Button from alert for unfederated rooms (#5715)
+- Better text for passphrase reset (#5595)
+- disallow http (#5759)
+- Better keybackup UI (#5668)
+- Better Readme (#5734)
+- Change composer default to old composer (bwm only) (#5768)
+
+Bugfix 🐛:
+- Room and user Avatars without borders (#5697)
+- Remove federation status from invites (#5715)
+- Fix Links to answers leading out of the app (#5603)
+
+Translations 🗣  :
+
+SDK API changes ⚠️:
+
+Build 🧱:
+
 Changes in BWI project 2.15.0 (2024-02-13)
 ===================================================

--- a/Config/BWIBuildSettings.swift
+++ b/Config/BWIBuildSettings.swift
@@ -209,7 +209,8 @@ class BWIBuildSettings: NSObject {
                      "dbaf8618e8a2f8d681591dfbcc73243c921c10dec69a2e5ee50bc91ca7dedcda",
                      "ed1af0fd873ec749f17c3b61ce4e481ab1644c132003f97a9c4e36516325788a",
                      "081e6ef90ba86102d678756fd13b07ca744340ad4d58a340e1956dca992f18e3",
-                      "40b22592f2417c8031a0c38098c83dd0bfd28dee4c77ed1e9a022556c6ec0ded"
+                      "40b22592f2417c8031a0c38098c83dd0bfd28dee4c77ed1e9a022556c6ec0ded",
+                      "00d059071d858e6360e67491f67318f90d664467013b2534185240b0e85b8ad3"
    ]
    
    // use a different badge color if the user was mentioned in a room
--- 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.16.0-RC02' }
+$matrixSDKVersionSpec = { :git => 'https://dl-gitlab.example.com/bwmessenger/bundesmessenger/bundesmessenger-ios-sdk', :tag => 'v2.16.0' }

 # Method to import the MatrixSDK
 def import_MatrixSDK
--- a/Riot/Assets/new_features.html
+++ b/Riot/Assets/new_features.html
@@ -27,6 +27,32 @@
 </head>
 <body>
    <div>
+        <p>
+        <b>Version 2.16.0</b>
+        </p>
+     
+     <p>
+     <b>Neue Funktionen</b>
+     <ul>
+         <li/>Für die Fotoauswahl bei Nachrichten, Raum- und Nutzerprofilen wird jetzt der aktuelle Photopicker von Apple verwendet.
+     </ul>
+     </p>
+     
+        <p>
+        <b>Verbesserungen</b>
+        <ul>
+            <li/>Als Voreinstellung wird jetzt der alte Editor verwendet. Der neue Editor ist weiterhin über die Einstellungen auswählbar.
+            <li/>Im Chatverlauf wird nun immer das aktuelle Profilbild der Mitglieder angezeigt.
+            <li/>Kleine Text und UI Verbesserungen rund um den Wiederherstellungsschlüssel und das Backup.
+        </ul>
+        </p>
+        
+        <p>
+        <b>Behobene Bugs</b>
+        <ul>
+            <li/>Nichtquadratische Bilder haben bei Nutzung als Raum- oder Nutzerprofil keinen Rand mehr.
+        </ul>
+        </p>
        <p>
        <b>Version 2.15.0</b>
        </p>
--- a/Riot/Modules/Room/RoomViewController.m
+++ b/Riot/Modules/Room/RoomViewController.m
@@ -8119,10 +8119,11 @@ static CGSize kThreadListBarButtonItemImageSize;
    [self createDiscussionIfNeeded:^(BOOL readyToSend) {
        if (readyToSend && [self inputToolbarConformsToToolbarViewProtocol])
        {
-            NSData *imageData = [image dataForPNGRepresentation];
+            // bwi: use jpeg reprsentation, its smaller and the same as the old picker
+            NSData *imageData = UIImageJPEGRepresentation(image, 1.0);
            if(imageData) {
                [self.inputToolbarView sendSelectedImage:imageData
-                                            withMimeType:@"image/png"
+                                            withMimeType:MXKUTI.jpeg.mimeType
                                      andCompressionMode:MediaCompressionHelper.defaultCompressionMode
                                     isPhotoLibraryAsset:YES];
            } else {