sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #89 from dschuermann/fix-otr-message 

Improve OTR fingerprint dialog and fix german sentence
This commit is contained in:
Daniel Gultsch 2014-05-08 20:08:49 +02:00
parent c555a9d03c 8a2da100d5
commit b0a0863ba2
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
res/layout/otr_fingerprint.xml
View File

@ -5,12 +5,20 @@
android:orientation="vertical"
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>

2
res/values-de/strings.xml
View File

@ -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>

3
src/eu/siacs/conversations/ui/ManageAccountActivity.java
View File

@ -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);