mirror of
https://github.com/libsdl-org/SDL.git
synced 2025-10-04 08:56:25 +00:00
Use clearPrimaryClip() on Android 9 and newer
Fixes https://github.com/libsdl-org/SDL/issues/8355
(cherry picked from commit 34b09be6a5
)
This commit is contained in:
@@ -2196,7 +2196,11 @@ class SDLClipboardHandler implements
|
|||||||
}
|
}
|
||||||
|
|
||||||
public boolean clipboardHasText() {
|
public boolean clipboardHasText() {
|
||||||
|
if (Build.VERSION.SDK_INT >= 28 /* Android 9 (P) */) {
|
||||||
return mClipMgr.hasPrimaryClip();
|
return mClipMgr.hasPrimaryClip();
|
||||||
|
} else {
|
||||||
|
return mClipMgr.hasText();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public String clipboardGetText() {
|
public String clipboardGetText() {
|
||||||
@@ -2215,8 +2219,17 @@ class SDLClipboardHandler implements
|
|||||||
|
|
||||||
public void clipboardSetText(String string) {
|
public void clipboardSetText(String string) {
|
||||||
mClipMgr.removePrimaryClipChangedListener(this);
|
mClipMgr.removePrimaryClipChangedListener(this);
|
||||||
|
if (string.isEmpty()) {
|
||||||
|
if (Build.VERSION.SDK_INT >= 28 /* Android 9 (P) */) {
|
||||||
|
mClipMgr.clearPrimaryClip();
|
||||||
|
} else {
|
||||||
|
ClipData clip = ClipData.newPlainText(null, "");
|
||||||
|
mClipMgr.setPrimaryClip(clip);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
ClipData clip = ClipData.newPlainText(null, string);
|
ClipData clip = ClipData.newPlainText(null, string);
|
||||||
mClipMgr.setPrimaryClip(clip);
|
mClipMgr.setPrimaryClip(clip);
|
||||||
|
}
|
||||||
mClipMgr.addPrimaryClipChangedListener(this);
|
mClipMgr.addPrimaryClipChangedListener(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user