thedevstack/PiratX-Archive
Archived
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

correct resend text

Browse source
This commit is contained in:
Christian Schneppe 2017-06-11 19:54:51 +02:00
parent d494a6d390
commit db3cb3066c
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java
View file

@ -92,6 +92,7 @@ public class MessageAdapter extends ArrayAdapter<Message> implements CopyTextVie
+ Patterns.GOOD_IRI_CHAR + Patterns.GOOD_IRI_CHAR
+ "\\;\\/\\?\\@\\&\\=\\#\\~\\-\\.\\+\\!\\*\\'\\(\\)\\,\\_])" + "\\;\\/\\?\\@\\&\\=\\#\\~\\-\\.\\+\\!\\*\\'\\(\\)\\,\\_])"
+ "|(?:\\%[a-fA-F0-9]{2}))+"); + "|(?:\\%[a-fA-F0-9]{2}))+");
boolean isResendable = false;
private static final Linkify.TransformFilter WEBURL_TRANSFORM_FILTER = new Linkify.TransformFilter() { private static final Linkify.TransformFilter WEBURL_TRANSFORM_FILTER = new Linkify.TransformFilter() {
@Override @Override
@ -234,7 +235,7 @@ public class MessageAdapter extends ArrayAdapter<Message> implements CopyTextVie
} }
break; break;
case Message.STATUS_SEND_FAILED: case Message.STATUS_SEND_FAILED:
if (activity.xmppConnectionService.mHttpConnectionManager.getAutoAcceptFileSize() >= message.getFileParams().size) { if (isResendable) {
info = getContext().getString(R.string.send_failed_resend); info = getContext().getString(R.string.send_failed_resend);
} else { } else {
info = getContext().getString(R.string.send_failed); info = getContext().getString(R.string.send_failed);
@ -252,9 +253,12 @@ public class MessageAdapter extends ArrayAdapter<Message> implements CopyTextVie
DownloadableFile file = activity.xmppConnectionService.getFileBackend().getFile(message); DownloadableFile file = activity.xmppConnectionService.getFileBackend().getFile(message);
if (file.exists()) { if (file.exists()) {
if (activity.xmppConnectionService.mHttpConnectionManager.getAutoAcceptFileSize() >= message.getFileParams().size) { if (activity.xmppConnectionService.mHttpConnectionManager.getAutoAcceptFileSize() >= message.getFileParams().size) {
isResendable = false;
viewHolder.resend_button.setVisibility(View.GONE); viewHolder.resend_button.setVisibility(View.GONE);
} else { } else {
isResendable = true;
viewHolder.resend_button.setVisibility(View.VISIBLE); viewHolder.resend_button.setVisibility(View.VISIBLE);
} }
} }
viewHolder.resend_button.setText(R.string.send_again); viewHolder.resend_button.setText(R.string.send_again);