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

Fix root message redaction

Browse Source
This commit is contained in:
ismailgulek
2022-01-04 18:07:39 +03:00
parent c0ada7adf3
commit 30497de61c
6 changed files with 33 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Threads/ThreadList/ThreadListViewModel.swift
+8 -8
View File
@@ -187,7 +187,7 @@ final class ThreadListViewModel: ThreadListViewModelProtocol {
summaryViewModel: summaryViewModel)
}
private func rootMessageText(forThread thread: MXThread) -> String? {
private func rootMessageText(forThread thread: MXThread) -> NSAttributedString? {
guard let eventFormatter = eventFormatter else {
return nil
}
@@ -195,12 +195,12 @@ final class ThreadListViewModel: ThreadListViewModelProtocol {
return nil
}
let formatterError = UnsafeMutablePointer<MXKEventFormatterError>.allocate(capacity: 1)
return eventFormatter.string(from: message,
with: roomState,
error: formatterError)
return eventFormatter.attributedString(from: message,
with: roomState,
error: formatterError)
}
private func lastMessageTextAndTime(forThread thread: MXThread) -> (String?, String?) {
private func lastMessageTextAndTime(forThread thread: MXThread) -> (NSAttributedString?, String?) {
guard let eventFormatter = eventFormatter else {
return (nil, nil)
}
@@ -209,9 +209,9 @@ final class ThreadListViewModel: ThreadListViewModelProtocol {
}
let formatterError = UnsafeMutablePointer<MXKEventFormatterError>.allocate(capacity: 1)
return (
eventFormatter.string(from: message,
with: roomState,
error: formatterError),
eventFormatter.attributedString(from: message,
with: roomState,
error: formatterError),
eventFormatter.dateString(from: message, withTime: true)
)
}
Riot/Modules/Threads/ThreadList/Views/Cell/ThreadTableViewCell.swift
+1 -1
View File
@@ -52,7 +52,7 @@ class ThreadTableViewCell: UITableViewCell {
rootMessageSenderLabel.textColor = Self.usernameColorGenerator.defaultColor
}
rootMessageSenderLabel.text = viewModel.rootMessageSenderDisplayName
rootMessageContentLabel.text = viewModel.rootMessageText
rootMessageContentLabel.attributedText = viewModel.rootMessageText
lastMessageTimeLabel.text = viewModel.lastMessageTime
if let summaryViewModel = viewModel.summaryViewModel {
summaryView.configure(withViewModel: summaryViewModel)
Riot/Modules/Threads/ThreadList/Views/Cell/ThreadViewModel.swift
+1 -1
View File
@@ -20,7 +20,7 @@ struct ThreadViewModel {
var rootMessageSenderUserId: String?
var rootMessageSenderAvatar: AvatarViewDataProtocol?
var rootMessageSenderDisplayName: String?
var rootMessageText: String?
var rootMessageText: NSAttributedString?
var lastMessageTime: String?
var summaryViewModel: ThreadSummaryViewModel?
}