Add support for XEP-0191 (Blocking command)

Fixes #791

Squash of commits:
534f25d7dae3ce6852243e28fdd0a69ac01e9463
808fdf5147f27a912a60bee39aa4bf1ddd4f43b4
1eaf8a8330710ad35ba7c368e04f909af623ae4c
31585242c2359efdcd0eeddb9745077f54dbc9eb
2e69bd0bd0286ed1e98a42f4c3421ba4d8cf524b
e904fb5015bf3a1904ab941a1957edf3b1e7abd2
eebbadf3b3816bbf8fcccb763e419fed252d266f
7c5b87724ce494e5a6e8026557ed50a8fd9f23e8
b0eaaf446937794fe19cbdb4f8309c3ff83d4e42
8c652f9e8bb3512958d9ad8c6f1326505f2d98c8
ad0ea1ad948ff6f8fde7b0b10f5163dc8852032f
f5d49897e0dba691ef53a0eddb9ed34d129ad442
a08fa64c505bd895b7c626cfad182380373be20b
de67079113e08394a276048c31f6b21baa300829
9069f342173ba30c2b20c67529c7ff497a6a257d
0169fa79d161ee898c4b6762e207087682a952d8
8585a5bd75a5d56927fed8317729bd15fffe4dcc
0053528a078369e0b65dcf71bda251072a1299c7
e901a9c3554bd7cca193e92919b463991eadfea7
c5c78257434813c69ab9b7558bcc8f7cbe858433
e905af348d46d77bc46b5f7211527684acc02fab
13a0f9a10c7892b0f90f5fabd2f2615701b0fd66
2cfba1e24b0139839e4453b92be7e20634d150cf
58e074fb5bb44b05a8104250fccd7c024c808c1a
0d6cf98fc8eab212d798ac79b336f9b70a14f06d
e23620f56b85bcab9f3b5d9ce1c01524cd9674dc
d72cd2fcc8d54176c3ff53411a69b9bb4642eff3
195143dff8836623a37094a6b8fa6aa01ef31580
5f5f3caf3a1e480a99d27ee5c34ba516419c52e4
1dee3d5861c9f9c710da4cbda3688d94c622ca93
23949b8aa32c78b27bab49bb3c4f3ff588925ce1
9bf97f8ae522796e0dacb7f6fe7a7f90f86a93a1

1 files changed, 112 insertions, 90 deletions

diff --git a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
index 8fad66cf9..47fe5964e 100644
--- a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
@@ -67,7 +67,7 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 				mAccount.setOption(Account.OPTION_DISABLED, false);
 				xmppConnectionService.updateAccount(mAccount);
 				return;
-			}
+					}
 			if (!Validator.isValidJid(mAccountJid.getText().toString())) {
 				mAccountJid.setError(getString(R.string.invalid_jid));
 				mAccountJid.requestFocus();
@@ -87,32 +87,32 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 			if (registerNewAccount) {
 				if (!password.equals(passwordConfirm)) {
 					mPasswordConfirm
-							.setError(getString(R.string.passwords_do_not_match));
+						.setError(getString(R.string.passwords_do_not_match));
 					mPasswordConfirm.requestFocus();
 					return;
 				}
 			}
 			if (mAccount != null) {
 				mAccount.setPassword(password);
-                try {
-                    mAccount.setUsername(jid.hasLocalpart() ? jid.getLocalpart() : "");
-                    mAccount.setServer(jid.getDomainpart());
-                } catch (final InvalidJidException ignored) {
-                }
+				try {
+					mAccount.setUsername(jid.hasLocalpart() ? jid.getLocalpart() : "");
+					mAccount.setServer(jid.getDomainpart());
+				} catch (final InvalidJidException ignored) {
+				}
 				mAccount.setOption(Account.OPTION_REGISTER, registerNewAccount);
 				xmppConnectionService.updateAccount(mAccount);
 			} else {
-                try {
-                    if (xmppConnectionService.findAccountByJid(Jid.fromString(mAccountJid.getText().toString())) != null) {
-                        mAccountJid
-                                .setError(getString(R.string.account_already_exists));
-                        mAccountJid.requestFocus();
-                        return;
-                    }
-                } catch (InvalidJidException e) {
-                    return;
-                }
-                mAccount = new Account(jid.toBareJid(), password);
+				try {
+					if (xmppConnectionService.findAccountByJid(Jid.fromString(mAccountJid.getText().toString())) != null) {
+						mAccountJid
+							.setError(getString(R.string.account_already_exists));
+						mAccountJid.requestFocus();
+						return;
+					}
+				} catch (InvalidJidException e) {
+					return;
+				}
+				mAccount = new Account(jid.toBareJid(), password);
 				mAccount.setOption(Account.OPTION_USETLS, true);
 				mAccount.setOption(Account.OPTION_USECOMPRESSION, true);
 				mAccount.setOption(Account.OPTION_REGISTER, registerNewAccount);
@@ -134,34 +134,34 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 			finish();
 		}
 	};
-		@Override
-		public void onAccountUpdate() {
-			runOnUiThread(new Runnable() {
+	@Override
+	public void onAccountUpdate() {
+		runOnUiThread(new Runnable() {
 
-				@Override
-				public void run() {
-					if (mAccount != null
-							&& mAccount.getStatus() != Account.State.ONLINE
-							&& mFetchingAvatar) {
-						startActivity(new Intent(getApplicationContext(),
+			@Override
+			public void run() {
+				if (mAccount != null
+						&& mAccount.getStatus() != Account.State.ONLINE
+						&& mFetchingAvatar) {
+					startActivity(new Intent(getApplicationContext(),
 								ManageAccountActivity.class));
-						finish();
-					} else if (jidToEdit == null && mAccount != null
-							&& mAccount.getStatus() == Account.State.ONLINE) {
-						if (!mFetchingAvatar) {
-							mFetchingAvatar = true;
-							xmppConnectionService.checkForAvatar(mAccount,
-									mAvatarFetchCallback);
-						}
-					} else {
-						updateSaveButton();
-					}
-					if (mAccount != null) {
-						updateAccountInformation();
+					finish();
+				} else if (jidToEdit == null && mAccount != null
+						&& mAccount.getStatus() == Account.State.ONLINE) {
+					if (!mFetchingAvatar) {
+						mFetchingAvatar = true;
+						xmppConnectionService.checkForAvatar(mAccount,
+								mAvatarFetchCallback);
 					}
+				} else {
+					updateSaveButton();
 				}
-			});
-		}
+				if (mAccount != null) {
+					updateAccountInformation();
+				}
+			}
+		});
+	}
 	private UiCallback<Avatar> mAvatarFetchCallback = new UiCallback<Avatar>() {
 
 		@Override
@@ -179,17 +179,17 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 			finishInitialSetup(avatar);
 		}
 	};
-    private TextWatcher mTextWatcher = new TextWatcher() {
+	private TextWatcher mTextWatcher = new TextWatcher() {
 
 		@Override
 		public void onTextChanged(CharSequence s, int start, int before,
-								  int count) {
+				int count) {
 			updateSaveButton();
 		}
 
 		@Override
 		public void beforeTextChanged(CharSequence s, int start, int count,
-									  int after) {
+				int after) {
 
 		}
 
@@ -264,9 +264,9 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 
 	protected boolean accountInfoEdited() {
 		return (!this.mAccount.getJid().toBareJid().equals(
-				this.mAccountJid.getText().toString()))
-				|| (!this.mAccount.getPassword().equals(
-				this.mPassword.getText().toString()));
+					this.mAccountJid.getText().toString()))
+			|| (!this.mAccount.getPassword().equals(
+						this.mPassword.getText().toString()));
 	}
 
 	@Override
@@ -303,28 +303,32 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 		this.mSaveButton.setOnClickListener(this.mSaveButtonClickListener);
 		this.mCancelButton.setOnClickListener(this.mCancelButtonClickListener);
 		this.mRegisterNew
-				.setOnCheckedChangeListener(new OnCheckedChangeListener() {
-
-					@Override
-					public void onCheckedChanged(CompoundButton buttonView,
-												 boolean isChecked) {
-						if (isChecked) {
-							mPasswordConfirm.setVisibility(View.VISIBLE);
-						} else {
-							mPasswordConfirm.setVisibility(View.GONE);
-						}
-						updateSaveButton();
+			.setOnCheckedChangeListener(new OnCheckedChangeListener() {
+
+				@Override
+				public void onCheckedChanged(CompoundButton buttonView,
+						boolean isChecked) {
+					if (isChecked) {
+						mPasswordConfirm.setVisibility(View.VISIBLE);
+					} else {
+						mPasswordConfirm.setVisibility(View.GONE);
 					}
-				});
+					updateSaveButton();
+				}
+			});
 	}
 
 	@Override
-	public boolean onCreateOptionsMenu(Menu menu) {
+	public boolean onCreateOptionsMenu(final Menu menu) {
 		super.onCreateOptionsMenu(menu);
 		getMenuInflater().inflate(R.menu.editaccount, menu);
-		MenuItem showQrCode = menu.findItem(R.id.action_show_qr_code);
+		final MenuItem showQrCode = menu.findItem(R.id.action_show_qr_code);
+		final MenuItem showBlocklist = menu.findItem(R.id.action_show_block_list);
 		if (mAccount == null) {
 			showQrCode.setVisible(false);
+			showBlocklist.setVisible(false);
+		} else if (!mAccount.getXmppConnection().getFeatures().blocking()) {
+			showBlocklist.setVisible(false);
 		}
 		return true;
 	}
@@ -333,32 +337,38 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 	protected void onStart() {
 		super.onStart();
 		if (getIntent() != null) {
-            try {
-                this.jidToEdit = Jid.fromString(getIntent().getStringExtra("jid"));
-            } catch (final InvalidJidException | NullPointerException ignored) {
-                this.jidToEdit = null;
-            }
-            if (this.jidToEdit != null) {
+			try {
+				this.jidToEdit = Jid.fromString(getIntent().getStringExtra("jid"));
+			} catch (final InvalidJidException | NullPointerException ignored) {
+				this.jidToEdit = null;
+			}
+			if (this.jidToEdit != null) {
 				this.mRegisterNew.setVisibility(View.GONE);
-				getActionBar().setTitle(getString(R.string.account_details));
+				if (getActionBar() != null) {
+					getActionBar().setTitle(getString(R.string.account_details));
+				}
 			} else {
 				this.mAvatar.setVisibility(View.GONE);
-				getActionBar().setTitle(R.string.action_add_account);
+				if (getActionBar() != null) {
+					getActionBar().setTitle(R.string.action_add_account);
+				}
 			}
 		}
 	}
 
 	@Override
 	protected void onBackendConnected() {
-        KnownHostsAdapter mKnownHostsAdapter = new KnownHostsAdapter(this,
-                android.R.layout.simple_list_item_1,
-                xmppConnectionService.getKnownHosts());
+		final KnownHostsAdapter mKnownHostsAdapter = new KnownHostsAdapter(this,
+				android.R.layout.simple_list_item_1,
+				xmppConnectionService.getKnownHosts());
 		if (this.jidToEdit != null) {
 			this.mAccount = xmppConnectionService.findAccountByJid(jidToEdit);
 			updateAccountInformation();
 		} else if (this.xmppConnectionService.getAccounts().size() == 0) {
-			getActionBar().setDisplayHomeAsUpEnabled(false);
-			getActionBar().setDisplayShowHomeEnabled(false);
+			if (getActionBar() != null) {
+				getActionBar().setDisplayHomeAsUpEnabled(false);
+				getActionBar().setDisplayShowHomeEnabled(false);
+			}
 			this.mCancelButton.setEnabled(false);
 			this.mCancelButton.setTextColor(getSecondaryTextColor());
 		}
@@ -366,6 +376,18 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 		updateSaveButton();
 	}
 
+	@Override
+	public boolean onOptionsItemSelected(final MenuItem item) {
+		switch (item.getItemId()) {
+			case R.id.action_show_block_list:
+				final Intent intent = new Intent(this, BlocklistActivity.class);
+				intent.putExtra("account", mAccount.getJid().toString());
+				startActivity(intent);
+				break;
+		}
+		return super.onOptionsItemSelected(item);
+	}
+
 	private void updateAccountInformation() {
 		this.mAccountJid.setText(this.mAccount.getJid().toBareJid().toString());
 		this.mPassword.setText(this.mAccount.getPassword());
@@ -385,14 +407,14 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 				&& !this.mFetchingAvatar) {
 			this.mStats.setVisibility(View.VISIBLE);
 			this.mSessionEst.setText(UIHelper.readableTimeDifferenceFull(
-					getApplicationContext(), this.mAccount.getXmppConnection()
-							.getLastSessionEstablished()));
-			Features features = this.mAccount.getXmppConnection().getFeatures();
+						getApplicationContext(), this.mAccount.getXmppConnection()
+						.getLastSessionEstablished()));
+			final Features features = this.mAccount.getXmppConnection().getFeatures();
 			if (features.carbons()) {
 				this.mServerInfoCarbons.setText(R.string.server_info_available);
 			} else {
 				this.mServerInfoCarbons
-						.setText(R.string.server_info_unavailable);
+					.setText(R.string.server_info_unavailable);
 			}
 			if (features.sm()) {
 				this.mServerInfoSm.setText(R.string.server_info_available);
@@ -409,21 +431,21 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 				this.mOtrFingerprintBox.setVisibility(View.VISIBLE);
 				this.mOtrFingerprint.setText(CryptoHelper.prettifyFingerprint(fingerprint));
 				this.mOtrFingerprintToClipboardButton
-						.setVisibility(View.VISIBLE);
+					.setVisibility(View.VISIBLE);
 				this.mOtrFingerprintToClipboardButton
-						.setOnClickListener(new View.OnClickListener() {
+					.setOnClickListener(new View.OnClickListener() {
 
-							@Override
-							public void onClick(View v) {
+						@Override
+						public void onClick(View v) {
 
-								if (copyTextToClipboard(fingerprint, R.string.otr_fingerprint)) {
-									Toast.makeText(
-											EditAccountActivity.this,
-											R.string.toast_message_otr_fingerprint,
-											Toast.LENGTH_SHORT).show();
-								}
+							if (copyTextToClipboard(fingerprint, R.string.otr_fingerprint)) {
+								Toast.makeText(
+										EditAccountActivity.this,
+										R.string.toast_message_otr_fingerprint,
+										Toast.LENGTH_SHORT).show();
 							}
-						});
+						}
+					});
 			} else {
 				this.mOtrFingerprintBox.setVisibility(View.GONE);
 			}