From 07e2fb571407f5fac3a86a7a19885d90046fc897 Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Fri, 18 May 2018 21:10:40 +0200 Subject: temporarly fix crash with resending files via button --- src/main/java/de/pixart/messenger/ui/ConversationFragment.java | 2 +- src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java | 3 +++ src/main/java/de/pixart/messenger/ui/widget/UnreadCountCustomView.java | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) (limited to 'src/main/java/de/pixart') diff --git a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java index ebe02fe4b..5e005f391 100644 --- a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java +++ b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java @@ -1325,7 +1325,7 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke shareWith.setVisible(true); } - if (m.getStatus() == Message.STATUS_SEND_FAILED && !m.isFileOrImage()) { + if (m.getStatus() == Message.STATUS_SEND_FAILED) { sendAgain.setVisible(true); } if (m.hasFileOnRemoteHost() 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 ab599c1f3..4e33214c5 100644 --- a/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java +++ b/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java @@ -323,10 +323,13 @@ public class MessageAdapter extends ArrayAdapter implements CopyTextVie viewHolder.resend_button.setVisibility(View.GONE); } else { isResendable = false; + viewHolder.resend_button.setVisibility(View.GONE); + /* viewHolder.resend_button.setVisibility(View.VISIBLE); viewHolder.resend_button.setText(R.string.send_again); viewHolder.resend_button.setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_resend_grey600_48dp, 0, 0, 0); viewHolder.resend_button.setOnClickListener(v -> mConversationFragment.resendMessage(message)); + */ } } else { isResendable = false; diff --git a/src/main/java/de/pixart/messenger/ui/widget/UnreadCountCustomView.java b/src/main/java/de/pixart/messenger/ui/widget/UnreadCountCustomView.java index 6b4a6de0f..93cf0bd36 100644 --- a/src/main/java/de/pixart/messenger/ui/widget/UnreadCountCustomView.java +++ b/src/main/java/de/pixart/messenger/ui/widget/UnreadCountCustomView.java @@ -16,7 +16,7 @@ public class UnreadCountCustomView extends View { private int unreadCount; private Paint paint, textPaint; - private int backgroundColor = 0xff326130; + private int backgroundColor = 0xff0091ea; public UnreadCountCustomView(Context context) { super(context); -- cgit v1.2.3