feat: Get clipboard content via ADB if necessary on Android 10 (#348)

appium · Nov 18, 2019 · 4f0b90c · 4f0b90c
1 parent 725c13e
commit 4f0b90c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/lib/commands/general.js b/lib/commands/general.js
@@ -11,6 +11,12 @@ commands.getPageSource = async function () {
   return await this.uiautomator2.jwproxy.command('/source', 'GET', {});
 };
 
+commands.getClipboard = async function () {
+  return (await this.adb.getApiLevel() < 29)
+    ? (await this.uiautomator2.jwproxy.command('/appium/device/get_clipboard', 'POST', {}))
+    : (await this.adb.getClipboard());
+};
+
 // Need to override this for correct unicode support
 commands.doSendKeys = async function (params) {
   await this.uiautomator2.jwproxy.command('/keys', 'POST', params);

diff --git a/lib/driver.js b/lib/driver.js
@@ -63,7 +63,7 @@ const NO_PROXY = [
   ['POST', new RegExp('^/session/[^/]+/appium/[^/]+/start_activity')],
   ['POST', new RegExp('^/session/[^/]+/appium/app/[^/]+')],
   ['POST', new RegExp('^/session/[^/]+/appium/compare_images')],
-  ['POST', new RegExp('^/session/[^/]+/appium/device/(?!set_clipboard|get_clipboard)[^/]+')],
+  ['POST', new RegExp('^/session/[^/]+/appium/device/(?!set_clipboard)[^/]+')],
   ['POST', new RegExp('^/session/[^/]+/appium/element/[^/]+/replace_value')],
   ['POST', new RegExp('^/session/[^/]+/appium/element/[^/]+/value')],
   ['POST', new RegExp('^/session/[^/]+/appium/getPerformanceData')],

diff --git a/package.json b/package.json
@@ -41,7 +41,7 @@
   ],
   "dependencies": {
     "@babel/runtime": "^7.0.0",
-    "appium-adb": "^7.4.0",
+    "appium-adb": "^7.15.1",
     "appium-android-driver": "^4.19.1",
     "appium-base-driver": "^4.0.0",
     "appium-support": "^2.33.0",