From 8d8ebc47f7de8adc951bc36f23b74f2360871ffd Mon Sep 17 00:00:00 2001
From: Soren Stoutner <soren@stoutner.com>
Date: Fri, 3 Jun 2016 20:32:42 -0700
Subject: [PATCH] Populate the About:Changelog tab.

---
 .idea/dictionaries/soren.xml                  |  5 ++
 app/src/free/assets/about_privacy_policy.html |  4 +-
 app/src/main/AndroidManifest.xml              | 21 +++---
 app/src/main/assets/about_changelog.html      | 65 ++++++++++++++++++-
 app/src/main/assets/about_permissions.html    |  2 +-
 app/src/main/assets/about_privacy_policy.html |  2 +-
 6 files changed, 82 insertions(+), 17 deletions(-)

diff --git a/.idea/dictionaries/soren.xml b/.idea/dictionaries/soren.xml
index 7e004c46..783d740d 100644
--- a/.idea/dictionaries/soren.xml
+++ b/.idea/dictionaries/soren.xml
@@ -4,9 +4,12 @@
       <w>androidversion</w>
       <w>anonymized</w>
       <w>aren</w>
+      <w>bebdb</w>
       <w>buildapi</w>
       <w>buildversion</w>
       <w>chromeversion</w>
+      <w>commitdiff</w>
+      <w>eadd</w>
       <w>exynos</w>
       <w>intl</w>
       <w>khtml</w>
@@ -14,10 +17,12 @@
       <w>linearlayout</w>
       <w>mozilla</w>
       <w>nojs</w>
+      <w>redmine</w>
       <w>relativelayout</w>
       <w>samsung</w>
       <w>securitypatch</w>
       <w>snackbar</w>
+      <w>snackbars</w>
       <w>techrepublic</w>
       <w>textview</w>
       <w>webkitversion</w>
diff --git a/app/src/free/assets/about_privacy_policy.html b/app/src/free/assets/about_privacy_policy.html
index 1abb0270..1ad476da 100644
--- a/app/src/free/assets/about_privacy_policy.html
+++ b/app/src/free/assets/about_privacy_policy.html
@@ -10,7 +10,7 @@
     which has its <a href="https://www.google.com/intl/en/policies/privacy/">own privacy policy</a>.
     Note that unless you have <a href="http://www.techrepublic.com/article/pro-tip-how-to-opt-out-of-interest-based-ads-on-your-android-phone/">opted out of interest-based ads</a>,
     the advertiser will receive a copy of your unique device advertising ID, which allows them to track your device across apps.
-    AdMob reports anonymized summaries of the following information. <strong>Stoutner may use this information for any purpose</strong>.</p>
+    AdMob reports <em>anonymized summaries</em> of the following information. <strong>Stoutner may use this information for any purpose</strong>.</p>
 <ul>
     <li><strong>Total impressions</strong></li>
     <li><strong>Total clicks</strong></li>
@@ -22,7 +22,7 @@
 
 <h3><font color="0D4781">Google Play Ratings</font></h3>
 <p>Google Play has its <a href="https://www.google.com/intl/en/policies/privacy/">own privacy policy</a>.
-    Google provides developers with anonymized summaries of the following information related to user ratings.
+    Google provides developers with <em>anonymized summaries</em> of the following information related to user ratings.
     <strong>Stoutner may use this information for any purpose</strong>.</p>
 <ul>
     <li><strong>Country</strong></li>
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 8a622224..33ae421b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -27,10 +27,7 @@
     <!-- Required to create homescreen shortcuts. -->
     <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
 
-    <!-- Required to upload files to websites. -->
-    <!-- <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> -->
-
-    <!-- on API >= 23, app data is automatically backed up to Google cloud servers unless android:allowBackup="false" and android:fullBackupContent="false" is set. -->
+    <!-- For API >= 23, app data is automatically backed up to Google cloud servers unless android:allowBackup="false" and android:fullBackupContent="false" is set. -->
     <application
         android:label="@string/privacy_browser"
         android:icon="@mipmap/privacy_browser"
@@ -38,10 +35,10 @@
         android:allowBackup="false"
         android:fullBackupContent="false" >
 
-        <!-- android:configChanges="orientation|screenSize" makes the activity not reload when the orientation changes, which preserves scroll location in the WebView. -->
-        <!-- android:launchMode="singleTask" makes the app launch in a new task instead of inside the task of the program that sends it an intent.
-            It also makes it reuse an existing Privacy Browser activity if available instead of launching a new one. -->
-        <!-- android:persistableMode="persistNever" removes Privacy Browser from the recents screen on a device reboot. -->
+        <!-- android:configChanges="orientation|screenSize" makes the activity not reload when the orientation changes, which preserves scroll location in the WebView.
+          android:launchMode="singleTask" makes the app launch in a new task instead of inside the task of the program that sends it an intent.
+          It also makes it reuse an existing Privacy Browser activity if available instead of launching a new one.
+          android:persistableMode="persistNever" removes Privacy Browser from the recents screen on a device reboot. -->
         <activity
             android:name=".MainWebViewActivity"
             android:label="@string/privacy_browser"
@@ -65,8 +62,8 @@
             </intent-filter>
         </activity>
 
-        <!-- android:configChanges="orientation|screenSize" makes the activity not reload when the orientation changes. -->
-        <!-- android:persistableMode="persistNever" removes Privacy Browser from the recents screen on a device reboot. -->
+        <!-- android:configChanges="orientation|screenSize" makes the activity not reload when the orientation changes.
+          android:persistableMode="persistNever" removes Privacy Browser from the recents screen on a device reboot. -->
         <activity
             android:name=".SettingsActivity"
             android:label="@string/privacy_browser_settings"
@@ -80,8 +77,8 @@
                 android:value=".MainWebViewActivity" />
         </activity>
 
-        <!-- android:configChanges="orientation|screenSize" makes the activity not reload when the orientation changes. -->
-        <!-- android:persistableMode="persistNever" removes Privacy Browser from the recents screen on a device reboot. -->
+        <!-- android:configChanges="orientation|screenSize" makes the activity not reload when the orientation changes.
+          android:persistableMode="persistNever" removes Privacy Browser from the recents screen on a device reboot. -->
         <activity
             android:name=".AboutActivity"
             android:label="@string/about_privacy_browser"
diff --git a/app/src/main/assets/about_changelog.html b/app/src/main/assets/about_changelog.html
index 7ec2764e..2d7c5d11 100644
--- a/app/src/main/assets/about_changelog.html
+++ b/app/src/main/assets/about_changelog.html
@@ -1,5 +1,68 @@
 <html>
 <body>
-<p>Changelog</p>
+<h4>1.6 - minimum API 15, target API 23 - released <a href="https://git.stoutner.com/?p=PrivacyBrowser.git;a=commitdiff;h=151e4550065da8e740e8e3bd414ec30ae2a18c33">11 May 2016</a></h4>
+<ul>
+    <li>Add a setting to <a href="https://redmine.stoutner.com/issues/4">customize the search URLs</a>.</li>
+    <li>Add a setting to <a href="https://redmine.stoutner.com/issues/3">customize the browser’s user agent</a>.</li>
+</ul>
+
+<hr />
+
+<h4>1.5 - minimum API 15, target API 23 - released <a href="https://git.stoutner.com/?p=PrivacyBrowser.git;a=commitdiff;h=b0a048867d5582bc693ba8699a75aa93b4fa1b69">5 May 2016</a></h4>
+<ul>
+    <li>Add the option to disable swipe to refresh so that certain websites, like Google Maps, will function correctly.</li>
+</ul>
+
+<hr />
+
+<h4>1.4 - minimum API 15, target API 23 - released <a href="https://git.stoutner.com/?p=PrivacyBrowser.git;a=commitdiff;h=58e6c22da860871eadd1cbf214a30e88ced4f19e">28 April 2016</a></h4>
+<ul>
+    <li>Add controls for <a href="https://redmine.stoutner.com/issues/21">third-party cookies</a>.</li>
+    <li>Fix full screen video playback.</li>
+</ul>
+
+<hr />
+
+<h4>1.3 - minimum API 15, target API 23 - released <a href="https://git.stoutner.com/?p=PrivacyBrowser.git;a=commitdiff;h=4f704be746c00c0a29a52c28646e6d7cf2f9c53c">7 April 2016</a></h4>
+<ul>
+    <li>Create a <a href="https://redmine.stoutner.com/issues/17">navigation drawer</a>.</li>
+</ul>
+
+<hr />
+
+<h4>1.2 - minimum API 15, target API 23 - released <a href="https://git.stoutner.com/?p=PrivacyBrowser.git;a=commitdiff;h=bde6908fee004715f0125ab2d51016dd63a956f4">23 March 2016</a></h4>
+<ul>
+    <li>Update launcher icon to make it bigger.</li>
+    <li>Replace all toast messages with <a href="https://redmine.stoutner.com/issues/12">snackbars</a>.</li>
+    <li><a href="https://redmine.stoutner.com/issues/11">Don't update the URL box if the user is typing in it</a>.</li>
+    <li>Bump the minimum API from 10 to 15.  Privacy Browser was crashing on load in API 10.</li>
+</ul>
+
+<hr />
+
+<h4>1.1 - minimum API 10, target API 23 - released <a href="https://git.stoutner.com/?p=PrivacyBrowser.git;a=commitdiff;h=f56d4111a627bebdb7f181da062253b3e6145381">9 March 2016</a></h4>
+<ul>
+    <li>Separate the standard and the free flavors so that Privacy Browser builds correctly on F-Droid.</li>
+</ul>
+
+<hr />
+
+<h4>1.0 - minimum API 10, target API 23 - released <a href="https://git.stoutner.com/?p=PrivacyBrowser.git;a=commitdiff;h=6f7130bc4218755bea242a2108e4c4ad6f63dcf9">24 Feb 2016</a></h4>
+<ul>
+    <li>Toggle JavaScript, DOM storage, and cookies.</li>
+    <li>Set default enabled status for JavaScript, DOM storage, and cookies.</li>
+    <li>Clear DOM storage and cookies.</li>
+    <li>Add shortcuts to the home screen.</li>
+    <li>Utilize download manager.</li>
+    <li>Navigate forward and back.</li>
+    <li>Cut, copy, paste URLs.</li>
+    <li>Share URLs.</li>
+    <li>Set homepage.</li>
+    <li>Scroll URL bar.</li>
+    <li>Maintain WebView scroll location when rotating screen.</li>
+    <li>Swipe to refresh WebView.</li>
+    <li>Play full screen videos (requires JavaScript to be enabled).</li>
+    <li>Clear and Exit menu item.</li>
+</ul>
 </body>
 </html>
\ No newline at end of file
diff --git a/app/src/main/assets/about_permissions.html b/app/src/main/assets/about_permissions.html
index 77ebdbf7..742c9593 100644
--- a/app/src/main/assets/about_permissions.html
+++ b/app/src/main/assets/about_permissions.html
@@ -3,7 +3,7 @@
 <h2>Privacy Browser uses the following permissions.</h2>
 
 <h3>Have full network access (<a href="https://developer.android.com/reference/android/Manifest.permission.html#INTERNET">android.permission.INTERNET</a>)</h3>
-<p>Required for the WebView to access the internet.  Without this permission, Privacy Browser would be “No Browser: Protect Your Privacy by Staying Completely Off the Internet”.</p>
+<p>Required for the WebView to access the internet.  Without this permission, Privacy Browser would be “No Browser: Protecting Your Privacy by Staying Completely Off the Internet”.</p>
 
 <h3>Install shortcuts (<a href="https://developer.android.com/reference/android/Manifest.permission.html#INSTALL_SHORTCUT">com.android.launcher.permission.INSTALL_SHORTCUT</a>)</h3>
 <p>Required to add shortcuts for websites to the launcher desktop.</p>
diff --git a/app/src/main/assets/about_privacy_policy.html b/app/src/main/assets/about_privacy_policy.html
index 2aa3f2ab..4351af01 100644
--- a/app/src/main/assets/about_privacy_policy.html
+++ b/app/src/main/assets/about_privacy_policy.html
@@ -7,7 +7,7 @@
 
 <h3><font color="0D4781">Google Play Ratings</font></h3>
 <p>Google Play has its <a href="https://www.google.com/intl/en/policies/privacy/">own privacy policy</a>.
-    Google provides developers with anonymized summaries of the following information related to user ratings.
+    Google provides developers with <em>anonymized summaries</em> of the following information related to user ratings.
     <strong>Stoutner may use this information for any purpose</strong>.</p>
 <ul>
     <li><strong>Country</strong></li>
-- 
2.45.2