aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/pixart/messenger/utils
diff options
context:
space:
mode:
authorChristian Schneppe <christian.schneppe@pix-art.de>2020-01-02 09:43:51 +0100
committerChristian Schneppe <christian.schneppe@pix-art.de>2020-01-02 09:43:51 +0100
commit8ca04b46e6663e2956fcd82785714ca3c93d1377 (patch)
tree17b0ecc5fe53ed682e6c2d958de494137c65e69c /src/main/java/de/pixart/messenger/utils
parenta5f52ef599ae5519bd704fae8ceb1dd78c7edcc6 (diff)
persist file size across aborts
Diffstat (limited to '')
-rw-r--r--src/main/java/de/pixart/messenger/utils/MessageUtils.java5
-rw-r--r--src/main/java/de/pixart/messenger/utils/UIHelper.java4
2 files changed, 7 insertions, 2 deletions
diff --git a/src/main/java/de/pixart/messenger/utils/MessageUtils.java b/src/main/java/de/pixart/messenger/utils/MessageUtils.java
index 4ad0e84a5..72e47578e 100644
--- a/src/main/java/de/pixart/messenger/utils/MessageUtils.java
+++ b/src/main/java/de/pixart/messenger/utils/MessageUtils.java
@@ -41,6 +41,7 @@ public class MessageUtils {
private static final Pattern LTR_RTL = Pattern.compile("(\\u200E[^\\u200F]*\\u200F){3,}");
private static final String EMPTY_STRING = "";
+
public static String prepareQuote(Message message) {
final StringBuilder builder = new StringBuilder();
final String body = message.getMergedBody().toString();
@@ -89,4 +90,8 @@ public class MessageUtils {
public static String filterLtrRtl(String body) {
return LTR_RTL.matcher(body).replaceFirst(EMPTY_STRING);
}
+
+ public static boolean unInitiatedButKnownSize(Message message) {
+ return message.getType() == Message.TYPE_TEXT && message.getTransferable() == null && message.isOOb() && message.getFileParams().size > 0 && message.getFileParams().url != null;
+ }
} \ No newline at end of file
diff --git a/src/main/java/de/pixart/messenger/utils/UIHelper.java b/src/main/java/de/pixart/messenger/utils/UIHelper.java
index dcbe51b53..c74b34d41 100644
--- a/src/main/java/de/pixart/messenger/utils/UIHelper.java
+++ b/src/main/java/de/pixart/messenger/utils/UIHelper.java
@@ -307,7 +307,7 @@ public class UIHelper {
return new Pair<>(context.getString(R.string.location), true);
} else if (message.isXmppUri()) {
return new Pair<>(context.getString(R.string.contact), true);
- } else if (message.treatAsDownloadable()) {
+ } else if (message.treatAsDownloadable() || MessageUtils.unInitiatedButKnownSize(message)) {
return new Pair<>(context.getString(R.string.x_file_offered_for_download,
getFileDescriptionString(context, message)), true);
} else {
@@ -520,7 +520,7 @@ public class UIHelper {
final Account account = conversation.getAccount();
final Jid jid = account.getJid();
final String displayName = account.getDisplayName();
- if (displayName != null ) {
+ if (displayName != null) {
return displayName;
} else {
if (jid.getLocal() != null) {