aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/pixart/messenger/ui/adapter
diff options
context:
space:
mode:
authorChristian Schneppe <christian.schneppe@pix-art.de>2019-10-26 17:09:36 +0200
committerChristian Schneppe <christian.schneppe@pix-art.de>2019-10-26 17:19:06 +0200
commit3b6b25720f4b203aa231568e91dc221b5a694f8e (patch)
treec60b812f60d9dccf138200ed5ef9addc9fdc8eb1 /src/main/java/de/pixart/messenger/ui/adapter
parent41e055953391700001da179fc251d2a304fa4157 (diff)
mark cancelled jingle ft as such on both sides
Diffstat (limited to 'src/main/java/de/pixart/messenger/ui/adapter')
-rw-r--r--src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java b/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java
index 6cff1aebd..d11a2af0f 100644
--- a/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java
+++ b/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java
@@ -9,10 +9,6 @@ import android.graphics.Rect;
import android.graphics.Typeface;
import android.net.Uri;
import android.preference.PreferenceManager;
-
-import androidx.core.app.ActivityCompat;
-import androidx.core.content.ContextCompat;
-
import android.text.Editable;
import android.text.Spannable;
import android.text.SpannableString;
@@ -39,6 +35,9 @@ import android.widget.RelativeLayout;
import android.widget.TextView;
import android.widget.Toast;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+
import com.google.common.base.Strings;
import com.squareup.picasso.Picasso;
@@ -230,7 +229,7 @@ public class MessageAdapter extends ArrayAdapter<Message> implements CopyTextVie
if (message.isFileOrImage() || transferable != null) {
FileParams params = message.getFileParams();
filesize = params.size > 0 ? UIHelper.filesizeToString(params.size) : null;
- if (transferable != null && transferable.getStatus() == Transferable.STATUS_FAILED) {
+ if (transferable != null && (transferable.getStatus() == Transferable.STATUS_FAILED || transferable.getStatus() == Transferable.STATUS_CANCELLED)) {
error = true;
}
}