From 748b7a3561b5b273dfb13ad345bf220970d3c3f5 Mon Sep 17 00:00:00 2001
From: Tejas Shah <tejas.s@browserstack.com>
Date: Tue, 12 Dec 2017 15:47:46 +0530
Subject: [PATCH] update condition | remove realMobile, automationName cap

---
 android/BrowserStackAndroid.java | 1 -
 android/LocalSampleAndroid.java  | 1 -
 ios/BrowserStackIOS.java         | 4 +---
 ios/LocalSampleIOS.java          | 2 --
 4 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/android/BrowserStackAndroid.java b/android/BrowserStackAndroid.java
index 17d3dea..45eb56d 100644
--- a/android/BrowserStackAndroid.java
+++ b/android/BrowserStackAndroid.java
@@ -18,7 +18,6 @@ public class BrowserStackAndroid {
     public static void main(String args[]) throws MalformedURLException, InterruptedException {
         DesiredCapabilities capabilities = new DesiredCapabilities();
 
-        capabilities.setCapability("realMobile", true);
         capabilities.setCapability("device", "Samsung Galaxy S7");
         capabilities.setCapability("app", "bs://<hashed app-id>");
 
diff --git a/android/LocalSampleAndroid.java b/android/LocalSampleAndroid.java
index af28764..28483d9 100644
--- a/android/LocalSampleAndroid.java
+++ b/android/LocalSampleAndroid.java
@@ -37,7 +37,6 @@ public static void main(String[] args) throws Exception {
         DesiredCapabilities capabilities = new DesiredCapabilities();
 
         capabilities.setCapability("browserstack.local", true);
-        capabilities.setCapability("realMobile", true);
         capabilities.setCapability("device", "Samsung Galaxy S7");
         capabilities.setCapability("app", "bs://<hashed app-id>");
 
diff --git a/ios/BrowserStackIOS.java b/ios/BrowserStackIOS.java
index 8261de4..250e007 100644
--- a/ios/BrowserStackIOS.java
+++ b/ios/BrowserStackIOS.java
@@ -18,10 +18,8 @@ public class BrowserStackIOS {
     public static void main(String args[]) throws MalformedURLException, InterruptedException {
         DesiredCapabilities capabilities = new DesiredCapabilities();
 
-        capabilities.setCapability("realMobile", true);
         capabilities.setCapability("device", "iPhone 7");
         capabilities.setCapability("app", "bs://<hashed app-id>");
-        capabilities.setCapability("automationName", "XCUITest");
 
         IOSDriver<IOSElement> driver = new IOSDriver<IOSElement>(new URL("http://"+userName+":"+accessKey+"@hub.browserstack.com/wd/hub"), capabilities);
 
@@ -40,7 +38,7 @@ public static void main(String args[]) throws MalformedURLException, Interrupted
         String matchedString = "";
         for(IOSElement textElement : textElements) {
           String textContent = textElement.getText();
-          if(textContent.contains("not registered")) {
+          if(textContent != null && textContent.contains("not registered")) {
             matchedString = textContent;
           }
         }
diff --git a/ios/LocalSampleIOS.java b/ios/LocalSampleIOS.java
index 75ff044..bb3f889 100644
--- a/ios/LocalSampleIOS.java
+++ b/ios/LocalSampleIOS.java
@@ -42,10 +42,8 @@ public static void main(String[] args) throws Exception {
         DesiredCapabilities capabilities = new DesiredCapabilities();
 
         capabilities.setCapability("browserstack.local", true);
-        capabilities.setCapability("realMobile", true);
         capabilities.setCapability("device", "iPhone 7");
         capabilities.setCapability("app", "bs://<hashed app-id>");
-        capabilities.setCapability("automationName", "XCUITest");
 
         IOSDriver<IOSElement> driver = new IOSDriver<IOSElement>(new URL("http://"+userName+":"+accessKey+"@hub.browserstack.com/wd/hub"), capabilities);