From 9e0466d1e643c07d1c3de088ddf2e5655899a50c Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Mon, 29 Feb 2016 13:18:07 +0100
Subject: refactored omemo to take multiple recipients

---
 src/main/res/layout/activity_trust_keys.xml | 29 +++------------------------
 src/main/res/layout/keys_card.xml           | 31 +++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 26 deletions(-)
 create mode 100644 src/main/res/layout/keys_card.xml

(limited to 'src/main/res/layout')

diff --git a/src/main/res/layout/activity_trust_keys.xml b/src/main/res/layout/activity_trust_keys.xml
index 6f8a1bc9..d7bb7628 100644
--- a/src/main/res/layout/activity_trust_keys.xml
+++ b/src/main/res/layout/activity_trust_keys.xml
@@ -80,34 +80,11 @@
             </LinearLayout>
 
             <LinearLayout
-                android:id="@+id/foreign_keys_card"
+                android:id="@+id/foreign_keys"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/activity_horizontal_margin"
-                android:layout_marginRight="@dimen/activity_horizontal_margin"
-                android:layout_marginTop="@dimen/activity_vertical_margin"
-                android:layout_marginBottom="@dimen/activity_vertical_margin"
-                android:background="@drawable/infocard_border"
-                android:orientation="vertical"
-                android:padding="@dimen/infocard_padding"
-                android:visibility="gone">
-
-                <TextView
-                    android:id="@+id/foreign_keys_title"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textColor="@color/black87"
-                    android:textSize="?attr/TextSizeHeadline"
-                    android:textStyle="bold"/>
-
-                <LinearLayout
-                    android:id="@+id/foreign_keys_details"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:divider="?android:dividerHorizontal"
-                    android:showDividers="middle"
-                    android:orientation="vertical">
-                </LinearLayout>
+                android:visibility="gone"
+                android:orientation="vertical">
 
             </LinearLayout>
 
diff --git a/src/main/res/layout/keys_card.xml b/src/main/res/layout/keys_card.xml
new file mode 100644
index 00000000..7a502816
--- /dev/null
+++ b/src/main/res/layout/keys_card.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+android:id="@+id/foreign_keys_card"
+android:layout_width="fill_parent"
+android:layout_height="wrap_content"
+android:layout_marginLeft="@dimen/activity_horizontal_margin"
+android:layout_marginRight="@dimen/activity_horizontal_margin"
+android:layout_marginTop="@dimen/activity_vertical_margin"
+android:layout_marginBottom="@dimen/activity_vertical_margin"
+android:background="@drawable/infocard_border"
+android:orientation="vertical"
+android:padding="@dimen/infocard_padding">
+
+<TextView
+    android:id="@+id/foreign_keys_title"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:textColor="@color/black87"
+    android:textSize="?attr/TextSizeHeadline"
+    android:textStyle="bold"/>
+
+<LinearLayout
+    android:id="@+id/foreign_keys_details"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:divider="?android:dividerHorizontal"
+    android:showDividers="middle"
+    android:orientation="vertical">
+</LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From 198dc2c6b444671ec71deb10fbbaaced6e03dced Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Tue, 1 Mar 2016 11:26:59 +0100
Subject: let users confirm each member in a conference even if that contact is
 already trusted

---
 src/main/res/layout/keys_card.xml | 60 ++++++++++++++++++++++-----------------
 1 file changed, 34 insertions(+), 26 deletions(-)

(limited to 'src/main/res/layout')

diff --git a/src/main/res/layout/keys_card.xml b/src/main/res/layout/keys_card.xml
index 7a502816..d3271d1b 100644
--- a/src/main/res/layout/keys_card.xml
+++ b/src/main/res/layout/keys_card.xml
@@ -1,31 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-android:id="@+id/foreign_keys_card"
-android:layout_width="fill_parent"
-android:layout_height="wrap_content"
-android:layout_marginLeft="@dimen/activity_horizontal_margin"
-android:layout_marginRight="@dimen/activity_horizontal_margin"
-android:layout_marginTop="@dimen/activity_vertical_margin"
-android:layout_marginBottom="@dimen/activity_vertical_margin"
-android:background="@drawable/infocard_border"
-android:orientation="vertical"
-android:padding="@dimen/infocard_padding">
+<LinearLayout android:id="@+id/foreign_keys_card"
+              xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="fill_parent"
+              android:layout_height="wrap_content"
+              android:layout_marginBottom="@dimen/activity_vertical_margin"
+              android:layout_marginLeft="@dimen/activity_horizontal_margin"
+              android:layout_marginRight="@dimen/activity_horizontal_margin"
+              android:layout_marginTop="@dimen/activity_vertical_margin"
+              android:background="@drawable/infocard_border"
+              android:orientation="vertical"
+              android:padding="@dimen/infocard_padding">
 
-<TextView
-    android:id="@+id/foreign_keys_title"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:textColor="@color/black87"
-    android:textSize="?attr/TextSizeHeadline"
-    android:textStyle="bold"/>
+    <TextView
+        android:id="@+id/foreign_keys_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textColor="@color/black87"
+        android:textSize="?attr/TextSizeHeadline"
+        android:textStyle="bold"/>
 
-<LinearLayout
-    android:id="@+id/foreign_keys_details"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:divider="?android:dividerHorizontal"
-    android:showDividers="middle"
-    android:orientation="vertical">
-</LinearLayout>
+    <LinearLayout
+        android:id="@+id/foreign_keys_details"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:divider="?android:dividerHorizontal"
+        android:orientation="vertical"
+        android:showDividers="middle">
+    </LinearLayout>
 
+    <TextView
+        android:layout_marginTop="8dp"
+        android:id="@+id/no_keys_to_accept"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textColor="@color/black87"
+        android:text="@string/no_keys_just_confirm"
+        android:textSize="?attr/TextSizeBody"/>
 </LinearLayout>
\ No newline at end of file
-- 
cgit v1.2.3