Skip to content
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.

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

8210199: [linux / macOS] fileChooser can't handle emojis #471

Closed
wants to merge 2 commits into from

Conversation

@jperedadnr
Copy link
Collaborator

@jperedadnr jperedadnr commented Apr 21, 2021

Both GlassDialogs.m for macOS and GlassCommonDialogs.c for Linux use UTF8 encoding for the file names selected via native FileChooser, and this will fail if there are emojis in the file name.

This PR uses the same approach as in JDK-8258381 for macOS, using UTF16 encoding.

For Linux, the Java String(byte[] bytes) constructor with default charset is used instead, preventing the need of using UTF8 encoding.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8210199: [linux / macOS] fileChooser can't handle emojis

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jfx pull/471/head:pull/471
$ git checkout pull/471

Update a local copy of the PR:
$ git checkout pull/471
$ git pull https://git.openjdk.java.net/jfx pull/471/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 471

View PR using the GUI difftool:
$ git pr show -t 471

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jfx/pull/471.diff

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Apr 21, 2021

👋 Welcome back jpereda! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk openjdk bot added the rfr label Apr 21, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Apr 21, 2021

Webrevs

@kevinrushforth
Copy link
Member

@kevinrushforth kevinrushforth commented Apr 22, 2021

/reviewers 2

@openjdk
Copy link

@openjdk openjdk bot commented Apr 22, 2021

@kevinrushforth
The number of required reviews for this PR is now set to 2 (with at least 1 of role reviewers).

@pankaj-bansal
Copy link
Collaborator

@pankaj-bansal pankaj-bansal commented May 6, 2021

I ran this on both MacOS and Linux. The fix looks fine and solves the issue. I do not see the exception with the fix. I tested on MacOs 10.15.7 and Ubuntu 20.10 and Ubuntu 20.04.
The file opens fine on MacOS.
One thing I noticed is that on linux, the file does not actually open on selection and Java stops responding. I see this on both Ubuntu 20.04 and Ubuntu 20.10. But this happens without the current fix also and not just for the file containing emojis in the filename. It is happening for all the files. So I do not think it is related to the current changes and it may be a test case issue also. I am attaching a screenshot for reference.

error

Copy link
Member

@kevinrushforth kevinrushforth left a comment

I can reproduce the problem Pankaj reported on Linux, and can confirm that it is unrelated to FileChooser. It looks like some sort of deadlock that happens when calling java.awt.Desktop::open from the event handler. I'll file a separate bug for that.

I modified the test program to call Files.readString(file.toPath()) instead, and can confirm that the fix works on Linux as well as on macOS.

@openjdk
Copy link

@openjdk openjdk bot commented May 22, 2021

@jperedadnr This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8210199: [linux / macOS] fileChooser can't handle emojis

Reviewed-by: pbansal, kcr

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 42 new commits pushed to the master branch:

  • 240d28f: 8264127: ListCell editing status is true, when index changes while editing
  • 5843910: 8267392: ENTER key press on editable TableView throws NPE
  • 111bac4: 8263760: Update gradle to version 7.0.1
  • 485b242: 8264219: tools/scripts/build.ps1 is out of date and no longer works
  • e76b7b1: 8186904: TableColumnHeader: resize cursor lost on right click
  • 4619cdd: 8264138: Replace uses of Class.newInstance
  • 93de584: 8266966: Wrong CSS properties are applied to other nodes after fix for JDK-8204568
  • c511789: 8266860: [macos] Incorrect duration reported for HLS live streams
  • d2d145d: 8266643: Intermittent failure of HonorDeveloperSettingsTest unit test
  • 9c97d9b: 8267121: Illegal access to private "size" field of ArrayList from build.gradle
  • ... and 32 more: https://git.openjdk.java.net/jfx/compare/86b854dc367fb32743810716da5583f7d59208f8...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready label May 22, 2021
@kevinrushforth
Copy link
Member

@kevinrushforth kevinrushforth commented May 22, 2021

I filed JDK-8267572 to track the hang on Linux.

@jperedadnr
Copy link
Collaborator Author

@jperedadnr jperedadnr commented May 22, 2021

/integrate

@openjdk openjdk bot closed this May 22, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels May 22, 2021
@openjdk
Copy link

@openjdk openjdk bot commented May 22, 2021

@jperedadnr Since your change was applied there have been 42 commits pushed to the master branch:

  • 240d28f: 8264127: ListCell editing status is true, when index changes while editing
  • 5843910: 8267392: ENTER key press on editable TableView throws NPE
  • 111bac4: 8263760: Update gradle to version 7.0.1
  • 485b242: 8264219: tools/scripts/build.ps1 is out of date and no longer works
  • e76b7b1: 8186904: TableColumnHeader: resize cursor lost on right click
  • 4619cdd: 8264138: Replace uses of Class.newInstance
  • 93de584: 8266966: Wrong CSS properties are applied to other nodes after fix for JDK-8204568
  • c511789: 8266860: [macos] Incorrect duration reported for HLS live streams
  • d2d145d: 8266643: Intermittent failure of HonorDeveloperSettingsTest unit test
  • 9c97d9b: 8267121: Illegal access to private "size" field of ArrayList from build.gradle
  • ... and 32 more: https://git.openjdk.java.net/jfx/compare/86b854dc367fb32743810716da5583f7d59208f8...master

Your commit was automatically rebased without conflicts.

Pushed as commit aebac07.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
3 participants