From 206ac09f79ad008a630cdf09c04e38b6a15424d6 Mon Sep 17 00:00:00 2001 From: Matt Tucker Date: Sat, 17 May 2003 15:54:48 +0000 Subject: [PATCH] Filters now ignore case when doing comparisons. git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@1942 b35dd754-fafc-0310-a699-88a17e54d16e --- .../smack/filter/FromContainsFilter.java | 12 ++++++------ .../jivesoftware/smack/filter/ToContainsFilter.java | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/source/org/jivesoftware/smack/filter/FromContainsFilter.java b/source/org/jivesoftware/smack/filter/FromContainsFilter.java index 0e887b09a..7183e0548 100644 --- a/source/org/jivesoftware/smack/filter/FromContainsFilter.java +++ b/source/org/jivesoftware/smack/filter/FromContainsFilter.java @@ -72,15 +72,15 @@ public class FromContainsFilter implements PacketFilter { if (from == null) { throw new IllegalArgumentException("Parameter cannot be null."); } - this.from = from; + this.from = from.toLowerCase(); } public boolean accept(Packet packet) { - if (packet.getFrom() != null) { - return packet.getFrom().indexOf(from) != -1; - } - else { + if (packet.getFrom() == null) { return false; } + else { + return packet.getFrom().toLowerCase().indexOf(from) != -1; + } } -} +} \ No newline at end of file diff --git a/source/org/jivesoftware/smack/filter/ToContainsFilter.java b/source/org/jivesoftware/smack/filter/ToContainsFilter.java index 8ef32eacc..d895a5331 100644 --- a/source/org/jivesoftware/smack/filter/ToContainsFilter.java +++ b/source/org/jivesoftware/smack/filter/ToContainsFilter.java @@ -73,7 +73,7 @@ public class ToContainsFilter implements PacketFilter { if (to == null) { throw new IllegalArgumentException("Parameter cannot be null."); } - this.to = to; + this.to = to.toLowerCase(); } public boolean accept(Packet packet) { @@ -81,7 +81,7 @@ public class ToContainsFilter implements PacketFilter { return false; } else { - return packet.getTo().indexOf(to) != -1; + return packet.getTo().toLowerCase().indexOf(to) != -1; } } -} +} \ No newline at end of file