hide resend button if file is smaller than AutoAcceptFileSize…

…otherwise show resend button

5 files changed, 15 insertions, 4 deletions

diff --git a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
index 97999a587..d843ed2bd 100644
--- a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
+++ b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
@@ -232,8 +232,7 @@ public class XmppConnectionService extends Service {
             }
         }
     };
-    private HttpConnectionManager mHttpConnectionManager = new HttpConnectionManager(
-            this);
+    public HttpConnectionManager mHttpConnectionManager = new HttpConnectionManager(this);
     private AvatarService mAvatarService = new AvatarService(this);
     private MessageArchiveService mMessageArchiveService = new MessageArchiveService(this);
     private PushManagementService mPushManagementService = new PushManagementService(this);
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);
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 42dfe0d80..29ecd7a3d 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -723,5 +723,6 @@
     <string name="pref_use_colored_names_to_indicate_status">Kontaktnamen-Farbe zeigt Online-Status an</string>
     <string name="pref_use_colored_names_to_indicate_status_summary">Kontaktnamen einfärben, um den Online-Status des Kontakts anzuzeigen</string>
     <string name="send_message">Nachricht senden</string>
+    <string name="send_failed_resend">Zustellung fehlgeschlagen, sende erneut…</string>
 
 </resources>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index f91bb9c94..57b26caf8 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -771,4 +771,5 @@
     <string name="image_high">high (3840p)</string>
     <string name="last_seen_just_away">recently</string>
     <string name="send_message">Send message</string>
+    <string name="send_failed_resend">delivery failed, resending…</string>
 </resources>