Skip to content

Custom Tabs was first added in Samsung Internet 4.0 #383

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
iainmcgin merged 3 commits into from
Aug 7, 2018
Merged

Custom Tabs was first added in Samsung Internet 4.0 #383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9ad748c
Custom Tabs was first added in Samsung Internet 4.0
hnljp Jul 20, 2018
37efd2e
Custom Tabs was first added in Samsung Internet 4.0
hnljp Jul 20, 2018
4e20e18
Custom Tabs was first added in Samsung Internet 4.0
hnljp Jul 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CONTRIBUTORS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ Alex Chau <alexchau@google.com>
Benjamin Franz <bfranz@google.com>
Rebecka Gulliksson <rebecka.gulliksson@gmail.com>
Rahul Ravikumar <rahulrav@google.com>
Henning Nielsen Lund <henning.n.lund@jp.dk>
6 changes: 6 additions & 0 deletions library/java/net/openid/appauth/browser/Browsers.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,12 @@ public static final class SBrowser {
public static final Set<String> SIGNATURE_SET =
Collections.singleton(SIGNATURE_HASH);

/**
* The version in which Custom Tabs were introduced in Samsung Internet.
*/
public static final DelimitedVersion MINIMUM_VERSION_FOR_CUSTOM_TAB =
DelimitedVersion.parse("4.0");

/**
* Creates a browser descriptor for the specified version of SBrowser, when
* used as a standalone browser.
Expand Down
2 changes: 1 addition & 1 deletion library/java/net/openid/appauth/browser/VersionedBrowserMatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public class VersionedBrowserMatcher implements BrowserMatcher {
Browsers.SBrowser.PACKAGE_NAME,
Browsers.SBrowser.SIGNATURE_SET,
true,
VersionRange.ANY_VERSION);
VersionRange.atLeast(Browsers.SBrowser.MINIMUM_VERSION_FOR_CUSTOM_TAB));

private String mPackageName;
private Set<String> mSignatureHashes;
Expand Down
2 changes: 2 additions & 0 deletions library/javatests/net/openid/appauth/browser/AnyBrowserMatcherTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,7 @@ public void testMatches() {
.isTrue();
assertThat(AnyBrowserMatcher.INSTANCE.matches(Browsers.SBrowser.standaloneBrowser("2.1")))
.isTrue();
assertThat(AnyBrowserMatcher.INSTANCE.matches(Browsers.SBrowser.customTab("4.0")))
.isTrue();
}
}
3 changes: 2 additions & 1 deletion library/javatests/net/openid/appauth/browser/BrowserWhitelistTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@ public void testMatches_firefoxOrSamsung() {
assertThat(whitelist.matches(Browsers.Chrome.customTab("46"))).isFalse();
assertThat(whitelist.matches(Browsers.Firefox.standaloneBrowser("10"))).isTrue();
assertThat(whitelist.matches(Browsers.SBrowser.standaloneBrowser("10"))).isTrue();
assertThat(whitelist.matches(Browsers.SBrowser.customTab("10"))).isTrue();
assertThat(whitelist.matches(Browsers.SBrowser.customTab("4.0"))).isTrue();
assertThat(whitelist.matches(Browsers.SBrowser.customTab("3.9"))).isFalse();
}

}