From f82135d919d64d4909c37c79a18e14ceba802579 Mon Sep 17 00:00:00 2001 From: Soren Stoutner Date: Thu, 18 May 2017 17:56:17 -0700 Subject: [PATCH] Updates about_licenses, adding the full text of the Apache License 2.0 and the 3-Clause BSD License. --- app/build.gradle | 2 +- app/src/free/assets/de/about_permissions.html | 2 +- .../free/assets/de/about_privacy_policy.html | 2 +- app/src/free/assets/en/about_permissions.html | 2 +- .../free/assets/en/about_privacy_policy.html | 2 +- app/src/free/assets/es/about_permissions.html | 2 +- .../free/assets/es/about_privacy_policy.html | 2 +- app/src/free/assets/it/about_permissions.html | 2 +- .../free/assets/it/about_privacy_policy.html | 2 +- .../free/assets/zh-rTW/about_permissions.html | 2 +- .../assets/zh-rTW/about_privacy_policy.html | 2 +- .../com/stoutner/privacybrowser/BannerAd.java | 2 +- app/src/free/res/layout/main_webview.xml | 2 +- app/src/free/res/values-de/strings.xml | 2 +- app/src/free/res/values-es/strings.xml | 2 +- app/src/free/res/values-it/strings.xml | 2 +- app/src/free/res/values-zh-rTW/strings.xml | 2 +- app/src/free/res/values/strings.xml | 2 +- app/src/main/AndroidManifest.xml | 2 +- app/src/main/assets/de/about_changelog.html | 2 +- .../main/assets/de/about_contributors.html | 2 +- app/src/main/assets/de/about_licenses.html | 344 +++++++++++++++++- app/src/main/assets/de/about_links.html | 2 +- app/src/main/assets/de/about_permissions.html | 2 +- .../main/assets/de/about_privacy_policy.html | 2 +- .../main/assets/de/guide_clear_and_exit.html | 2 +- .../main/assets/de/guide_domain_settings.html | 2 +- app/src/main/assets/de/guide_javascript.html | 2 +- .../main/assets/de/guide_local_storage.html | 2 +- app/src/main/assets/de/guide_overview.html | 2 +- .../assets/de/guide_planned_features.html | 2 +- app/src/main/assets/de/guide_tor.html | 2 +- .../main/assets/de/guide_tracking_ids.html | 2 +- app/src/main/assets/de/guide_user_agent.html | 2 +- app/src/main/assets/en/about_changelog.html | 2 +- .../main/assets/en/about_contributors.html | 2 +- app/src/main/assets/en/about_licenses.html | 340 ++++++++++++++++- app/src/main/assets/en/about_links.html | 2 +- app/src/main/assets/en/about_permissions.html | 2 +- .../main/assets/en/about_privacy_policy.html | 2 +- .../main/assets/en/guide_clear_and_exit.html | 2 +- .../main/assets/en/guide_domain_settings.html | 2 +- app/src/main/assets/en/guide_javascript.html | 2 +- .../main/assets/en/guide_local_storage.html | 2 +- app/src/main/assets/en/guide_overview.html | 2 +- .../assets/en/guide_planned_features.html | 2 +- app/src/main/assets/en/guide_tor.html | 2 +- .../main/assets/en/guide_tracking_ids.html | 2 +- app/src/main/assets/en/guide_user_agent.html | 2 +- .../main/assets/en/images/ic_find_in_page.png | Bin 0 -> 2115 bytes .../assets/en/images/ic_important_devices.png | Bin 0 -> 1592 bytes .../assets/en/images/ic_local_activity.png | Bin 0 -> 1889 bytes app/src/main/assets/en/images/ic_search.png | Bin 0 -> 1893 bytes .../assets/en/images/ic_visibility_off.png | Bin 0 -> 2400 bytes app/src/main/assets/en/images/orbot.png | Bin 0 -> 1995 bytes app/src/main/assets/es/about_changelog.html | 2 +- .../main/assets/es/about_contributors.html | 2 +- app/src/main/assets/es/about_licenses.html | 340 ++++++++++++++++- app/src/main/assets/es/about_links.html | 2 +- app/src/main/assets/es/about_permissions.html | 2 +- .../main/assets/es/about_privacy_policy.html | 2 +- .../main/assets/es/guide_clear_and_exit.html | 2 +- .../main/assets/es/guide_domain_settings.html | 2 +- app/src/main/assets/es/guide_javascript.html | 2 +- .../main/assets/es/guide_local_storage.html | 2 +- app/src/main/assets/es/guide_overview.html | 2 +- .../assets/es/guide_planned_features.html | 4 +- app/src/main/assets/es/guide_tor.html | 2 +- .../main/assets/es/guide_tracking_ids.html | 2 +- app/src/main/assets/es/guide_user_agent.html | 2 +- app/src/main/assets/it/about_changelog.html | 2 +- .../main/assets/it/about_contributors.html | 2 +- app/src/main/assets/it/about_licenses.html | 338 ++++++++++++++++- app/src/main/assets/it/about_links.html | 2 +- app/src/main/assets/it/about_permissions.html | 2 +- .../main/assets/it/about_privacy_policy.html | 2 +- .../main/assets/it/guide_clear_and_exit.html | 2 +- .../main/assets/it/guide_domain_settings.html | 4 +- app/src/main/assets/it/guide_javascript.html | 2 +- .../main/assets/it/guide_local_storage.html | 2 +- app/src/main/assets/it/guide_overview.html | 2 +- .../assets/it/guide_planned_features.html | 2 +- app/src/main/assets/it/guide_tor.html | 4 +- .../main/assets/it/guide_tracking_ids.html | 2 +- app/src/main/assets/it/guide_user_agent.html | 2 +- .../main/assets/zh-rTW/about_changelog.html | 2 +- .../assets/zh-rTW/about_contributors.html | 2 +- .../main/assets/zh-rTW/about_licenses.html | 340 ++++++++++++++++- app/src/main/assets/zh-rTW/about_links.html | 2 +- .../main/assets/zh-rTW/about_permissions.html | 2 +- .../assets/zh-rTW/about_privacy_policy.html | 2 +- .../assets/zh-rTW/guide_clear_and_exit.html | 2 +- .../assets/zh-rTW/guide_domain_settings.html | 2 +- .../main/assets/zh-rTW/guide_javascript.html | 2 +- .../assets/zh-rTW/guide_local_storage.html | 2 +- .../main/assets/zh-rTW/guide_overview.html | 2 +- .../assets/zh-rTW/guide_planned_features.html | 2 +- app/src/main/assets/zh-rTW/guide_tor.html | 2 +- .../assets/zh-rTW/guide_tracking_ids.html | 2 +- .../main/assets/zh-rTW/guide_user_agent.html | 2 +- .../activities/AboutActivity.java | 2 +- .../activities/BookmarksActivity.java | 2 +- .../BookmarksDatabaseViewActivity.java | 2 +- .../activities/DomainSettingsActivity.java | 2 +- .../activities/DomainsActivity.java | 2 +- .../activities/GuideActivity.java | 2 +- .../activities/MainWebViewActivity.java | 2 +- .../activities/SettingsActivity.java | 2 +- .../adapters/HistoryArrayAdapter.java | 4 +- .../privacybrowser/definitions/History.java | 2 +- .../dialogs/AddDomainDialog.java | 2 +- .../dialogs/CreateBookmarkDialog.java | 2 +- .../dialogs/CreateBookmarkFolderDialog.java | 2 +- .../CreateHomeScreenShortcutDialog.java | 2 +- .../dialogs/DownloadFileDialog.java | 2 +- .../dialogs/DownloadImageDialog.java | 2 +- .../dialogs/EditBookmarkDialog.java | 2 +- .../dialogs/EditBookmarkFolderDialog.java | 2 +- .../dialogs/MoveToFolderDialog.java | 2 +- .../dialogs/SslCertificateErrorDialog.java | 2 +- .../dialogs/UrlHistoryDialog.java | 2 +- .../dialogs/ViewSslCertificateDialog.java | 2 +- .../fragments/AboutTabFragment.java | 2 +- .../fragments/DomainSettingsFragment.java | 2 +- .../fragments/GuideTabFragment.java | 2 +- .../fragments/SettingsFragment.java | 92 ++++- .../helpers/BookmarksDatabaseHelper.java | 2 +- .../helpers/DomainsDatabaseHelper.java | 2 +- .../helpers/OrbotProxyHelper.java | 2 +- app/src/main/res/drawable/about.xml | 1 - app/src/main/res/drawable/add.xml | 1 - app/src/main/res/drawable/back.xml | 2 +- .../main/res/drawable/block_ads_disabled.xml | 12 + .../main/res/drawable/block_ads_enabled.xml | 12 + app/src/main/res/drawable/bookmarks.xml | 1 - app/src/main/res/drawable/close.xml | 1 - .../main/res/drawable/cookies_disabled.xml | 2 +- app/src/main/res/drawable/cookies_enabled.xml | 2 +- app/src/main/res/drawable/cookies_ghosted.xml | 2 +- app/src/main/res/drawable/cookies_warning.xml | 2 +- app/src/main/res/drawable/create_folder.xml | 2 +- .../drawable/custom_user_agent_enabled.xml | 18 + .../drawable/custom_user_agent_ghosted.xml | 18 + app/src/main/res/drawable/delete.xml | 1 - app/src/main/res/drawable/delete_blue.xml | 1 - .../res/drawable/do_not_track_disabled.xml | 3 +- .../res/drawable/do_not_track_enabled.xml | 3 +- .../res/drawable/dom_storage_disabled.xml | 2 +- .../main/res/drawable/dom_storage_enabled.xml | 2 +- .../main/res/drawable/dom_storage_ghosted.xml | 2 +- app/src/main/res/drawable/domains.xml | 2 +- app/src/main/res/drawable/downloads.xml | 1 - app/src/main/res/drawable/edit.xml | 2 +- app/src/main/res/drawable/exit.xml | 2 +- .../main/res/drawable/folder_dark_blue.xml | 1 - app/src/main/res/drawable/folder_gray.xml | 1 - app/src/main/res/drawable/font_size.xml | 2 +- .../main/res/drawable/form_data_disabled.xml | 2 +- .../main/res/drawable/form_data_enabled.xml | 2 +- app/src/main/res/drawable/forward.xml | 2 +- app/src/main/res/drawable/guide.xml | 2 +- app/src/main/res/drawable/history.xml | 2 +- app/src/main/res/drawable/home.xml | 1 - .../res/drawable/incognito_mode_disabled.xml | 18 + .../res/drawable/incognito_mode_enabled.xml | 18 + .../main/res/drawable/javascript_enabled.xml | 2 +- .../drawable/move_bookmark_down_disabled.xml | 1 - .../drawable/move_bookmark_down_enabled.xml | 1 - .../drawable/move_bookmark_up_disabled.xml | 1 - .../res/drawable/move_bookmark_up_enabled.xml | 1 - app/src/main/res/drawable/move_to_folder.xml | 2 +- app/src/main/res/drawable/next.xml | 1 - app/src/main/res/drawable/orbot_disabled.xml | 19 + app/src/main/res/drawable/orbot_enabled.xml | 19 + app/src/main/res/drawable/previous.xml | 1 - app/src/main/res/drawable/privacy_mode.xml | 2 +- .../drawable/search_custom_url_enabled.xml | 18 + .../drawable/search_custom_url_ghosted.xml | 18 + app/src/main/res/drawable/search_enabled.xml | 18 + app/src/main/res/drawable/select_all.xml | 1 - app/src/main/res/drawable/settings.xml | 1 - ...{user_agent_ghosted.xml => user_agent.xml} | 6 +- app/src/main/res/drawable/warning.xml | 2 +- .../main/res/layout-w900dp/domains_list.xml | 2 +- .../res/layout/about_coordinatorlayout.xml | 2 +- app/src/main/res/layout/about_tab_version.xml | 2 +- app/src/main/res/layout/add_domain_dialog.xml | 2 +- app/src/main/res/layout/bare_webview.xml | 2 +- .../layout/bookmarks_coordinatorlayout.xml | 2 +- ...kmarks_database_view_coordinatorlayout.xml | 2 +- ...kmarks_database_view_item_linearlayout.xml | 2 +- .../layout/bookmarks_item_linearlayout.xml | 2 +- .../res/layout/create_bookmark_dialog.xml | 2 +- .../layout/create_bookmark_folder_dialog.xml | 2 +- .../create_home_screen_shortcut_dialog.xml | 2 +- .../res/layout/domain_name_linearlayout.xml | 2 +- app/src/main/res/layout/domain_settings.xml | 4 +- .../domain_settings_coordinatorlayout.xml | 2 +- .../res/layout/domains_coordinatorlayout.xml | 2 +- app/src/main/res/layout/domains_list.xml | 2 +- .../main/res/layout/download_file_dialog.xml | 2 +- .../main/res/layout/download_image_dialog.xml | 2 +- .../main/res/layout/edit_bookmark_dialog.xml | 2 +- .../layout/edit_bookmark_folder_dialog.xml | 2 +- .../main/res/layout/find_on_page_app_bar.xml | 2 +- .../res/layout/guide_coordinatorlayout.xml | 2 +- app/src/main/res/layout/guide_tab_webview.xml | 2 +- app/src/main/res/layout/main_drawerlayout.xml | 2 +- app/src/main/res/layout/main_webview.xml | 2 +- .../main/res/layout/move_to_folder_dialog.xml | 2 +- .../move_to_folder_item_linearlayout.xml | 2 +- app/src/main/res/layout/navigation_header.xml | 2 +- .../main/res/layout/ssl_certificate_error.xml | 2 +- .../main/res/layout/unencrypted_website.xml | 2 +- app/src/main/res/layout/url_app_bar.xml | 2 +- .../main/res/layout/url_history_dialog.xml | 2 +- .../layout/url_history_item_linearlayout.xml | 2 +- .../main/res/layout/view_ssl_certificate.xml | 2 +- .../main/res/menu/bookmarks_context_menu.xml | 2 +- .../main/res/menu/bookmarks_options_menu.xml | 2 +- .../main/res/menu/domains_options_menu.xml | 2 +- .../main/res/menu/webview_navigation_menu.xml | 2 +- .../main/res/menu/webview_options_menu.xml | 2 +- app/src/main/res/values-de/strings.xml | 2 +- app/src/main/res/values-es/strings.xml | 2 +- app/src/main/res/values-it/strings.xml | 2 +- app/src/main/res/values-zh-rTW/strings.xml | 2 +- app/src/main/res/values/colors.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- app/src/main/res/values/styles.xml | 2 +- app/src/main/res/xml/preferences.xml | 7 +- .../com/stoutner/privacybrowser/BannerAd.java | 4 +- 232 files changed, 2122 insertions(+), 283 deletions(-) create mode 100644 app/src/main/assets/en/images/ic_find_in_page.png create mode 100644 app/src/main/assets/en/images/ic_important_devices.png create mode 100644 app/src/main/assets/en/images/ic_local_activity.png create mode 100644 app/src/main/assets/en/images/ic_search.png create mode 100644 app/src/main/assets/en/images/ic_visibility_off.png create mode 100644 app/src/main/assets/en/images/orbot.png create mode 100644 app/src/main/res/drawable/block_ads_disabled.xml create mode 100644 app/src/main/res/drawable/block_ads_enabled.xml create mode 100644 app/src/main/res/drawable/custom_user_agent_enabled.xml create mode 100644 app/src/main/res/drawable/custom_user_agent_ghosted.xml create mode 100644 app/src/main/res/drawable/incognito_mode_disabled.xml create mode 100644 app/src/main/res/drawable/incognito_mode_enabled.xml create mode 100644 app/src/main/res/drawable/orbot_disabled.xml create mode 100644 app/src/main/res/drawable/orbot_enabled.xml create mode 100644 app/src/main/res/drawable/search_custom_url_enabled.xml create mode 100644 app/src/main/res/drawable/search_custom_url_ghosted.xml create mode 100644 app/src/main/res/drawable/search_enabled.xml rename app/src/main/res/drawable/{user_agent_ghosted.xml => user_agent.xml} (86%) diff --git a/app/build.gradle b/app/build.gradle index d6155919..16dd5a44 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,5 +1,5 @@ /* - * Copyright 2016-2017 Soren Stoutner . + * Copyright © 2016-2017 Soren Stoutner . * * This file is part of Privacy Browser . * diff --git a/app/src/free/assets/de/about_permissions.html b/app/src/free/assets/de/about_permissions.html index 45083853..75b01770 100644 --- a/app/src/free/assets/de/about_permissions.html +++ b/app/src/free/assets/de/about_permissions.html @@ -1,5 +1,5 @@ - - - + + + + + + diff --git a/app/src/main/res/drawable/block_ads_enabled.xml b/app/src/main/res/drawable/block_ads_enabled.xml new file mode 100644 index 00000000..de1efc61 --- /dev/null +++ b/app/src/main/res/drawable/block_ads_enabled.xml @@ -0,0 +1,12 @@ + + + + + + diff --git a/app/src/main/res/drawable/bookmarks.xml b/app/src/main/res/drawable/bookmarks.xml index 29b2648d..995775bc 100644 --- a/app/src/main/res/drawable/bookmarks.xml +++ b/app/src/main/res/drawable/bookmarks.xml @@ -1,5 +1,4 @@ - - . It is released under the Apache License 2.0. --> - + . It is released under the Apache License 2.0. --> - + . It is released under the Apache License 2.0. --> - + . It is released under the Apache License 2.0. --> - + - + + + + + + + + diff --git a/app/src/main/res/drawable/custom_user_agent_ghosted.xml b/app/src/main/res/drawable/custom_user_agent_ghosted.xml new file mode 100644 index 00000000..86bdf912 --- /dev/null +++ b/app/src/main/res/drawable/custom_user_agent_ghosted.xml @@ -0,0 +1,18 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/delete.xml b/app/src/main/res/drawable/delete.xml index 15b276bd..853d272c 100644 --- a/app/src/main/res/drawable/delete.xml +++ b/app/src/main/res/drawable/delete.xml @@ -1,5 +1,4 @@ - - - + + diff --git a/app/src/main/res/drawable/do_not_track_enabled.xml b/app/src/main/res/drawable/do_not_track_enabled.xml index c60ecc1b..dafb11e6 100644 --- a/app/src/main/res/drawable/do_not_track_enabled.xml +++ b/app/src/main/res/drawable/do_not_track_enabled.xml @@ -1,6 +1,6 @@ - + + diff --git a/app/src/main/res/drawable/dom_storage_disabled.xml b/app/src/main/res/drawable/dom_storage_disabled.xml index b6a8d83f..d6180570 100644 --- a/app/src/main/res/drawable/dom_storage_disabled.xml +++ b/app/src/main/res/drawable/dom_storage_disabled.xml @@ -1,6 +1,6 @@ - + - + - + - + - - + - + - - - + - + - + - + - + - + - + + + + + + + diff --git a/app/src/main/res/drawable/incognito_mode_enabled.xml b/app/src/main/res/drawable/incognito_mode_enabled.xml new file mode 100644 index 00000000..a8fee863 --- /dev/null +++ b/app/src/main/res/drawable/incognito_mode_enabled.xml @@ -0,0 +1,18 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/javascript_enabled.xml b/app/src/main/res/drawable/javascript_enabled.xml index 3af89ca6..02c9b168 100644 --- a/app/src/main/res/drawable/javascript_enabled.xml +++ b/app/src/main/res/drawable/javascript_enabled.xml @@ -1,5 +1,5 @@ + Modifications copyright Soren Stoutner 2016. The resulting image is released under the GPLv3+ license. --> - - - - - + - , which is released under the 3-clause BSD license. + Modifications copyright Soren Stoutner 2017. The resulting image is released under the GPLv3+ license. --> + + + + + + + diff --git a/app/src/main/res/drawable/orbot_enabled.xml b/app/src/main/res/drawable/orbot_enabled.xml new file mode 100644 index 00000000..1b3c2cc7 --- /dev/null +++ b/app/src/main/res/drawable/orbot_enabled.xml @@ -0,0 +1,19 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/previous.xml b/app/src/main/res/drawable/previous.xml index 2b0eb08f..c10bb3d4 100644 --- a/app/src/main/res/drawable/previous.xml +++ b/app/src/main/res/drawable/previous.xml @@ -1,5 +1,4 @@ - in 2016 and are released under the GPLv3+ license. --> + Modifications copyright Soren Stoutner 2016. The resulting image is released under the GPLv3+ license. --> + + + + + + + diff --git a/app/src/main/res/drawable/search_custom_url_ghosted.xml b/app/src/main/res/drawable/search_custom_url_ghosted.xml new file mode 100644 index 00000000..c2cc1177 --- /dev/null +++ b/app/src/main/res/drawable/search_custom_url_ghosted.xml @@ -0,0 +1,18 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/search_enabled.xml b/app/src/main/res/drawable/search_enabled.xml new file mode 100644 index 00000000..7f4a880e --- /dev/null +++ b/app/src/main/res/drawable/search_enabled.xml @@ -0,0 +1,18 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/select_all.xml b/app/src/main/res/drawable/select_all.xml index 216677e3..c27e108e 100644 --- a/app/src/main/res/drawable/select_all.xml +++ b/app/src/main/res/drawable/select_all.xml @@ -1,5 +1,4 @@ - - + - + = 21. Then we can use `@color`. --> diff --git a/app/src/main/res/drawable/warning.xml b/app/src/main/res/drawable/warning.xml index 863c1262..6225884c 100644 --- a/app/src/main/res/drawable/warning.xml +++ b/app/src/main/res/drawable/warning.xml @@ -1,5 +1,5 @@ + Modifications copyright © 2016 Soren Stoutner . The resulting image is released under the GPLv3+ license. --> + android:defaultValue="https://duckduckgo.com/html/?q=" + android:icon="@drawable/search_enabled" /> . +/* + * Copyright © 2016-2017 Soren Stoutner . * * This file is part of Privacy Browser . * -- 2.45.2