felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-21 00:52:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '2e9bb7067e9f1596f29b986729822184145906db' into feature/4068_merge_foss_1_9_15

Browse Source 
# Conflicts:
#	Config/AppVersion.xcconfig
#	Podfile.lock
#	Riot/Assets/de.lproj/Localizable.strings
#	Riot/Modules/Room/RoomViewController.m
#	RiotNSE/NotificationService.swift
#	fastlane/Fastfile
This commit is contained in:
Frank Rotermund
2023-01-16 12:11:51 +01:00
parent c2517b8637 a9c617fe00
commit 9f6deb9110
144 changed files with 2870 additions and 431 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/MatrixKit/Utils/EventFormatter/MXKEventFormatter.m
+19 -7
View File
@@ -1606,6 +1606,23 @@ static NSString *const kHTMLATagRegexPattern = @"<a href=(?:'|\")(.*?)(?:'|\")>(
}
break;
}
case MXEventTypePollEnd:
{
if (event.isEditEvent)
{
return nil;
}
MXEvent* pollStartedEvent = [self->mxSession.store eventWithEventId:event.relatesTo.eventId inRoom:event.roomId];
if (pollStartedEvent) {
displayText = [MXEventContentPollStart modelFromJSON:pollStartedEvent.content].question;
} else {
displayText = [VectorL10n pollTimelineEndedText];
}
break;
}
case MXEventTypePollStart:
{
if (event.isEditEvent)
@@ -1983,8 +2000,8 @@ static NSString *const kHTMLATagRegexPattern = @"<a href=(?:'|\")(.*?)(?:'|\")>(
}
// Replace <mx-reply><blockquote><a href=\"__permalink__\">In reply to</a>
// By <mx-reply><blockquote><a href=\"#\">['In reply to' from resources]</a>
// To disable the link and to localize the "In reply to" string
// By <mx-reply><blockquote><a href=\"__permalink__\">['In reply to' from resources]</a>
// To localize the "In reply to" string
// This link is the first <a> HTML node of the html string
if (inReplyToTextRange.location != NSNotFound)
@@ -1992,11 +2009,6 @@ static NSString *const kHTMLATagRegexPattern = @"<a href=(?:'|\")(.*?)(?:'|\")>(
html = [html stringByReplacingCharactersInRange:inReplyToTextRange withString:[VectorL10n noticeInReplyTo]];
}
if (inReplyToLinkRange.location != NSNotFound)
{
html = [html stringByReplacingCharactersInRange:inReplyToLinkRange withString:@"#"];
}
return html;
}