Merge branch 'add_ssl_warning_dialog_for_devices_without_access_to_X509Certificte_in_...

[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / dialog / SslUntrustedCertDialogForEmptySslError.java

diff --git a/src/com/owncloud/android/ui/dialog/SslUntrustedCertDialogForEmptySslError.java b/src/com/owncloud/android/ui/dialog/SslUntrustedCertDialogForEmptySslError.java
index 3bc2897..7495ba5 100644 (file)
--- a/src/com/owncloud/android/ui/dialog/SslUntrustedCertDialogForEmptySslError.java
+++ b/src/com/owncloud/android/ui/dialog/SslUntrustedCertDialogForEmptySslError.java
@@ -114,7 +114,7 @@ public class SslUntrustedCertDialogForEmptySslError extends SslUntrustedCertDial
             ((ViewGroup)mView.getParent()).removeView(mView);
         }
         
-        Button ok = (Button) mView.findViewById(R.id.untrusted_ok);
+        Button ok = (Button) mView.findViewById(R.id.ok);
         ok.setOnClickListener(new OnClickListener() {
             
             @Override
@@ -125,7 +125,7 @@ public class SslUntrustedCertDialogForEmptySslError extends SslUntrustedCertDial
             }
         });
         
-        Button cancel = (Button) mView.findViewById(R.id.untrusted_cancel);
+        Button cancel = (Button) mView.findViewById(R.id.cancel);
         cancel.setOnClickListener(new OnClickListener() {
             
             @Override
@@ -137,11 +137,11 @@ public class SslUntrustedCertDialogForEmptySslError extends SslUntrustedCertDial
             }
         });
         
-        Button details = (Button) mView.findViewById(R.id.untrusted_details_btn);
+        Button details = (Button) mView.findViewById(R.id.details_btn);
         details.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {
-                View detailsScroll = mView.findViewById(R.id.untrusted_details_scroll);
+                View detailsScroll = mView.findViewById(R.id.details_scroll);
                 if (detailsScroll.getVisibility() == View.VISIBLE) {
                     detailsScroll.setVisibility(View.GONE);
                     ((Button) v).setText(R.string.ssl_validator_btn_details_see);
@@ -172,7 +172,7 @@ public class SslUntrustedCertDialogForEmptySslError extends SslUntrustedCertDial
     }
     
     private void showCertificateData() {
-        TextView nullCerView = (TextView) mView.findViewById(R.id.untrusted_null_cert);
+        TextView nullCerView = (TextView) mView.findViewById(R.id.null_cert);
         SslCertificate cert = mError.getCertificate();
         if (cert != null) {
             nullCerView.setVisibility(View.GONE);
@@ -187,8 +187,8 @@ public class SslUntrustedCertDialogForEmptySslError extends SslUntrustedCertDial
     }
     
     private void showValidity(Date notBefore, Date notAfter) {
-        TextView fromView = ((TextView)mView.findViewById(R.id.untrusted_value_validity_from));
-        TextView toView = ((TextView)mView.findViewById(R.id.untrusted_value_validity_to));
+        TextView fromView = ((TextView)mView.findViewById(R.id.value_validity_from));
+        TextView toView = ((TextView)mView.findViewById(R.id.value_validity_to));
         DateFormat dateFormat = DateFormat.getDateInstance();
         fromView.setText(dateFormat.format(notBefore));
         toView.setText(dateFormat.format(notAfter));
@@ -196,55 +196,55 @@ public class SslUntrustedCertDialogForEmptySslError extends SslUntrustedCertDial
 
     
     private void showSubject(SslCertificate.DName subject) {
-        TextView cnView = ((TextView)mView.findViewById(R.id.untrusted_value_subject_CN));
+        TextView cnView = ((TextView)mView.findViewById(R.id.value_subject_CN));
         cnView.setText(subject.getCName());
         cnView.setVisibility(View.VISIBLE);
         
-        TextView oView = ((TextView)mView.findViewById(R.id.untrusted_value_subject_O));
+        TextView oView = ((TextView)mView.findViewById(R.id.value_subject_O));
         oView.setText(subject.getOName());
         oView.setVisibility(View.VISIBLE);
         
-        TextView ouView = ((TextView)mView.findViewById(R.id.untrusted_value_subject_OU));
+        TextView ouView = ((TextView)mView.findViewById(R.id.value_subject_OU));
         ouView.setText(subject.getUName());
         ouView.setVisibility(View.VISIBLE);
 
         // SslCertificates don't offer this information
-        ((TextView)mView.findViewById(R.id.untrusted_value_subject_C)).setVisibility(View.GONE);
-        ((TextView)mView.findViewById(R.id.untrusted_value_subject_ST)).setVisibility(View.GONE);
-        ((TextView)mView.findViewById(R.id.untrusted_value_subject_L)).setVisibility(View.GONE);
-        ((TextView)mView.findViewById(R.id.untrusted_label_subject_C)).setVisibility(View.GONE);
-        ((TextView)mView.findViewById(R.id.untrusted_label_subject_ST)).setVisibility(View.GONE);
-        ((TextView)mView.findViewById(R.id.untrusted_label_subject_L)).setVisibility(View.GONE);
+        ((TextView)mView.findViewById(R.id.value_subject_C)).setVisibility(View.GONE);
+        ((TextView)mView.findViewById(R.id.value_subject_ST)).setVisibility(View.GONE);
+        ((TextView)mView.findViewById(R.id.value_subject_L)).setVisibility(View.GONE);
+        ((TextView)mView.findViewById(R.id.label_subject_C)).setVisibility(View.GONE);
+        ((TextView)mView.findViewById(R.id.label_subject_ST)).setVisibility(View.GONE);
+        ((TextView)mView.findViewById(R.id.label_subject_L)).setVisibility(View.GONE);
     }
     
     
     private void showIssuer(SslCertificate.DName issuer) {
-        TextView cnView = ((TextView)mView.findViewById(R.id.untrusted_value_issuer_CN));
+        TextView cnView = ((TextView)mView.findViewById(R.id.value_issuer_CN));
         cnView.setText(issuer.getCName());
         cnView.setVisibility(View.VISIBLE);
         
-        TextView oView = ((TextView)mView.findViewById(R.id.untrusted_value_issuer_O));
+        TextView oView = ((TextView)mView.findViewById(R.id.value_issuer_O));
         oView.setText(issuer.getOName());
         oView.setVisibility(View.VISIBLE);
 
-        TextView ouView = ((TextView)mView.findViewById(R.id.untrusted_value_issuer_OU));
+        TextView ouView = ((TextView)mView.findViewById(R.id.value_issuer_OU));
         ouView.setText(issuer.getUName());
         ouView.setVisibility(View.VISIBLE);
         
         // SslCertificates don't offer this information
-        ((TextView)mView.findViewById(R.id.untrusted_value_issuer_C)).setVisibility(View.GONE);
-        ((TextView)mView.findViewById(R.id.untrusted_value_issuer_ST)).setVisibility(View.GONE);
-        ((TextView)mView.findViewById(R.id.untrusted_value_issuer_L)).setVisibility(View.GONE);
-        ((TextView)mView.findViewById(R.id.untrusted_label_issuer_C)).setVisibility(View.GONE);
-        ((TextView)mView.findViewById(R.id.untrusted_label_issuer_ST)).setVisibility(View.GONE);
-        ((TextView)mView.findViewById(R.id.untrusted_label_issuer_L)).setVisibility(View.GONE);
+        ((TextView)mView.findViewById(R.id.value_issuer_C)).setVisibility(View.GONE);
+        ((TextView)mView.findViewById(R.id.value_issuer_ST)).setVisibility(View.GONE);
+        ((TextView)mView.findViewById(R.id.value_issuer_L)).setVisibility(View.GONE);
+        ((TextView)mView.findViewById(R.id.label_issuer_C)).setVisibility(View.GONE);
+        ((TextView)mView.findViewById(R.id.label_issuer_ST)).setVisibility(View.GONE);
+        ((TextView)mView.findViewById(R.id.label_issuer_L)).setVisibility(View.GONE);
     }
     
     private void hideSignature() {
-        ((TextView)mView.findViewById(R.id.untrusted_label_signature)).setVisibility(View.GONE);
-        ((TextView)mView.findViewById(R.id.untrusted_label_signature_algorithm)).setVisibility(View.GONE);
-        ((TextView)mView.findViewById(R.id.untrusted_value_signature_algorithm)).setVisibility(View.GONE);
-        ((TextView)mView.findViewById(R.id.untrusted_value_signature)).setVisibility(View.GONE);
+        ((TextView)mView.findViewById(R.id.label_signature)).setVisibility(View.GONE);
+        ((TextView)mView.findViewById(R.id.label_signature_algorithm)).setVisibility(View.GONE);
+        ((TextView)mView.findViewById(R.id.value_signature_algorithm)).setVisibility(View.GONE);
+        ((TextView)mView.findViewById(R.id.value_signature)).setVisibility(View.GONE);
     }
 
 }