diff options
author | Sylvain Becker <sylvain.becker@gmail.com> | 2020-10-24 15:36:05 +0200 |
---|---|---|
committer | Sylvain Becker <sylvain.becker@gmail.com> | 2020-10-24 15:36:05 +0200 |
commit | 581a320444d6d4acd32a2a6356cab0b54300d5d7 (patch) | |
tree | 1725c3eea58d49622fa4bdc5d5ae5084e549d5e0 /android-project | |
parent | 542b4c99aa3d30c382368f0b2012eef86e409812 (diff) | |
download | sdl-581a320444d6d4acd32a2a6356cab0b54300d5d7.tar.gz |
Android: fix Clipboard deprecated methods
Diffstat (limited to 'android-project')
-rw-r--r-- | android-project/app/src/main/java/org/libsdl/app/SDLActivity.java | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java b/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java index 32d944671..ad9aeb594 100644 --- a/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java +++ b/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java @@ -2278,13 +2278,12 @@ class SDLInputConnection extends BaseInputConnection { interface SDLClipboardHandler { - public boolean clipboardHasText(); - public String clipboardGetText(); - public void clipboardSetText(String string); + boolean clipboardHasText(); + String clipboardGetText(); + void clipboardSetText(String string); } - class SDLClipboardHandler_API11 implements SDLClipboardHandler, android.content.ClipboardManager.OnPrimaryClipChangedListener { @@ -2298,15 +2297,20 @@ class SDLClipboardHandler_API11 implements @Override public boolean clipboardHasText() { - return mClipMgr.hasText(); + return mClipMgr.hasPrimaryClip(); } @Override public String clipboardGetText() { - CharSequence text; - text = mClipMgr.getText(); - if (text != null) { - return text.toString(); + ClipData clip = mClipMgr.getPrimaryClip(); + if (clip != null) { + ClipData.Item item = clip.getItemAt(0); + if (item != null) { + CharSequence text = item.getText(); + if (text != null) { + return text.toString(); + } + } } return null; } @@ -2314,7 +2318,8 @@ class SDLClipboardHandler_API11 implements @Override public void clipboardSetText(String string) { mClipMgr.removePrimaryClipChangedListener(this); - mClipMgr.setText(string); + ClipData clip = ClipData.newPlainText(null, string); + mClipMgr.setPrimaryClip(clip); mClipMgr.addPrimaryClipChangedListener(this); } @@ -2322,6 +2327,5 @@ class SDLClipboardHandler_API11 implements public void onPrimaryClipChanged() { SDLActivity.onNativeClipboardChanged(); } - } |