Skip to content

fix: Override getScreenshotAs to support the legacy base64 encoding #1787

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
mykola-mokhnach merged 4 commits into from
Oct 29, 2022
Merged

fix: Override getScreenshotAs to support the legacy base64 encoding #1787

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bbbf6a2
fix: Override getScreenshotAs to support the legacy base64 encoding
mykola-mokhnach Oct 28, 2022
0ea1518
Use encodeToString
mykola-mokhnach Oct 29, 2022
f922632
Add hack
mykola-mokhnach Oct 29, 2022
6811278
Tune regexp
mykola-mokhnach Oct 29, 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
21 changes: 21 additions & 0 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 @@ -31,6 +31,7 @@
import org.openqa.selenium.Capabilities;
import org.openqa.selenium.ImmutableCapabilities;
import org.openqa.selenium.MutableCapabilities;
import org.openqa.selenium.OutputType;
import org.openqa.selenium.SessionNotCreatedException;
import org.openqa.selenium.WebDriverException;
import org.openqa.selenium.remote.CapabilityType;
Expand Down Expand Up @@ -270,4 +271,24 @@ public Response execute(String driverCommand, Map<String, ?> parameters) {
public Response execute(String command) {
return super.execute(command, Collections.emptyMap());
}

@Override
public <X> X getScreenshotAs(OutputType<X> outputType) {
// TODO: Eventually we should not override this method.
// TODO: Although, we have a legacy burden,
// TODO: so it's impossible to do it the other way as of Oct 29 2022.
// TODO: See https://github.com/SeleniumHQ/selenium/issues/11168
return super.getScreenshotAs(new OutputType<X>() {
@Override
public X convertFromBase64Png(String base64Png) {
String rfc4648Base64 = base64Png.replaceAll("\\r?\\n", "");
return outputType.convertFromBase64Png(rfc4648Base64);
}

@Override
public X convertFromPngBytes(byte[] png) {
return outputType.convertFromPngBytes(png);
}
});
}
}