diff options
| author | Christian S <christian@pix-art.de> | 2016-04-30 21:56:57 +0200 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2016-04-30 21:56:57 +0200 |
| commit | b609e32813f640e7a1ab32e41e61f5461733d686 (patch) | |
| tree | 5d11b873a1880e237dde86a4039a78a07421a44b | |
| parent | ab37336d1edc446f17d7a7aaeb653efb170283d9 (diff) | |
remove old config variable
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java | 5 | ||||
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/ManageAccountActivity.java | 4 |
2 files changed, 2 insertions, 7 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java index 501a3ab7e..3efec037f 100644 --- a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java @@ -662,11 +662,6 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate this.mNamePort.setVisibility(mShowOptions ? View.VISIBLE : View.GONE); } - mPassword.setEnabled(!Config.LOCK_SETTINGS); - mAccountJid.setEnabled(!Config.LOCK_SETTINGS); - mHostname.setEnabled(!Config.LOCK_SETTINGS); - mPort.setEnabled(!Config.LOCK_SETTINGS); - mRegisterNew.setEnabled(!Config.LOCK_SETTINGS); if (!mInitMode) { this.mAvatar.setVisibility(View.VISIBLE); diff --git a/src/main/java/eu/siacs/conversations/ui/ManageAccountActivity.java b/src/main/java/eu/siacs/conversations/ui/ManageAccountActivity.java index b117e55ff..7d3c34252 100644 --- a/src/main/java/eu/siacs/conversations/ui/ManageAccountActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ManageAccountActivity.java @@ -155,9 +155,9 @@ public class ManageAccountActivity extends XmppActivity implements OnAccountUpda addAccount.setVisible(false); addAccountWithCertificate.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS); } else { - addAccount.setVisible(!(Config.LOCK_SETTINGS || Config.SINGLE_ACCOUNT)); + addAccount.setVisible(!Config.SINGLE_ACCOUNT); } - addAccountWithCertificate.setVisible(!(Config.LOCK_SETTINGS || Config.SINGLE_ACCOUNT)); + addAccountWithCertificate.setVisible(!Config.SINGLE_ACCOUNT); return true; } |