Update the unencrypted website `AlertDialog` text. Implements https://redmine.stoutn...

diff --git a/app/src/main/assets/es/about_licenses.html b/app/src/main/assets/es/about_licenses.html
index 9460f56402427a07e16d33a19747540a2e2db496..1c50064fdf542bef13c550f38d3a14696c069cb7 100644 (file)
--- a/app/src/main/assets/es/about_licenses.html
+++ b/app/src/main/assets/es/about_licenses.html
@@ -60,7 +60,7 @@
             <a href="https://www.gnu.org/licenses/gpl-3.0.html">licencia GPLv3+</a>.</p>
         <p><img class="left" src="../en/images/clear_and_exit.png">
             deriva de ic_exit_to_app, que es parte del <a href="https://material.io/icons/">conjunto de iconos Android Material</a> y es liberado bajo la <a href ="https://www.apache.org/licenses/LICENSE-2.0">Licencia Apache 2.0</a>.
-            El texto completo de la licencia se encuentra debajo. Copyright de modificaciones © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>. El imagen resultante se libera bajo la
+            El texto completo de la licencia se encuentra debajo. Copyright de modificaciones © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>. La imagen resultante se libera bajo la
             <a href="https://www.gnu.org/licenses/gpl-3.0.html">licencia GPLv3+</a>.</p>
         <p><img class="left" src="../en/images/orbot.png"> orbot es una versión modificada del <a href="https://gitweb.torproject.org/orbot.git/tree/app/src/main/res/drawable-xxxhdpi/ic_stat_tor.png">icono de estado del proyecto Orbot</a>,
             que tiene copyright 2009-2010 por Nathan Freitas, The Guardian Project. Es liberado bajo la <a href="https://gitweb.torproject.org/orbot.git/tree/LICENSE">licencia BSD modificada (de 3 cláusulas)</a>.

diff --git a/app/src/main/res/layout/unencrypted_website.xml b/app/src/main/res/layout/unencrypted_website.xml
index 9e5759d40a69e0ef09db1ffc193704b3bae3b227..59b6cd63f0adef128c78d29305c0f3f4237aecf7 100644 (file)
--- a/app/src/main/res/layout/unencrypted_website.xml
+++ b/app/src/main/res/layout/unencrypted_website.xml
@@ -23,4 +23,5 @@
     android:layout_height="match_parent"
     android:layout_width="match_parent"
     android:padding="10dp"
+    android:textColor="?attr/redText"
     android:text="@string/no_ssl_certificate" />
\ No newline at end of file

diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 8b2ce62c560f682b617368c37dba7670582c7efd..a756278c0a3a73b61184a5521722bc8e5e5a357c 100644 (file)
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -29,6 +29,7 @@
     <attr name="sslTitle" format="reference" />
     <attr name="urlHistoryText" format="reference" />
     <attr name="primaryTextColorSelector" format="reference" />
+    <attr name="redText" format="reference" />
 
     <attr name="navigationHeaderBackground" format="reference" />
     <attr name="navigationHeaderTextColor" format="reference" />

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index dcbabfcc3a021f433ccd0ee80dccd0617a342b49..386e9c9dba0ba051f7bdd667934db05f604fe467 100644 (file)
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -64,7 +64,7 @@
     <!-- View SSL Certificate. -->
     <string name="view_ssl_certificate">View SSL Certificate</string>
     <string name="unencrypted_website">Unencrypted Website</string>
-    <string name="no_ssl_certificate">Communication with this website is not encrypted by an SSL certificate.</string>
+    <string name="no_ssl_certificate">Communication with this website is not encrypted. This allows third parties to intercept information, track your browsing, and inject malicious content.</string>
     <string name="ssl_certificate">SSL Certificate</string>
     <string name="close">Close</string>
     <string name="issued_to">Issued To</string>

diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 8f119233759d8600729c5c141b62d6275db31ef7..851ec955d7817e7e1acc1b43b000a15573d4ec66 100644 (file)
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -34,6 +34,7 @@
         <item name="findOnPageIconTintColor">@color/blue_700</item>
         <item name="sslTitle">@color/blue_900</item>
         <item name="urlHistoryText">@color/black</item>
+        <item name="redText">@color/red_a700</item>
     </style>
 
     <!-- `windowActionModeOverlay` makes the contextual app bar cover the support app bar.  `colorPrimaryDark` goes behind the status bar, which is then darkened by the overlay.-->
@@ -107,6 +108,7 @@
         <item name="findOnPageIconTintColor">@color/blue_600</item>
         <item name="sslTitle">@color/blue_700</item>
         <item name="urlHistoryText">@color/gray_200</item>
+        <item name="redText">@color/red_900</item>
     </style>
 
     <!-- `windowActionModeOverlay` makes the contextual app bar cover the support app bar.  `colorPrimaryDark` goes behind the status bar, which is then darkened by the overlay.-->