aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2014-12-23 23:39:35 +0100
committerDaniel Gultsch <daniel@gultsch.de>2014-12-23 23:39:35 +0100
commit293e39c87a75f58f7ac5310d4b803f55a383e0d1 (patch)
treea5527bfa94cc66acfbb4a2b8db9475094cbf0ef3 /src/main/java
parent7c02677531e21d18bbf37c0aa5108efa7d979c92 (diff)
parentafbe727b17b1e1d1a994b003f28ab7562bb655b4 (diff)
Merge pull request #807 from SamWhited/development
Misc minor bug fixes
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
index 07e06b75..9597b15e 100644
--- a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
@@ -82,6 +82,11 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
mAccountJid.requestFocus();
return;
}
+ if (jid.isDomainJid()) {
+ mAccountJid.setError(getString(R.string.invalid_jid));
+ mAccountJid.requestFocus();
+ return;
+ }
final String password = mPassword.getText().toString();
final String passwordConfirm = mPasswordConfirm.getText().toString();
if (registerNewAccount) {
@@ -329,11 +334,14 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
getMenuInflater().inflate(R.menu.editaccount, menu);
final MenuItem showQrCode = menu.findItem(R.id.action_show_qr_code);
final MenuItem showBlocklist = menu.findItem(R.id.action_show_block_list);
+ final MenuItem showMoreInfo = menu.findItem(R.id.action_server_info_show_more);
if (mAccount == null) {
showQrCode.setVisible(false);
showBlocklist.setVisible(false);
+ showMoreInfo.setVisible(false);
} else if (mAccount.getStatus() != Account.State.ONLINE || !mAccount.getXmppConnection().getFeatures().blocking()) {
showBlocklist.setVisible(false);
+ showMoreInfo.setVisible(false);
}
return true;
}