Merge pull request #408 from Iterable/jay/MOB-3767-js

[MOB-3767] set in-app javascript execution to false

Author: roninopf

app/src/androidTest/java/com/iterable/iterableapi/MainActivityTest.java

@@ -145,6 +145,7 @@ public void checkIfMessageShownAsPopUpForImproperIntent() throws Exception {
         onView(withText("Tips and tricks 2")).perform(click());
         intended(allOf(hasComponent(IterableInboxMessageActivity.class.getName())), times(0));
         onView(withId(R.id.webView)).inRoot(isDialog()).check(matches(isDisplayed()));
+        onWebView(withId(R.id.webView)).forceJavascriptEnabled();
         onWebView().withElement(findElement(Locator.XPATH, "//*[contains(text(),'Ok, got it')]"));
     }
 
@@ -165,6 +166,7 @@ public void checkIfMessageShownAsPopUpForUnexpectedIntent() throws Exception {
         onView(withText("Tips and tricks 2")).perform(click());
         intended(allOf(hasComponent(IterableInboxMessageActivity.class.getName())), times(0));
         onView(withId(R.id.webView)).inRoot(isDialog()).check(matches(isDisplayed()));
+        onWebView(withId(R.id.webView)).forceJavascriptEnabled();
         onWebView().withElement(findElement(Locator.XPATH, "//*[contains(text(),'Ok, got it')]"));
     }
 
@@ -182,6 +184,7 @@ public void checkIfMessageShownAsPopUpForNoIntent() throws Exception {
         onView(withText("Tips and tricks 2")).perform(click());
         intended(allOf(hasComponent(IterableInboxMessageActivity.class.getName())), times(0));
         onView(withId(R.id.webView)).inRoot(isDialog()).check(matches(isDisplayed()));
+        onWebView(withId(R.id.webView)).forceJavascriptEnabled();
         onWebView().withElement(findElement(Locator.XPATH, "//*[contains(text(),'Ok, got it')]"));
     }
 
@@ -203,6 +206,7 @@ public void checkIfMessageShownAsPopUp() throws Exception {
         onView(withText("Tips and tricks 2")).perform(click());
         intended(allOf(hasComponent(IterableInboxMessageActivity.class.getName())), times(0));
         onView(withId(R.id.webView)).inRoot(isDialog()).check(matches(isDisplayed()));
+        onWebView(withId(R.id.webView)).forceJavascriptEnabled();
         onWebView().withElement(findElement(Locator.XPATH, "//*[contains(text(),'Ok, got it')]"));
     }
 

iterableapi/src/main/java/com/iterable/iterableapi/IterableWebView.java

@@ -51,6 +51,6 @@ public void onProgressChanged(WebView view, int newProgress) {
         getSettings().setAllowContentAccess(false);
 
         //resize:
-        getSettings().setJavaScriptEnabled(true);
+        getSettings().setJavaScriptEnabled(false);
     }
 }