thedevstack/PiratX-Archive
Archived
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Relates to FS#299: Change Invite URLs to jabber.thedevstack.de and set magic create domain to null

Browse source
This commit is contained in:
steckbrief 2019-07-13 22:34:03 +02:00
parent 653af7463e
commit 4f06309b14
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/main/java/de/pixart/messenger/Config.java
View file

@ -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

2
src/main/java/de/pixart/messenger/utils/XmppUri.java
View file

@ -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 {