mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-02-23 22:51:02 +00:00
Code Issues Releases Wiki Activity

Disable custom tabs for OAuth

Browse source
This commit is contained in:
M66B 2021-06-29 21:38:15 +02:00
parent 2440466385
commit 8d09542b50
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
app/src/main/java/eu/faircode/email/FragmentOAuth.java
View file

@ -301,19 +301,20 @@ public class FragmentOAuth extends FragmentBase {
AppAuthConfiguration appAuthConfig = new AppAuthConfiguration.Builder() AppAuthConfiguration appAuthConfig = new AppAuthConfiguration.Builder()
.setBrowserMatcher(new BrowserMatcher() { .setBrowserMatcher(new BrowserMatcher() {
final BrowserMatcher SBROWSER = new VersionedBrowserMatcher(
Browsers.SBrowser.PACKAGE_NAME,
Browsers.SBrowser.SIGNATURE_SET,
true,
VersionRange.atMost("5.3"));
@Override @Override
public boolean matches(@NonNull BrowserDescriptor descriptor) { public boolean matches(@NonNull BrowserDescriptor descriptor) {
BrowserMatcher sbrowser = new VersionedBrowserMatcher( boolean accept =
Browsers.SBrowser.PACKAGE_NAME, (!SBROWSER.matches(descriptor) && !descriptor.useCustomTab);
Browsers.SBrowser.SIGNATURE_SET,
true,
VersionRange.atMost("5.3"));
boolean accept = (!sbrowser.matches(descriptor) &&
(!"gmail".equals(provider.id) || !descriptor.useCustomTab));
EntityLog.log(context, EntityLog.log(context,
"Browser=" + descriptor.packageName + "Browser=" + descriptor.packageName +
":" + descriptor.version + ":" + descriptor.version +
":" + descriptor.useCustomTab + "" + " tabs=" + descriptor.useCustomTab + "" +
" accept=" + accept + " accept=" + accept +
" provider=" + provider.id); " provider=" + provider.id);
return accept; return accept;