Skip to content

Encode using UTF-8 if return has funny characters #912

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

Closed
wants to merge 4 commits into from
Closed

Encode using UTF-8 if return has funny characters #912

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ee5b813
Encode using UTF-8 if return has funny characters
tomas-sexenian Oct 10, 2024
0252dc8
Remove funny characters fix. Encode with UTF8 by default.
tomas-sexenian Oct 18, 2024
c23fb52
Encode with UTF-8 if getString has funny characters
tomas-sexenian Nov 2, 2024
baff02e
Merge branch 'master' into FunnyFix
tomas-sexenian Nov 2, 2024
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
25 changes: 9 additions & 16 deletions java/src/main/java/com/genexus/internet/HttpClientJavaLib.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -718,29 +718,22 @@ private void setEntityReader() throws IOException {
if (reader == null)
reader = new BufferedReader(new InputStreamReader(response.getEntity().getContent()));
}

public String getString() {
if (response == null)
return "";
public String getString() {
if (response == null)
return "";
try {
this.setEntity();
ContentType contentType = ContentType.getOrDefault(entity);
Charset charset;
if (contentType.equals(ContentType.DEFAULT_TEXT)) {
charset = StandardCharsets.UTF_8;
} else {
charset = contentType.getCharset();
if (charset == null) {
charset = StandardCharsets.UTF_8;
}
}
Charset charset = ContentType.getOrDefault(entity).getCharset();
String res = EntityUtils.toString(entity, charset);
if (res.matches(".*[Ã-ÿ].*")) {
res = EntityUtils.toString(entity, StandardCharsets.UTF_8);
}
eof = true;
return res;
} catch (IOException e) {
setExceptionsCatch(e);
} catch (IllegalArgumentException e) {
}
} catch (IllegalArgumentException e) {}
return "";
}

Expand Down
Loading