aboutsummaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel.gultsch@rwth-aachen.de>2014-02-16 16:32:15 +0100
committerDaniel Gultsch <daniel.gultsch@rwth-aachen.de>2014-02-16 16:32:15 +0100
commit9c7cacdbddf6ba1a34fd56b71718ba4e44e20efa (patch)
treea9f138b3bd8395b3a198235a1c8d559d71347ef4 /res
parent42c4c1789a75c87b67c38ef9ca3f57ddd10f0548 (diff)
show unknown otr fingerprint warining
Diffstat (limited to 'res')
-rw-r--r--res/layout/dialog_verify_otr.xml53
-rw-r--r--res/layout/fragment_conversation.xml30
-rw-r--r--res/menu/encryption_choices.xml17
3 files changed, 100 insertions, 0 deletions
diff --git a/res/layout/dialog_verify_otr.xml b/res/layout/dialog_verify_otr.xml
new file mode 100644
index 000000000..9f389c73a
--- /dev/null
+++ b/res/layout/dialog_verify_otr.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical"
+ android:paddingLeft="8dp">
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingTop="8dp"
+ android:text="Jabber ID"
+ android:textColor="#33B5E5"
+ android:textSize="20sp"/>
+
+ <TextView
+ android:id="@+id/verify_otr_jid"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingLeft="8dp"
+ android:text="julia@jabber.example.com"
+ android:textSize="14sp" />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingTop="8dp"
+ android:text="OTR fingerprint"
+ android:textColor="#33B5E5"
+ android:textSize="20sp"/>
+
+ <TextView
+ android:id="@+id/verify_otr_fingerprint"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingLeft="8dp"
+ android:text="2674D6A0 0B1421B1 BFC42AEC C56F3719 672437D8"
+ android:textSize="14sp" />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingTop="8dp"
+ android:text="Your fingerprint"
+ android:textColor="#33B5E5"
+ android:textSize="20sp"/>
+
+ <TextView
+ android:id="@+id/verify_otr_yourprint"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingLeft="8dp"
+ android:text="2674D6A0 0B1421B1 BFC42AEC C56F3719 672437D8"
+ android:textSize="14sp" />
+</LinearLayout>
diff --git a/res/layout/fragment_conversation.xml b/res/layout/fragment_conversation.xml
index 3b965af28..5db687481 100644
--- a/res/layout/fragment_conversation.xml
+++ b/res/layout/fragment_conversation.xml
@@ -53,5 +53,35 @@
android:transcriptMode="alwaysScroll"
android:listSelector="@android:color/transparent">
</ListView>
+ <LinearLayout
+ android:id="@+id/new_fingerprint"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentTop="true"
+ android:layout_alignTop="@+id/messages_view"
+ android:background="#cc0000"
+ android:orientation="vertical"
+ android:visibility="gone"
+ >
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="Unknown OTR Fingerprint"
+ android:textColor="#eee"
+ android:textStyle="bold"
+ android:padding="8dp"
+ android:textSize="20sp"/>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/otr_fingerprint"
+ android:textColor="#eee"
+ android:text="2674D6A0 0B1421B1 BFC42AEC C56F3719 672437D8"
+ android:paddingLeft="8dp"
+ android:paddingBottom="8dp"
+ android:textSize="14sp"/>
+
+ </LinearLayout>
</RelativeLayout> \ No newline at end of file
diff --git a/res/menu/encryption_choices.xml b/res/menu/encryption_choices.xml
new file mode 100644
index 000000000..ade176548
--- /dev/null
+++ b/res/menu/encryption_choices.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+ <group android:checkableBehavior="single">
+
+<item
+ android:id="@+id/encryption_choice_none"
+ android:title="Plain text"
+ />
+<item
+ android:id="@+id/encryption_choice_otr"
+ android:title="OTR"
+ />
+<item
+ android:id="@+id/encryption_choice_pgp"
+ android:title="OpenPGP"/>
+</group>
+</menu>