rework quicksy domain checks

Daniel Gultsch created 5 years ago

Change summary

src/main/java/eu/siacs/conversations/Config.java                         | 2 
src/main/java/eu/siacs/conversations/entities/Contact.java               | 2 
src/main/java/eu/siacs/conversations/entities/Conversation.java          | 2 
src/main/java/eu/siacs/conversations/services/XmppConnectionService.java | 2 
src/main/java/eu/siacs/conversations/ui/adapter/KnownHostsAdapter.java   | 2 
src/main/java/eu/siacs/conversations/utils/JidHelper.java                | 5 
6 files changed, 10 insertions(+), 5 deletions(-)

Detailed changes

src/main/java/eu/siacs/conversations/Config.java

@@ -41,7 +41,7 @@ public final class Config {
 
     public static final String DOMAIN_LOCK = null; //only allow account creation for this domain
     public static final String MAGIC_CREATE_DOMAIN = "conversations.im";
-    public static final String QUICKSY_DOMAIN = "quicksy.im";
+    public static final Jid QUICKSY_DOMAIN = Jid.of("quicksy.im");
 
     public static final String CHANNEL_DISCOVERY = "https://search.jabber.network";
 

src/main/java/eu/siacs/conversations/entities/Contact.java

@@ -134,7 +134,7 @@ public class Contact implements ListItem, Blockable {
 			return this.systemName;
 		} else if (!TextUtils.isEmpty(this.serverName)) {
 			return this.serverName;
-		} else if (!TextUtils.isEmpty(this.presenceName) && ((QuickConversationsService.isQuicksy() && Config.QUICKSY_DOMAIN.equals(jid.getDomain().toEscapedString())) ||mutualPresenceSubscription())) {
+		} else if (!TextUtils.isEmpty(this.presenceName) && ((QuickConversationsService.isQuicksy() && JidHelper.isQuicksyDomain(jid.getDomain())) ||mutualPresenceSubscription())) {
 			return this.presenceName;
 		} else if (jid.getLocal() != null) {
 			return JidHelper.localPartOrFallback(jid);

src/main/java/eu/siacs/conversations/entities/Conversation.java

@@ -1006,7 +1006,7 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
                 && !contact.isOwnServer()
                 && !contact.showInContactList()
                 && !contact.isSelf()
-                && !(Config.QUICKSY_DOMAIN != null && Config.QUICKSY_DOMAIN.equals(contact.getJid().toEscapedString()))
+                && !JidHelper.isQuicksyDomain(contact.getJid())
                 && sentMessagesCount() == 0;
     }
 

src/main/java/eu/siacs/conversations/services/XmppConnectionService.java

@@ -4146,7 +4146,7 @@ public class XmppConnectionService extends Service {
             }
         }
         if (Config.QUICKSY_DOMAIN != null) {
-            hosts.remove(Config.QUICKSY_DOMAIN); //we only want to show this when we type a e164 number
+            hosts.remove(Config.QUICKSY_DOMAIN.toEscapedString()); //we only want to show this when we type a e164 number
         }
         if (Config.DOMAIN_LOCK != null) {
             hosts.add(Config.DOMAIN_LOCK);

src/main/java/eu/siacs/conversations/ui/adapter/KnownHostsAdapter.java

@@ -27,7 +27,7 @@ public class KnownHostsAdapter extends ArrayAdapter<String> {
             if (split.length == 1) {
                 final String local = split[0].toLowerCase(Locale.ENGLISH);
                 if (Config.QUICKSY_DOMAIN != null && E164_PATTERN.matcher(local).matches()) {
-                    suggestions.add(local + '@' + Config.QUICKSY_DOMAIN);
+                    suggestions.add(local + '@' + Config.QUICKSY_DOMAIN.toEscapedString());
                 } else {
                     for (String domain : domains) {
                         suggestions.add(local + '@' + domain);

src/main/java/eu/siacs/conversations/utils/JidHelper.java

@@ -34,6 +34,7 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
 
+import eu.siacs.conversations.Config;
 import eu.siacs.conversations.xmpp.InvalidJid;
 import eu.siacs.conversations.xmpp.Jid;
 
@@ -59,4 +60,8 @@ public class JidHelper {
         }
     }
 
+    public static boolean isQuicksyDomain(final Jid jid) {
+        return Config.QUICKSY_DOMAIN != null && Config.QUICKSY_DOMAIN.equals(jid.getDomain());
+    }
+
 }