Release 69.0.3497.91

.github/ISSUE_TEMPLATE/bug_report.md

@@ -4,10 +4,11 @@ about: Create a Bromite bug report
 
 ---
 
-**Version**
+**Bromite version**
 
 Version: `v67...`
 Arch: `arm` or `arm64` or `x86`
+Android version: ... (example: `lollipop`)
 
 **Is the bug reproducible with latest version?**
 `Bug must be reproducible with latest version`

CHANGELOG.md

@@ -1,3 +1,6 @@
+# 69.0.3497.91
+* fixed crash when accessing site settings media preferences (fixes https://github.com/bromite/bromite/issues/122)
+
 # 69.0.3497.73
 * enabled WebRTC
 * drop clear HTTP cache patch

README.md

@@ -62,7 +62,7 @@ It is not on the official F-Droid repository and there are no (more) plans to su
 You can use F-Droid client to install and receive updates via [the official Bromite F-Droid repository](https://www.bromite.org/fdroid).
 
 ## Does Bromite support WebRTC?
-No, it is not built-in.
+Yes, since version 69. While the desktop version of Chromium has an option to disable it (video/audio site settings), the Android version cannot.
 
 # Features
 
@@ -73,7 +73,7 @@ No, it is not built-in.
 * chrome flags to hide NTP tiles, disable custom intents and clear session on exit
 * always-incognito mode
 * privacy enhancement patches from [Iridium](https://iridiumbrowser.de/), [Inox patchset](https://github.com/gcarq/inox-patchset), [Brave](https://brave.com/) and [ungoogled-chromium](https://github.com/Eloston/ungoogled-chromium) projects
-* webRTC, canvas, audio and other anti-fingerprinting mitigations
+* canvas, audio and other anti-fingerprinting mitigations
 
 ## Features not related to privacy
 * import/export bookmarks

patches/BRM020_Remove-Sync-and-Translate-menu.patch

@@ -9,8 +9,8 @@ Subject: Remove Sync and Translate menu
  .../java/res/drawable-xxhdpi/settings_translate.png      | Bin 793 -> 0 bytes
  .../java/res/drawable-xxxhdpi/settings_translate.png     | Bin 1038 -> 0 bytes
  .../android/java/res/xml/site_settings_preferences.xml   |   4 ++--
- .../preferences/website/SiteSettingsPreferences.java     |  12 ++++++------
- 7 files changed, 8 insertions(+), 8 deletions(-)
+ .../preferences/website/SiteSettingsPreferences.java     |  14 +++++++-------
+ 7 files changed, 9 insertions(+), 9 deletions(-)
  delete mode 100644 chrome/android/java/res/drawable-hdpi/settings_translate.png
  delete mode 100644 chrome/android/java/res/drawable-mdpi/settings_translate.png
  delete mode 100644 chrome/android/java/res/drawable-xhdpi/settings_translate.png
@@ -51,9 +51,18 @@ index 8165826..346cdce 100644
      <!-- TODO(finnur): Move this over to the new Usage screen, once it exists. -->
      <org.chromium.chrome.browser.preferences.website.SiteSettingsPreference
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java
-index bf12a5c..9059822 100644
+index bf12a5c..e3cc3d1 100644
 --- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java
+@@ -89,7 +89,7 @@ public class SiteSettingsPreferences extends PreferenceFragment
+                 getPreferenceScreen().removePreference(findPreference(i));
+             }
+             getPreferenceScreen().removePreference(findPreference(MEDIA_KEY));
+-            getPreferenceScreen().removePreference(findPreference(TRANSLATE_KEY));
++//            getPreferenceScreen().removePreference(findPreference(TRANSLATE_KEY));
+         } else {
+             // If both Autoplay and Protected Content menus are available, they'll be tucked under
+             // the Media key. Otherwise, we can remove the Media menu entry.
 @@ -118,9 +118,9 @@ public class SiteSettingsPreferences extends PreferenceFragment
              }
              // The new Languages Preference *feature* is an advanced version of this translate

patches/BRM047_Bromite-adblock-engine.patch

@@ -21,9 +21,9 @@ New mechanism for adblocking based on Brave's adblocking hook
  chrome/browser/net/chrome_network_delegate.cc      |  58 ++++
  .../subresource_filter_content_settings_manager.cc |   1 +
  net/BUILD.gn                                       |   7 +
- net/url_request/adblock_intercept.cc               | 321 +++++++++++++++++++++
- net/url_request/adblock_intercept.h                |  17 ++
- 12 files changed, 494 insertions(+)
+ net/url_request/adblock_intercept.cc               | 325 +++++++++++++++++++++
+ net/url_request/adblock_intercept.h                |  24 ++
+ 12 files changed, 505 insertions(+)
  create mode 100644 net/url_request/adblock_intercept.cc
  create mode 100644 net/url_request/adblock_intercept.h
 
@@ -319,9 +319,8 @@ diff --git a/net/url_request/adblock_intercept.cc b/net/url_request/adblock_inte
 new file mode 100644
 --- /dev/null
 +++ b/net/url_request/adblock_intercept.cc
-@@ -0,0 +1,321 @@
+@@ -0,0 +1,325 @@
 +#include "url/gurl.h"
-+#include "content/public/common/resource_type.h"
 +
 +#ifdef ADB_TESTER
 +#include <cstddef>
@@ -333,6 +332,7 @@ new file mode 100644
 +
 +#else
 +
++#include "content/public/common/resource_type.h"
 +#include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 +#include <android/log.h>
 +
@@ -573,7 +573,11 @@ new file mode 100644
 +  return fp == wanted_fp;
 +}
 +
-+int adblock_intercept(const GURL &url, const std::string &origin_host, content::ResourceType resource_type) {
++int adblock_intercept(const GURL &url, const std::string &origin_host
++#ifndef ADB_TESTER
++, content::ResourceType resource_type
++#endif
++) {
 +  if (url.is_valid() && url.SchemeIsHTTPOrHTTPS()) {
 +    const char *c_url = url.spec().c_str();
 +    char *c_url_lower = strtolower(c_url);
@@ -645,12 +649,15 @@ diff --git a/net/url_request/adblock_intercept.h b/net/url_request/adblock_inter
 new file mode 100644
 --- /dev/null
 +++ b/net/url_request/adblock_intercept.h
-@@ -0,0 +1,17 @@
+@@ -0,0 +1,24 @@
 +#ifndef NET_URL_REQUEST_ADBLOCK_INTERCEPT_H_
 +#define NET_URL_REQUEST_ADBLOCK_INTERCEPT_H_
 +
 +#include "url/gurl.h"
++
++#ifndef ADB_TESTER
 +#include "content/public/common/resource_type.h"
++#endif
 +
 +namespace net {
 +
@@ -658,7 +665,11 @@ new file mode 100644
 +int adblock_rules_count();
 +#endif
 +
-+int adblock_intercept(const GURL &url, const std::string &origin_host, content::ResourceType resource_type);
++int adblock_intercept(const GURL &url, const std::string &origin_host
++#ifndef ADB_TESTER
++, content::ResourceType resource_type
++#endif
++);
 +
 +} // namespace net
 +