]> gitweb.stoutner.com Git - PrivacyBrowserAndroid.git/commitdiff
projects / PrivacyBrowserAndroid.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: bb64092)
Create the About:Links tab.
authorSoren Stoutner <soren@stoutner.com>
Tue, 7 Jun 2016 21:32:35 +0000 (14:32 -0700)
committerSoren Stoutner <soren@stoutner.com>
Tue, 7 Jun 2016 21:32:35 +0000 (14:32 -0700)
app/src/free/assets/about_privacy_policy.html patch | blob | history
app/src/main/assets/about_changelog.html patch | blob | history
app/src/main/assets/about_contributors.html patch | blob | history
app/src/main/assets/about_license.html patch | blob | history
app/src/main/assets/about_links.html [new file with mode: 0644] patch | blob
app/src/main/assets/about_permissions.html patch | blob | history
app/src/main/assets/about_privacy_policy.html patch | blob | history
app/src/main/java/com/stoutner/privacybrowser/AboutActivity.java patch | blob | history
app/src/main/java/com/stoutner/privacybrowser/AboutTabFragment.java patch | blob | history
app/src/main/res/values/strings.xml patch | blob | history

diff --git a/app/src/free/assets/about_privacy_policy.html b/app/src/free/assets/about_privacy_policy.html
index a51f2bfdcf347d0598f065af55092e87e5f96c6e..3b61cfe53e5b2886926a1af205e8a70d5647e61c 100644 (file)
--- a/app/src/free/assets/about_privacy_policy.html
+++ b/app/src/free/assets/about_privacy_policy.html
@@ -1,3 +1,21 @@
+<!--
+  Copyright 2016 Soren Stoutner <soren@stoutner.com>.
+
+  This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
+
+  Privacy Browser is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  Privacy Browser is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with Privacy Browser.  If not, see <http://www.gnu.org/licenses/>. -->
+
 <html>
 <body>
 <h3><font color="0D4781">Privacy Browser Free</font></h3>
diff --git a/app/src/main/assets/about_changelog.html b/app/src/main/assets/about_changelog.html
index ca11b748fd43e509fd000815e77c2c077e0bff52..2d90a7e72a30b78fe32f35e9bf1e05d4fd9462b8 100644 (file)
--- a/app/src/main/assets/about_changelog.html
+++ b/app/src/main/assets/about_changelog.html
@@ -1,3 +1,21 @@
+<!--
+  Copyright 2016 Soren Stoutner <soren@stoutner.com>.
+
+  This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
+
+  Privacy Browser is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  Privacy Browser is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with Privacy Browser.  If not, see <http://www.gnu.org/licenses/>. -->
+
 <html>
 <body>
 <h4>1.6 <font color="0D4781">- minimum API 15, target API 23 - released <a href="https://git.stoutner.com/?p=PrivacyBrowser.git;a=commitdiff;h=151e4550065da8e740e8e3bd414ec30ae2a18c33">11 May 2016</a></font></h4>
diff --git a/app/src/main/assets/about_contributors.html b/app/src/main/assets/about_contributors.html
index 8c1ca87271b56de4a15cc3842b94157bd46054c8..68fbfacacc157645c780ecfd2469c494bbf13903 100644 (file)
--- a/app/src/main/assets/about_contributors.html
+++ b/app/src/main/assets/about_contributors.html
@@ -1,7 +1,25 @@
+<!--
+  Copyright 2016 Soren Stoutner <soren@stoutner.com>.
+
+  This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
+
+  Privacy Browser is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  Privacy Browser is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with Privacy Browser.  If not, see <http://www.gnu.org/licenses/>. -->
+
 <html>
 <body>
 <p>Privacy Browser is primarily developed by <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.</p>
 
-<p>Contributors are welcome to submit both code and translations.</p>
+<p>Contributors are welcome to submit both <a href="https://www.stoutner.com/privacy-browser/contributors/">code and translations</a>.</p>
 </body>
 </html>
\ No newline at end of file
diff --git a/app/src/main/assets/about_license.html b/app/src/main/assets/about_license.html
index 78269a25993bdee9e143ca76ad8a37fc160932f7..2322c4eff2ea8f4985e807507651f410e64a1dd0 100644 (file)
--- a/app/src/main/assets/about_license.html
+++ b/app/src/main/assets/about_license.html
@@ -1,3 +1,21 @@
+<!--
+  Copyright 2016 Soren Stoutner <soren@stoutner.com>.
+
+  This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
+
+  Privacy Browser is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  Privacy Browser is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with Privacy Browser.  If not, see <http://www.gnu.org/licenses/>. -->
+
 <html>
 <head>
 <style>
diff --git a/app/src/main/assets/about_links.html b/app/src/main/assets/about_links.html
new file mode 100644 (file)
index 0000000..a02225b
--- /dev/null
+++ b/app/src/main/assets/about_links.html
@@ -0,0 +1,29 @@
+<!--
+  Copyright 2016 Soren Stoutner <soren@stoutner.com>.
+
+  This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
+
+  Privacy Browser is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  Privacy Browser is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with Privacy Browser.  If not, see <http://www.gnu.org/licenses/>. -->
+
+<html>
+<body>
+<p>More information related to Privacy Browser is available on the website.</p>
+
+<ul>
+    <li><a href="https://redmine.stoutner.com/projects/privacy-browser/issues">Bug Tracker and Feature Requests</a>.</li>
+    <li><a href="https://redmine.stoutner.com/projects/privacy-browser/boards">Forum</a>.</li>
+    <li><a href="https://git.stoutner.com/?p=PrivacyBrowser.git;a=summary">GitWeb</a>.</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 17cbcf8435fe313ca2e832ac616e7deddad1d6db..92af0dd70d2e31787d0a7e0a0917b7fa241c03b8 100644 (file)
--- a/app/src/main/assets/about_permissions.html
+++ b/app/src/main/assets/about_permissions.html
@@ -1,3 +1,21 @@
+<!--
+  Copyright 2016 Soren Stoutner <soren@stoutner.com>.
+
+  This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
+
+  Privacy Browser is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  Privacy Browser is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with Privacy Browser.  If not, see <http://www.gnu.org/licenses/>. -->
+
 <html>
 <body>
 <h2>Privacy Browser uses the following permissions.</h2>
diff --git a/app/src/main/assets/about_privacy_policy.html b/app/src/main/assets/about_privacy_policy.html
index e91c130411961d1bba8d6b3eeecebf333275cacf..352c16389507f3c48d141b218d3cd081a0436607 100644 (file)
--- a/app/src/main/assets/about_privacy_policy.html
+++ b/app/src/main/assets/about_privacy_policy.html
@@ -1,3 +1,21 @@
+<!--
+  Copyright 2016 Soren Stoutner <soren@stoutner.com>.
+
+  This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
+
+  Privacy Browser is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  Privacy Browser is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with Privacy Browser.  If not, see <http://www.gnu.org/licenses/>. -->
+
 <html>
 <body>
 <h3><font color="0D4781">Privacy Browser</font></h3>
diff --git a/app/src/main/java/com/stoutner/privacybrowser/AboutActivity.java b/app/src/main/java/com/stoutner/privacybrowser/AboutActivity.java
index 2e019f599e646b445461e5bbe16bb43ef26b6b3f..1df1387288a01fa35cd8dd8fc86045f194cd5c97 100644 (file)
--- a/app/src/main/java/com/stoutner/privacybrowser/AboutActivity.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/AboutActivity.java
@@ -52,7 +52,7 @@ public class AboutActivity extends AppCompatActivity {
         @Override
         // Get the count of the number of tabs.
         public int getCount() {
-            return 6;
+            return 7;
         }
 
         @Override
@@ -77,6 +77,9 @@ public class AboutActivity extends AppCompatActivity {
                 case 5:
                     return getString(R.string.contributors);
 
+                case 6:
+                    return getString(R.string.links);
+
                 default:
                     return "";
             }
diff --git a/app/src/main/java/com/stoutner/privacybrowser/AboutTabFragment.java b/app/src/main/java/com/stoutner/privacybrowser/AboutTabFragment.java
index c82af274023e3eb78872492fe5aa0fce032ae9f1..b88c30a0420a1c97c3c540bc8844fb87e1a4bd9e 100644 (file)
--- a/app/src/main/java/com/stoutner/privacybrowser/AboutTabFragment.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/AboutTabFragment.java
@@ -157,6 +157,9 @@ public class AboutTabFragment extends Fragment {
                     tabWebView.loadUrl("file:///android_asset/about_contributors.html");
                     break;
 
+                case 6:
+                    tabWebView.loadUrl("file:///android_asset/about_links.html");
+
                 default:
                     break;
             }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 134ee100b0c8b1553efbc6db67f4e67be9e637aa..eb2a4585cd10e23022d44b2437b4cdfac4da5652 100644 (file)
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -171,7 +171,7 @@
     <string name="changelog">Changelog</string>
     <string name="license">License</string>
     <string name="contributors">Contributors</string>
-    <string name="dismiss">Dismiss</string>
+    <string name="links">Links</string>
 
     <!-- Ad Control. -->
     <string name="ad_id">Null</string>  <!-- There are no ads in the standard flavor, but this string must exist because it is referenced in the code. -->
A web browser that respects your privacy.