Add yet another copy-paste workaround

For some Honor devices. PR #4822 <#4822> Signed-off-by: Romain Vimont <rom@rom1v.com>
Genymobile · Apr 7, 2024 · ad8b824 · ad8b824
1 parent d1a0f9b
commit ad8b824
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/server/src/main/java/com/genymobile/scrcpy/wrappers/ClipboardManager.java b/server/src/main/java/com/genymobile/scrcpy/wrappers/ClipboardManager.java
@@ -76,9 +76,15 @@ private Method getGetPrimaryClipMethod() throws NoSuchMethodException {
             } catch (NoSuchMethodException e) {
                 // fall through
             }
-            getPrimaryClipMethod = manager.getClass()
-                    .getMethod("getPrimaryClip", String.class, String.class, String.class, String.class, int.class, int.class, boolean.class);
-            getMethodVersion = 5;
+            try {
+                getPrimaryClipMethod = manager.getClass()
+                        .getMethod("getPrimaryClip", String.class, String.class, String.class, String.class, int.class, int.class, boolean.class);
+                getMethodVersion = 5;
+            } catch (NoSuchMethodException e) {
+                // fall through
+            }
+            getPrimaryClipMethod = manager.getClass().getMethod("getPrimaryClip", String.class, String.class, int.class, int.class, String.class);
+            getMethodVersion = 6;
         }
         return getPrimaryClipMethod;
     }
@@ -135,8 +141,10 @@ private static ClipData getPrimaryClip(Method method, int methodVersion, IInterf
             case 4:
                 // The last boolean parameter is "userOperate"
                 return (ClipData) method.invoke(manager, FakeContext.PACKAGE_NAME, null, FakeContext.ROOT_UID, 0, true);
-            default:
+            case 5:
                 return (ClipData) method.invoke(manager, FakeContext.PACKAGE_NAME, null, null, null, FakeContext.ROOT_UID, 0, true);
+            default:
+                return (ClipData) method.invoke(manager, FakeContext.PACKAGE_NAME, null, FakeContext.ROOT_UID, 0, null);
         }
     }