[AUTOMATED] Update to 150.0.7871.46.0#1170
Conversation
7d1d0fd to
c9342a9
Compare
| + public static void setCommaDelimitedSwitchValue(String name, List<String> value) { | ||
| + if (value.isEmpty()) { | ||
| + CommandLine.getInstance().appendSwitch(name); | ||
| + } else { | ||
| + CommandLine.getInstance().appendSwitchWithValue(name, TextUtils.join(",", value)); | ||
| + } | ||
| + } |
There was a problem hiding this comment.
I think it should remove the switch if the value is empty, e.g. see previous patch:
| '--output', | ||
| 'src/vanadium/android_config/filter_lists/filter_lists_easylist_bulgaria.txt', | ||
| '--urls', | ||
| 'http://stanev.org/abp/adblock_bg.txt'] |
There was a problem hiding this comment.
This is not an https url and will be skipped
| if not url.startswith("https://"): | ||
| continue |
There was a problem hiding this comment.
This will skip non https urls, and thus skip Bulgaria
| if not url.startswith("https://"): | ||
| continue | ||
| context = ssl.create_default_context(ssl.Purpose.SERVER_AUTH) | ||
| context.minimum_version = ssl.TLSVersion.TLSv1_3 | ||
| req = urllib.request.Request(url, headers={'User-Agent': 'Mozilla/5.0'}) | ||
| with urllib.request.urlopen(url=req, context=context, timeout=30) as res: | ||
| while True: | ||
| buf = res.read(4096) | ||
| if not buf: | ||
| break | ||
| args.output.write(buf) | ||
| hasher.update(buf) | ||
| with open('.'.join([args.output.name, 'sha256']), 'w') as f: | ||
| f.write(hasher.hexdigest()) |
There was a problem hiding this comment.
This script doesn't check for network failures, and anything that gets skipped is factored into the hash. It's also not clear what these .txt.sha256 are for, since they're added to .gitignore in src/vanadium/android_config/filter_lists
If the host returned empty body, etc., then it will also write empty file
| + if (vanadiumConfigVersion >= 1) { | ||
| + int order = p.getOrder(); | ||
| + p = new LongClickCopySummaryPreference(requireContext(), null); | ||
| + p = new Preference(requireContext()); |
There was a problem hiding this comment.
Is there a reason for this change away from LongClickCopySummaryPreference to Preference? The config version can no longer be long clicked to copy
| diff --git a/chrome/browser/magic_stack/android/java/src/org/chromium/chrome/browser/magic_stack/HomeModulesConfigManager.java b/chrome/browser/magic_stack/android/java/src/org/chromium/chrome/browser/magic_stack/HomeModulesConfigManager.java | ||
| index 0d80babfbdfb8..887d4fd43352e 100644 | ||
| --- a/chrome/browser/magic_stack/android/java/src/org/chromium/chrome/browser/magic_stack/HomeModulesConfigManager.java | ||
| +++ b/chrome/browser/magic_stack/android/java/src/org/chromium/chrome/browser/magic_stack/HomeModulesConfigManager.java | ||
| @@ -86,7 +86,7 @@ public class HomeModulesConfigManager { | ||
| * @param moduleType {@link ModuleType} needed to be notified to the listeners. | ||
| */ | ||
| public boolean getPrefModuleTypeEnabled(@ModuleType int moduleType) { | ||
| - return mSharedPreferencesManager.readBoolean(getSettingsPreferenceKey(moduleType), true); | ||
| + return mSharedPreferencesManager.readBoolean(getSettingsPreferenceKey(moduleType), false); | ||
| } | ||
|
|
||
| /** | ||
| @@ -103,7 +103,7 @@ public class HomeModulesConfigManager { | ||
| /** Returns the user preference for whether all cards in the magic stack are enabled. */ | ||
| public boolean getPrefAllCardsEnabled() { | ||
| return mSharedPreferencesManager.readBoolean( | ||
| - ChromePreferenceKeys.HOME_MODULE_CARDS_ENABLED, true); | ||
| + ChromePreferenceKeys.HOME_MODULE_CARDS_ENABLED, false); | ||
| } |
There was a problem hiding this comment.
Note that this patch only modifies the getters for these preferences and no longer stubs out the setters. See previous:
0012c10 to
a35a81d
Compare
inthewaves
left a comment
There was a problem hiding this comment.
Existing WebView compat tests (atest GosCompatWebViewTests) pass
Should be merged with GrapheneOS/grapheneos.org#1553
This will be needed in the next commits
a35a81d to
81ca0a2
Compare
No description provided.