narayana/anotherim
narayana/anotherim
3
2
Fork 0
Code Issues 3 Pull requests 1 Actions Packages Projects Releases 6 Wiki Activity

use 'partial' in server info if publish-options is n/a

Browse source 
fixes #2621
This commit is contained in:
Daniel Gultsch 2017-09-09 13:34:44 +02:00
parent 39ad17b8d3
commit 5cc92acbee
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
View file

@ -912,12 +912,14 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
} else { } else {
this.mServerInfoSm.setText(R.string.server_info_unavailable); this.mServerInfoSm.setText(R.string.server_info_unavailable);
} }
if (features.pep() && features.pepPublishOptions()) { if (features.pep()) {
AxolotlService axolotlService = this.mAccount.getAxolotlService(); AxolotlService axolotlService = this.mAccount.getAxolotlService();
if (axolotlService != null && axolotlService.isPepBroken()) { if (axolotlService != null && axolotlService.isPepBroken()) {
this.mServerInfoPep.setText(R.string.server_info_broken); this.mServerInfoPep.setText(R.string.server_info_broken);
} else { } else if (features.pepPublishOptions()) {
this.mServerInfoPep.setText(R.string.server_info_available); this.mServerInfoPep.setText(R.string.server_info_available);
} else {
this.mServerInfoPep.setText(R.string.server_info_partial);
} }
} else { } else {
this.mServerInfoPep.setText(R.string.server_info_unavailable); this.mServerInfoPep.setText(R.string.server_info_unavailable);

1
src/main/res/values/strings.xml
View file

@ -761,4 +761,5 @@
<string name="pref_validate_hostname_summary">Server certificates that contain the validated hostname are considered verified</string> <string name="pref_validate_hostname_summary">Server certificates that contain the validated hostname are considered verified</string>
<string name="network_is_unreachable">Network is unreachable</string> <string name="network_is_unreachable">Network is unreachable</string>
<string name="certificate_does_not_contain_jid">Certificate does not contain a Jabber ID</string> <string name="certificate_does_not_contain_jid">Certificate does not contain a Jabber ID</string>
<string name="server_info_partial">partial</string>
</resources> </resources>