aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu/siacs/conversations
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2014-05-08 20:08:49 +0200
committerDaniel Gultsch <daniel@gultsch.de>2014-05-08 20:08:49 +0200
commitb0a0863ba2c23023b0b04d813b1dc30bd638735e (patch)
tree8d1053881da79d2295dbe2ade529df0079f3742e /src/eu/siacs/conversations
parentc555a9d03c25407be43b114d74edd6f2c1587300 (diff)
parent8a2da100d5fd673e2f5160920f15ac2fffaa8e77 (diff)
Merge pull request #89 from dschuermann/fix-otr-message
Improve OTR fingerprint dialog and fix german sentence
Diffstat (limited to 'src/eu/siacs/conversations')
-rw-r--r--src/eu/siacs/conversations/ui/ManageAccountActivity.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/eu/siacs/conversations/ui/ManageAccountActivity.java b/src/eu/siacs/conversations/ui/ManageAccountActivity.java
index 8fefa272..0a1cb5cd 100644
--- a/src/eu/siacs/conversations/ui/ManageAccountActivity.java
+++ b/src/eu/siacs/conversations/ui/ManageAccountActivity.java
@@ -288,7 +288,10 @@ public class ManageAccountActivity extends XmppActivity {
View view = (View) getLayoutInflater().inflate(R.layout.otr_fingerprint, null);
if (fingerprintTxt!=null) {
TextView fingerprint = (TextView) view.findViewById(R.id.otr_fingerprint);
+ TextView noFingerprintView = (TextView) view.findViewById(R.id.otr_no_fingerprint);
fingerprint.setText(fingerprintTxt);
+ fingerprint.setVisibility(View.VISIBLE);
+ noFingerprintView.setVisibility(View.GONE);
}
builder.setView(view);
builder.setPositiveButton("Done", null);