diff options
| author | steckbrief <steckbrief@chefmail.de> | 2019-07-13 22:34:03 +0200 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2019-07-13 22:34:03 +0200 |
| commit | 4f06309b14bbaeccd085aca85e0011de5f63eb28 (patch) | |
| tree | 940e4ab1677e6ec580862812c1dbd3092c7f3fbe | |
| parent | 653af7463e3c49f6d0ab7eed35220e06eca72e8b (diff) | |
Relates to FS#299: Change Invite URLs to jabber.thedevstack.de and set magic create domain to null
| -rw-r--r-- | src/main/java/de/pixart/messenger/Config.java | 11 | ||||
| -rw-r--r-- | src/main/java/de/pixart/messenger/utils/XmppUri.java | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/main/java/de/pixart/messenger/Config.java b/src/main/java/de/pixart/messenger/Config.java index 26685eb4d..2c853002b 100644 --- a/src/main/java/de/pixart/messenger/Config.java +++ b/src/main/java/de/pixart/messenger/Config.java @@ -44,16 +44,17 @@ public final class Config { public static final Jid BUG_REPORTS = Jid.of("piratx+bugs@conference.thedevstack.de"); - public static final String inviteUserURL = "https://jabber.pix-art.de/i/"; - public static final String inviteMUCURL = "https://jabber.pix-art.de/j/"; - public static final String inviteHostURL = "jabber.pix-art.de"; // without http(s) + public static final String inviteUrlScheme = "https"; + public static final String inviteHostURL = "jabber.thedevstack.de"; // without http(s) + + public static final String inviteUserURL = inviteUrlScheme + "://" + inviteHostURL + "/i/"; + public static final String inviteMUCURL = inviteUrlScheme + "://" + inviteHostURL + "/j/"; public static final String CHANGELOG_URL = "https://github.com/kriztan/Pix-Art-Messenger/blob/master/CHANGELOG.md"; public static final String XMPP_IP = null; //BuildConfig.XMPP_IP; // set to null means disable public static final Integer[] XMPP_Ports = null; //BuildConfig.XMPP_Ports; // set to null means disable public static final String DOMAIN_LOCK = null; //BuildConfig.DOMAIN_LOCK; //only allow account creation for this domain - public static final String MAGIC_CREATE_DOMAIN = "blabber.im"; - public static final String QUICKSY_DOMAIN = "quicksy.im"; + public static final String MAGIC_CREATE_DOMAIN = null; //"blabber.im"; public static final String CHANNEL_DISCOVERY = "https://search.jabbercat.org"; public static final boolean DISALLOW_REGISTRATION_IN_UI = false; //hide the register checkbox diff --git a/src/main/java/de/pixart/messenger/utils/XmppUri.java b/src/main/java/de/pixart/messenger/utils/XmppUri.java index 64f28cbab..90599c62e 100644 --- a/src/main/java/de/pixart/messenger/utils/XmppUri.java +++ b/src/main/java/de/pixart/messenger/utils/XmppUri.java @@ -63,7 +63,7 @@ public class XmppUri { String scheme = uri.getScheme(); String host = uri.getHost(); List<String> segments = uri.getPathSegments(); - if ("https".equalsIgnoreCase(scheme) && "jabber.pix-art.de".equalsIgnoreCase(host)) { + if (Config.inviteUrlScheme.equalsIgnoreCase(scheme) && Config.inviteHostURL.equalsIgnoreCase(host)) { if (segments.size() >= 2 && segments.get(1).contains("@")) { // sample : https://conversations.im/i/foo@bar.com try { |