Fix: revert android tests to android api 23.

Author: Dimitar Todorov

.travis.yml

@@ -144,7 +144,7 @@ matrix:
       script:
         - npm i -g appium
         - cd demo && npm i
-        - travis_wait travis_retry npm run e2e -- --runType android24.sauce --sauceLab --appPath $ANDROID_PACKAGE_JS
+        - travis_wait travis_retry npm run e2e -- --runType android23 --sauceLab --appPath $ANDROID_PACKAGE_JS
     - os: linux
       env:
         - Android="24"
@@ -155,7 +155,7 @@ matrix:
       script:
         - npm i -g appium
         - cd demo-vue && npm i
-        - travis_wait travis_retry npm run e2e -- --runType android24.sauce --sauceLab --appPath $ANDROID_PACKAGE_VUE
+        - travis_wait travis_retry npm run e2e -- --runType android23 --sauceLab --appPath $ANDROID_PACKAGE_VUE
     - os: linux
       env:
         - iOS="12.0"

demo/e2e/tests.e2e.ts

@@ -33,21 +33,20 @@ describe("Camera", () => {
         const takePictureButton = await driver.findElementByText("Take Picture");
         await takePictureButton.click();
         if (isAndroid) {
-            let allow = await driver.findElementByText("Allow", SearchOptions.exact);
-            await allow.click();
-            let allowSecond = await driver.findElementByText("Allow", SearchOptions.exact);
-            await allowSecond.click();
-            let allowLocation = await driver.findElementByText("Allow", SearchOptions.exact);
-            await allowLocation.click();
-            let geoTagConfirm = await driver.findElementByTextIfExists("Next", SearchOptions.contains)
-            if(geoTagConfirm !== undefined){
-                await geoTagConfirm.click();
+            let allow = await driver.findElementByTextIfExists("Allow", SearchOptions.exact);
+            if (allow !== undefined) {
+                await allow.click();
+                allow = await driver.findElementByTextIfExists("Allow", SearchOptions.exact);
+                await allow.click();
             }
-            
-            let shutterBtn = await driver.findElementByAccessibilityId("Shutter");
-            await shutterBtn.click();
-            let acceptBtn = await driver.findElementByAccessibilityId("Done");
-            await acceptBtn.click();
+            const deny = await driver.findElementByTextIfExists("Deny", SearchOptions.exact);
+            if (deny !== undefined) {
+                await deny.click();
+            }
+            let images = await driver.findElementsByClassName(driver.locators.image); // Take a picture
+            await images[5].click();
+            images = await driver.findElementsByClassName(driver.locators.image); // Accept it
+            await images[4].click();
         } else {
             let ok = await driver.findElementByTextIfExists("OK", SearchOptions.exact);
             if(ok !== undefined){