From 427518c1ed732574053f7fc684664354a26cc98e Mon Sep 17 00:00:00 2001 From: M66B Date: Fri, 14 Oct 2022 14:07:10 +0200 Subject: [PATCH] OAuth: exclude SBrowser 5.3 or older --- app/src/main/java/eu/faircode/email/FragmentOAuth.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentOAuth.java b/app/src/main/java/eu/faircode/email/FragmentOAuth.java index 450a3a74e5..42ff8336d7 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOAuth.java +++ b/app/src/main/java/eu/faircode/email/FragmentOAuth.java @@ -383,7 +383,13 @@ public class FragmentOAuth extends FragmentBase { AppAuthConfiguration appAuthConfig = new AppAuthConfiguration.Builder() .setBrowserMatcher(new BrowserMatcher() { + // https://github.com/openid/AppAuth-Android/issues/116 final BrowserMatcher SBROWSER = new VersionedBrowserMatcher( + Browsers.SBrowser.PACKAGE_NAME, + Browsers.SBrowser.SIGNATURE_SET, + false, + VersionRange.atMost("5.3")); + final BrowserMatcher SBROWSER_TAB = new VersionedBrowserMatcher( Browsers.SBrowser.PACKAGE_NAME, Browsers.SBrowser.SIGNATURE_SET, true, @@ -391,7 +397,7 @@ public class FragmentOAuth extends FragmentBase { @Override public boolean matches(@NonNull BrowserDescriptor descriptor) { - boolean accept = !SBROWSER.matches(descriptor); + boolean accept = !(SBROWSER.matches(descriptor) || SBROWSER_TAB.matches(descriptor)); EntityLog.log(context, "Browser=" + descriptor.packageName + ":" + descriptor.version +