0ct0pu5/bromite
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

removed dcheck, fix comments

Browse source
This commit is contained in:
Carmelo Messina 2021-12-13 17:30:29 +01:00
parent 69b6dc1cff
commit e5a236efbc
No known key found for this signature in database
GPG key ID: 968894BE688289FD
2 changed files with 28 additions and 91 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

96
build/patches/Always-ask-for-permissions.patch
View file

@ -1,24 +1,23 @@
From: uazo <uazo@users.noreply.github.com>
Date: Sat, 20 Nov 2021 15:23:48 +0000
Date: Fri, 10 Dec 2021 13:15:30 +0000
Subject: Always ask for permissions
Always ask for permissions for location, microphone and camera in every session
---
.../java/res/xml/privacy_preferences.xml | 5 ++
.../download/FileAccessPermissionHelper.java | 2 +-
.../PermissionUpdateInfoBarDelegate.java | 10 ++-
...mission_update_infobar_delegate_android.cc | 11 ++-
.../PermissionUpdateRequester.java | 6 +-
.../strings/android_chrome_strings.grd | 8 ++
.../strings/android/browser_ui_strings.grd | 4 +
.../PermissionParamsListBuilder.java | 4 +
.../AndroidPermissionRequester.java | 81 ++++++++++++++++++-
.../AndroidPermissionRequester.java | 80 ++++++++++++++++++-
.../PermissionDialogController.java | 3 +
9 files changed, 121 insertions(+), 7 deletions(-)
8 files changed, 109 insertions(+), 3 deletions(-)
diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
--- a/chrome/android/java/res/xml/privacy_preferences.xml
+++ b/chrome/android/java/res/xml/privacy_preferences.xml
@@ -70,6 +70,11 @@
@@ -75,6 +75,11 @@
android:title="@string/open_external_links_incognito_title"
android:summary="@string/open_external_links_incognito_summary"
android:defaultValue="false" />
@ -42,22 +41,18 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/FileAc
ApplicationStatus.getLastTrackedFocusedActivity(),
org.chromium.chrome.R.string.missing_storage_permission_download_education_text,
()
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/infobar/PermissionUpdateInfoBarDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/infobar/PermissionUpdateInfoBarDelegate.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/infobar/PermissionUpdateInfoBarDelegate.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/infobar/PermissionUpdateInfoBarDelegate.java
@@ -23,6 +23,11 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/permissions/PermissionUpdateRequester.java b/chrome/android/java/src/org/chromium/chrome/browser/permissions/PermissionUpdateRequester.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/permissions/PermissionUpdateRequester.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/permissions/PermissionUpdateRequester.java
@@ -18,6 +18,7 @@ import org.chromium.base.annotations.NativeMethods;
import org.chromium.content_public.browser.WebContents;
import org.chromium.ui.base.PermissionCallback;
import org.chromium.ui.base.WindowAndroid;
+import org.chromium.components.permissions.AndroidPermissionRequester;
+
+// remove this comment when moved to
+// chrome/android/java/src/org/chromium/chrome/browser/permissions/PermissionUpdateRequester.java
+
/**
* Handles requesting the android runtime permissions for the permission update infobar.
*/
@@ -131,7 +136,10 @@ class PermissionUpdateInfoBarDelegate implements PermissionCallback {
import java.util.Collections;
import java.util.HashSet;
@@ -130,7 +131,10 @@ class PermissionUpdateRequester implements PermissionCallback {
if (!mRequiredAndroidPermissions.contains(mAndroidPermisisons[i])) {
continue;
}
@ -69,48 +64,13 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/infobar/Permiss
}
}
if (mNativePtr != 0) {
diff --git a/chrome/browser/permissions/permission_update_infobar_delegate_android.cc b/chrome/browser/permissions/permission_update_infobar_delegate_android.cc
--- a/chrome/browser/permissions/permission_update_infobar_delegate_android.cc
+++ b/chrome/browser/permissions/permission_update_infobar_delegate_android.cc
@@ -53,6 +53,9 @@ infobars::InfoBar* PermissionUpdateInfoBarDelegate::Create(
permissions::AppendOptionalAndroidPermissionsForContentSetting(
content_settings_type, &optional_permissions);
+ // in bromite there are other contentsettings defined as permission
+ // so in debug please don't crash
+ // moved to chrome/browser/permissions/permission_update_message_controller_android.cc
if (message_id == -1) {
if (content_settings_type == ContentSettingsType::GEOLOCATION) {
message_id = IDS_INFOBAR_MISSING_LOCATION_PERMISSION_TEXT;
@@ -65,16 +68,16 @@ infobars::InfoBar* PermissionUpdateInfoBarDelegate::Create(
} else if (content_settings_type == ContentSettingsType::AR) {
message_id = IDS_INFOBAR_MISSING_AR_CAMERA_PERMISSION_TEXT;
} else {
- NOTREACHED();
+ //NOTREACHED();
}
} else if (message_id == IDS_INFOBAR_MISSING_CAMERA_PERMISSION_TEXT) {
- DCHECK(content_settings_type == ContentSettingsType::MEDIASTREAM_MIC);
+ //DCHECK(content_settings_type == ContentSettingsType::MEDIASTREAM_MIC);
message_id = IDS_INFOBAR_MISSING_MICROPHONE_CAMERA_PERMISSIONS_TEXT;
} else if (message_id == IDS_INFOBAR_MISSING_MICROPHONE_PERMISSION_TEXT) {
- DCHECK(content_settings_type == ContentSettingsType::MEDIASTREAM_CAMERA);
+ //DCHECK(content_settings_type == ContentSettingsType::MEDIASTREAM_CAMERA);
message_id = IDS_INFOBAR_MISSING_MICROPHONE_CAMERA_PERMISSIONS_TEXT;
} else {
- NOTREACHED();
+ //NOTREACHED();
}
}
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -5237,6 +5237,14 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
<message name="IDS_SETTINGS_HTTPS_FIRST_MODE_SUMMARY" desc="Secondary, continued explanation of HTTPS-First Mode in settings.">
@@ -5296,6 +5296,14 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
Upgrade navigations to HTTPS and warn you before loading sites that don’t support it
</message>
+
+ <!-- Ask permissions to user settings strings -->
+ <message name="IDS_ASK_PERMISSIONS_TO_USER_TITLE" desc="Title for always ask for permissions settings. [CHAR-LIMIT=32]">
+ Always ask for permissions
@ -118,13 +78,14 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
+ <message name="IDS_ASK_PERMISSIONS_TO_USER_SUMMARY" desc="Summary for always ask for permissions settings">
+ Always ask for permissions for location, microphone and camera in every session
+ </message>
</messages>
</release>
</grit>
+
<!-- Auto-darken web content -->
<message name="IDS_AUTO_DARK_MESSAGE_TITLE" desc="Message shown that informs the user auto darkening of website contents has been enabled.">
Dark theme for sites is on in Chrome
diff --git a/components/browser_ui/strings/android/browser_ui_strings.grd b/components/browser_ui/strings/android/browser_ui_strings.grd
--- a/components/browser_ui/strings/android/browser_ui_strings.grd
+++ b/components/browser_ui/strings/android/browser_ui_strings.grd
@@ -568,6 +568,10 @@
@@ -574,6 +574,10 @@
<message name="IDS_PAGE_INFO_URL_TRUNCATED" desc="Accessibility announcement when the URL in PageInfo switches from full to truncated display">
URL truncated
</message>
@ -138,7 +99,7 @@ diff --git a/components/browser_ui/strings/android/browser_ui_strings.grd b/comp
diff --git a/components/page_info/android/java/src/org/chromium/components/page_info/PermissionParamsListBuilder.java b/components/page_info/android/java/src/org/chromium/components/page_info/PermissionParamsListBuilder.java
--- a/components/page_info/android/java/src/org/chromium/components/page_info/PermissionParamsListBuilder.java
+++ b/components/page_info/android/java/src/org/chromium/components/page_info/PermissionParamsListBuilder.java
@@ -85,6 +85,10 @@ public class PermissionParamsListBuilder {
@@ -86,6 +86,10 @@ public class PermissionParamsListBuilder {
permissionParams.warningTextResource =
R.string.page_info_android_permission_blocked;
}
@ -182,21 +143,20 @@ diff --git a/components/permissions/android/java/src/org/chromium/components/per
}
}
@@ -198,6 +207,13 @@ public class AndroidPermissionRequester {
@@ -198,6 +207,12 @@ public class AndroidPermissionRequester {
return true;
}
+ // do not re-request permissions for file access
+ public static void showMissingPermissionDialogUnchecked(Activity activity, @StringRes int messageId,
+ Runnable onPositiveButtonClicked, Runnable onCancelled) {
+ // permitted without any check for requestFileAccessPermissionHelper.FileAccessPermissionHelper
+ // used by download manager
+ showMissingPermissionDialog(activity, messageId, onPositiveButtonClicked, onCancelled);
+ }
+
/**
* Shows a dialog that informs the user about a missing Android permission.
* @param activity Current Activity. It should implement {@link ModalDialogManagerHolder}.
@@ -205,7 +221,7 @@ public class AndroidPermissionRequester {
@@ -205,7 +220,7 @@ public class AndroidPermissionRequester {
* @param onPositiveButtonClicked Runnable that is executed on positive button click.
* @param onCancelled Runnable that is executed on cancellation.
*/
@ -205,7 +165,7 @@ diff --git a/components/permissions/android/java/src/org/chromium/components/per
Runnable onPositiveButtonClicked, Runnable onCancelled) {
assert activity
instanceof ModalDialogManagerHolder
@@ -244,4 +260,67 @@ public class AndroidPermissionRequester {
@@ -244,4 +259,67 @@ public class AndroidPermissionRequester {
.build();
modalDialogManager.showDialog(dialogModel, ModalDialogManager.ModalDialogType.APP);
}

23
build/patches/Disable-unified-autoplay-feature.patch
View file

@ -1,23 +0,0 @@
From: csagan5 <32685696+csagan5@users.noreply.github.com>
Date: Sat, 19 Dec 2020 20:04:14 +0100
Subject: Disable unified autoplay feature
---
media/base/media_switches.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media/base/media_switches.cc b/media/base/media_switches.cc
--- a/media/base/media_switches.cc
+++ b/media/base/media_switches.cc
@@ -490,7 +490,7 @@ const base::Feature kUseR16Texture{"use-r16-texture",
// Enables the Unified Autoplay policy by overriding the platform's default
// autoplay policy.
const base::Feature kUnifiedAutoplay{"UnifiedAutoplay",
- base::FEATURE_ENABLED_BY_DEFAULT};
+ base::FEATURE_DISABLED_BY_DEFAULT};
#if defined(OS_LINUX)
// Enable vaapi video decoding on linux. This is already enabled by default on
--
2.20.1