gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-07-18 02:05:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

remove unneeded null checks

Browse Source 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
This commit is contained in:
Andy Scherzinger 2022-02-28 13:23:35 +01:00
parent 92a2c44415
commit da39d12a7f
No known key found for this signature in database
GPG Key ID: 6CADC7E3523C308B
1 changed files with 32 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
app/src/main/java/com/nextcloud/talk/adapters/items/ParticipantItem.java
View File

@ -61,9 +61,9 @@ public class ParticipantItem extends AbstractFlexibleItem<ParticipantItem.Partic
private static final float STATUS_SIZE_IN_DP = 9f; private static final float STATUS_SIZE_IN_DP = 9f;
private static final String NO_ICON = ""; private static final String NO_ICON = "";
private Context context; private final Context context;
private Participant participant; private final Participant participant;
private UserEntity userEntity; private final UserEntity userEntity;
public boolean isOnline = true; public boolean isOnline = true;
public ParticipantItem(Context activityContext, public ParticipantItem(Context activityContext,
@ -80,8 +80,8 @@ public class ParticipantItem extends AbstractFlexibleItem<ParticipantItem.Partic
@Override @Override
public boolean equals(Object o) { public boolean equals(Object o) {
if (o instanceof UserItem) { if (o instanceof ParticipantItem) {
UserItem inItem = (UserItem) o; ParticipantItem inItem = (ParticipantItem) o;
return participant.getActorType() == inItem.getModel().getActorType() && return participant.getActorType() == inItem.getModel().getActorType() &&
participant.getActorId().equals(inItem.getModel().getActorId()); participant.getActorId().equals(inItem.getModel().getActorId());
} }
@ -268,39 +268,35 @@ public class ParticipantItem extends AbstractFlexibleItem<ParticipantItem.Partic
} }
private void drawStatus(ParticipantItemViewHolder holder) { private void drawStatus(ParticipantItemViewHolder holder) {
if (holder.binding.conversationInfoStatusMessage != null && float size = DisplayUtils.convertDpToPixel(STATUS_SIZE_IN_DP, context);
holder.binding.participantStatusEmoji != null && holder.binding.userStatusImage.setImageDrawable(new StatusDrawable(
holder.binding.userStatusImage != null) { participant.status,
float size = DisplayUtils.convertDpToPixel(STATUS_SIZE_IN_DP, context); NO_ICON,
holder.binding.userStatusImage.setImageDrawable(new StatusDrawable( size,
participant.status, context.getResources().getColor(R.color.bg_default),
NO_ICON, context));
size,
context.getResources().getColor(R.color.bg_default),
context));
if (participant.statusMessage != null) { if (participant.statusMessage != null) {
holder.binding.conversationInfoStatusMessage.setText(participant.statusMessage); holder.binding.conversationInfoStatusMessage.setText(participant.statusMessage);
alignUsernameVertical(holder, 0); alignUsernameVertical(holder, 0);
} else { } else {
holder.binding.conversationInfoStatusMessage.setText(""); holder.binding.conversationInfoStatusMessage.setText("");
alignUsernameVertical(holder, 10); alignUsernameVertical(holder, 10);
}
if (participant.statusIcon != null && !participant.statusIcon.isEmpty()) {
holder.binding.participantStatusEmoji.setText(participant.statusIcon);
} else {
holder.binding.participantStatusEmoji.setVisibility(View.GONE);
}
if (participant.status != null && participant.status.equals(StatusType.DND.getString())) {
if (participant.statusMessage == null || participant.statusMessage.isEmpty()) {
holder.binding.conversationInfoStatusMessage.setText(R.string.dnd);
} }
} else if (participant.status != null && participant.status.equals(StatusType.AWAY.getString())) {
if (participant.statusIcon != null && !participant.statusIcon.isEmpty()) { if (participant.statusMessage == null || participant.statusMessage.isEmpty()) {
holder.binding.participantStatusEmoji.setText(participant.statusIcon); holder.binding.conversationInfoStatusMessage.setText(R.string.away);
} else {
holder.binding.participantStatusEmoji.setVisibility(View.GONE);
}
if (participant.status != null && participant.status.equals(StatusType.DND.getString())) {
if (participant.statusMessage == null || participant.statusMessage.isEmpty()) {
holder.binding.conversationInfoStatusMessage.setText(R.string.dnd);
}
} else if (participant.status != null && participant.status.equals(StatusType.AWAY.getString())) {
if (participant.statusMessage == null || participant.statusMessage.isEmpty()) {
holder.binding.conversationInfoStatusMessage.setText(R.string.away);
}
} }
} }
} }