From f5434ed563e4cb01c950d83aa4e179e2811a8612 Mon Sep 17 00:00:00 2001
From: Soren Stoutner <soren@stoutner.com>
Date: Wed, 13 Sep 2017 16:42:29 -0700
Subject: [PATCH] Update SSL Certificate Guide.

---
 app/build.gradle                                       |  4 ++--
 ...ficate_pinning.html => guide_ssl_certificates.html} |  5 +++--
 app/src/main/assets/en/about_changelog.html            | 10 ++++++++++
 ...ficate_pinning.html => guide_ssl_certificates.html} |  5 +++--
 ...ficate_pinning.html => guide_ssl_certificates.html} |  0
 ...ficate_pinning.html => guide_ssl_certificates.html} |  0
 .../privacybrowser/activities/GuideActivity.java       |  2 +-
 .../privacybrowser/fragments/GuideTabFragment.java     |  2 +-
 app/src/main/res/values-es/strings.xml                 |  2 +-
 app/src/main/res/values-it/strings.xml                 |  2 +-
 app/src/main/res/values/strings.xml                    |  2 +-
 build.gradle                                           |  3 +++
 12 files changed, 26 insertions(+), 11 deletions(-)
 rename app/src/main/assets/de/{guide_ssl_certificate_pinning.html => guide_ssl_certificates.html} (90%)
 rename app/src/main/assets/en/{guide_ssl_certificate_pinning.html => guide_ssl_certificates.html} (90%)
 rename app/src/main/assets/es/{guide_ssl_certificate_pinning.html => guide_ssl_certificates.html} (100%)
 rename app/src/main/assets/it/{guide_ssl_certificate_pinning.html => guide_ssl_certificates.html} (100%)

diff --git a/app/build.gradle b/app/build.gradle
index 8764284e..399adf0b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -55,10 +55,10 @@ android {
 
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile 'com.android.support:design:25.3.1'
+    compile 'com.android.support:design:25.4.0'
 
     // Only compile `com.google.firebase:firebase-ads:9.8.0` for the free flavor.
-    freeCompile 'com.google.firebase:firebase-ads:9.8.0'
+    freeCompile 'com.google.firebase:firebase-ads:11.2.2'
 }
 
 // Google's documentation says the following line is required for `firebase-ads` but things work correctly without it.  I have no interest in applying the Google Mobile Services plugin in the standard flavor if I don't have to.
diff --git a/app/src/main/assets/de/guide_ssl_certificate_pinning.html b/app/src/main/assets/de/guide_ssl_certificates.html
similarity index 90%
rename from app/src/main/assets/de/guide_ssl_certificate_pinning.html
rename to app/src/main/assets/de/guide_ssl_certificates.html
index 8fb49250..1a228fe3 100644
--- a/app/src/main/assets/de/guide_ssl_certificate_pinning.html
+++ b/app/src/main/assets/de/guide_ssl_certificates.html
@@ -49,7 +49,7 @@
             Android has a list of trusted certificate authorities, and will accept any of their certificates for any website.
             It isn’t supposed to be possible for an organization to acquire an SSL certificate for a domain they do not control, but in practice many governments and large corporations have been able to do so.</p>
 
-        <p>The purpose of SSL certificate pinning is to tell the browser that only one specific SSL certificate is to be trusted for a particular domain. Any other certificate, even if it is valid, will be rejected.</p>
+        <p>Pinning an SSL certificate tells the browser that only one specific SSL certificate is to be trusted for a particular domain. Any other certificate, even if it is valid, will be rejected.</p>
 
         <p><img class="center" src="images/ssl_certificate_mismatch.png"></p>
 
@@ -60,6 +60,7 @@
         <p><img class="center" src="images/pinned_ssl_certificate.png"></p>
 
         <p>SSL certificates can be pinned in Domain Settings.
-            Besides protecting against MITM attacks, pinning a self-signed certificate for a device like a wireless router or access point will remove the error message that is normally presented every time its website is loaded.</p>
+            Besides protecting against MITM attacks, pinning a self-signed certificate for a device like a wireless router or access point will remove the error message that is normally presented every time its website is loaded.
+            To view the current website SSL certificate, tap on the favorite icon next to the URL bar.</p>
     </body>
 </html>
\ No newline at end of file
diff --git a/app/src/main/assets/en/about_changelog.html b/app/src/main/assets/en/about_changelog.html
index 21c37df0..ce198911 100644
--- a/app/src/main/assets/en/about_changelog.html
+++ b/app/src/main/assets/en/about_changelog.html
@@ -27,6 +27,16 @@
     </head>
 
     <body>
+        <h3>2.6 (version code 26)</h3>
+        <p>14 September 2017 - minimum API 19, target API 25</p>
+        <ul>
+            <li>Add <a href="https://redmine.stoutner.com/issues/145">night mode rendering</a>.</li>
+            <li>Add support for <a href="https://redmine.stoutner.com/issues/52">HTTP authentication</a>.</li>
+            <li><a href="https://redmine.stoutner.com/issues/178">Color code the Common Name</a> in the view SSL certificate dialog.</li>
+            <li>Updated Italian translation provided by Francesco Buratti.</li>
+            <li>Updated Spanish translation provided by <a href="mailto:emails@joseleon.me">Jose A. León Becerra</a></li>
+        </ul>
+
         <h3>2.5 (version code 25)</h3>
         <p><a href="https://git.stoutner.com/?p=PrivacyBrowser.git;a=commitdiff;h=80ddcb075d03a4c78263d1ff80466f3df0967f6d">26 August 2017</a> - minimum API 19, target API 25</p>
         <ul>
diff --git a/app/src/main/assets/en/guide_ssl_certificate_pinning.html b/app/src/main/assets/en/guide_ssl_certificates.html
similarity index 90%
rename from app/src/main/assets/en/guide_ssl_certificate_pinning.html
rename to app/src/main/assets/en/guide_ssl_certificates.html
index a06431bd..bc3b37b3 100644
--- a/app/src/main/assets/en/guide_ssl_certificate_pinning.html
+++ b/app/src/main/assets/en/guide_ssl_certificates.html
@@ -49,7 +49,7 @@
             Android has a list of trusted certificate authorities, and will accept any of their certificates for any website.
             It isn’t supposed to be possible for an organization to acquire an SSL certificate for a domain they do not control, but in practice many governments and large corporations have been able to do so.</p>
 
-        <p>The purpose of SSL certificate pinning is to tell the browser that only one specific SSL certificate is to be trusted for a particular domain. Any other certificate, even if it is valid, will be rejected.</p>
+        <p>Pinning an SSL certificate tells the browser that only one specific SSL certificate is to be trusted for a particular domain. Any other certificate, even if it is valid, will be rejected.</p>
 
         <p><img class="center" src="images/ssl_certificate_mismatch.png"></p>
 
@@ -60,6 +60,7 @@
         <p><img class="center" src="images/pinned_ssl_certificate.png"></p>
 
         <p>SSL certificates can be pinned in Domain Settings.
-            Besides protecting against MITM attacks, pinning a self-signed certificate for a device like a wireless router or access point will remove the error message that is normally presented every time its website is loaded.</p>
+            Besides protecting against MITM attacks, pinning a self-signed certificate for a device like a wireless router or access point will remove the error message that is normally presented every time its website is loaded.
+            To view the current website SSL certificate, tap on the favorite icon next to the URL bar.</p>
     </body>
 </html>
\ No newline at end of file
diff --git a/app/src/main/assets/es/guide_ssl_certificate_pinning.html b/app/src/main/assets/es/guide_ssl_certificates.html
similarity index 100%
rename from app/src/main/assets/es/guide_ssl_certificate_pinning.html
rename to app/src/main/assets/es/guide_ssl_certificates.html
diff --git a/app/src/main/assets/it/guide_ssl_certificate_pinning.html b/app/src/main/assets/it/guide_ssl_certificates.html
similarity index 100%
rename from app/src/main/assets/it/guide_ssl_certificate_pinning.html
rename to app/src/main/assets/it/guide_ssl_certificates.html
diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/GuideActivity.java b/app/src/main/java/com/stoutner/privacybrowser/activities/GuideActivity.java
index 68be2b5e..945d9b69 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/activities/GuideActivity.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/activities/GuideActivity.java
@@ -99,7 +99,7 @@ public class GuideActivity extends AppCompatActivity {
                     return getString(R.string.domain_settings);
 
                 case 5:
-                    return getString(R.string.ssl_certificate_pinning);
+                    return getString(R.string.ssl_certificates);
 
                 case 6:
                     return getString(R.string.tor);
diff --git a/app/src/main/java/com/stoutner/privacybrowser/fragments/GuideTabFragment.java b/app/src/main/java/com/stoutner/privacybrowser/fragments/GuideTabFragment.java
index 2a9d0666..ef4b80cd 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/fragments/GuideTabFragment.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/fragments/GuideTabFragment.java
@@ -107,7 +107,7 @@ public class GuideTabFragment extends Fragment {
                 break;
 
             case 5:
-                tabWebView.loadUrl("file:///android_asset/" + getString(R.string.android_asset_path) + "/guide_ssl_certificate_pinning.html");
+                tabWebView.loadUrl("file:///android_asset/" + getString(R.string.android_asset_path) + "/guide_ssl_certificates.html");
                 break;
 
             case 6:
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index d99b3371..d8e519e4 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -218,7 +218,7 @@
     <string name="privacy_browser_guide">Guía de Navegador Privado</string>
     <string name="overview">Visión general</string>
     <string name="local_storage">Almacenamiento local</string>
-    <string name="ssl_certificate_pinning">Fijación de certificados SSL</string>
+    <string name="ssl_certificates">Certificados SSL</string>
     <string name="tracking_ids">Rastreo de IDs</string>
 
     <!-- Preferences. -->
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index e73cf7a2..1a974664 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -220,7 +220,7 @@
     <string name="privacy_browser_guide">Guida di Privacy Browser</string>
     <string name="overview">Descrizione</string>
     <string name="local_storage">Archiviazione Locale</string>
-    <string name="ssl_certificate_pinning">Appuntare il certificato SSL</string>
+    <string name="ssl_certificates">Certificatos SSL</string>
     <string name="tracking_ids">Tracciamento utenti</string>
 
     <!-- Preferences. -->
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 62e75a04..815abe87 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -228,7 +228,7 @@
     <string name="privacy_browser_guide">Privacy Browser Guide</string>
     <string name="overview">Overview</string>
     <string name="local_storage">Local Storage</string>
-    <string name="ssl_certificate_pinning">SSL Certificate Pinning</string>
+    <string name="ssl_certificates">SSL Certificates</string>
     <string name="tracking_ids">Tracking IDs</string>
 
     <!-- Preferences. -->
diff --git a/build.gradle b/build.gradle
index 59660130..477cd224 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,5 +15,8 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        maven {
+            url "https://maven.google.com"
+        }
     }
 }
-- 
2.45.2