diff options
Diffstat (limited to '')
3 files changed, 57 insertions, 12 deletions
diff --git a/src/main/java/de/pixart/messenger/entities/Contact.java b/src/main/java/de/pixart/messenger/entities/Contact.java index 7eb1394ce..63d8f6352 100644 --- a/src/main/java/de/pixart/messenger/entities/Contact.java +++ b/src/main/java/de/pixart/messenger/entities/Contact.java @@ -15,6 +15,7 @@ import java.util.List; import java.util.Locale; import de.pixart.messenger.Config; +import de.pixart.messenger.utils.JidHelper; import de.pixart.messenger.utils.UIHelper; import de.pixart.messenger.xml.Element; import de.pixart.messenger.xmpp.jid.InvalidJidException; @@ -121,7 +122,7 @@ public class Contact implements ListItem, Blockable { } else if (this.presenceName != null && !this.presenceName.isEmpty() && mutualPresenceSubscription()) { return this.presenceName; } else if (jid.hasLocalpart()) { - return jid.getUnescapedLocalpart(); + return JidHelper.localPartOrFallback(jid); } else { return jid.getDomainpart(); } diff --git a/src/main/java/de/pixart/messenger/entities/MucOptions.java b/src/main/java/de/pixart/messenger/entities/MucOptions.java index 86c8c3326..f60c2643c 100644 --- a/src/main/java/de/pixart/messenger/entities/MucOptions.java +++ b/src/main/java/de/pixart/messenger/entities/MucOptions.java @@ -3,13 +3,13 @@ package de.pixart.messenger.entities; import android.annotation.SuppressLint; import java.util.ArrayList; -import java.util.Arrays; import java.util.HashSet; import java.util.List; import java.util.Set; import de.pixart.messenger.Config; import de.pixart.messenger.R; +import de.pixart.messenger.utils.JidHelper; import de.pixart.messenger.utils.Namespace; import de.pixart.messenger.xmpp.chatstate.ChatState; import de.pixart.messenger.xmpp.forms.Data; @@ -21,8 +21,6 @@ import de.pixart.messenger.xmpp.pep.Avatar; @SuppressLint("DefaultLocale") public class MucOptions { - private static List<String> LOCALPART_BLACKLIST = Arrays.asList("xmpp", "jabber"); - private boolean mAutoPushConfiguration = true; public Account getAccount() { @@ -602,14 +600,7 @@ public class MucOptions { } else if (!conversation.getJid().isBareJid()) { return conversation.getJid().getResourcepart(); } else { - Jid jid = account.getJid(); - if (LOCALPART_BLACKLIST.contains(jid.getLocalpart())) { - final String domain = jid.getDomainpart(); - final int index = domain.lastIndexOf('.'); - return index > 1 ? domain.substring(0, index) : domain; - } else { - return jid.getLocalpart(); - } + return JidHelper.localPartOrFallback(account.getJid()); } } diff --git a/src/main/java/de/pixart/messenger/utils/JidHelper.java b/src/main/java/de/pixart/messenger/utils/JidHelper.java new file mode 100644 index 000000000..625b56a58 --- /dev/null +++ b/src/main/java/de/pixart/messenger/utils/JidHelper.java @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2017, Daniel Gultsch All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation and/or + * other materials provided with the distribution. + * + * 3. Neither the name of the copyright holder nor the names of its contributors + * may be used to endorse or promote products derived from this software without + * specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +package de.pixart.messenger.utils; + + +import java.util.Arrays; +import java.util.List; +import java.util.Locale; + +import de.pixart.messenger.xmpp.jid.Jid; + +public class JidHelper { + + private static List<String> LOCALPART_BLACKLIST = Arrays.asList("xmpp", "jabber", "me"); + + public static String localPartOrFallback(Jid jid) { + if (LOCALPART_BLACKLIST.contains(jid.getLocalpart().toLowerCase(Locale.ENGLISH))) { + final String domain = jid.getDomainpart(); + final int index = domain.lastIndexOf('.'); + return index > 1 ? domain.substring(0, index) : domain; + } else { + return jid.getUnescapedLocalpart(); + } + } + +}
\ No newline at end of file |