return sone.getInsertUri() != null;
} else if (member.equals("friend")) {
Sone currentSone = (Sone) dataProvider.getData("currentSone");
- return (currentSone != null) && currentSone.hasFriend(sone);
+ return (currentSone != null) && currentSone.hasFriend(sone.getId());
} else if (member.equals("current")) {
Sone currentSone = (Sone) dataProvider.getData("currentSone");
return (currentSone != null) && currentSone.equals(sone);
- } else if (member.equals("blocked")) {
- Sone currentSone = (Sone) dataProvider.getData("currentSone");
- return (currentSone != null) && currentSone.isSoneBlocked(sone.getId());
- } else if (member.equals("blacklisted")) {
- return core.isBlacklistedSone(sone);
} else if (member.equals("modified")) {
- return sone.getModificationCounter() > 0;
+ return core.isModifiedSone(sone);
} else if (member.equals("status")) {
- return core.getSoneStatus(sone).toString();
+ return core.getSoneStatus(sone);
} else if (member.equals("unknown")) {
return core.getSoneStatus(sone) == SoneStatus.unknown;
} else if (member.equals("idle")) {
return core.getSoneStatus(sone) == SoneStatus.inserting;
} else if (member.equals("downloading")) {
return core.getSoneStatus(sone) == SoneStatus.downloading;
+ } else if (member.equals("new")) {
+ return core.isNewSone(sone);
+ } else if (member.equals("locked")) {
+ return core.isLocked(sone);
}
return super.get(dataProvider, object, member);
}
String lastName = profile.getLastName();
if (firstName == null) {
if (lastName == null) {
- return sone.getName();
+ return String.valueOf(sone.getName());
}
return lastName;
}