diff options
Diffstat (limited to 'src/main/java/de/pixart/messenger/ui')
| -rw-r--r-- | src/main/java/de/pixart/messenger/ui/SettingsActivity.java | 3 | ||||
| -rw-r--r-- | src/main/java/de/pixart/messenger/ui/util/ConversationMenuConfigurator.java | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/SettingsActivity.java b/src/main/java/de/pixart/messenger/ui/SettingsActivity.java index e57030a61..419785ecf 100644 --- a/src/main/java/de/pixart/messenger/ui/SettingsActivity.java +++ b/src/main/java/de/pixart/messenger/ui/SettingsActivity.java @@ -370,6 +370,9 @@ public class SettingsActivity extends XmppActivity implements case "default_off": omemoPreference.setSummary(R.string.pref_omemo_setting_summary_default_off); break; + case "always_off": + omemoPreference.setSummary(R.string.pref_omemo_setting_summary_always_off); + break; } } else { Log.d(Config.LOGTAG, "unable to find preference named " + OMEMO_SETTING); diff --git a/src/main/java/de/pixart/messenger/ui/util/ConversationMenuConfigurator.java b/src/main/java/de/pixart/messenger/ui/util/ConversationMenuConfigurator.java index fd5a5c441..cb4211b1e 100644 --- a/src/main/java/de/pixart/messenger/ui/util/ConversationMenuConfigurator.java +++ b/src/main/java/de/pixart/messenger/ui/util/ConversationMenuConfigurator.java @@ -106,7 +106,7 @@ public class ConversationMenuConfigurator { final int next = conversation.getNextEncryption(); boolean visible; - if (OmemoSetting.isAlways()) { + if (OmemoSetting.isAlways() || OmemoSetting.isNever()) { visible = false; } else if (conversation.getMode() == Conversation.MODE_MULTI) { if (next == Message.ENCRYPTION_NONE && !conversation.isPrivateAndNonAnonymous() && !conversation.getBooleanAttribute(Conversation.ATTRIBUTE_FORMERLY_PRIVATE_NON_ANONYMOUS, false)) { |