sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

black list certain local parts and show domain instead

This commit is contained in:
Daniel Gultsch 2017-10-27 15:46:12 +02:00
parent 3c2aa8a4d2
commit 08aad7d0aa
3 changed files with 57 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/eu/siacs/conversations/entities/Contact.java
View File

@ -15,6 +15,7 @@ import java.util.List;
import java.util.Locale;
import eu.siacs.conversations.Config;
import eu.siacs.conversations.utils.JidHelper;
import eu.siacs.conversations.utils.UIHelper;
import eu.siacs.conversations.xml.Element;
import eu.siacs.conversations.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();
}

12
src/main/java/eu/siacs/conversations/entities/MucOptions.java
View File

@ -10,6 +10,7 @@ import java.util.Set;
import eu.siacs.conversations.Config;
import eu.siacs.conversations.R;
import eu.siacs.conversations.utils.JidHelper;
import eu.siacs.conversations.xml.Namespace;
import eu.siacs.conversations.xmpp.chatstate.ChatState;
import eu.siacs.conversations.xmpp.forms.Data;
@ -21,8 +22,6 @@ import eu.siacs.conversations.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() {
@ -605,14 +604,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());
}
}

53
src/main/java/eu/siacs/conversations/utils/JidHelper.java Normal file
View File

@ -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 eu.siacs.conversations.utils;
import java.util.Arrays;
import java.util.List;
import java.util.Locale;
import eu.siacs.conversations.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();
}
}
}