Disable chat message content click action if edition mode enabled
This commit is contained in:
parent
e550efc094
commit
006737b18b
2 changed files with 15 additions and 5 deletions
|
@ -82,6 +82,7 @@ public class ChatMessageViewHolder extends RecyclerView.ViewHolder implements Vi
|
|||
private final RelativeLayout singleFileContent;
|
||||
|
||||
public final CheckBox delete;
|
||||
public boolean isEditionEnabled;
|
||||
|
||||
private Context mContext;
|
||||
private ChatMessageViewHolderClickListener mListener;
|
||||
|
@ -275,8 +276,12 @@ public class ChatMessageViewHolder extends RecyclerView.ViewHolder implements Vi
|
|||
new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
if (isEditionEnabled) {
|
||||
ChatMessageViewHolder.this.onClick(v);
|
||||
} else {
|
||||
openFile(filePath);
|
||||
}
|
||||
}
|
||||
});
|
||||
} else {
|
||||
downloadOrCancel.setVisibility(View.VISIBLE);
|
||||
|
@ -315,6 +320,9 @@ public class ChatMessageViewHolder extends RecyclerView.ViewHolder implements Vi
|
|||
new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
if (isEditionEnabled) {
|
||||
ChatMessageViewHolder.this.onClick(v);
|
||||
} else {
|
||||
Content c = (Content) v.getTag();
|
||||
if (!message.isFileTransferInProgress()) {
|
||||
message.downloadContent(c);
|
||||
|
@ -322,6 +330,7 @@ public class ChatMessageViewHolder extends RecyclerView.ViewHolder implements Vi
|
|||
message.cancelFileTransfer();
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
} else {
|
||||
Log.w(
|
||||
|
|
|
@ -119,6 +119,7 @@ public class ChatMessagesAdapter extends SelectableAdapter<ChatMessageViewHolder
|
|||
holder.bubbleLayout.setVisibility(View.GONE);
|
||||
holder.sendInProgress.setVisibility(View.GONE);
|
||||
|
||||
holder.isEditionEnabled = isEditionEnabled();
|
||||
if (isEditionEnabled()) {
|
||||
holder.delete.setVisibility(View.VISIBLE);
|
||||
holder.delete.setChecked(isSelected(position));
|
||||
|
|
Loading…
Reference in a new issue