From 5cc92acbee251dd4eafcae07b34b0027a5fee001 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Sat, 9 Sep 2017 13:34:44 +0200 Subject: [PATCH] use 'partial' in server info if publish-options is n/a fixes #2621 --- .../java/eu/siacs/conversations/ui/EditAccountActivity.java | 6 ++++-- src/main/res/values/strings.xml | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java index 88859f405..5d1b6cd86 100644 --- a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java @@ -912,12 +912,14 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat } else { this.mServerInfoSm.setText(R.string.server_info_unavailable); } - if (features.pep() && features.pepPublishOptions()) { + if (features.pep()) { AxolotlService axolotlService = this.mAccount.getAxolotlService(); if (axolotlService != null && axolotlService.isPepBroken()) { this.mServerInfoPep.setText(R.string.server_info_broken); - } else { + } else if (features.pepPublishOptions()) { this.mServerInfoPep.setText(R.string.server_info_available); + } else { + this.mServerInfoPep.setText(R.string.server_info_partial); } } else { this.mServerInfoPep.setText(R.string.server_info_unavailable); diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index cc5448b20..9c3575fdf 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -761,4 +761,5 @@ Server certificates that contain the validated hostname are considered verified Network is unreachable Certificate does not contain a Jabber ID + partial