<h3>Librerías</h3>
<p>Navegador privado está construido con la <a href="https://developer.android.com/topic/libraries/support-library/index.html">librería de soporte de android</a>,
que se libera bajo la <a href="https://www.apache.org/licenses/LICENSE-2.0">Licencia Apache 2.0</a>.</p>
- <p>The free flavor of Privacy Browser is built with <a href="https://mvnrepository.com/artifact/com.google.firebase/firebase-ads">Firebase Ads</a>,
- which is released under the <a href="https://developer.android.com/studio/terms">Android Software Development Kit License</a>.</p>
-
- <h3>Classes</h3>
- <p><code>com.stoutner.privacybrowser.views.CheckedLinearLayout</code> is a modified version of a class contained in the
- <a href="https://android.googlesource.com/platform/packages/apps/Camera/+/master/src/com/android/camera/ui/CheckedLinearLayout.java">Android Camera</a> source code.
- The original file was released under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>.
- The modified file is released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>.</p>
+ <p>El sabor o versión libre de Navegador Privado está construido con <a href="https://mvnrepository.com/artifact/com.google.firebase/firebase-ads">anuncios de Firebase</a>,
+ que se libera bajo la <a href="https://developer.android.com/studio/terms">Licencia del Android Software Development Kit</a>.</p>
+
+ <h3>Clases</h3>
+ <p><code>com.stoutner.privacybrowser.views.CheckedLinearLayout</code> es una versión modificada de una clase incluida en el código fuente de
+ <a href="https://android.googlesource.com/platform/packages/apps/Camera/+/master/src/com/android/camera/ui/CheckedLinearLayout.java">Android Camera</a>.
+ El archivo original se liberó bajo la <a href="https://www.apache.org/licenses/LICENSE-2.0">Licencia Apache 2.0</a>.
+ El archivo modificado se libera bajo la <a href="https://www.gnu.org/licenses/gpl-3.0.html">licencia GPLv3+</a>.</p>
<h3>Iconos</h3>
<p><img class="left" src="../shared_images/privacy_browser.png"> <img class="left" src="../shared_images/privacy_browser_free.png"> <img class="left" src="../shared_images/warning.png">
<h3>Librerías</h3>
<p>Navegador privado está construido con la <a href="https://developer.android.com/topic/libraries/support-library/index.html">librería de soporte de android</a>,
que se libera bajo la <a href="https://www.apache.org/licenses/LICENSE-2.0">Licencia Apache 2.0</a>.</p>
- <p>The free flavor of Privacy Browser is built with <a href="https://mvnrepository.com/artifact/com.google.firebase/firebase-ads">Firebase Ads</a>,
- which is released under the <a href="https://developer.android.com/studio/terms">Android Software Development Kit License</a>.</p>
-
- <h3>Classes</h3>
- <p><code>com.stoutner.privacybrowser.views.CheckedLinearLayout</code> is a modified version of a class contained in the
- <a href="https://android.googlesource.com/platform/packages/apps/Camera/+/master/src/com/android/camera/ui/CheckedLinearLayout.java">Android Camera</a> source code.
- The original file was released under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>.
- The modified file is released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>.</p>
+ <p>El sabor o versión libre de Navegador Privado está construido con <a href="https://mvnrepository.com/artifact/com.google.firebase/firebase-ads">anuncios de Firebase</a>,
+ que se libera bajo la <a href="https://developer.android.com/studio/terms">Licencia del Android Software Development Kit</a>.</p>
+
+ <h3>Clases</h3>
+ <p><code>com.stoutner.privacybrowser.views.CheckedLinearLayout</code> es una versión modificada de una clase incluida en el código fuente de
+ <a href="https://android.googlesource.com/platform/packages/apps/Camera/+/master/src/com/android/camera/ui/CheckedLinearLayout.java">Android Camera</a>.
+ El archivo original se liberó bajo la <a href="https://www.apache.org/licenses/LICENSE-2.0">Licencia Apache 2.0</a>.
+ El archivo modificado se libera bajo la <a href="https://www.gnu.org/licenses/gpl-3.0.html">licencia GPLv3+</a>.</p>
<h3>Iconos</h3>
<p><img class="left" src="../shared_images/privacy_browser.png"> <img class="left" src="../shared_images/privacy_browser_free.png"> <img class="left" src="../shared_images/warning.png">
/*
- * Copyright © 2017-2018 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2017-2019 Soren Stoutner <soren@stoutner.com>.
*
* This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
*
import android.net.http.SslCertificate;
import android.os.Build;
import android.os.Bundle;
-// `android.support.v4.app.Fragment` must be used until minimum API >= 23. Otherwise `getContext()` does not work.
import android.preference.PreferenceManager;
import android.support.annotation.NonNull;
+// `android.support.v4.app.Fragment` must be used until minimum API >= 23. Otherwise `getContext()` does not work.
import android.support.v4.app.Fragment;
+import android.support.v7.widget.CardView;
import android.text.Editable;
import android.text.SpannableStringBuilder;
import android.text.Spanned;
final TextView displayImagesTextView = domainSettingsView.findViewById(R.id.domain_settings_display_webpage_images_textview);
final ImageView pinnedSslCertificateImageView = domainSettingsView.findViewById(R.id.domain_settings_pinned_ssl_certificate_imageview);
Switch pinnedSslCertificateSwitch = domainSettingsView.findViewById(R.id.domain_settings_pinned_ssl_certificate_switch);
- final LinearLayout savedSslCertificateLinearLayout = domainSettingsView.findViewById(R.id.saved_ssl_certificate_linearlayout);
+ final CardView savedSslCertificateCardView = domainSettingsView.findViewById(R.id.saved_ssl_certificate_cardview);
+ LinearLayout savedSslCertificateLinearLayout = domainSettingsView.findViewById(R.id.saved_ssl_certificate_linearlayout);
final RadioButton savedSslCertificateRadioButton = domainSettingsView.findViewById(R.id.saved_ssl_certificate_radiobutton);
final TextView savedSslCertificateIssuedToCNameTextView = domainSettingsView.findViewById(R.id.saved_ssl_certificate_issued_to_cname);
TextView savedSslCertificateIssuedToONameTextView = domainSettingsView.findViewById(R.id.saved_ssl_certificate_issued_to_oname);
TextView savedSslCertificateIssuedByUNameTextView = domainSettingsView.findViewById(R.id.saved_ssl_certificate_issued_by_uname);
TextView savedSslCertificateStartDateTextView = domainSettingsView.findViewById(R.id.saved_ssl_certificate_start_date);
TextView savedSslCertificateEndDateTextView = domainSettingsView.findViewById(R.id.saved_ssl_certificate_end_date);
- final LinearLayout currentWebsiteCertificateLinearLayout = domainSettingsView.findViewById(R.id.current_website_certificate_linearlayout);
+ final CardView currentWebsiteCertificateCardView = domainSettingsView.findViewById(R.id.current_website_certificate_cardview);
+ LinearLayout currentWebsiteCertificateLinearLayout = domainSettingsView.findViewById(R.id.current_website_certificate_linearlayout);
final RadioButton currentWebsiteCertificateRadioButton = domainSettingsView.findViewById(R.id.current_website_certificate_radiobutton);
final TextView currentWebsiteCertificateIssuedToCNameTextView = domainSettingsView.findViewById(R.id.current_website_certificate_issued_to_cname);
TextView currentWebsiteCertificateIssuedToONameTextView = domainSettingsView.findViewById(R.id.current_website_certificate_issued_to_oname);
if (pinnedSslCertificateSwitch.isChecked()) {
// Set the visibility of the saved SSL certificate.
if (savedSslCertificateIssuedToCNameString == null) {
- savedSslCertificateLinearLayout.setVisibility(View.GONE);
+ savedSslCertificateCardView.setVisibility(View.GONE);
} else {
- savedSslCertificateLinearLayout.setVisibility(View.VISIBLE);
+ savedSslCertificateCardView.setVisibility(View.VISIBLE);
}
// Set the visibility of the current website SSL certificate.
if (currentWebsiteSslCertificate == null) {
// Hide the SSL certificate.
- currentWebsiteCertificateLinearLayout.setVisibility(View.GONE);
+ currentWebsiteCertificateCardView.setVisibility(View.GONE);
// Show the instruction.
noCurrentWebsiteCertificateTextView.setVisibility(View.VISIBLE);
} else {
// Show the SSL certificate.
- currentWebsiteCertificateLinearLayout.setVisibility(View.VISIBLE);
+ currentWebsiteCertificateCardView.setVisibility(View.VISIBLE);
// Hide the instruction.
noCurrentWebsiteCertificateTextView.setVisibility(View.GONE);
}
// Set the status of the radio buttons.
- if (savedSslCertificateLinearLayout.getVisibility() == View.VISIBLE) { // The saved SSL certificate is displayed.
+ if (savedSslCertificateCardView.getVisibility() == View.VISIBLE) { // The saved SSL certificate is displayed.
+ // Check the saved SSL certificate radio button.
savedSslCertificateRadioButton.setChecked(true);
+
+ // Uncheck the current website SSL certificate radio button.
currentWebsiteCertificateRadioButton.setChecked(false);
- } else if (currentWebsiteCertificateLinearLayout.getVisibility() == View.VISIBLE) { // The saved SSL certificate is hidden but the current website SSL certificate is visible.
+
+ // Darken the background of the current website SSL certificate linear layout according to the theme.
+ if (MainWebViewActivity.darkTheme) {
+ currentWebsiteCertificateLinearLayout.setBackgroundResource(R.color.black_translucent_33);
+ } else {
+ currentWebsiteCertificateLinearLayout.setBackgroundResource(R.color.black_translucent_11);
+ }
+ } else if (currentWebsiteCertificateCardView.getVisibility() == View.VISIBLE) { // The saved SSL certificate is hidden but the current website SSL certificate is visible.
+ // Check the current website SSL certificate radio button.
currentWebsiteCertificateRadioButton.setChecked(true);
+
+ // Uncheck the saved SSL certificate radio button.
savedSslCertificateRadioButton.setChecked(false);
+
+ // Darken the background of the saved SSL certificate linear layout according to the theme.
+ if (MainWebViewActivity.darkTheme) {
+ savedSslCertificateLinearLayout.setBackgroundResource(R.color.black_translucent_33);
+ } else {
+ savedSslCertificateLinearLayout.setBackgroundResource(R.color.black_translucent_11);
+ }
} else { // Neither SSL certificate is visible.
+ // Uncheck both radio buttons.
savedSslCertificateRadioButton.setChecked(false);
currentWebsiteCertificateRadioButton.setChecked(false);
}
} else { // `pinnedSslCertificateSwitch` is not checked.
// Hide the SSl certificates and instructions.
- savedSslCertificateLinearLayout.setVisibility(View.GONE);
- currentWebsiteCertificateLinearLayout.setVisibility(View.GONE);
+ savedSslCertificateCardView.setVisibility(View.GONE);
+ currentWebsiteCertificateCardView.setVisibility(View.GONE);
noCurrentWebsiteCertificateTextView.setVisibility(View.GONE);
// Uncheck the radio buttons.
// Update the visibility of the saved SSL certificate.
if (savedSslCertificateIssuedToCNameString == null) {
- savedSslCertificateLinearLayout.setVisibility(View.GONE);
+ savedSslCertificateCardView.setVisibility(View.GONE);
} else {
- savedSslCertificateLinearLayout.setVisibility(View.VISIBLE);
+ savedSslCertificateCardView.setVisibility(View.VISIBLE);
}
// Update the visibility of the current website SSL certificate.
if (currentWebsiteSslCertificate == null) {
// Hide the SSL certificate.
- currentWebsiteCertificateLinearLayout.setVisibility(View.GONE);
+ currentWebsiteCertificateCardView.setVisibility(View.GONE);
// Show the instruction.
noCurrentWebsiteCertificateTextView.setVisibility(View.VISIBLE);
} else {
// Show the SSL certificate.
- currentWebsiteCertificateLinearLayout.setVisibility(View.VISIBLE);
+ currentWebsiteCertificateCardView.setVisibility(View.VISIBLE);
// Hide the instruction.
noCurrentWebsiteCertificateTextView.setVisibility(View.GONE);
}
// Set the status of the radio buttons.
- if (savedSslCertificateLinearLayout.getVisibility() == View.VISIBLE) { // The saved SSL certificate is displayed.
+ if (savedSslCertificateCardView.getVisibility() == View.VISIBLE) { // The saved SSL certificate is displayed.
+ // Check the saved SSL certificate radio button.
savedSslCertificateRadioButton.setChecked(true);
+
+ // Uncheck the current website SSL certificate radio button.
currentWebsiteCertificateRadioButton.setChecked(false);
- } else if (currentWebsiteCertificateLinearLayout.getVisibility() == View.VISIBLE) { // The saved SSL certificate is hidden but the current website SSL certificate is visible.
+
+ // Set the background of the saved SSL certificate linear layout to be transparent.
+ savedSslCertificateLinearLayout.setBackgroundResource(R.color.transparent);
+
+ // Darken the background of the current website SSL certificate linear layout according to the theme.
+ if (MainWebViewActivity.darkTheme) {
+ currentWebsiteCertificateLinearLayout.setBackgroundResource(R.color.black_translucent_33);
+ } else {
+ currentWebsiteCertificateLinearLayout.setBackgroundResource(R.color.black_translucent_11);
+ }
+ } else if (currentWebsiteCertificateCardView.getVisibility() == View.VISIBLE) { // The saved SSL certificate is hidden but the current website SSL certificate is visible.
+ // Check the current website SSL certificate radio button.
currentWebsiteCertificateRadioButton.setChecked(true);
+
+ // Uncheck the saved SSL certificate radio button.
savedSslCertificateRadioButton.setChecked(false);
+
+ // Set the background of the current website SSL certificate linear layout to be transparent.
+ currentWebsiteCertificateLinearLayout.setBackgroundResource(R.color.transparent);
+
+ // Darken the background of the saved SSL certificate linear layout according to the theme.
+ if (MainWebViewActivity.darkTheme) {
+ savedSslCertificateLinearLayout.setBackgroundResource(R.color.black_translucent_33);
+ } else {
+ savedSslCertificateLinearLayout.setBackgroundResource(R.color.black_translucent_11);
+ }
} else { // Neither SSL certificate is visible.
+ // Uncheck both radio buttons.
savedSslCertificateRadioButton.setChecked(false);
currentWebsiteCertificateRadioButton.setChecked(false);
}
}
// Hide the SSl certificates and instructions.
- savedSslCertificateLinearLayout.setVisibility(View.GONE);
- currentWebsiteCertificateLinearLayout.setVisibility(View.GONE);
+ savedSslCertificateCardView.setVisibility(View.GONE);
+ currentWebsiteCertificateCardView.setVisibility(View.GONE);
noCurrentWebsiteCertificateTextView.setVisibility(View.GONE);
// Uncheck the radio buttons.
}
});
- savedSslCertificateLinearLayout.setOnClickListener((View v) -> {
+ savedSslCertificateCardView.setOnClickListener((View v) -> {
+ // Check the saved SSL certificate radio button.
savedSslCertificateRadioButton.setChecked(true);
+
+ // Uncheck the current website SSL certificate radio button.
currentWebsiteCertificateRadioButton.setChecked(false);
+
+ // Set the background of the saved SSL certificate linear layout to be transparent.
+ savedSslCertificateLinearLayout.setBackgroundResource(R.color.transparent);
+
+ // Darken the background of the current website SSL certificate linear layout according to the theme.
+ if (MainWebViewActivity.darkTheme) {
+ currentWebsiteCertificateLinearLayout.setBackgroundResource(R.color.black_translucent_33);
+ } else {
+ currentWebsiteCertificateLinearLayout.setBackgroundResource(R.color.black_translucent_11);
+ }
});
savedSslCertificateRadioButton.setOnClickListener((View v) -> {
+ // Check the saved SSL certificate radio button.
savedSslCertificateRadioButton.setChecked(true);
+
+ // Uncheck the current website SSL certificate radio button.
currentWebsiteCertificateRadioButton.setChecked(false);
+
+ // Set the background of the saved SSL certificate linear layout to be transparent.
+ savedSslCertificateLinearLayout.setBackgroundResource(R.color.transparent);
+
+ // Darken the background of the current website SSL certificate linear layout according to the theme.
+ if (MainWebViewActivity.darkTheme) {
+ currentWebsiteCertificateLinearLayout.setBackgroundResource(R.color.black_translucent_33);
+ } else {
+ currentWebsiteCertificateLinearLayout.setBackgroundResource(R.color.black_translucent_11);
+ }
});
- currentWebsiteCertificateLinearLayout.setOnClickListener((View v) -> {
+ currentWebsiteCertificateCardView.setOnClickListener((View v) -> {
+ // Check the current website SSL certificate radio button.
currentWebsiteCertificateRadioButton.setChecked(true);
+
+ // Uncheck the saved SSL certificate radio button.
savedSslCertificateRadioButton.setChecked(false);
+
+ // Set the background of the current website SSL certificate linear layout to be transparent.
+ currentWebsiteCertificateLinearLayout.setBackgroundResource(R.color.transparent);
+
+ // Darken the background of the saved SSL certificate linear layout according to the theme.
+ if (MainWebViewActivity.darkTheme) {
+ savedSslCertificateLinearLayout.setBackgroundResource(R.color.black_translucent_33);
+ } else {
+ savedSslCertificateLinearLayout.setBackgroundResource(R.color.black_translucent_11);
+ }
});
currentWebsiteCertificateRadioButton.setOnClickListener((View v) -> {
+ // Check the current website SSL certificate radio button.
currentWebsiteCertificateRadioButton.setChecked(true);
+
+ // Uncheck the saved SSL certificate radio button.
savedSslCertificateRadioButton.setChecked(false);
+
+ // Set the background of the current website SSL certificate linear layout to be transparent.
+ currentWebsiteCertificateLinearLayout.setBackgroundResource(R.color.transparent);
+
+ // Darken the background of the saved SSL certificate linear layout according to the theme.
+ if (MainWebViewActivity.darkTheme) {
+ savedSslCertificateLinearLayout.setBackgroundResource(R.color.black_translucent_33);
+ } else {
+ savedSslCertificateLinearLayout.setBackgroundResource(R.color.black_translucent_11);
+ }
});
return domainSettingsView;
<?xml version="1.0" encoding="utf-8"?>
<!--
- Copyright © 2017-2018 Soren Stoutner <soren@stoutner.com>.
+ Copyright © 2017-2019 Soren Stoutner <soren@stoutner.com>.
This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
</LinearLayout>
<!-- Saved Certificate -->
- <LinearLayout
- android:id="@+id/saved_ssl_certificate_linearlayout"
+ <android.support.v7.widget.CardView
+ android:id="@+id/saved_ssl_certificate_cardview"
android:layout_height="wrap_content"
android:layout_width="match_parent"
- android:orientation="vertical"
- android:layout_marginTop="20dp"
- android:layout_marginBottom="12dp"
+ android:layout_marginTop="10dp"
+ android:layout_marginBottom="5dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp" >
- <RadioButton
- android:id="@+id/saved_ssl_certificate_radiobutton"
- android:layout_height="wrap_content"
- android:layout_width="match_parent"
- android:text="@string/saved_ssl_certificate"
- android:textSize="17sp"
- android:textAllCaps="true"
- android:textStyle="bold" />
-
<LinearLayout
+ android:id="@+id/saved_ssl_certificate_linearlayout"
android:layout_height="wrap_content"
android:layout_width="match_parent"
- android:layout_marginStart="32dp"
- android:orientation="vertical" >
+ android:orientation="vertical"
+ android:padding="10dp" >
- <!-- Saved Certificate Issued To. -->
- <TextView
+ <RadioButton
+ android:id="@+id/saved_ssl_certificate_radiobutton"
android:layout_height="wrap_content"
android:layout_width="match_parent"
- android:text="@string/issued_to"
+ android:text="@string/saved_ssl_certificate"
+ android:textSize="17sp"
android:textAllCaps="true"
android:textStyle="bold"
- android:textColor="?attr/sslTitle" />
-
- <TextView
- android:id="@+id/saved_ssl_certificate_issued_to_cname"
- android:layout_height="wrap_content"
- android:layout_width="match_parent" />
+ android:textColor="?android:textColorPrimary" />
- <TextView
- android:id="@+id/saved_ssl_certificate_issued_to_oname"
- android:layout_height="wrap_content"
- android:layout_width="match_parent" />
-
- <TextView
- android:id="@+id/saved_ssl_certificate_issued_to_uname"
- android:layout_height="wrap_content"
- android:layout_width="match_parent"/>
-
- <!-- Saved Certificate Issued By. -->
- <TextView
+ <LinearLayout
android:layout_height="wrap_content"
android:layout_width="match_parent"
- android:layout_marginTop="15dp"
- android:text="@string/issued_by"
- android:textAllCaps="true"
- android:textStyle="bold"
- android:textColor="?attr/sslTitle"/>
-
- <TextView
- android:id="@+id/saved_ssl_certificate_issued_by_cname"
- android:layout_height="wrap_content"
- android:layout_width="match_parent" />
-
- <TextView
- android:id="@+id/saved_ssl_certificate_issued_by_oname"
- android:layout_height="wrap_content"
- android:layout_width="match_parent" />
-
- <TextView
- android:id="@+id/saved_ssl_certificate_issued_by_uname"
- android:layout_height="wrap_content"
- android:layout_width="match_parent" />
-
- <!-- Saved Certificate Valid Dates. -->
- <TextView
- android:layout_height="wrap_content"
- android:layout_width="match_parent"
- android:layout_marginTop="15dp"
- android:text="@string/valid_dates"
- android:textAllCaps="true"
- android:textStyle="bold"
- android:textColor="?attr/sslTitle"/>
-
- <TextView
- android:id="@+id/saved_ssl_certificate_start_date"
- android:layout_height="wrap_content"
- android:layout_width="match_parent" />
-
- <TextView
- android:id="@+id/saved_ssl_certificate_end_date"
- android:layout_height="wrap_content"
- android:layout_width="match_parent" />
+ android:layout_marginStart="32dp"
+ android:orientation="vertical" >
+
+ <!-- Saved Certificate Issued To. -->
+ <TextView
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:text="@string/issued_to"
+ android:textAllCaps="true"
+ android:textStyle="bold"
+ android:textColor="?attr/sslTitle" />
+
+ <TextView
+ android:id="@+id/saved_ssl_certificate_issued_to_cname"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent" />
+
+ <TextView
+ android:id="@+id/saved_ssl_certificate_issued_to_oname"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent" />
+
+ <TextView
+ android:id="@+id/saved_ssl_certificate_issued_to_uname"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"/>
+
+ <!-- Saved Certificate Issued By. -->
+ <TextView
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:layout_marginTop="15dp"
+ android:text="@string/issued_by"
+ android:textAllCaps="true"
+ android:textStyle="bold"
+ android:textColor="?attr/sslTitle"/>
+
+ <TextView
+ android:id="@+id/saved_ssl_certificate_issued_by_cname"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent" />
+
+ <TextView
+ android:id="@+id/saved_ssl_certificate_issued_by_oname"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent" />
+
+ <TextView
+ android:id="@+id/saved_ssl_certificate_issued_by_uname"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent" />
+
+ <!-- Saved Certificate Valid Dates. -->
+ <TextView
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:layout_marginTop="15dp"
+ android:text="@string/valid_dates"
+ android:textAllCaps="true"
+ android:textStyle="bold"
+ android:textColor="?attr/sslTitle"/>
+
+ <TextView
+ android:id="@+id/saved_ssl_certificate_start_date"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent" />
+
+ <TextView
+ android:id="@+id/saved_ssl_certificate_end_date"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent" />
+ </LinearLayout>
</LinearLayout>
- </LinearLayout>
+ </android.support.v7.widget.CardView>
<!-- Current Website Certificate -->
- <LinearLayout
- android:id="@+id/current_website_certificate_linearlayout"
+ <android.support.v7.widget.CardView
+ android:id="@+id/current_website_certificate_cardview"
android:layout_height="wrap_content"
android:layout_width="match_parent"
- android:orientation="vertical"
- android:layout_marginTop="20dp"
- android:layout_marginBottom="8dp"
+ android:layout_marginTop="5dp"
+ android:layout_marginBottom="10dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp" >
- <RadioButton
- android:id="@+id/current_website_certificate_radiobutton"
- android:layout_height="wrap_content"
- android:layout_width="match_parent"
- android:text="@string/current_website_ssl_certificate"
- android:textSize="17sp"
- android:textAllCaps="true"
- android:textStyle="bold" />
-
<LinearLayout
+ android:id="@+id/current_website_certificate_linearlayout"
android:layout_height="wrap_content"
android:layout_width="match_parent"
- android:layout_marginStart="32dp"
- android:orientation="vertical" >
-
- <!-- Current Website Certificate Issued To. -->
- <TextView
- android:layout_height="wrap_content"
- android:layout_width="match_parent"
- android:text="@string/issued_to"
- android:textAllCaps="true"
- android:textStyle="bold"
- android:textColor="?attr/sslTitle" />
-
- <TextView
- android:id="@+id/current_website_certificate_issued_to_cname"
- android:layout_height="wrap_content"
- android:layout_width="match_parent" />
-
- <TextView
- android:id="@+id/current_website_certificate_issued_to_oname"
- android:layout_height="wrap_content"
- android:layout_width="match_parent" />
-
- <TextView
- android:id="@+id/current_website_certificate_issued_to_uname"
- android:layout_height="wrap_content"
- android:layout_width="match_parent" />
+ android:orientation="vertical"
+ android:padding="10dp" >
- <!-- Current Website Certificate Issued By. -->
- <TextView
+ <RadioButton
+ android:id="@+id/current_website_certificate_radiobutton"
android:layout_height="wrap_content"
android:layout_width="match_parent"
- android:layout_marginTop="15dp"
- android:text="@string/issued_by"
+ android:text="@string/current_website_ssl_certificate"
+ android:textSize="17sp"
android:textAllCaps="true"
android:textStyle="bold"
- android:textColor="?attr/sslTitle" />
-
- <TextView
- android:id="@+id/current_website_certificate_issued_by_cname"
- android:layout_height="wrap_content"
- android:layout_width="match_parent" />
-
- <TextView
- android:id="@+id/current_website_certificate_issued_by_oname"
- android:layout_height="wrap_content"
- android:layout_width="match_parent" />
-
- <TextView
- android:id="@+id/current_website_certificate_issued_by_uname"
- android:layout_height="wrap_content"
- android:layout_width="match_parent" />
+ android:textColor="?android:textColorPrimary" />
- <!-- Current Website Certificate Valid Dates. -->
- <TextView
+ <LinearLayout
android:layout_height="wrap_content"
android:layout_width="match_parent"
- android:layout_marginTop="15dp"
- android:text="@string/valid_dates"
- android:textAllCaps="true"
- android:textStyle="bold"
- android:textColor="?attr/sslTitle" />
-
- <TextView
- android:id="@+id/current_website_certificate_start_date"
- android:layout_height="wrap_content"
- android:layout_width="match_parent" />
-
- <TextView
- android:id="@+id/current_website_certificate_end_date"
- android:layout_height="wrap_content"
- android:layout_width="match_parent" />
+ android:layout_marginStart="32dp"
+ android:orientation="vertical" >
+
+ <!-- Current Website Certificate Issued To. -->
+ <TextView
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:text="@string/issued_to"
+ android:textAllCaps="true"
+ android:textStyle="bold"
+ android:textColor="?attr/sslTitle" />
+
+ <TextView
+ android:id="@+id/current_website_certificate_issued_to_cname"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent" />
+
+ <TextView
+ android:id="@+id/current_website_certificate_issued_to_oname"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent" />
+
+ <TextView
+ android:id="@+id/current_website_certificate_issued_to_uname"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent" />
+
+ <!-- Current Website Certificate Issued By. -->
+ <TextView
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:layout_marginTop="15dp"
+ android:text="@string/issued_by"
+ android:textAllCaps="true"
+ android:textStyle="bold"
+ android:textColor="?attr/sslTitle" />
+
+ <TextView
+ android:id="@+id/current_website_certificate_issued_by_cname"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent" />
+
+ <TextView
+ android:id="@+id/current_website_certificate_issued_by_oname"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent" />
+
+ <TextView
+ android:id="@+id/current_website_certificate_issued_by_uname"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent" />
+
+ <!-- Current Website Certificate Valid Dates. -->
+ <TextView
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:layout_marginTop="15dp"
+ android:text="@string/valid_dates"
+ android:textAllCaps="true"
+ android:textStyle="bold"
+ android:textColor="?attr/sslTitle" />
+
+ <TextView
+ android:id="@+id/current_website_certificate_start_date"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent" />
+
+ <TextView
+ android:id="@+id/current_website_certificate_end_date"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent" />
+ </LinearLayout>
</LinearLayout>
- </LinearLayout>
+ </android.support.v7.widget.CardView>
<!-- Load An Encrypted Website Instructions. -->
<TextView
<string name="close">Cerrar</string>
<string name="domain">Dominio</string>
<string name="domain_label">Dominio:</string>
+ <string name="ip_addresses">Direcciones IP:</string>
<string name="issued_to">Emitido a</string>
<string name="issued_by">Emitido por</string>
<string name="common_name">Nombre Común (CN):</string>
<string name="close">Chiudi</string>
<string name="domain">Dominio</string>
<string name="domain_label">Dominio:</string>
+ <string name="ip_addresses">Indirizzi IP:</string>
<string name="issued_to">Emesso a</string>
<string name="issued_by">Emesso da</string>
<string name="common_name">Nome comune (NC):</string>
<string name="close">Закрыть</string>
<string name="domain">Домен</string>
<string name="domain_label">Домен:</string>
+ <string name="ip_addresses">IP-адреса:</string>
<string name="issued_to">Кому выдан</string>
<string name="issued_by">Кем выдан</string>
<string name="common_name">Общепринятое имя (CN):</string>
<string name="close">Kapat</string>
<string name="domain">Domain</string>
<string name="domain_label">Domain:</string>
+ <string name="ip_addresses">IP Adresleri:</string>
<string name="issued_to">Verilen</string>
<string name="issued_by">Veren</string>
<string name="common_name">Ortak Ad (CN):</string>
projects / PrivacyBrowserAndroid.git / commitdiff