Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Disable chat message content click action if edition mode enabled

Browse source
This commit is contained in:
Sylvain Berfini 2019-11-27 11:24:15 +01:00
parent e550efc094
commit 006737b18b
2 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/src/main/java/org/linphone/chat/ChatMessageViewHolder.java
View file

@ -82,6 +82,7 @@ public class ChatMessageViewHolder extends RecyclerView.ViewHolder implements Vi
private final RelativeLayout singleFileContent; private final RelativeLayout singleFileContent;
public final CheckBox delete; public final CheckBox delete;
public boolean isEditionEnabled;
private Context mContext; private Context mContext;
private ChatMessageViewHolderClickListener mListener; private ChatMessageViewHolderClickListener mListener;
@ -275,8 +276,12 @@ public class ChatMessageViewHolder extends RecyclerView.ViewHolder implements Vi
new View.OnClickListener() { new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
if (isEditionEnabled) {
ChatMessageViewHolder.this.onClick(v);
} else {
openFile(filePath); openFile(filePath);
} }
}
}); });
} else { } else {
downloadOrCancel.setVisibility(View.VISIBLE); downloadOrCancel.setVisibility(View.VISIBLE);
@ -315,6 +320,9 @@ public class ChatMessageViewHolder extends RecyclerView.ViewHolder implements Vi
new View.OnClickListener() { new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
if (isEditionEnabled) {
ChatMessageViewHolder.this.onClick(v);
} else {
Content c = (Content) v.getTag(); Content c = (Content) v.getTag();
if (!message.isFileTransferInProgress()) { if (!message.isFileTransferInProgress()) {
message.downloadContent(c); message.downloadContent(c);
@ -322,6 +330,7 @@ public class ChatMessageViewHolder extends RecyclerView.ViewHolder implements Vi
message.cancelFileTransfer(); message.cancelFileTransfer();
} }
} }
}
}); });
} else { } else {
Log.w( Log.w(

1
app/src/main/java/org/linphone/chat/ChatMessagesAdapter.java
View file

@ -119,6 +119,7 @@ public class ChatMessagesAdapter extends SelectableAdapter<ChatMessageViewHolder
holder.bubbleLayout.setVisibility(View.GONE); holder.bubbleLayout.setVisibility(View.GONE);
holder.sendInProgress.setVisibility(View.GONE); holder.sendInProgress.setVisibility(View.GONE);
holder.isEditionEnabled = isEditionEnabled();
if (isEditionEnabled()) { if (isEditionEnabled()) {
holder.delete.setVisibility(View.VISIBLE); holder.delete.setVisibility(View.VISIBLE);
holder.delete.setChecked(isSelected(position)); holder.delete.setChecked(isSelected(position));