[Room] Heroes null check

This commit is contained in:
Christian Pauly 2019-08-28 12:32:50 +02:00
parent f90a996db6
commit c33350f796

View file

@ -71,7 +71,7 @@ class Room {
return states["m.room.name"].content["name"]; return states["m.room.name"].content["name"];
if (canonicalAlias != null && !canonicalAlias.isEmpty) if (canonicalAlias != null && !canonicalAlias.isEmpty)
return canonicalAlias.substring(1, canonicalAlias.length).split(":")[0]; return canonicalAlias.substring(1, canonicalAlias.length).split(":")[0];
if (mHeroes.length > 0) { if (mHeroes != null && mHeroes.length > 0) {
String displayname = ""; String displayname = "";
for (int i = 0; i < mHeroes.length; i++) { for (int i = 0; i < mHeroes.length; i++) {
User hero = states[mHeroes[i]] != null User hero = states[mHeroes[i]] != null
@ -93,7 +93,7 @@ class Room {
MxContent get avatar { MxContent get avatar {
if (states["m.room.avatar"] != null) if (states["m.room.avatar"] != null)
return MxContent(states["m.room.avatar"].content["url"]); return MxContent(states["m.room.avatar"].content["url"]);
if (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;
return MxContent(""); return MxContent("");
} }