Merge branch 'refs/heads/welcome-screen' into development

19 files changed, 363 insertions, 66 deletions

diff --git a/art/render.rb b/art/render.rb
index c1e57e0f6..c18617158 100755
--- a/art/render.rb
+++ b/art/render.rb
@@ -12,6 +12,7 @@ resolutions = {
 
 images = {
 	'conversations_baloon.svg' => ['ic_launcher', 48],
+   'conversations_baloon.svg' => ['main_logo', 200],
 	'conversations_mono.svg' => ['ic_notification', 24],
 	'ic_received_indicator.svg' => ['ic_received_indicator', 12],
 	'ic_read_indicator.svg' => ['ic_read_indicator', 12],
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 521deac59..bbec8f12d 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -82,6 +82,16 @@
             </intent-filter>
         </activity>
         <activity
+            android:name=".ui.WelcomeActivity"
+            android:label="@string/app_name"
+            android:screenOrientation="portrait"
+            android:launchMode="singleTask"/>
+        <activity
+            android:name=".ui.MagicCreateActivity"
+            android:label="@string/create_account"
+            android:screenOrientation="portrait"
+            android:launchMode="singleTask"/>
+        <activity
             android:name=".ui.SettingsActivity"
             android:label="@string/title_activity_settings"/>
         <activity
@@ -143,7 +153,7 @@
             </intent-filter>
             <meta-data
                 android:name="android.service.chooser.chooser_target_service"
-                android:value=".services.ContactChooserTargetService" />
+                android:value=".services.ContactChooserTargetService"/>
         </activity>
         <activity
             android:name=".ui.TrustKeysActivity"
@@ -175,7 +185,7 @@
         <service android:name=".services.ContactChooserTargetService"
                  android:permission="android.permission.BIND_CHOOSER_TARGET_SERVICE">
             <intent-filter>
-                <action android:name="android.service.chooser.ChooserTargetService" />
+                <action android:name="android.service.chooser.ChooserTargetService"/>
             </intent-filter>
         </service>
     </application>
diff --git a/src/main/java/eu/siacs/conversations/Config.java b/src/main/java/eu/siacs/conversations/Config.java
index 8eca26e04..2fee7211d 100644
--- a/src/main/java/eu/siacs/conversations/Config.java
+++ b/src/main/java/eu/siacs/conversations/Config.java
@@ -37,6 +37,7 @@ public final class Config {
 	public static final String LOGTAG = "conversations";
 
 	public static final String DOMAIN_LOCK = "pix-art.de"; //only allow account creation for this domain
+	public static final String MAGIC_CREATE_DOMAIN = "pix-art.de";
 	public static final String CONFERENCE_DOMAIN_LOCK = null; //only allow conference creation for this domain
 	public static final boolean LOCK_DOMAINS_IN_CONVERSATIONS = false; //only add contacts and conferences for own domains
 	public static final boolean LOCK_SETTINGS = false; //set to true to disallow account and settings editing
diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index 6b7bf001f..82fe4a4e2 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -3213,6 +3213,18 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 		return mPushManagementService;
 	}
 
+	public Account getPendingAccount() {
+		Account pending = null;
+		for(Account account : getAccounts()) {
+			if (account.isOptionSet(Account.OPTION_REGISTER)) {
+				pending = account;
+			} else {
+				return null;
+			}
+		}
+		return pending;
+	}
+
 	public interface OnMamPreferencesFetched {
 		void onPreferencesFetched(Element prefs);
 		void onPreferencesFetchFailed();
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
index ea3cf627a..a7f0f8d72 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
@@ -1222,6 +1222,8 @@ public class ConversationActivity extends XmppActivity
 			if (mRedirected.compareAndSet(false, true)) {
 				if (Config.X509_VERIFICATION) {
 					startActivity(new Intent(this, ManageAccountActivity.class));
+				} else if (Config.MAGIC_CREATE_DOMAIN != null) {
+					startActivity(new Intent(this, WelcomeActivity.class));
 				} else {
 					startActivity(new Intent(this, EditAccountActivity.class));
 				}
@@ -1229,9 +1231,14 @@ public class ConversationActivity extends XmppActivity
 			}
 		} else if (conversationList.size() <= 0) {
 			if (mRedirected.compareAndSet(false, true)) {
-				Intent intent = new Intent(this, StartConversationActivity.class);
-				intent.putExtra("init", true);
-				startActivity(intent);
+				Account pendingAccount = xmppConnectionService.getPendingAccount();
+				if (pendingAccount == null) {
+					Intent intent = new Intent(this, StartConversationActivity.class);
+					intent.putExtra("init", true);
+					startActivity(intent);
+				} else {
+					switchToAccount(pendingAccount, true);
+				}
 				finish();
 			}
 		} else if (getIntent() != null && VIEW_CONVERSATION.equals(getIntent().getType())) {
diff --git a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
index a8b667cee..c9082f170 100644
--- a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
@@ -62,13 +62,11 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 
 	private AutoCompleteTextView mAccountJid;
 	private EditText mPassword;
-	private EditText mPasswordConfirm;
 	private CheckBox mRegisterNew;
 	private Button mCancelButton;
 	private Button mSaveButton;
 	private Button mDisableBatterOptimizations;
 	private TableLayout mMoreTable;
-
 	private LinearLayout mStats;
 	private RelativeLayout mBatteryOptimizations;
 	private TextView mServerInfoSm;
@@ -174,20 +172,12 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 				return;
 			}
 			final String password = mPassword.getText().toString();
-			final String passwordConfirm = mPasswordConfirm.getText().toString();
-			if (registerNewAccount) {
-				if (!password.equals(passwordConfirm)) {
-					mPasswordConfirm.setError(getString(R.string.passwords_do_not_match));
-					mPasswordConfirm.requestFocus();
-					return;
-				}
-			}
+
 			if (mAccount != null) {
 				mAccount.setJid(jid);
 				mAccount.setPort(numericPort);
 				mAccount.setHostname(hostname);
 				mAccountJid.setError(null);
-				mPasswordConfirm.setError(null);
 				mAccount.setPassword(password);
 				mAccount.setOption(Account.OPTION_REGISTER, registerNewAccount);
 				xmppConnectionService.updateAccount(mAccount);
@@ -400,7 +390,6 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 		}
 		this.mPassword = (EditText) findViewById(R.id.account_password);
 		this.mPassword.addTextChangedListener(this.mTextWatcher);
-		this.mPasswordConfirm = (EditText) findViewById(R.id.account_password_confirm);
 		this.mAvatar = (ImageView) findViewById(R.id.avater);
 		this.mAvatar.setOnClickListener(this.mAvatarClickListener);
 		this.mRegisterNew = (CheckBox) findViewById(R.id.account_register_new);
@@ -447,19 +436,7 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 		this.mSaveButton.setOnClickListener(this.mSaveButtonClickListener);
 		this.mCancelButton.setOnClickListener(this.mCancelButtonClickListener);
 		this.mMoreTable = (TableLayout) findViewById(R.id.server_info_more);
-		final OnCheckedChangeListener OnCheckedShowConfirmPassword = new OnCheckedChangeListener() {
-			@Override
-			public void onCheckedChanged(final CompoundButton buttonView,
-										 final boolean isChecked) {
-				if (isChecked) {
-					mPasswordConfirm.setVisibility(View.VISIBLE);
-				} else {
-					mPasswordConfirm.setVisibility(View.GONE);
-				}
-				updateSaveButton();
-			}
-		};
-		this.mRegisterNew.setOnCheckedChangeListener(OnCheckedShowConfirmPassword);
+
 		if (Config.DISALLOW_REGISTRATION_IN_UI) {
 			this.mRegisterNew.setVisibility(View.GONE);
 		}
@@ -546,7 +523,9 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 				}
 				updateAccountInformation(true);
 			}
-		} else if (this.xmppConnectionService.getAccounts().size() == 0) {
+		}
+		if (this.xmppConnectionService.getAccounts().size() == 0
+				|| this.mAccount == xmppConnectionService.getPendingAccount()) {
 			if (getActionBar() != null) {
 				getActionBar().setDisplayHomeAsUpEnabled(false);
 				getActionBar().setDisplayShowHomeEnabled(false);
@@ -626,7 +605,6 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 		mAccountJid.setEnabled(!Config.LOCK_SETTINGS);
 		mHostname.setEnabled(!Config.LOCK_SETTINGS);
 		mPort.setEnabled(!Config.LOCK_SETTINGS);
-		mPasswordConfirm.setEnabled(!Config.LOCK_SETTINGS);
 		mRegisterNew.setEnabled(!Config.LOCK_SETTINGS);
 
 		if (!mInitMode) {
@@ -638,7 +616,6 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 		if (this.mAccount.isOptionSet(Account.OPTION_REGISTER)) {
 			this.mRegisterNew.setVisibility(View.VISIBLE);
 			this.mRegisterNew.setChecked(true);
-			this.mPasswordConfirm.setText(this.mAccount.getPassword());
 		} else {
 			this.mRegisterNew.setVisibility(View.GONE);
 			this.mRegisterNew.setChecked(false);
diff --git a/src/main/java/eu/siacs/conversations/ui/MagicCreateActivity.java b/src/main/java/eu/siacs/conversations/ui/MagicCreateActivity.java
new file mode 100644
index 000000000..6b32bdc28
--- /dev/null
+++ b/src/main/java/eu/siacs/conversations/ui/MagicCreateActivity.java
@@ -0,0 +1,113 @@
+package eu.siacs.conversations.ui;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.TextView;
+
+import java.security.SecureRandom;
+
+import eu.siacs.conversations.Config;
+import eu.siacs.conversations.R;
+import eu.siacs.conversations.entities.Account;
+import eu.siacs.conversations.xmpp.jid.InvalidJidException;
+import eu.siacs.conversations.xmpp.jid.Jid;
+
+public class MagicCreateActivity extends XmppActivity implements TextWatcher {
+
+	private TextView mFullJidDisplay;
+	private EditText mUsername;
+	private SecureRandom mRandom;
+
+	private static final String CHARS = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456780+-/#$!?";
+	private static final int PW_LENGTH = 10;
+
+	@Override
+	protected void refreshUiReal() {
+
+	}
+
+	@Override
+	void onBackendConnected() {
+
+	}
+
+	@Override
+	protected void onCreate(final Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.magic_create);
+		mFullJidDisplay = (TextView) findViewById(R.id.full_jid);
+		mUsername = (EditText) findViewById(R.id.username);
+		mRandom = new SecureRandom();
+		Button next = (Button) findViewById(R.id.create_account);
+		next.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				String username = mUsername.getText().toString();
+				if (username.contains("@") || username.length() < 3) {
+					mUsername.setError(getString(R.string.invalid_username));
+					mUsername.requestFocus();
+				} else {
+					mUsername.setError(null);
+					try {
+						Jid jid = Jid.fromParts(username.toLowerCase(), Config.MAGIC_CREATE_DOMAIN, null);
+						Account account = xmppConnectionService.findAccountByJid(jid);
+						if (account == null) {
+							account = new Account(jid, createPassword());
+							account.setOption(Account.OPTION_REGISTER, true);
+							account.setOption(Account.OPTION_DISABLED, true);
+							xmppConnectionService.createAccount(account);
+						}
+						Intent intent = new Intent(MagicCreateActivity.this, EditAccountActivity.class);
+						intent.putExtra("jid", account.getJid().toBareJid().toString());
+						intent.putExtra("init", true);
+						intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+						startActivity(intent);
+					} catch (InvalidJidException e) {
+						mUsername.setError(getString(R.string.invalid_username));
+						mUsername.requestFocus();
+					}
+				}
+			}
+		});
+		mUsername.addTextChangedListener(this);
+	}
+
+	private String createPassword() {
+		StringBuilder builder = new StringBuilder(PW_LENGTH);
+		for(int i = 0; i < PW_LENGTH; ++i) {
+			builder.append(CHARS.charAt(mRandom.nextInt(CHARS.length() - 1)));
+		}
+		return builder.toString();
+	}
+
+	@Override
+	public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+
+	}
+
+	@Override
+	public void onTextChanged(CharSequence s, int start, int before, int count) {
+
+	}
+
+	@Override
+	public void afterTextChanged(Editable s) {
+		if (s.toString().trim().length() > 0) {
+			try {
+				mFullJidDisplay.setVisibility(View.VISIBLE);
+				Jid jid = Jid.fromParts(s.toString().toLowerCase(), Config.MAGIC_CREATE_DOMAIN, null);
+				mFullJidDisplay.setText(getString(R.string.your_full_jid_will_be, jid.toString()));
+			} catch (InvalidJidException e) {
+				mFullJidDisplay.setVisibility(View.INVISIBLE);
+			}
+
+		} else {
+			mFullJidDisplay.setVisibility(View.INVISIBLE);
+		}
+	}
+}
diff --git a/src/main/java/eu/siacs/conversations/ui/WelcomeActivity.java b/src/main/java/eu/siacs/conversations/ui/WelcomeActivity.java
new file mode 100644
index 000000000..ad6f7ba77
--- /dev/null
+++ b/src/main/java/eu/siacs/conversations/ui/WelcomeActivity.java
@@ -0,0 +1,37 @@
+package eu.siacs.conversations.ui;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+
+import eu.siacs.conversations.R;
+
+public class WelcomeActivity extends Activity {
+
+	@Override
+	protected void onCreate(final Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.welcome);
+		final Button createAccount = (Button) findViewById(R.id.create_account);
+		createAccount.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				Intent intent = new Intent(WelcomeActivity.this, MagicCreateActivity.class);
+				intent.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
+				startActivity(intent);
+			}
+		});
+		final Button useOwnProvider = (Button) findViewById(R.id.use_existing_account);
+		useOwnProvider.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				startActivity(new Intent(WelcomeActivity.this, EditAccountActivity.class));
+				finish();
+			}
+		});
+
+	}
+
+}
diff --git a/src/main/res/drawable-hdpi/main_logo.png b/src/main/res/drawable-hdpi/main_logo.png
new file mode 100644
index 000000000..e3d6b5edd
--- /dev/null
+++ b/src/main/res/drawable-hdpi/main_logo.png
diff --git a/src/main/res/drawable-mdpi/main_logo.png b/src/main/res/drawable-mdpi/main_logo.png
new file mode 100644
index 000000000..efeb80fa4
--- /dev/null
+++ b/src/main/res/drawable-mdpi/main_logo.png
diff --git a/src/main/res/drawable-xhdpi/main_logo.png b/src/main/res/drawable-xhdpi/main_logo.png
new file mode 100644
index 000000000..da7dc86fc
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/main_logo.png
diff --git a/src/main/res/drawable-xxhdpi/main_logo.png b/src/main/res/drawable-xxhdpi/main_logo.png
new file mode 100644
index 000000000..3a3fc6eef
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/main_logo.png
diff --git a/src/main/res/drawable-xxxhdpi/main_logo.png b/src/main/res/drawable-xxxhdpi/main_logo.png
new file mode 100644
index 000000000..510540907
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/main_logo.png
diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index bc2a0624a..62cc947dc 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -82,7 +82,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:hint="@string/password"
-                        android:inputType="textPassword"
+                        android:inputType="text"
                         android:textColor="@color/black87"
                         android:textColorHint="@color/black54"
                         android:textSize="?attr/TextSizeBody" />
@@ -153,27 +153,6 @@
                         android:text="@string/register_account"
                         android:textColor="@color/black87"
                         android:textSize="?attr/TextSizeBody" />
-
-                    <TextView
-                        android:id="@+id/account_confirm_password_desc"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/account_settings_confirm_password"
-                        android:textColor="@color/black87"
-                        android:textSize="?attr/TextSizeBody"
-                        android:visibility="gone" />
-
-                    <EditText
-                        android:id="@+id/account_password_confirm"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="8dp"
-                        android:hint="@string/confirm_password"
-                        android:inputType="textPassword"
-                        android:textColor="@color/black87"
-                        android:textColorHint="@color/black54"
-                        android:textSize="?attr/TextSizeBody"
-                        android:visibility="gone" />
                 </LinearLayout>
             </RelativeLayout>
 
diff --git a/src/main/res/layout/magic_create.xml b/src/main/res/layout/magic_create.xml
new file mode 100644
index 000000000..c4adc0297
--- /dev/null
+++ b/src/main/res/layout/magic_create.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:fillViewport="true">
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/grey50">
+
+        <LinearLayout
+            android:id="@+id/linearLayout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
+            android:minHeight="256dp"
+            android:orientation="vertical"
+            android:paddingBottom="8dp"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp">
+            <Space
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1"/>
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/pick_your_username"
+                android:textColor="@color/black87"
+                android:textSize="?attr/TextSizeHeadline"
+                android:textStyle="bold"/>
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:text="@string/magic_create_text"
+                android:textColor="@color/black87"
+                android:textSize="?attr/TextSizeBody"/>
+            <EditText
+                android:id="@+id/username"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:hint="@string/username_hint"
+                android:inputType="textNoSuggestions"
+                android:textSize="?attr/TextSizeBody"/>
+            <TextView
+                android:id="@+id/full_jid"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:text="@string/your_full_jid_will_be"
+                android:textColor="@color/black54"
+                android:textSize="?attr/TextSizeInfo"
+                android:visibility="invisible"/>
+            <Button
+                android:id="@+id/create_account"
+                style="?android:attr/borderlessButtonStyle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="right"
+                android:text="@string/next"
+                android:textColor="@color/accent"/>
+        </LinearLayout>
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_above="@+id/linearLayout"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
+            android:layout_alignParentTop="true">
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerHorizontal="true"
+                android:layout_centerVertical="true"
+                android:padding="8dp"
+                android:src="@drawable/main_logo"/>
+        </RelativeLayout>
+    </RelativeLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/src/main/res/layout/welcome.xml b/src/main/res/layout/welcome.xml
new file mode 100644
index 000000000..3af3f6e63
--- /dev/null
+++ b/src/main/res/layout/welcome.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+android:background="@color/grey50">
+
+    <LinearLayout
+        android:id="@+id/linearLayout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:orientation="vertical"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp"
+        android:paddingBottom="8dp"
+        android:minHeight="256dp">
+        <Space
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"/>
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/welcome_header"
+            android:textColor="@color/black87"
+            android:textSize="?attr/TextSizeHeadline"
+            android:textStyle="bold"/>
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:text="@string/welcome_text"
+            android:textColor="@color/black87"
+            android:textSize="?attr/TextSizeBody"/>
+        <Button
+            android:id="@+id/create_account"
+            style="?android:attr/borderlessButtonStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="right"
+            android:text="@string/create_account"
+            android:textColor="@color/accent"/>
+        <Button
+            android:id="@+id/use_existing_account"
+            style="?android:attr/borderlessButtonStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="right"
+            android:text="@string/use_existing_accout"
+            android:textColor="@color/black54"/>
+    </LinearLayout>
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@+id/linearLayout"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentTop="true">
+        <ImageView
+            android:padding="8dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:layout_centerVertical="true"
+            android:src="@drawable/main_logo"/>
+    </RelativeLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 437d660df..de5a67c58 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -166,7 +166,7 @@
   <string name="attach_record_voice">Sprache aufzeichnen</string>
   <string name="account_settings_jabber_id">Jabber-ID</string>
   <string name="account_settings_password">Passwort</string>
-  <string name="account_settings_example_jabber_id">benutzer@domain.de</string>
+  <string name="account_settings_example_jabber_id">benutzer@pix-art.de</string>
   <string name="account_settings_confirm_password">Passwort bestätigen</string>
   <string name="password">Passwort</string>
   <string name="confirm_password">Passwort bestätigen</string>
@@ -232,7 +232,7 @@
   <string name="contact_already_exists">Der Kontakt existiert bereits</string>
   <string name="join">Beitreten</string>
   <string name="conference_address">Konferenz-Adresse</string>
-  <string name="conference_address_example">raum@conference.domain.de</string>
+  <string name="conference_address_example">raum@room.pix-art.de</string>
   <string name="save_as_bookmark">Zur Kontaktliste hinzufügen</string>
   <string name="delete_bookmark">Von Kontaktliste entfernen</string>
   <string name="bookmark_already_exists">Die Konferenz befindet sich bereits auf deiner Kontaktliste</string>
@@ -512,7 +512,7 @@
   <string name="pref_xa_on_silent_mode_summary">Setzt deinen Status auf \"nicht verfügbar\", solange dein Gerät lautlos ist</string>
   <string name="pref_treat_vibrate_as_silent">Vibration als Lautlos behandeln</string>
   <string name="pref_treat_vibrate_as_silent_summary">Setzt deinen Status auf \"nicht verfügbar\", solange das Gerät auf Vibration geschaltet ist</string>
-  <string name="hostname_example">xmpp.domain.de</string>
+  <string name="hostname_example">xmpp.pix-art.de</string>
   <string name="action_add_account_with_certificate">Konto mit Zertifikat hinzufügen</string>
   <string name="unable_to_parse_certificate">Zertifikat kann nicht gelesen werden</string>
   <string name="authenticate_with_certificate">Leer lassen, um mit Zertifikat anzumelden</string>
@@ -617,4 +617,10 @@
   <string name="pref_return_to_previous">Schnell-Teilen</string>
   <string name="pref_return_to_previous_summary">Nach dem teilen sofort wieder zur letzten App zurückkehren anstatt die Unterhalt zu öffnen</string>
   <string name="shared_text_with_x">Text mit %s geteilt</string>
+  <string name="create_account">Konto erstellen</string>
+  <string name="magic_create_text">Wir erstellen nun mit dir gemeinsam ein Konto auf pix-art.de.\nDanach kannst du mit Kontakten auf diesem und anderen Servern in Kontakt treten, indem du ihnen deine Jabber-ID gibst.</string>
+  <string name="pick_your_username">Wähle deinen Benutzernamen</string>
+  <string name="use_existing_accout">Nutze ein bestehendes Konto</string>
+  <string name="welcome_text">...ist ein kostenfreier und sicherer XMPP/Jabber Client für die Benutzung mit pix-art.de</string>
+  <string name="your_full_jid_will_be">Deine Jabber-ID lautet: %s</string>
 </resources>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index ad09161eb..8a5214783 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -173,7 +173,7 @@
 	<string name="attach_record_voice">Record voice</string>
 	<string name="account_settings_jabber_id">Jabber ID</string>
 	<string name="account_settings_password">Password</string>
-	<string name="account_settings_example_jabber_id">username@example.com</string>
+	<string name="account_settings_example_jabber_id">username@pix-art.de</string>
 	<string name="account_settings_confirm_password">Confirm password</string>
 	<string name="password">Password</string>
 	<string name="confirm_password">Confirm password</string>
@@ -241,7 +241,7 @@
 	<string name="contact_already_exists">The contact already exists</string>
 	<string name="join">Join</string>
 	<string name="conference_address">Conference address</string>
-	<string name="conference_address_example">room@conference.example.com</string>
+	<string name="conference_address_example">conference@room.pix-art.de</string>
 	<string name="save_as_bookmark">Save as bookmark</string>
 	<string name="delete_bookmark">Delete bookmark</string>
 	<string name="bookmark_already_exists">This bookmark already exists</string>
@@ -565,7 +565,7 @@
 	<string name="pref_treat_vibrate_as_silent_summary">Marks your resource as not available when device is on vibrate</string>
 	<string name="pref_show_connection_options">Extended connection settings</string>
 	<string name="pref_show_connection_options_summary">Show hostname and port settings when setting up an account</string>
-	<string name="hostname_example">xmpp.example.com</string>
+	<string name="hostname_example">xmpp.pix-art.de</string>
 	<string name="action_add_account_with_certificate">Add account with certificate</string>
 	<string name="unable_to_parse_certificate">Unable to parse certificate</string>
 	<string name="authenticate_with_certificate">Leave empty to authenticate w/ certificate</string>
@@ -647,4 +647,11 @@
 	<string name="no_application_to_share_uri">No application found to share URI</string>
 	<string name="share_uri_with">Share URI with…</string>
 	<string name="mgmt_account_reconnect">reconnect</string>
+	<string name="welcome_header" translatable="false">Pix-Art Messenger</string>
+	<string name="welcome_text">...is a free and secure XMPP/Jabber client for the use with pix-art.de</string>
+	<string name="magic_create_text">We will guide you through the process of creating an account on pix-art.de.\nYou will be able to communicate with users of this and other providers by giving them your full Jabber-ID.</string>
+	<string name="your_full_jid_will_be">Your Jabber-ID will be: %s</string>
+	<string name="create_account">Create account</string>
+	<string name="use_existing_accout">Use an existing account</string>
+	<string name="pick_your_username">Choose your username</string>
 </resources>
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index 5da8217eb..5ce392765 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -198,11 +198,6 @@
                     android:key="use_tor"
                     android:summary="@string/pref_use_tor_summary"
                     android:title="@string/pref_use_tor"/>
-                <CheckBoxPreference
-                    android:defaultValue="false"
-                    android:key="show_connection_options"
-                    android:summary="@string/pref_show_connection_options_summary"
-                    android:title="@string/pref_show_connection_options"/>
             </PreferenceCategory>
             <PreferenceCategory android:title="@string/pref_input_options">
                 <CheckBoxPreference