From 422fd1847fa18553398a2747c72f835d9227f172 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Sat, 28 May 2016 23:13:47 +0200 Subject: only rendering first 5k chars of each message --- src/main/java/eu/siacs/conversations/Config.java | 2 ++ src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java | 6 ++++++ src/main/res/layout/message_received.xml | 1 - src/main/res/layout/message_sent.xml | 1 - 4 files changed, 8 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/main/java/eu/siacs/conversations/Config.java b/src/main/java/eu/siacs/conversations/Config.java index c73da59e3..c4fe28d98 100644 --- a/src/main/java/eu/siacs/conversations/Config.java +++ b/src/main/java/eu/siacs/conversations/Config.java @@ -76,6 +76,8 @@ public final class Config { public static final int REFRESH_UI_INTERVAL = 500; + public static final int MAX_DISPLAY_MESSAGE_CHARS = 5 * 1024; + public static final boolean DISABLE_PROXY_LOOKUP = false; //useful to debug ibb public static final boolean DISABLE_HTTP_UPLOAD = false; public static final boolean DISABLE_STRING_PREP = false; // setting to true might increase startup performance diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java index 74bfb491a..32646a92d 100644 --- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java +++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java @@ -19,6 +19,7 @@ import android.text.style.RelativeSizeSpan; import android.text.style.StyleSpan; import android.text.util.Linkify; import android.util.DisplayMetrics; +import android.util.Log; import android.util.Patterns; import android.view.View; import android.view.View.OnClickListener; @@ -39,6 +40,7 @@ import java.util.regex.MatchResult; import java.util.regex.Matcher; import java.util.regex.Pattern; +import eu.siacs.conversations.Config; import eu.siacs.conversations.R; import eu.siacs.conversations.crypto.axolotl.XmppAxolotlSession; import eu.siacs.conversations.entities.Account; @@ -308,6 +310,10 @@ public class MessageAdapter extends ArrayAdapter { } catch (ArrayIndexOutOfBoundsException e) { body = message.getMergedBody(); } + if (body.length() > Config.MAX_DISPLAY_MESSAGE_CHARS) { + Log.d(Config.LOGTAG,"not showing complete message of length "+body.length()); + body = body.substring(0, Config.MAX_DISPLAY_MESSAGE_CHARS); + } final SpannableString formattedBody = new SpannableString(body); int i = body.indexOf(Message.MERGE_SEPARATOR); while(i >= 0) { diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml index e720a6ff2..466dd045a 100644 --- a/src/main/res/layout/message_received.xml +++ b/src/main/res/layout/message_received.xml @@ -53,7 +53,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:autoLink="web" - android:maxLines="256" android:textColorLink="@color/white" android:textColor="@color/white" android:textColorHighlight="@color/grey800" diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml index be530c5fe..fc68c3894 100644 --- a/src/main/res/layout/message_sent.xml +++ b/src/main/res/layout/message_sent.xml @@ -54,7 +54,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:autoLink="web" - android:maxLines="256" android:textColorLink="@color/black87" android:textColor="@color/black87" android:textColorHighlight="@color/grey500" -- cgit v1.2.3 From aaf5233efe39e8473c4e616ac256004f627816c8 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Sat, 28 May 2016 23:48:39 +0200 Subject: limit text size in message adapter to 2k and also limit text size in conversations adapter --- src/main/java/eu/siacs/conversations/Config.java | 2 +- src/main/java/eu/siacs/conversations/utils/UIHelper.java | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/main/java/eu/siacs/conversations/Config.java b/src/main/java/eu/siacs/conversations/Config.java index c4fe28d98..1d2c727d1 100644 --- a/src/main/java/eu/siacs/conversations/Config.java +++ b/src/main/java/eu/siacs/conversations/Config.java @@ -76,7 +76,7 @@ public final class Config { public static final int REFRESH_UI_INTERVAL = 500; - public static final int MAX_DISPLAY_MESSAGE_CHARS = 5 * 1024; + public static final int MAX_DISPLAY_MESSAGE_CHARS = 2 * 1024; public static final boolean DISABLE_PROXY_LOOKUP = false; //useful to debug ibb public static final boolean DISABLE_HTTP_UPLOAD = false; diff --git a/src/main/java/eu/siacs/conversations/utils/UIHelper.java b/src/main/java/eu/siacs/conversations/utils/UIHelper.java index 6ca5370a3..4ab748188 100644 --- a/src/main/java/eu/siacs/conversations/utils/UIHelper.java +++ b/src/main/java/eu/siacs/conversations/utils/UIHelper.java @@ -184,8 +184,12 @@ public class UIHelper { return new Pair<>(getFileDescriptionString(context,message),true); } } else { - if (message.getBody().startsWith(Message.ME_COMMAND)) { - return new Pair<>(message.getBody().replaceAll("^" + Message.ME_COMMAND, + String body = message.getBody(); + if (body.length() > 256) { + body = body.substring(0,256); + } + if (body.startsWith(Message.ME_COMMAND)) { + return new Pair<>(body.replaceAll("^" + Message.ME_COMMAND, UIHelper.getMessageDisplayName(message) + " "), false); } else if (GeoHelper.isGeoUri(message.getBody())) { if (message.getStatus() == Message.STATUS_RECEIVED) { @@ -197,7 +201,7 @@ public class UIHelper { return new Pair<>(context.getString(R.string.x_file_offered_for_download, getFileDescriptionString(context,message)),true); } else{ - return new Pair<>(message.getBody().trim(), false); + return new Pair<>(body.trim(), false); } } } -- cgit v1.2.3 From 2c55954ddda1d84a32150b430fe80ff8084612a1 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Sun, 29 May 2016 01:14:45 +0200 Subject: show in ui when text was shortened --- src/main/java/eu/siacs/conversations/Config.java | 2 +- src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/main/java/eu/siacs/conversations/Config.java b/src/main/java/eu/siacs/conversations/Config.java index 1d2c727d1..c9b430c70 100644 --- a/src/main/java/eu/siacs/conversations/Config.java +++ b/src/main/java/eu/siacs/conversations/Config.java @@ -76,7 +76,7 @@ public final class Config { public static final int REFRESH_UI_INTERVAL = 500; - public static final int MAX_DISPLAY_MESSAGE_CHARS = 2 * 1024; + public static final int MAX_DISPLAY_MESSAGE_CHARS = 4096; public static final boolean DISABLE_PROXY_LOOKUP = false; //useful to debug ibb public static final boolean DISABLE_HTTP_UPLOAD = false; diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java index 32646a92d..5ba29802d 100644 --- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java +++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java @@ -19,7 +19,6 @@ import android.text.style.RelativeSizeSpan; import android.text.style.StyleSpan; import android.text.util.Linkify; import android.util.DisplayMetrics; -import android.util.Log; import android.util.Patterns; import android.view.View; import android.view.View.OnClickListener; @@ -311,8 +310,7 @@ public class MessageAdapter extends ArrayAdapter { body = message.getMergedBody(); } if (body.length() > Config.MAX_DISPLAY_MESSAGE_CHARS) { - Log.d(Config.LOGTAG,"not showing complete message of length "+body.length()); - body = body.substring(0, Config.MAX_DISPLAY_MESSAGE_CHARS); + body = body.substring(0, Config.MAX_DISPLAY_MESSAGE_CHARS)+"\u2026"; } final SpannableString formattedBody = new SpannableString(body); int i = body.indexOf(Message.MERGE_SEPARATOR); -- cgit v1.2.3