From 52605ef877efedce92d51ff95fb1a1ef7037c4e4 Mon Sep 17 00:00:00 2001 From: tom79 Date: Sat, 14 Sep 2019 12:30:16 +0200 Subject: [PATCH] Improve mentions when splitting toots --- .../java/app/fedilab/android/helper/Helper.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/app/fedilab/android/helper/Helper.java b/app/src/main/java/app/fedilab/android/helper/Helper.java index 79f5c0c02..8d9d03d0a 100644 --- a/app/src/main/java/app/fedilab/android/helper/Helper.java +++ b/app/src/main/java/app/fedilab/android/helper/Helper.java @@ -3624,11 +3624,6 @@ public class Helper { ArrayList mentions = new ArrayList<>(); Matcher matcher = mentionLongPattern.matcher(content); - while (matcher.find()) { - String mentionLong = matcher.group(1); - mentions.add(mentionLong); - } - matcher = mentionLongPattern.matcher(content); while (matcher.find()) { String mentionLong = matcher.group(1); if (!mentions.contains(mentionLong)) { @@ -3671,8 +3666,14 @@ public class Helper { if (reply.size() > 1) { int i = 0; for (String r : reply) { - if (mentions.size() > 0) { - reply.set(i, r + " " + mentionString + " - " + (i + 1) + "/" + reply.size()); + if (mentions.size() > 0 ) { + String tmpMention = mentionString.toString(); + for (String mention : mentions) { + if(r.contains(mention)){ + tmpMention = tmpMention.replace(mention,""); + } + } + reply.set(i, r + " " + tmpMention + " - " + (i + 1) + "/" + reply.size()); } else { reply.set(i, r + " - " + (i + 1) + "/" + reply.size()); }