From c73219b79718f6781ec7856e4365a4ef9f68b9c0 Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Wed, 20 Jun 2018 18:55:24 +0200 Subject: [PATCH] Add (To|From)TypeFilter.(FROM|TO)_ANY_JID to filter all stanzas which have a valid jid set as to/from. --- .../org/jivesoftware/smack/filter/AbstractJidTypeFilter.java | 5 ++++- .../java/org/jivesoftware/smack/filter/FromTypeFilter.java | 3 ++- .../java/org/jivesoftware/smack/filter/ToTypeFilter.java | 3 ++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/smack-core/src/main/java/org/jivesoftware/smack/filter/AbstractJidTypeFilter.java b/smack-core/src/main/java/org/jivesoftware/smack/filter/AbstractJidTypeFilter.java index 60bd2df5b..93628b5e9 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/filter/AbstractJidTypeFilter.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/filter/AbstractJidTypeFilter.java @@ -1,6 +1,6 @@ /** * - * Copyright 2017 Florian Schmaus. + * Copyright 2017-2018 Florian Schmaus. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,6 +27,7 @@ public abstract class AbstractJidTypeFilter implements StanzaFilter { entityBare, domainFull, domainBare, + any, ; } @@ -55,6 +56,8 @@ public abstract class AbstractJidTypeFilter implements StanzaFilter { return jid.isDomainFullJid(); case domainBare: return jid.isDomainBareJid(); + case any: + return true; default: throw new AssertionError(); } diff --git a/smack-core/src/main/java/org/jivesoftware/smack/filter/FromTypeFilter.java b/smack-core/src/main/java/org/jivesoftware/smack/filter/FromTypeFilter.java index 27258547f..a571cd791 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/filter/FromTypeFilter.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/filter/FromTypeFilter.java @@ -1,6 +1,6 @@ /** * - * Copyright 2017 Florian Schmaus. + * Copyright 2017-2018 Florian Schmaus. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,6 +26,7 @@ public final class FromTypeFilter extends AbstractJidTypeFilter { public static final FromTypeFilter ENTITY_BARE_JID = new FromTypeFilter(JidType.entityBare); public static final FromTypeFilter DOMAIN_FULL_JID = new FromTypeFilter(JidType.domainFull); public static final FromTypeFilter DOMAIN_BARE_JID = new FromTypeFilter(JidType.domainBare); + public static final FromTypeFilter FROM_ANY_JID = new FromTypeFilter(JidType.any); private FromTypeFilter(JidType jidType) { super(jidType); diff --git a/smack-core/src/main/java/org/jivesoftware/smack/filter/ToTypeFilter.java b/smack-core/src/main/java/org/jivesoftware/smack/filter/ToTypeFilter.java index 0f3ea6835..68b25d4ee 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/filter/ToTypeFilter.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/filter/ToTypeFilter.java @@ -1,6 +1,6 @@ /** * - * Copyright 2017 Florian Schmaus. + * Copyright 2017-2018 Florian Schmaus. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,6 +26,7 @@ public final class ToTypeFilter extends AbstractJidTypeFilter { public static final ToTypeFilter ENTITY_BARE_JID = new ToTypeFilter(JidType.entityBare); public static final ToTypeFilter DOMAIN_FULL_JID = new ToTypeFilter(JidType.domainFull); public static final ToTypeFilter DOMAIN_BARE_JID = new ToTypeFilter(JidType.domainBare); + public static final ToTypeFilter TO_ANY_JID = new ToTypeFilter(JidType.any); public static final StanzaFilter ENTITY_FULL_OR_BARE_JID = new OrFilter(ENTITY_FULL_JID, ENTITY_BARE_JID);