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

Handle empty displayname & fix iOS 14 mentions

Browse Source
This commit is contained in:
aringenbach
2022-05-05 15:12:59 +02:00
parent a772dc40c6
commit c8a9f90007
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Room/RoomViewController.swift
+13 -7
View File
@@ -19,17 +19,19 @@ import UIKit
extension RoomViewController {
// MARK: - Override
open override func mention(_ roomMember: MXRoomMember) {
guard #available(iOS 15.0, *),
let inputToolbar = inputToolbar else {
super.mention(roomMember)
guard let inputToolbar = inputToolbar else {
return
}
let newAttributedString = NSMutableAttributedString(attributedString: inputToolbar.attributedTextMessage)
if inputToolbar.attributedTextMessage.length > 0 {
newAttributedString.append(StringPillsUtils.mentionPill(withRoomMember: roomMember,
isCurrentUser: false))
if #available(iOS 15.0, *) {
newAttributedString.append(StringPillsUtils.mentionPill(withRoomMember: roomMember,
isCurrentUser: false))
} else {
newAttributedString.appendString(roomMember.displayname.count > 0 ? roomMember.displayname : roomMember.userId)
}
let empty = NSAttributedString(string: " ",
attributes: [.font: inputToolbar.textDefaultFont])
newAttributedString.append(empty)
@@ -38,8 +40,12 @@ extension RoomViewController {
attributes: [.font: inputToolbar.textDefaultFont])
newAttributedString.append(selfMentionString)
} else {
newAttributedString.append(StringPillsUtils.mentionPill(withRoomMember: roomMember,
isCurrentUser: false))
if #available(iOS 15.0, *) {
newAttributedString.append(StringPillsUtils.mentionPill(withRoomMember: roomMember,
isCurrentUser: false))
} else {
newAttributedString.appendString(roomMember.displayname.count > 0 ? roomMember.displayname : roomMember.userId)
}
let colon = NSAttributedString(string: ": ",
attributes: [.font: inputToolbar.textDefaultFont])
newAttributedString.append(colon)