X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/a2be11ad54df6e2a71fb8aca2bba2f0f3947bf91..b3147346eb3ee5befbbb1cec025eb4c0892feb7e:/res/layout/ssl_untrusted_cert_layout.xml

diff --git a/res/layout/ssl_untrusted_cert_layout.xml b/res/layout/ssl_untrusted_cert_layout.xml
index e64099a7..813d6771 100644
--- a/res/layout/ssl_untrusted_cert_layout.xml
+++ b/res/layout/ssl_untrusted_cert_layout.xml
@@ -2,7 +2,7 @@
 <!-- 
     ownCloud Android client application
 
-    Copyright (C) 2012-2013 ownCloud Inc.
+    Copyright (C) 2015 ownCloud Inc.
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License version 2,
@@ -24,40 +24,85 @@
     android:orientation="vertical" >
 
 	<TextView
-		android:id="@+id/untrusted_header"
+		android:id="@+id/header"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
+		android:layout_weight="0"
 		android:text="@string/ssl_validator_header"
 		android:padding="5dp"
 		android:textAppearance="?android:attr/textAppearanceMedium"
 		 />
     
 	<TextView
-		android:id="@+id/untrusted_reason_cert_not_trusted"
+		android:id="@+id/reason_cert_not_trusted"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
+		android:layout_weight="0"
 		android:layout_gravity="left"
 		android:paddingLeft="20dp"
 		android:text="@string/ssl_validator_reason_cert_not_trusted"
 		android:textAppearance="?android:attr/textAppearanceSmall"
 		 />
 		
+	
+	<TextView
+		android:id="@+id/reason_cert_expired"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_gravity="left"
+		android:paddingLeft="20dp"
+		android:text="@string/ssl_validator_reason_cert_expired"
+		android:textAppearance="?android:attr/textAppearanceSmall"
+		 />
+	
+	<TextView
+		android:id="@+id/reason_cert_not_yet_valid"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_gravity="left"
+		android:paddingLeft="20dp"
+		android:text="@string/ssl_validator_reason_cert_not_yet_valid"
+		android:textAppearance="?android:attr/textAppearanceSmall"
+		 />
+		
+	<TextView
+		android:id="@+id/reason_hostname_not_verified"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_gravity="left"
+		android:paddingLeft="20dp"
+		android:text="@string/ssl_validator_reason_hostname_not_verified"
+		android:textAppearance="?android:attr/textAppearanceSmall"
+		 />
+	
+	<TextView
+		android:id="@+id/reason_no_info_about_error"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_gravity="left"
+		android:paddingLeft="20dp"
+		android:text="@string/ssl_validator_no_info_about_error"
+		android:textAppearance="?android:attr/textAppearanceSmall"
+		 />
+	
     <ScrollView 
-        android:id="@+id/untrusted_details_scroll"
+        android:id="@+id/details_scroll"
         android:visibility="gone" 
     	android:padding="20dp"
         android:layout_width="match_parent"
-        android:layout_height="180dp">
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        >
         
 		<LinearLayout 
-    		android:id="@+id/untrusted_details_view"
+    		android:id="@+id/details_view"
     		android:layout_width="wrap_content"
     		android:layout_height="wrap_content"
     		android:gravity="left"
     		android:orientation="vertical" >
     			
 		    <TextView
-		        android:id="@+id/untrusted_null_cert"
+		        android:id="@+id/null_cert"
 		        android:layout_width="wrap_content"
 		        android:layout_height="wrap_content"
 		        android:layout_gravity="left"
@@ -66,7 +111,7 @@
 		        android:textAppearance="?android:attr/textAppearanceSmall" />
 
 				<TextView
-        			android:id="@+id/untrusted_label_subject"
+        			android:id="@+id/label_subject"
         			android:layout_width="wrap_content"
         			android:layout_height="wrap_content"
 					android:paddingBottom="5dp"
@@ -75,7 +120,7 @@
         		/>
 				
 				<TextView
-				    android:id="@+id/untrusted_label_subject_CN"
+				    android:id="@+id/label_subject_CN"
 				    android:layout_width="wrap_content"
 				    android:layout_height="wrap_content"
 				    android:text="@string/ssl_validator_label_CN"
@@ -83,7 +128,7 @@
 				/>
 			    
 				<TextView
-				    android:id="@+id/untrusted_value_subject_CN"
+				    android:id="@+id/value_subject_CN"
 				    android:layout_width="wrap_content"
 				    android:layout_height="wrap_content"
 				    android:paddingBottom="5dp"
@@ -92,7 +137,7 @@
 				/>
 				
 				<TextView
-				    android:id="@+id/untrusted_label_subject_O"
+				    android:id="@+id/label_subject_O"
 				    android:layout_width="wrap_content"
 				    android:layout_height="wrap_content"
 				    android:text="@string/ssl_validator_label_O"
@@ -100,7 +145,7 @@
 				/>
 			    
 				<TextView
-				    android:id="@+id/untrusted_value_subject_O"
+				    android:id="@+id/value_subject_O"
 				    android:layout_width="wrap_content"
 				    android:layout_height="wrap_content"
 				    android:paddingBottom="5dp"
@@ -109,7 +154,7 @@
 				/>
 				
 				<TextView
-				    android:id="@+id/untrusted_label_subject_OU"
+				    android:id="@+id/label_subject_OU"
 				    android:layout_width="wrap_content"
 				    android:layout_height="wrap_content"
 				    android:text="@string/ssl_validator_label_OU"
@@ -117,7 +162,7 @@
 				/>
 			    
 				<TextView
-				    android:id="@+id/untrusted_value_subject_OU"
+				    android:id="@+id/value_subject_OU"
 				    android:layout_width="wrap_content"
 				    android:layout_height="wrap_content"
 				    android:paddingBottom="5dp"
@@ -126,7 +171,7 @@
 				/>
 				
 				<TextView
-				    android:id="@+id/untrusted_label_subject_ST"
+				    android:id="@+id/label_subject_ST"
 				    android:layout_width="wrap_content"
 				    android:layout_height="wrap_content"
 				    android:text="@string/ssl_validator_label_ST"
@@ -134,7 +179,7 @@
 				/>
 			    
 				<TextView
-				    android:id="@+id/untrusted_value_subject_ST"
+				    android:id="@+id/value_subject_ST"
 				    android:layout_width="wrap_content"
 				    android:layout_height="wrap_content"
 				    android:paddingBottom="5dp"
@@ -143,7 +188,7 @@
 				/>
 
 				<TextView
-				    android:id="@+id/untrusted_label_subject_C"
+				    android:id="@+id/label_subject_C"
 				    android:layout_width="wrap_content"
 				    android:layout_height="wrap_content"
 				    android:text="@string/ssl_validator_label_C"
@@ -151,7 +196,7 @@
 				/>
 				
 				<TextView
-				    android:id="@+id/untrusted_value_subject_C"
+				    android:id="@+id/value_subject_C"
 				    android:layout_width="wrap_content"
 				    android:layout_height="wrap_content"
 				    android:paddingBottom="5dp"
@@ -160,7 +205,7 @@
 				/>
 				
 				<TextView
-				    android:id="@+id/untrusted_label_subject_L"
+				    android:id="@+id/label_subject_L"
 				    android:layout_width="wrap_content"
 				    android:layout_height="wrap_content"
 				    android:text="@string/ssl_validator_label_L"
@@ -168,7 +213,7 @@
 				/>
 			    
 				<TextView
-				    android:id="@+id/untrusted_value_subject_L"
+				    android:id="@+id/value_subject_L"
 				    android:layout_width="wrap_content"
 				    android:layout_height="wrap_content"
 				    android:paddingBottom="5dp"
@@ -178,7 +223,7 @@
 			    
 
 				<TextView
-        			android:id="@+id/untrusted_label_issuer"
+        			android:id="@+id/label_issuer"
         			android:layout_width="wrap_content"
         			android:layout_height="wrap_content"
 					android:paddingBottom="5dp"
@@ -187,7 +232,7 @@
         		/>
 				
 				<TextView
-				    android:id="@+id/untrusted_label_issuer_CN"
+				    android:id="@+id/label_issuer_CN"
 				    android:layout_width="wrap_content"
 				    android:layout_height="wrap_content"
 				    android:text="@string/ssl_validator_label_CN"
@@ -195,7 +240,7 @@
 				/>
 			    
 				<TextView
-				    android:id="@+id/untrusted_value_issuer_CN"
+				    android:id="@+id/value_issuer_CN"
 				    android:layout_width="wrap_content"
 				    android:layout_height="wrap_content"
 				    android:paddingBottom="5dp"
@@ -204,7 +249,7 @@
 				/>
 				
 				<TextView
-				    android:id="@+id/untrusted_label_issuer_O"
+				    android:id="@+id/label_issuer_O"
 				    android:layout_width="wrap_content"
 				    android:layout_height="wrap_content"
 				    android:text="@string/ssl_validator_label_O"
@@ -212,7 +257,7 @@
 				/>
 			    
 				<TextView
-				    android:id="@+id/untrusted_value_issuer_O"
+				    android:id="@+id/value_issuer_O"
 				    android:layout_width="wrap_content"
 				    android:layout_height="wrap_content"
 				    android:paddingBottom="5dp"
@@ -221,7 +266,7 @@
 				/>
 				
 				<TextView
-				    android:id="@+id/untrusted_label_issuer_OU"
+				    android:id="@+id/label_issuer_OU"
 				    android:layout_width="wrap_content"
 				    android:layout_height="wrap_content"
 				    android:text="@string/ssl_validator_label_OU"
@@ -229,7 +274,7 @@
 				/>
 			    
 				<TextView
-				    android:id="@+id/untrusted_value_issuer_OU"
+				    android:id="@+id/value_issuer_OU"
 				    android:layout_width="wrap_content"
 				    android:layout_height="wrap_content"
 				    android:paddingBottom="5dp"
@@ -238,7 +283,7 @@
 				/>
 				
 				<TextView
-				    android:id="@+id/untrusted_label_issuer_ST"
+				    android:id="@+id/label_issuer_ST"
 				    android:layout_width="wrap_content"
 				    android:layout_height="wrap_content"
 				    android:text="@string/ssl_validator_label_ST"
@@ -246,7 +291,7 @@
 				/>
 			    
 				<TextView
-				    android:id="@+id/untrusted_value_issuer_ST"
+				    android:id="@+id/value_issuer_ST"
 				    android:layout_width="wrap_content"
 				    android:layout_height="wrap_content"
 				    android:paddingBottom="5dp"
@@ -255,7 +300,7 @@
 				/>
 
 				<TextView
-				    android:id="@+id/untrusted_label_issuer_C"
+				    android:id="@+id/label_issuer_C"
 				    android:layout_width="wrap_content"
 				    android:layout_height="wrap_content"
 				    android:text="@string/ssl_validator_label_C"
@@ -263,7 +308,7 @@
 				/>
 				
 				<TextView
-				    android:id="@+id/untrusted_value_issuer_C"
+				    android:id="@+id/value_issuer_C"
 				    android:layout_width="wrap_content"
 				    android:layout_height="wrap_content"
 				    android:paddingBottom="5dp"
@@ -272,7 +317,7 @@
 				/>
 				
 				<TextView
-				    android:id="@+id/untrusted_label_issuer_L"
+				    android:id="@+id/label_issuer_L"
 				    android:layout_width="wrap_content"
 				    android:layout_height="wrap_content"
 				    android:text="@string/ssl_validator_label_L"
@@ -280,7 +325,7 @@
 				/>
 			    
 				<TextView
-				    android:id="@+id/untrusted_value_issuer_L"
+				    android:id="@+id/value_issuer_L"
 				    android:layout_width="wrap_content"
 				    android:layout_height="wrap_content"
 				    android:paddingBottom="5dp"
@@ -289,7 +334,7 @@
 				/>
 			    
 				<TextView
-        			android:id="@+id/untrusted_label_validity"
+        			android:id="@+id/label_validity"
         			android:layout_width="wrap_content"
         			android:layout_height="wrap_content"
 					android:paddingBottom="5dp"
@@ -298,7 +343,7 @@
         		/>
 				
 				<TextView
-				    android:id="@+id/untrusted_label_validity_from"
+				    android:id="@+id/label_validity_from"
 				    android:layout_width="wrap_content"
 				    android:layout_height="wrap_content"
 				    android:text="@string/ssl_validator_label_validity_from"
@@ -306,7 +351,7 @@
 				/>
 			    
 				<TextView
-				    android:id="@+id/untrusted_value_validity_from"
+				    android:id="@+id/value_validity_from"
 				    android:layout_width="wrap_content"
 				    android:layout_height="wrap_content"
 				    android:paddingBottom="5dp"
@@ -315,7 +360,7 @@
 				/>
 				
 				<TextView
-				    android:id="@+id/untrusted_label_validity_to"
+				    android:id="@+id/label_validity_to"
 				    android:layout_width="wrap_content"
 				    android:layout_height="wrap_content"
 				    android:text="@string/ssl_validator_label_validity_to"
@@ -323,7 +368,7 @@
 				/>
 			    
 				<TextView
-				    android:id="@+id/untrusted_value_validity_to"
+				    android:id="@+id/value_validity_to"
 				    android:layout_width="wrap_content"
 				    android:layout_height="wrap_content"
 				    android:paddingBottom="5dp"
@@ -333,7 +378,7 @@
 				
 
 				<TextView
-        			android:id="@+id/untrusted_label_signature"
+        			android:id="@+id/label_signature"
         			android:layout_width="wrap_content"
         			android:layout_height="wrap_content"
 					android:paddingBottom="5dp"
@@ -342,7 +387,7 @@
         		/>
 				
 				<TextView
-        			android:id="@+id/untrusted_label_signature_algorithm"
+        			android:id="@+id/label_signature_algorithm"
         			android:layout_width="wrap_content"
         			android:layout_height="wrap_content"
         			android:text="@string/ssl_validator_label_signature_algorithm"
@@ -350,7 +395,7 @@
         		/>
 				
 				<TextView
-        			android:id="@+id/untrusted_value_signature_algorithm"
+        			android:id="@+id/value_signature_algorithm"
         			android:layout_width="wrap_content"
         			android:layout_height="wrap_content"
 					android:paddingBottom="5dp"
@@ -360,7 +405,7 @@
 																								
 								
 				<TextView
-        			android:id="@+id/untrusted_value_signature"
+        			android:id="@+id/value_signature"
         			android:layout_width="wrap_content"
         			android:layout_height="wrap_content"
 					android:paddingBottom="5dp"
@@ -373,9 +418,10 @@
     </ScrollView>
 	
 	<TextView
-        android:id="@+id/untrusted_question"
+        android:id="@+id/question"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+		android:layout_weight="0"
 		android:padding="5dp"
         android:text="@string/ssl_validator_question"
         android:textAppearance="?android:attr/textAppearanceMedium"
@@ -385,24 +431,25 @@
 	<LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+		android:layout_weight="0"
         android:gravity="center" >
 
         <Button
-            android:id="@+id/untrusted_cancel"
+            android:id="@+id/cancel"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:text="@string/common_cancel" />
 
         <Button
-            android:id="@+id/untrusted_details_btn"
+            android:id="@+id/details_btn"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:text="@string/ssl_validator_btn_details_see" />
 
         <Button
-            android:id="@+id/untrusted_ok"
+            android:id="@+id/ok"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"