diff options
| author | Christian Schneppe <christian@pix-art.de> | 2016-06-02 21:16:04 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2016-06-02 21:16:04 +0200 |
| commit | 124aab11c5cf8fce408d97ccdc28d4aae3f33663 (patch) | |
| tree | 00cfbeb67955892c4a9937672b13d1b452f5a0f8 /src | |
| parent | 1ea3287d6faec8b336a54eb83a302ea725681687 (diff) | |
| parent | 594aab56dbffab5eec5d922f30cec3262752ceb4 (diff) | |
Merge remote-tracking branch 'refs/remotes/siacs/master'
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java index 08cf161e5..dee356c81 100644 --- a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java @@ -521,7 +521,7 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate } mamPrefs.setVisible(mAccount.getXmppConnection().getFeatures().mam()); Set<Integer> otherDevices = mAccount.getAxolotlService().getOwnDeviceIds(); - if (otherDevices == null || otherDevices.isEmpty() || Config.supportOmemo()) { + if (otherDevices == null || otherDevices.isEmpty() || !Config.supportOmemo()) { clearDevices.setVisible(false); } changePresence.setVisible(manuallyChangePresence()); |