Added one type of fix to the other two methods.

Author: Bobby Jap

src/main/java/io/appium/java_client/AppiumDriver.java

@@ -424,9 +424,18 @@ public void pinch(WebElement el) {
  */
  public void pinch(int x, int y) {
  MultiTouchAction multiTouch = new MultiTouchAction(this);
+ 
+ int scrHeight = manage().window().getSize().getHeight();
+ int yOffset = 100;
+ 
+ if (y - 100 < 0) {
+ yOffset = y;
+ } else if (y + 100 > scrHeight) {
+ yOffset = scrHeight - y;
+ }
 
- TouchAction action0 = new TouchAction(this).press(x, y-100).moveTo(x, y).release();
- TouchAction action1 = new TouchAction(this).press(x, y+100).moveTo(x, y).release();
+ TouchAction action0 = new TouchAction(this).press(x, y - yOffset).moveTo(x, y).release();
+ TouchAction action1 = new TouchAction(this).press(x, y + yOffset).moveTo(x, y).release();
 
  multiTouch.add(action0).add(action1);
 
@@ -472,9 +481,18 @@ public void zoom(WebElement el) {
  */
  public void zoom(int x, int y) {
  MultiTouchAction multiTouch = new MultiTouchAction(this);
+ 
+ int scrHeight = manage().window().getSize().getHeight();
+ int yOffset = 100;
+ 
+ if (y - 100 < 0) {
+ yOffset = y;
+ } else if (y + 100 > scrHeight) {
+ yOffset = scrHeight - y;
+ }
 
- TouchAction action0 = new TouchAction(this).press(x, y).moveTo(x, y-100).release();
- TouchAction action1 = new TouchAction(this).press(x, y).moveTo(x, y+100).release();
+ TouchAction action0 = new TouchAction(this).press(x, y).moveTo(x, y - yOffset).release();
+ TouchAction action1 = new TouchAction(this).press(x, y).moveTo(x, y + yOffset).release();
 
  multiTouch.add(action0).add(action1);