diff options
| author | Christian Schneppe <christian@pix-art.de> | 2018-05-18 21:10:40 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2018-05-18 23:31:45 +0200 |
| commit | 07e2fb571407f5fac3a86a7a19885d90046fc897 (patch) | |
| tree | a5d853d7483750684d9937dfd8ff070b17db14dd /src/main | |
| parent | 6117f585e4b46b5897d5bc0cf0779f0d1385fd3a (diff) | |
temporarly fix crash with resending files via button
Diffstat (limited to 'src/main')
3 files changed, 5 insertions, 2 deletions
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<Message> 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); |