Usage reflection to use Android Bouncycastle to print Subject DN, also display CN in the basic settings screen

--HG--
extra : rebase_source : 6cff9134e9f0bd0e5261edd7ac0b4139b1580d3b

1 files changed, 40 insertions, 27 deletions

diff --git a/res/layout/keystore_selector.xml b/res/layout/keystore_selector.xml
index 211e977b..28a51836 100644
--- a/res/layout/keystore_selector.xml
+++ b/res/layout/keystore_selector.xml
@@ -17,39 +17,52 @@
 
 <!-- A layout to select a certificate, akin to a file selector on web pages. -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_margin="8dip"
-    android:gravity="center_vertical" >
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="8dip"
+                android:gravity="center_vertical">
 
     <Button
-        android:id="@+id/select_keystore_button"
-        style="@style/accountSetupButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
-        android:text="@string/select" />
+            android:id="@+id/select_keystore_button"
+            style="@style/accountSetupButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:text="@string/select"/>
 
     <TextView
-        android:id="@+id/title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentTop="true"
-        android:layout_toLeftOf="@+id/select_keystore_button"
-        android:textStyle="bold" />
+            android:id="@+id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentTop="true"
+            android:layout_toLeftOf="@+id/select_keystore_button"
+            android:text="@string/client_certificate_title"
+            android:textStyle="bold"/>
 
     <TextView
-        android:id="@+id/aliasname"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:layout_below="@+id/title"
-        android:layout_marginLeft="16dip"
-        android:layout_toLeftOf="@+id/select_keystore_button"
-        android:ellipsize="end"
-        android:singleLine="true"
-        android:text="@string/no_certificate" />
+            android:id="@+id/aliasname"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:layout_below="@+id/title"
+            android:layout_marginLeft="16dip"
+            android:layout_toLeftOf="@+id/select_keystore_button"
+            android:ellipsize="end"
+            android:singleLine="true"
+            android:text="@string/no_certificate"/>
+
+    <TextView
+            android:id="@+id/alias_certificate"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:layout_marginLeft="16dip"
+            android:layout_below="@id/aliasname"
+            android:layout_toLeftOf="@+id/select_keystore_button"
+            android:ellipsize="end"
+            android:singleLine="true"
+            />
     <!-- android:textColor="@color/text_secondary_color" -->
 
 </RelativeLayout>
\ No newline at end of file