aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2017-09-17 19:19:37 +0200
committerChristian Schneppe <christian@pix-art.de>2017-09-17 19:19:37 +0200
commit4382741b12085debcd29260e8cfab6e0603d6c01 (patch)
treeb8e4895aff4f000c8d3dcdabaad2cf517d267b33 /src
parent9cc393d0015c4a18b919bf71961627706c961b59 (diff)
use 'partial' in server info if publish-options is n/a
Diffstat (limited to 'src')
-rw-r--r--src/main/java/de/pixart/messenger/ui/EditAccountActivity.java6
-rw-r--r--src/main/res/values-de/strings.xml1
-rw-r--r--src/main/res/values/strings.xml1
3 files changed, 6 insertions, 2 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java b/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java
index dc8b12f57..a7b0d994a 100644
--- a/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java
@@ -949,12 +949,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-de/strings.xml b/src/main/res/values-de/strings.xml
index 78ae511f5..f615049f0 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -737,5 +737,6 @@
<string name="error_no_keys_to_trust_presence">Für diesen Kontakt sind keine benutzbaren Schlüssel verfügbar.\\nStelle sicher, dass du den gegenseitigen Online-Status aktiviert hast.</string>
<string name="mark_as_read">Als gelesen markieren</string>
<string name="network_is_unreachable">Netzwerk nicht verfügbar</string>
+ <string name="server_info_partial">teilweise</string>
</resources>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 8121ea382..481337cb9 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -785,4 +785,5 @@
<string name="certificate_does_not_contain_jid">Certificate does not contain a Jabber ID</string>
<string name="error_no_keys_to_trust_presence">There are no usable keys available for this contact.\\nMake sure you have mutual presence subscription.</string>
<string name="mark_as_read">Mark as read</string>
+ <string name="server_info_partial">partial</string>
</resources>