use blabber.im as default domain

5 files changed, 16 insertions, 4 deletions

diff --git a/src/main/java/de/pixart/messenger/Config.java b/src/main/java/de/pixart/messenger/Config.java
index 0af8e09ea..e3b60e664 100644
--- a/src/main/java/de/pixart/messenger/Config.java
+++ b/src/main/java/de/pixart/messenger/Config.java
@@ -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;
diff --git a/src/main/java/de/pixart/messenger/ui/MagicCreateActivity.java b/src/main/java/de/pixart/messenger/ui/MagicCreateActivity.java
index 76dc84499..b8f11be12 100644
--- a/src/main/java/de/pixart/messenger/ui/MagicCreateActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/MagicCreateActivity.java
@@ -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();
diff --git a/src/main/res/layout/activity_magic_create.xml b/src/main/res/layout/activity_magic_create.xml
index 8eb312ace..25b82205a 100644
--- a/src/main/res/layout/activity_magic_create.xml
+++ b/src/main/res/layout/activity_magic_create.xml
@@ -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"
diff --git a/src/main/res/values/defaults.xml b/src/main/res/values/defaults.xml
index 49c1a849a..c96f22f3d 100644
--- a/src/main/res/values/defaults.xml
+++ b/src/main/res/values/defaults.xml
@@ -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>
 
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 4a5b4e3c6..c17784722 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -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>