From 2d26b383f4c0e7e6290533a7a9157f7fde8f2814 Mon Sep 17 00:00:00 2001 From: Stephen Paul Weber Date: Wed, 30 Oct 2024 09:20:28 -0500 Subject: [PATCH] Old android doesn't support IsCyrrilic --- .../java/eu/siacs/conversations/entities/Conversation.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java index 223b28114e01635b0f88dc7ca88f6790ebb32ba1..ea449c946ef5f90f8b3030462c70e0ae5266bdbe 100644 --- a/src/main/java/eu/siacs/conversations/entities/Conversation.java +++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java @@ -1396,6 +1396,12 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl final var script = locale.getScript(); for (final var m : messages) { final var body = m.getRawBody(); + try { + if (!"Cyrl".equals(script) && body.matches(".*\\p{IsCyrillic}.*")) { + anyMatchSpam = true; + return; + } + } catch (final java.util.regex.PatternSyntaxException e) { } // Not supported on old android if (body.length() > 320 || (!"Cyrl".equals(script) && body.matches(".*\\p{IsCyrillic}.*")) || body.matches(".*(?:\\n.*\\n.*\\n|[Aa]\\s*d\\s*v\\s*v\\s*e\\s*r\\s*t|[Pp]romotion|[Dd][Dd][Oo][Ss]|[Ee]scrow|payout|seller|\\?OTR|write me when will be|[Pp]rii?vee?t|there online|bit\\.ly|goo\\.gl|tinyurl\\.com|tiny\\.cc|lc\\.chat|is\\.gd|soo\\.gd|s2r\\.co|clicky\\.me|budrul\\.com|bc\\.vc|uguu\\.se).*")) { anyMatchSpam = true; return;