Display and control your Android device
Adapt ClipboardManager for Android 13
Romain Vimont82cb8ab87014
diff --git a/server/src/main/java/com/genymobile/scrcpy/wrappers/ClipboardManager.java b/server/src/main/java/com/genymobile/scrcpy/wrappers/ClipboardManager.javaindex e25b6e99..f43a76bc 100644--- a/server/src/main/java/com/genymobile/scrcpy/wrappers/ClipboardManager.java+++ b/server/src/main/java/com/genymobile/scrcpy/wrappers/ClipboardManager.java@@ -15,6 +15,9 @@ public class ClipboardManager {private Method getPrimaryClipMethod;private Method setPrimaryClipMethod;private Method addPrimaryClipChangedListener;+ private boolean alternativeGetMethod;+ private boolean alternativeSetMethod;+ private boolean alternativeAddListenerMethod;public ClipboardManager(IInterface manager) {this.manager = manager;@@ -25,7 +28,12 @@ public class ClipboardManager {if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {getPrimaryClipMethod = manager.getClass().getMethod("getPrimaryClip", String.class);} else {- getPrimaryClipMethod = manager.getClass().getMethod("getPrimaryClip", String.class, int.class);+ try {+ getPrimaryClipMethod = manager.getClass().getMethod("getPrimaryClip", String.class, int.class);+ } catch (NoSuchMethodException e) {+ getPrimaryClipMethod = manager.getClass().getMethod("getPrimaryClip", String.class, String.class, int.class);+ alternativeGetMethod = true;+ }}}return getPrimaryClipMethod;@@ -36,23 +44,34 @@ public class ClipboardManager {if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {setPrimaryClipMethod = manager.getClass().getMethod("setPrimaryClip", ClipData.class, String.class);} else {- setPrimaryClipMethod = manager.getClass().getMethod("setPrimaryClip", ClipData.class, String.class, int.class);+ try {+ setPrimaryClipMethod = manager.getClass().getMethod("setPrimaryClip", ClipData.class, String.class, int.class);+ } catch (NoSuchMethodException e) {+ setPrimaryClipMethod = manager.getClass().getMethod("setPrimaryClip", ClipData.class, String.class, String.class, int.class);+ alternativeSetMethod = true;+ }}}return setPrimaryClipMethod;}- private static ClipData getPrimaryClip(Method method, IInterface manager) throws InvocationTargetException, IllegalAccessException {+ private static ClipData getPrimaryClip(Method method, boolean alternativeMethod, IInterface manager)+ throws InvocationTargetException, IllegalAccessException {if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {return (ClipData) method.invoke(manager, ServiceManager.PACKAGE_NAME);}+ if (alternativeMethod) {+ return (ClipData) method.invoke(manager, ServiceManager.PACKAGE_NAME, null, ServiceManager.USER_ID);+ }return (ClipData) method.invoke(manager, ServiceManager.PACKAGE_NAME, ServiceManager.USER_ID);}- private static void setPrimaryClip(Method method, IInterface manager, ClipData clipData)+ private static void setPrimaryClip(Method method, boolean alternativeMethod, IInterface manager, ClipData clipData)throws InvocationTargetException, IllegalAccessException {if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {method.invoke(manager, clipData, ServiceManager.PACKAGE_NAME);+ } else if (alternativeMethod) {+ method.invoke(manager, clipData, ServiceManager.PACKAGE_NAME, null, ServiceManager.USER_ID);} else {method.invoke(manager, clipData, ServiceManager.PACKAGE_NAME, ServiceManager.USER_ID);}@@ -61,7 +80,7 @@ public class ClipboardManager {public CharSequence getText() {try {Method method = getGetPrimaryClipMethod();- ClipData clipData = getPrimaryClip(method, manager);+ ClipData clipData = getPrimaryClip(method, alternativeGetMethod, manager);if (clipData == null || clipData.getItemCount() == 0) {return null;}@@ -76,7 +95,7 @@ public class ClipboardManager {try {Method method = getSetPrimaryClipMethod();ClipData clipData = ClipData.newPlainText(null, text);- setPrimaryClip(method, manager, clipData);+ setPrimaryClip(method, alternativeSetMethod, manager, clipData);return true;} catch (InvocationTargetException | IllegalAccessException | NoSuchMethodException e) {Ln.e("Could not invoke method", e);@@ -84,10 +103,12 @@ public class ClipboardManager {}}- private static void addPrimaryClipChangedListener(Method method, IInterface manager, IOnPrimaryClipChangedListener listener)- throws InvocationTargetException, IllegalAccessException {+ private static void addPrimaryClipChangedListener(Method method, boolean alternativeMethod, IInterface manager,+ IOnPrimaryClipChangedListener listener) throws InvocationTargetException, IllegalAccessException {if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {method.invoke(manager, listener, ServiceManager.PACKAGE_NAME);+ } else if (alternativeMethod) {+ method.invoke(manager, listener, ServiceManager.PACKAGE_NAME, null, ServiceManager.USER_ID);} else {method.invoke(manager, listener, ServiceManager.PACKAGE_NAME, ServiceManager.USER_ID);}@@ -99,8 +120,14 @@ public class ClipboardManager {addPrimaryClipChangedListener = manager.getClass().getMethod("addPrimaryClipChangedListener", IOnPrimaryClipChangedListener.class, String.class);} else {- addPrimaryClipChangedListener = manager.getClass()- .getMethod("addPrimaryClipChangedListener", IOnPrimaryClipChangedListener.class, String.class, int.class);+ try {+ addPrimaryClipChangedListener = manager.getClass()+ .getMethod("addPrimaryClipChangedListener", IOnPrimaryClipChangedListener.class, String.class, int.class);+ } catch (NoSuchMethodException e) {+ addPrimaryClipChangedListener = manager.getClass()+ .getMethod("addPrimaryClipChangedListener", IOnPrimaryClipChangedListener.class, String.class, String.class, int.class);+ alternativeAddListenerMethod = true;+ }}}return addPrimaryClipChangedListener;@@ -109,7 +136,7 @@ public class ClipboardManager {public boolean addPrimaryClipChangedListener(IOnPrimaryClipChangedListener listener) {try {Method method = getAddPrimaryClipChangedListener();- addPrimaryClipChangedListener(method, manager, listener);+ addPrimaryClipChangedListener(method, alternativeAddListenerMethod, manager, listener);return true;} catch (InvocationTargetException | IllegalAccessException | NoSuchMethodException e) {Ln.e("Could not invoke method", e);