From 5dce7d198d62639adc3d1603e4d05f42065e8068 Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Tue, 18 Apr 2017 21:07:42 +0200 Subject: =?UTF-8?q?hide=20resend=20button=20if=20file=20is=20smaller=20tha?= =?UTF-8?q?n=20AutoAcceptFileSize=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit …otherwise show resend button --- .../java/de/pixart/messenger/ui/adapter/MessageAdapter.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'src/main/java/de/pixart/messenger/ui/adapter') 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 071d62fa9..791a8ed51 100644 --- a/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java +++ b/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java @@ -233,7 +233,11 @@ public class MessageAdapter extends ArrayAdapter implements CopyTextVie } break; case Message.STATUS_SEND_FAILED: - info = getContext().getString(R.string.send_failed); + if (activity.xmppConnectionService.mHttpConnectionManager.getAutoAcceptFileSize() >= message.getFileParams().size) { + info = getContext().getString(R.string.send_failed_resend); + } else { + info = getContext().getString(R.string.send_failed); + } error = true; break; default: @@ -246,7 +250,11 @@ public class MessageAdapter extends ArrayAdapter implements CopyTextVie viewHolder.time.setTextColor(activity.getWarningTextColor()); DownloadableFile file = activity.xmppConnectionService.getFileBackend().getFile(message); if (file.exists()) { - viewHolder.resend_button.setVisibility(View.VISIBLE); + if (activity.xmppConnectionService.mHttpConnectionManager.getAutoAcceptFileSize() >= message.getFileParams().size) { + viewHolder.resend_button.setVisibility(View.GONE); + } else { + 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); -- cgit v1.2.3