From: Soren Stoutner Date: Sat, 4 Jun 2016 02:22:57 +0000 (-0700) Subject: Populate the About:Privacy Policy tab. X-Git-Tag: v1.7~10 X-Git-Url: https://gitweb.stoutner.com/?a=commitdiff_plain;h=e82e1211aa3063e2cb2dd716df160364abfaa073;p=PrivacyBrowserAndroid.git Populate the About:Privacy Policy tab. --- diff --git a/.idea/dictionaries/soren.xml b/.idea/dictionaries/soren.xml index 1dca8f52..7e004c46 100644 --- a/.idea/dictionaries/soren.xml +++ b/.idea/dictionaries/soren.xml @@ -2,20 +2,26 @@ androidversion + anonymized aren buildapi buildversion chromeversion + exynos + intl khtml konqueror linearlayout mozilla nojs relativelayout + samsung securitypatch snackbar + techrepublic textview webkitversion + zenlte \ No newline at end of file diff --git a/app/src/free/assets/about_privacy_policy.html b/app/src/free/assets/about_privacy_policy.html new file mode 100644 index 00000000..1abb0270 --- /dev/null +++ b/app/src/free/assets/about_privacy_policy.html @@ -0,0 +1,63 @@ + + +

Privacy Browser Free

+

Privacy Browser Free does not collect any user information.

+ +
+ +

Advertisements

+

Privacy Browser Free displays a banner add across the bottom of the screen using the Google's AdMob network, + which has its own privacy policy. + Note that unless you have opted out of interest-based ads, + 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. Stoutner may use this information for any purpose.

+ + +
+ +

Google Play Ratings

+

Google Play has its own privacy policy. + Google provides developers with anonymized summaries of the following information related to user ratings. + Stoutner may use this information for any purpose.

+ + +
+ +

Google Play Reviews

+

Google Play has it own privacy policy. + In addition to the name of the reviewer, the rating, and the text of the review (which are all available publicly), + Google provides some or all of the following information to the developer. + Stoutner may use this information for any purpose.

+ + +
+

Revision 1.2, 3 June 2016

+ + \ 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 adc0ddf0..77ebdbf7 100644 --- a/app/src/main/assets/about_permissions.html +++ b/app/src/main/assets/about_permissions.html @@ -1,8 +1,10 @@

Privacy Browser uses the following permissions.

+

Have full network access (android.permission.INTERNET)

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”.

+

Install shortcuts (com.android.launcher.permission.INSTALL_SHORTCUT)

Required to add shortcuts for websites to the launcher desktop.

diff --git a/app/src/main/assets/about_privacy_policy.html b/app/src/main/assets/about_privacy_policy.html new file mode 100644 index 00000000..2aa3f2ab --- /dev/null +++ b/app/src/main/assets/about_privacy_policy.html @@ -0,0 +1,48 @@ + + +

Privacy Browser

+

Privacy Browser does not collect any user information.

+ +
+ +

Google Play Ratings

+

Google Play has its own privacy policy. + Google provides developers with anonymized summaries of the following information related to user ratings. + Stoutner may use this information for any purpose.

+ + +
+ +

Google Play Reviews

+

Google Play has it own privacy policy. + In addition to the name of the reviewer, the rating, and the text of the review (which are all available publicly), + Google provides some or all of the following information to the developer. + Stoutner may use this information for any purpose.

+ + +
+

Revision 1.2, 3 June 2016

+ + \ No newline at end of file diff --git a/app/src/main/java/com/stoutner/privacybrowser/AboutActivity.java b/app/src/main/java/com/stoutner/privacybrowser/AboutActivity.java index c5d7bf77..2e019f59 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/AboutActivity.java +++ b/app/src/main/java/com/stoutner/privacybrowser/AboutActivity.java @@ -52,11 +52,11 @@ public class AboutActivity extends AppCompatActivity { @Override // Get the count of the number of tabs. public int getCount() { - return 5; + return 6; } @Override - // Get the name of each tab. + // Get the name of each tab. Tab numbers start at 0. public CharSequence getPageTitle(int tab) { switch (tab) { case 0: @@ -66,12 +66,15 @@ public class AboutActivity extends AppCompatActivity { return getString(R.string.permissions); case 2: - return getString(R.string.changelog); + return getString(R.string.privacy_policy); case 3: - return getString(R.string.license); + return getString(R.string.changelog); case 4: + return getString(R.string.license); + + case 5: return getString(R.string.contributors); default: diff --git a/app/src/main/java/com/stoutner/privacybrowser/AboutTabFragment.java b/app/src/main/java/com/stoutner/privacybrowser/AboutTabFragment.java index eda3e30a..c82af274 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/AboutTabFragment.java +++ b/app/src/main/java/com/stoutner/privacybrowser/AboutTabFragment.java @@ -52,7 +52,7 @@ public class AboutTabFragment extends Fragment { public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { View tabLayout; - // Load the about tab layout. + // Load the about tab layout. Tab numbers start at 0. if (tabNumber == 0) { // Setting false at the end of inflater.inflate does not attach the inflated layout as a child of container. // The fragment will take care of attaching the root automatically. @@ -130,7 +130,7 @@ public class AboutTabFragment extends Fragment { // Select the substring that begins after "Chrome/" and goes until the next " ". String chromeVersion = userAgentString.substring(userAgentString.indexOf("Chrome/") + 7, userAgentString.indexOf(" ", userAgentString.indexOf("Chrome/"))); versionChromeText.setText(chromeVersion); - } else { // load a WebView for all the other tabs. + } else { // load a WebView for all the other tabs. Tab numbers start at 0. // Setting false at the end of inflater.inflate does not attach the inflated layout as a child of container. // The fragment will take care of attaching the root automatically. tabLayout = inflater.inflate(R.layout.about_tab_webview, container, false); @@ -142,14 +142,18 @@ public class AboutTabFragment extends Fragment { break; case 2: - tabWebView.loadUrl("file:///android_asset/about_changelog.html"); + tabWebView.loadUrl("file:///android_asset/about_privacy_policy.html"); break; case 3: - tabWebView.loadUrl("file:///android_asset/about_license.html"); + tabWebView.loadUrl("file:///android_asset/about_changelog.html"); break; case 4: + tabWebView.loadUrl("file:///android_asset/about_license.html"); + break; + + case 5: tabWebView.loadUrl("file:///android_asset/about_contributors.html"); break; diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6ccc4270..134ee100 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -167,6 +167,7 @@ WebKit:\u00A0 Chrome:\u00A0 Permissions + Privacy Policy Changelog License Contributors