Fix: UserAgent is wrong on google.* if not .com #654
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
🤖 Pull request artifacts
|
le-jeu
force-pushed
the
fix/google-hostnames
branch
2 times, most recently
from
454e361
to
44ecdc8
Compare
xscreach
approved these changes
Jul 30, 2023
| @@ -118,6 +118,7 @@ public class IITC_Mobile extends AppCompatActivity | |||
| private String debugInputStore = ""; | |||
| private Map<String, String> mAllowedHostnames = new HashMap<>(); | |||
| private Set<String> mInternalHostnames = new HashSet<>(); | |||
| private final Pattern mGoogleHostnamePattern = Pattern.compile("google\\.(com\\.|co\\.).\\w+$"); | |||
There was a problem hiding this comment.
Suggested change
| private final Pattern mGoogleHostnamePattern = Pattern.compile("google\\.(com\\.|co\\.).\\w+$"); | |
| private final Pattern mGoogleHostnamePattern = Pattern.compile("google\\.(com\\.|co\\.)?\\w+$"); |
If the match should work as mentioned in comment (for google.com?.*), The pattern should look like this, right? 🤔
There was a problem hiding this comment.
fixup half fixed this, (?. instead of .), it's ? now
I kept the (com\.|co\.)? for readability (instead of (com?\.)?, should I use (com?\.)? instead ?
There was a problem hiding this comment.
Imho it's good like this.
I'd maybe prefer having the dot on the other side like this: ...google(\\.com|\\.co)?\\.\\w+
For me it reads a bit better, but it's really just a cosmetics 🤷
le-jeu
force-pushed
the
fix/google-hostnames
branch
2 times, most recently
from
491fa03
to
fbf2019
Compare
le-jeu
force-pushed
the
fix/google-hostnames
branch
from
fbf2019
to
4160899
Compare
modos189
approved these changes
Aug 1, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Hardcode a white list for all
google.*domain namesNote: this is more generic than the real exhaustive list from https://www.google.com/supported_domains