felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-05-08 08:57:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Doug
2023-04-18 20:11:38 +01:00
parent 013c62f6e1 98594fd01f
commit d31c7bc28b
10 changed files with 41 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGES.md
+19
View File
@@ -1,3 +1,22 @@
## Changes in 1.10.11 (2023-04-18)
🙌 Improvements
- Upgrade MatrixSDK version ([v0.26.9](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.26.9)).
- Labs: Rich Text Editor: Integrate version 2.0.0 with mention Pills support. ([#7442](https://github.com/vector-im/element-ios/issues/7442))
🐛 Bugfixes
- Continue to display pills for matrix.to permalinks if a custom permalinkBaseUrl is set. ([#7482](https://github.com/vector-im/element-ios/pull/7482))
- Add a foreground color attribute for the unformattable event error message. ([#7501](https://github.com/vector-im/element-ios/pull/7501))
- Fixed a bug that prevented audio messages that were not .mp4 to be played in the timeline ([#7451](https://github.com/vector-im/element-ios/issues/7451))
- Fix user suggestion list item height on iOS 16+ ([#7492](https://github.com/vector-im/element-ios/issues/7492))
🧱 Build
- Pinned used Xcode version to 14.2 as newer version fail ASC validation ([#7476](https://github.com/vector-im/element-ios/issues/7476))
## Changes in 1.10.10 (2023-04-12)
🙌 Improvements
Podfile
+1 -1
View File
@@ -16,7 +16,7 @@ use_frameworks!
# - `{ :specHash => {sdk spec hash}` to depend on specific pod options (:git => …, :podspec => …) for MatrixSDK repo. Used by Fastfile during CI
#
# Warning: our internal tooling depends on the name of this variable name, so be sure not to change it
$matrixSDKVersion = '= 0.26.7'
$matrixSDKVersion = '= 0.26.9'
# $matrixSDKVersion = :local
# $matrixSDKVersion = { :branch => 'develop'}
# $matrixSDKVersion = { :specHash => { git: 'https://git.io/fork123', branch: 'fix' } }
Podfile.lock
+11 -11
View File
@@ -39,20 +39,20 @@ PODS:
- LoggerAPI (1.9.200):
- Logging (~> 1.1)
- Logging (1.4.0)
- MatrixSDK (0.26.7):
- MatrixSDK/Core (= 0.26.7)
- MatrixSDK/Core (0.26.7):
- MatrixSDK (0.26.9):
- MatrixSDK/Core (= 0.26.9)
- MatrixSDK/Core (0.26.9):
- AFNetworking (~> 4.0.0)
- GZIP (~> 1.3.0)
- libbase58 (~> 0.1.4)
- MatrixSDKCrypto (= 0.3.3)
- MatrixSDKCrypto (= 0.3.4)
- OLMKit (~> 3.2.5)
- Realm (= 10.27.0)
- SwiftyBeaver (= 1.9.5)
- MatrixSDK/JingleCallStack (0.26.7):
- MatrixSDK/JingleCallStack (0.26.9):
- JitsiMeetSDKLite (= 7.0.1-lite)
- MatrixSDK/Core
- MatrixSDKCrypto (0.3.3)
- MatrixSDKCrypto (0.3.4)
- OLMKit (3.2.12):
- OLMKit/olmc (= 3.2.12)
- OLMKit/olmcpp (= 3.2.12)
@@ -102,8 +102,8 @@ DEPENDENCIES:
- KeychainAccess (~> 4.2.2)
- KTCenterFlowLayout (~> 1.3.1)
- libPhoneNumber-iOS (~> 0.9.13)
- MatrixSDK (= 0.26.7)
- MatrixSDK/JingleCallStack (= 0.26.7)
- MatrixSDK (= 0.26.9)
- MatrixSDK/JingleCallStack (= 0.26.9)
- OLMKit
- PostHog (~> 2.0.0)
- ReadMoreTextView (~> 3.0.1)
@@ -187,8 +187,8 @@ SPEC CHECKSUMS:
libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75
LoggerAPI: ad9c4a6f1e32f518fdb43a1347ac14d765ab5e3d
Logging: beeb016c9c80cf77042d62e83495816847ef108b
MatrixSDK: 1de7cd06bef00fabf5693eabcdcdbf2aa1978063
MatrixSDKCrypto: 427dbb126a3e3f97cadf9fc407abf17d365b4b39
MatrixSDK: 2f6222978156818cf4c6ba590762ade601ba72f9
MatrixSDKCrypto: ac805c22c24f79f349cdbfa065855c73a4c81b51
OLMKit: da115f16582e47626616874e20f7bb92222c7a51
PostHog: 660ec6c9d80cec17b685e148f17f6785a88b597d
ReadMoreTextView: 19147adf93abce6d7271e14031a00303fe28720d
@@ -208,6 +208,6 @@ SPEC CHECKSUMS:
zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb
PODFILE CHECKSUM: c063d05ddb39617ab9a259c4c9c6b57da2e6d8b6
PODFILE CHECKSUM: a55fb48d3bef5f5e24fcaf8c39d1eae1ed8c1603
COCOAPODS: 1.11.3
Riot/Modules/MatrixKit/Utils/EventFormatter/MXKEventFormatter.m
+10 -10
View File
@@ -344,7 +344,7 @@ static NSString *const kRepliedTextPattern = @"<mx-reply>.*<blockquote>.*<br>(.*
if ((RiotSettings.shared.enableThreads && [mxSession.threadingService isEventThreadRoot:event])
|| _settings.showRedactionsInRoomHistory)
{
MXLogDebug(@"[MXKEventFormatter] Redacted event %@ (%@)", event.description, event.redactedBecause);
MXLogDebug(@"[MXKEventFormatter] Redacted event %@ (%@)", event.eventId, event.redactedBecause);
NSString *redactorId = event.redactedBecause[@"sender"];
NSString *redactedBy = @"";
@@ -1316,7 +1316,7 @@ static NSString *const kRepliedTextPattern = @"<mx-reply>.*<blockquote>.*<br>(.*
// Check attachment validity
if (![self isSupportedAttachment:event])
{
MXLogDebug(@"[MXKEventFormatter] Warning: Unsupported attachment %@", event.description);
MXLogDebug(@"[MXKEventFormatter] Warning: Unsupported attachment in event %@", event.eventId);
body = [VectorL10n noticeInvalidAttachment];
*error = MXKEventFormatterErrorUnsupported;
}
@@ -1326,7 +1326,7 @@ static NSString *const kRepliedTextPattern = @"<mx-reply>.*<blockquote>.*<br>(.*
body = body? body : [VectorL10n noticeAudioAttachment];
if (![self isSupportedAttachment:event])
{
MXLogDebug(@"[MXKEventFormatter] Warning: Unsupported attachment %@", event.description);
MXLogDebug(@"[MXKEventFormatter] Warning: Unsupported attachment in event %@", event.eventId);
if (_isForSubtitle || !_settings.showUnsupportedEventsInRoomHistory)
{
body = [VectorL10n noticeInvalidAttachment];
@@ -1343,7 +1343,7 @@ static NSString *const kRepliedTextPattern = @"<mx-reply>.*<blockquote>.*<br>(.*
body = body? body : [VectorL10n noticeVideoAttachment];
if (![self isSupportedAttachment:event])
{
MXLogDebug(@"[MXKEventFormatter] Warning: Unsupported attachment %@", event.description);
MXLogDebug(@"[MXKEventFormatter] Warning: Unsupported attachment in event %@", event.eventId);
if (_isForSubtitle || !_settings.showUnsupportedEventsInRoomHistory)
{
body = [VectorL10n noticeInvalidAttachment];
@@ -1374,14 +1374,14 @@ static NSString *const kRepliedTextPattern = @"<mx-reply>.*<blockquote>.*<br>(.*
}
else
{
MXLogDebug(@"[MXKEventFormatter] Warning: Unsupported m.file format: %@", event.description);
MXLogDebug(@"[MXKEventFormatter] Warning: Unsupported m.file format in event: %@", event.eventId);
*error = MXKEventFormatterErrorUnsupported;
}
}
}
else
{
MXLogDebug(@"[MXKEventFormatter] Warning: Unsupported attachment %@", event.description);
MXLogDebug(@"[MXKEventFormatter] Warning: Unsupported attachment in event %@", event.eventId);
body = [VectorL10n noticeInvalidAttachment];
*error = MXKEventFormatterErrorUnsupported;
}
@@ -1620,7 +1620,7 @@ static NSString *const kRepliedTextPattern = @"<mx-reply>.*<blockquote>.*<br>(.*
// Check sticker validity
if (![self isSupportedAttachment:event])
{
MXLogDebug(@"[MXKEventFormatter] Warning: Unsupported sticker %@", event.description);
MXLogDebug(@"[MXKEventFormatter] Warning: Unsupported sticker in event %@", event.eventId);
body = [VectorL10n noticeInvalidAttachment];
*error = MXKEventFormatterErrorUnsupported;
}
@@ -1674,7 +1674,7 @@ static NSString *const kRepliedTextPattern = @"<mx-reply>.*<blockquote>.*<br>(.*
if (!attributedDisplayText)
{
MXLogDebug(@"[MXKEventFormatter] Warning: Unsupported event %@)", event.description);
MXLogDebug(@"[MXKEventFormatter] Warning: Unsupported event %@)", event.eventId);
if (_settings.showUnsupportedEventsInRoomHistory)
{
if (MXKEventFormatterErrorNone == *error)
@@ -1914,7 +1914,7 @@ static NSString *const kRepliedTextPattern = @"<mx-reply>.*<blockquote>.*<br>(.*
// No message content in a non-redacted event. Formatter should use fallback.
if (!repliedEventContent)
{
MXLogWarning(@"[MXKEventFormatter] Unable to retrieve content from replied event %@", repliedEvent.description)
MXLogWarning(@"[MXKEventFormatter] Unable to retrieve content from replied event %@", repliedEvent.eventId)
return nil;
}
}
@@ -1949,7 +1949,7 @@ static NSString *const kRepliedTextPattern = @"<mx-reply>.*<blockquote>.*<br>(.*
}
else
{
MXLogWarning(@"[MXKEventFormatter] Unable to build reply event %@", event.description)
MXLogWarning(@"[MXKEventFormatter] Unable to build reply event %@", event.eventId)
}
return html;
changelog.d/7442.change
-1
View File
@@ -1 +0,0 @@
Labs: Rich Text Editor: Integrate version 2.0.0 with mention Pills support.
changelog.d/7451.bugfix
-1
View File
@@ -1 +0,0 @@
Fixed a bug that prevented audio messages that were not .mp4 to be played in the timeline
changelog.d/7476.build
-1
View File
@@ -1 +0,0 @@
Pinned used Xcode version to 14.2 as newer version fail ASC validation
changelog.d/7492.bugfix
-1
View File
@@ -1 +0,0 @@
Fix user suggestion list item height on iOS 16+
changelog.d/pr-7482.bugfix
-1
View File
@@ -1 +0,0 @@
Continue to display pills for matrix.to permalinks if a custom permalinkBaseUrl is set.
changelog.d/pr-7501.bugfix
-1
View File
@@ -1 +0,0 @@
Add a foreground color attribute for the unformattable event error message.