hide resend button if file is smaller than AutoAcceptFileSize…

…otherwise show resend button

2 files changed, 12 insertions, 2 deletions

diff --git a/src/main/java/de/pixart/messenger/ui/XmppActivity.java b/src/main/java/de/pixart/messenger/ui/XmppActivity.java
index 95a896cde..f02441b90 100644
--- a/src/main/java/de/pixart/messenger/ui/XmppActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/XmppActivity.java
@@ -75,6 +75,7 @@ import de.pixart.messenger.entities.Conversation;
 import de.pixart.messenger.entities.Message;
 import de.pixart.messenger.entities.MucOptions;
 import de.pixart.messenger.entities.Presences;
+import de.pixart.messenger.http.HttpConnectionManager;
 import de.pixart.messenger.services.AvatarService;
 import de.pixart.messenger.services.BarcodeProvider;
 import de.pixart.messenger.services.XmppConnectionService;
@@ -97,6 +98,7 @@ public abstract class XmppActivity extends Activity {
     public static final String EXTRA_ACCOUNT = "account";
 
     public XmppConnectionService xmppConnectionService;
+    public HttpConnectionManager mHttpConnectionManager;
     public boolean xmppConnectionServiceBound = false;
     protected boolean registeredListeners = false;
 
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<Message> 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<Message> 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);