Skip to content

fix: Perform safe typecast while getting the platform name #1702

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
merged 3 commits into from
Jun 1, 2022
Merged

fix: Perform safe typecast while getting the platform name #1702

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
f156715
fix: Perform safe typecast while getting the platform name
mykola-mokhnach Jun 1, 2022
aa7c561
Tune condition
mykola-mokhnach Jun 1, 2022
f8a2dee
Address comments
mykola-mokhnach Jun 1, 2022
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
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ signing.secretKeyRingFile=PathToYourKeyRingFile
ossrhUsername=your-jira-id
ossrhPassword=your-jira-password

selenium.version=4.2.0
selenium.version=4.2.1
3 changes: 1 addition & 2 deletions src/main/java/io/appium/java_client/AppiumDriver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,7 @@ public AppiumDriver(Capabilities capabilities) {
*/
protected static Capabilities ensurePlatformName(
Capabilities originalCapabilities, String defaultName) {
String currentName = (String) originalCapabilities.getCapability(PLATFORM_NAME);
return isBlank(currentName)
return originalCapabilities.getPlatformName() == null
? originalCapabilities.merge(new ImmutableCapabilities(PLATFORM_NAME, defaultName))
: originalCapabilities;
}
Expand Down