Merge branch 'develop' of https://dl-gitlab.example.com/bwmessenger/bundesmessenger/bundesmessenger-ios into develop

CHANGES_BWI.md

@@ -1,4 +1,33 @@
 
+Changes in BWI project 1.26.0 (2022-10-21)
+===================================================
+ 
+Upstream merge ✨:
+
+- v1.9.8
+
+Features ✨:
+- Zooming pictures with double tap (#3699)
+- Enable animation handling with Lottie (for BuM) (#3620) 
+
+Improvements 🙌:
+- Rename closed polls to hidden polls (#3652)
+- New Copyright URL (#3626)
+- Better button contrast (#3688)
+- Remove room settings for DMs to be more similar to Android (#3639)
+
+Bugfix 🐛:
+- Security fix (Missing decoration for events decrypted with untrusted Megolm sessions ([Security advisory])
+
+Translations 🗣  :
+
+SDK API changes ⚠️:
+
++Build 🧱:
+
+Changes in BWI project 1.25.0 (2022-09-27)
+===================================================
+
 Changes in BWI project 1.25.0 (2022-09-27)
 ===================================================
  

Config/nexus_upload.sh

@@ -14,7 +14,7 @@ find ../out$SUBDIR -name "*$VARIANT*.$EXT" -print0 | while read -d $'\0' file
 do
   echo "Source: $file"
   zip -r $file.zip $file
-  BASENAME=$(basename $file .$EXT.zip)-$VERSION-$DATE_STR-$GITHASH.$EXT$SUBDIR.$EXT.zip
+  BASENAME=$(basename $file .zip)-$VERSION-$DATE_STR-$GITHASH.$EXT$SUBDIR.zip
   echo "Destination $NEXUS_BASE_URL/$VERSION/$BASENAME"
   curl --fail -u $S_BWMESSENGER_ID:$S_BWMESSENGER_PASSWORD -v --upload-file $file.zip $NEXUS_BASE_URL/$VERSION/$BASENAME
 done

Riot/Assets/new_features.html

@@ -33,6 +33,28 @@
         
         <li/><a href="$FEATURELINK">Feature-Übersicht</a>
     </div>
+    <div>
+        <p>
+        <b>Version 1.26.0</b>
+        </p>
+             
+        <p>
+        <b>Neue Funktionen</b>
+        <ul>
+        <li/>Du kannst in Bilder jetzt auch mit einem Doppelklick hineinzoomen.
+        </ul>
+        </p>
+             
+         <p>
+         <b>Verbesserungen</b>
+         <ul>
+         <li/>Einige Button haben jetzt einen besseren Kontrast.
+         <li/>Geschlossene Umfragen wurden zu Versteckten Umfragen umbenannt.
+         <li/>Es gibt eine angepasste Copyright Seite.
+         </ul>
+         </p>
+    </div>
+    <br>
     <div>
         <p>
         <b>Version 1.25.0</b>

Riot/Modules/Room/RoomViewController.m

@@ -4331,7 +4331,7 @@ static CGSize kThreadListBarButtonItemImageSize;
             }]];
         }
         
-        if (!isJitsiCallEvent && self.roomDataSource.room.summary.isEncrypted)
+        if (!isJitsiCallEvent && self.roomDataSource.room.summary.isEncrypted && BuildSettings.roomContextualMenuShowEncryptionOption)
         {
             [self.eventMenuBuilder addItemWithType:EventMenuItemTypeViewEncryption
                                             action:[UIAlertAction actionWithTitle:[VectorL10n roomEventActionViewEncryption]