Handle null/non-existant groups better

This commit is contained in:
Finn 2017-02-20 14:50:55 -08:00
parent 3a5ba0de48
commit 55e6a7be5b

View file

@ -802,12 +802,22 @@ class Manager implements Signal {
@Override @Override
public String getGroupName(byte[] groupId) { public String getGroupName(byte[] groupId) {
return getGroup(groupId).name; GroupInfo group = getGroup(groupId);
if (group == null) {
return "";
} else {
return group.name;
}
} }
@Override @Override
public List<String> getGroupMembers(byte[] groupId) { public List<String> getGroupMembers(byte[] groupId) {
return new ArrayList<String>(getGroup(groupId).members); GroupInfo group = getGroup(groupId);
if (group == null) {
return new ArrayList<String>();
} else {
return new ArrayList<String>(group.members);
}
} }
@Override @Override