Merge branch 'ChristianPauly-master-patch-10044' into 'master'
Update lib/src/room.dart See merge request famedly/famedlysdk!288
This commit is contained in:
commit
729f1f3b78
|
@ -294,19 +294,11 @@ class Room {
|
||||||
(mHeroes != null && mHeroes.isNotEmpty)) {
|
(mHeroes != null && mHeroes.isNotEmpty)) {
|
||||||
return i18n.groupWith(displayname);
|
return i18n.groupWith(displayname);
|
||||||
}
|
}
|
||||||
if ((name?.isEmpty ?? true) &&
|
if (displayname?.isNotEmpty ?? false) {
|
||||||
(canonicalAlias?.isEmpty ?? true) &&
|
return displayname;
|
||||||
!isDirectChat &&
|
|
||||||
(mHeroes?.isEmpty ?? true)) {
|
|
||||||
if (membership == Membership.invite) {
|
|
||||||
final sender =
|
|
||||||
getState('m.room.member', client.userID)?.sender?.calcDisplayname();
|
|
||||||
if (sender != null) return sender;
|
|
||||||
}
|
}
|
||||||
return i18n.emptyChat;
|
return i18n.emptyChat;
|
||||||
}
|
}
|
||||||
return displayname;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// The topic of the room if set by a participant.
|
/// The topic of the room if set by a participant.
|
||||||
String get topic => states['m.room.topic'] != null
|
String get topic => states['m.room.topic'] != null
|
||||||
|
|
Loading…
Reference in a new issue