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

Remove render edit flag and fix a nil room state crash

Browse Source
This commit is contained in:
aringenbach
2022-06-07 17:31:17 +02:00
parent 68a78724af
commit 48a83a9c55
3 changed files with 4 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Room/DataSources/RoomDataSource.swift
+3 -3
View File
@@ -156,7 +156,7 @@ extension RoomDataSource {
if event.isReply() {
let body: String
if let newContent = event.content[kMXMessageContentKeyNewContent] as? [String:Any] {
if let newContent = event.content[kMXMessageContentKeyNewContent] as? [String: Any] {
// Use new content if available.
body = newContent["formatted_body"] as? String ?? newContent[kMXMessageBodyKey] as? String ?? ""
} else {
@@ -167,7 +167,7 @@ extension RoomDataSource {
body = replyEventParts?.formattedBodyParts?.replyText ?? replyEventParts?.bodyParts.replyText ?? ""
}
let attributed = eventFormatter.renderHTMLString(body, for: event, with: self.roomState, isEditMode: true)
let attributed = eventFormatter.renderHTMLString(body, for: event, with: nil)
if let attributed = attributed, #available(iOS 15.0, *) {
editableTextMessage = PillsFormatter.insertPills(in: attributed,
withSession: self.mxSession,
@@ -180,7 +180,7 @@ extension RoomDataSource {
}
} else {
let body: String = event.content["formatted_body"] as? String ?? event.content["body"] as? String ?? ""
let attributed = eventFormatter.renderHTMLString(body, for: event, with: self.roomState, isEditMode: true)
let attributed = eventFormatter.renderHTMLString(body, for: event, with: nil)
if let attributed = attributed, #available(iOS 15.0, *) {
editableTextMessage = PillsFormatter.insertPills(in: attributed,
withSession: self.mxSession,