Merge tag '1.12.4' into trz/merge_1.12.4 (not tested yet)trz/merge_1.12.4

Conflicts:
	README.md
	art/render.rb
	build.gradle
	src/main/java/eu/siacs/conversations/Config.java
	src/main/java/eu/siacs/conversations/crypto/PgpEngine.java
	src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java
	src/main/java/eu/siacs/conversations/crypto/axolotl/SQLiteAxolotlStore.java
	src/main/java/eu/siacs/conversations/crypto/axolotl/XmppAxolotlSession.java
	src/main/java/eu/siacs/conversations/entities/Bookmark.java
	src/main/java/eu/siacs/conversations/entities/Contact.java
	src/main/java/eu/siacs/conversations/entities/ListItem.java
	src/main/java/eu/siacs/conversations/entities/Message.java
	src/main/java/eu/siacs/conversations/parser/IqParser.java
	src/main/java/eu/siacs/conversations/parser/PresenceParser.java
	src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java
	src/main/java/eu/siacs/conversations/persistance/FileBackend.java
	src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
	src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
	src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
	src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
	src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java
	src/main/java/eu/siacs/conversations/ui/XmppActivity.java
	src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
	src/main/java/eu/siacs/conversations/ui/adapter/ListItemAdapter.java
	src/main/java/eu/siacs/conversations/utils/DNSHelper.java
	src/main/java/eu/siacs/conversations/utils/UIHelper.java
	src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
	src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
	src/main/res/layout/activity_contact_details.xml
	src/main/res/layout/message_received.xml
	src/main/res/layout/message_sent.xml
	src/main/res/values-bg/strings.xml
	src/main/res/values-de/strings.xml
	src/main/res/values-es/strings.xml
	src/main/res/values-eu/strings.xml
	src/main/res/values-fr/strings.xml
	src/main/res/values-ja/strings.xml
	src/main/res/values-nl/strings.xml
	src/main/res/values-pt-rBR/strings.xml
	src/main/res/values-pt/strings.xml
	src/main/res/values-ro-rRO/strings.xml
	src/main/res/values-sr/strings.xml
	src/main/res/values-sv/strings.xml
	src/main/res/values-tr-rTR/strings.xml

1 files changed, 116 insertions, 0 deletions

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 00000000..1b16e565
--- /dev/null
+++ b/src/main/java/eu/siacs/conversations/ui/MagicCreateActivity.java
@@ -0,0 +1,116 @@
+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 android.widget.Toast;
+
+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);
+							account.setOption(Account.OPTION_MAGIC_CREATE, 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);
+						Toast.makeText(MagicCreateActivity.this, R.string.secure_password_generated, Toast.LENGTH_SHORT).show();
+						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);
+		}
+	}
+}