aboutsummaryrefslogtreecommitdiffstats
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
parentc555a9d03c25407be43b114d74edd6f2c1587300 (diff)
parent8a2da100d5fd673e2f5160920f15ac2fffaa8e77 (diff)
Merge pull request #89 from dschuermann/fix-otr-message
Improve OTR fingerprint dialog and fix german sentence
-rw-r--r--res/layout/otr_fingerprint.xml10
-rw-r--r--res/values-de/strings.xml2
-rw-r--r--src/eu/siacs/conversations/ui/ManageAccountActivity.java3
3 files changed, 13 insertions, 2 deletions
diff --git a/res/layout/otr_fingerprint.xml b/res/layout/otr_fingerprint.xml
index 666dadcd..b9eafca4 100644
--- a/res/layout/otr_fingerprint.xml
+++ b/res/layout/otr_fingerprint.xml
@@ -6,11 +6,19 @@
android:padding="8dp">
<TextView
+ android:id="@+id/otr_no_fingerprint"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textSize="20sp"
+ android:text="@string/no_otr_fingerprint"
+ android:visibility="visible"/>
+
+ <TextView
android:id="@+id/otr_fingerprint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="20sp"
android:typeface="monospace"
- android:text="@string/no_otr_fingerprint"/>
+ android:visibility="gone"/>
</LinearLayout>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index ac33ac3b..c6209625 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -28,7 +28,7 @@
<string name="share_with">Teile mit&#8230;</string>
<string name="ask_again"><u>Klick um noch einmal zu fragen</u></string>
<string name="show_otr_key">OTR Fingerabdruck</string>
- <string name="no_otr_fingerprint">Es wurde noch kein OTR Fingerabdruck erzeugt. Beginne einfach eine verschlüsselte Unterhaltung an.</string>
+ <string name="no_otr_fingerprint">Es wurde noch kein OTR-Fingerabdruck erzeugt. Beginne einfach eine verschlüsselte Unterhaltung um einen Fingerabdruck zu erzeugen.</string>
<string name="start_conversation">Beginne Unterhaltung</string>
<string name="invite_contacts">Kontakte einladen</string>
<string name="invite_contacts_to_existing">Lade zu bestehender Konferenz ein</string>
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);