narayana/anotherim
narayana/anotherim
3
2
Fork 0
Code Issues 3 Pull requests Actions Packages Projects Releases 4 Wiki Activity

offer either 'cancel download' or 'delete file' but not both

Browse source 
fixes #3221
This commit is contained in:
Daniel Gultsch 2018-10-11 04:33:12 +02:00
parent 58c6dbbbbe
commit 7c5af89c89
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
View file

@ -1148,13 +1148,14 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
downloadFile.setVisible(true); downloadFile.setVisible(true);
downloadFile.setTitle(activity.getString(R.string.download_x_file, UIHelper.getFileDescriptionString(activity, m))); downloadFile.setTitle(activity.getString(R.string.download_x_file, UIHelper.getFileDescriptionString(activity, m)));
} }
boolean waitingOfferedSending = m.getStatus() == Message.STATUS_WAITING final boolean waitingOfferedSending = m.getStatus() == Message.STATUS_WAITING
|| m.getStatus() == Message.STATUS_UNSEND || m.getStatus() == Message.STATUS_UNSEND
|| m.getStatus() == Message.STATUS_OFFERED; || m.getStatus() == Message.STATUS_OFFERED;
if ((t != null && !deleted) || waitingOfferedSending && m.needsUploading()) { final boolean cancelable = (t != null && !deleted) || waitingOfferedSending && m.needsUploading();
if (cancelable) {
cancelTransmission.setVisible(true); cancelTransmission.setVisible(true);
} }
if (m.isFileOrImage() && !deleted) { if (m.isFileOrImage() && !deleted && !cancelable) {
String path = m.getRelativeFilePath(); String path = m.getRelativeFilePath();
if (path == null || !path.startsWith("/") || FileBackend.isInDirectoryThatShouldNotBeScanned(getActivity(), path)) { if (path == null || !path.startsWith("/") || FileBackend.isInDirectoryThatShouldNotBeScanned(getActivity(), path)) {
deleteFile.setVisible(true); deleteFile.setVisible(true);