use blabber.im as default domain

This commit is contained in:
Christian Schneppe 2018-08-04 00:26:37 +02:00
parent 16f2aad597
commit 2df6517e8d
5 changed files with 16 additions and 4 deletions

View file

@ -50,7 +50,7 @@ public final class Config {
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 = "jabber.de";
public static final String MAGIC_CREATE_DOMAIN = "blabber.de";
public static final boolean DISALLOW_REGISTRATION_IN_UI = false; //hide the register checkbox
public static final boolean USE_RANDOM_RESOURCE_ON_EVERY_BIND = false;

View file

@ -67,9 +67,11 @@ public class MagicCreateActivity extends XmppActivity implements TextWatcher, Ad
final List<String> domains = Arrays.asList(getResources().getStringArray(R.array.domains));
Collections.sort(domains, String::compareToIgnoreCase);
final ArrayAdapter<String> adapter = new ArrayAdapter<>(this, android.R.layout.simple_selectable_list_item, domains);
int defaultServer = adapter.getPosition("blabber.im");
mUsername = findViewById(R.id.username);
mServer = findViewById(R.id.server);
mServer.setAdapter(adapter);
mServer.setSelection(defaultServer);
mServer.setOnItemSelectedListener(this);
adapter.setDropDownViewResource(android.R.layout.select_dialog_singlechoice);
mRandom = new SecureRandom();

View file

@ -54,9 +54,9 @@
style="@style/Widget.Conversations.EditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/username_hint"
android:imeOptions="actionNext"
android:inputType="text"
android:hint="@string/username_hint"
android:textColor="?attr/text_Color_Main" />
<TextView
@ -83,6 +83,14 @@
android:textAppearance="@style/TextAppearance.Conversations.Caption"
android:visibility="invisible" />
<TextView
android:id="@+id/server_info"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="@string/welcome_server_info"
android:textAppearance="@style/TextAppearance.Conversations.Caption" />
<Button
android:id="@+id/create_account"
style="@style/Widget.Conversations.Button.Borderless"

View file

@ -21,6 +21,7 @@
along with this program. If not, see https://www.gnu.org/licenses
\n\nDownload the full original source code at https://github.com/siacs/Conversations (Copyright © 2014-2018 Daniel Gultsch)
\n\nDownload the modified source code at https://github.com/kriztan/Pix-Art-Messenger
\n\n\n\Pix-Art Messenger recommends blabber.im as provider. More information can be found at https://blabber.im
</string>
<string name="pref_about_libraries" translatable="false"><b>Libraries</b>
\n\nhttps://www.bouncycastle.org\n(The MIT License (MIT))
@ -225,8 +226,8 @@
<item>chat.hipchat.com</item>
<item>googlemail.com</item>
<item>nsa.li</item>
<item>blabber.im</item>
<item>buzon.uy</item>
<item>blabber.im</item>
<item>buzon.uy</item>
</string-array>
</resources>

View file

@ -806,4 +806,5 @@
<string name="delete_message">Delete message</string>
<string name="conference_destroyed">This group chat has been destroyed</string>
<string name="no_application_found_to_view_contact">No application found to view contact</string>
<string name="welcome_server_info">We recommend the use of blabber.im as your provider.</string>
</resources>