fix: Use Uri.tryParse where applicable
This commit is contained in:
parent
f84d5fed6d
commit
b67ab870fa
|
|
@ -211,7 +211,7 @@ class Room {
|
||||||
Uri get avatar {
|
Uri get avatar {
|
||||||
if (states[EventTypes.RoomAvatar] != null &&
|
if (states[EventTypes.RoomAvatar] != null &&
|
||||||
states[EventTypes.RoomAvatar].content['url'] is String) {
|
states[EventTypes.RoomAvatar].content['url'] is String) {
|
||||||
return Uri.parse(states[EventTypes.RoomAvatar].content['url']);
|
return Uri.tryParse(states[EventTypes.RoomAvatar].content['url']);
|
||||||
}
|
}
|
||||||
if (mHeroes != null && mHeroes.length == 1 && states[mHeroes[0]] != null) {
|
if (mHeroes != null && mHeroes.length == 1 && states[mHeroes[0]] != null) {
|
||||||
return states[mHeroes[0]].asUser.avatarUrl;
|
return states[mHeroes[0]].asUser.avatarUrl;
|
||||||
|
|
|
||||||
|
|
@ -94,10 +94,10 @@ class User extends Event {
|
||||||
/// The avatar if the user has one.
|
/// The avatar if the user has one.
|
||||||
Uri get avatarUrl => content != null && content.containsKey('avatar_url')
|
Uri get avatarUrl => content != null && content.containsKey('avatar_url')
|
||||||
? (content['avatar_url'] is String
|
? (content['avatar_url'] is String
|
||||||
? Uri.parse(content['avatar_url'])
|
? Uri.tryParse(content['avatar_url'])
|
||||||
: null)
|
: null)
|
||||||
: (prevContent != null && prevContent['avatar_url'] is String
|
: (prevContent != null && prevContent['avatar_url'] is String
|
||||||
? Uri.parse(prevContent['avatar_url'])
|
? Uri.tryParse(prevContent['avatar_url'])
|
||||||
: null);
|
: null);
|
||||||
|
|
||||||
/// Returns the displayname or the local part of the Matrix ID if the user
|
/// Returns the displayname or the local part of the Matrix ID if the user
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue