Merge branch 'post_release_work' into 'master'

post release tweaks and fixes

Closes #9150 and #8983

See merge request leap/bitmask_android!264

1 files changed, 0 insertions, 62 deletions

diff --git a/app/src/androidTestCustom/java/se/leap/bitmaskclient/base/CustomProviderTest.java b/app/src/androidTestCustom/java/se/leap/bitmaskclient/base/CustomProviderTest.java
deleted file mode 100644
index 92416af4..00000000
--- a/app/src/androidTestCustom/java/se/leap/bitmaskclient/base/CustomProviderTest.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package se.leap.bitmaskclient.base;
-
-import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
-import static androidx.test.espresso.Espresso.onView;
-import static androidx.test.espresso.action.ViewActions.click;
-import static androidx.test.espresso.assertion.ViewAssertions.matches;
-import static androidx.test.espresso.matcher.RootMatchers.isDialog;
-import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static androidx.test.espresso.matcher.ViewMatchers.withId;
-import static androidx.test.espresso.matcher.ViewMatchers.withText;
-import static utils.CustomInteractions.tryResolve;
-
-import android.net.VpnService;
-
-import androidx.test.espresso.ViewInteraction;
-import androidx.test.uiautomator.UiObject;
-import androidx.test.uiautomator.UiObjectNotFoundException;
-import androidx.test.uiautomator.UiSelector;
-
-import org.junit.Test;
-
-import se.leap.bitmaskclient.R;
-import tools.fastlane.screengrab.Screengrab;
-
-public class CustomProviderTest extends ProviderBaseTest {
-
-    @Test
-    @Override
-    public void test01_vpnStartTest() throws InterruptedException, UiObjectNotFoundException {
-        // handle VPN permission dialog
-        if (VpnService.prepare(getApplicationContext()) != null) {
-            UiObject okButton = device.findObject(new UiSelector().packageName("com.android.vpndialogs").resourceId("android:id/button1"));
-            okButton.waitForExists(30000);
-            okButton.click();
-        }
-
-        ViewInteraction mainButtonStop;
-        mainButtonStop = tryResolve(
-                onView(withId(R.id.main_button)),
-                matches(isDisplayed()),
-                30);
-        Screengrab.screenshot("VPN_connected");
-
-        mainButtonStop.perform(click());
-        Screengrab.screenshot("VPN_ask_disconnect");
-
-        ViewInteraction alertDialogOKbutton = tryResolve(onView(withText(android.R.string.yes))
-                .inRoot(isDialog()),
-                matches(isDisplayed()));
-        alertDialogOKbutton.perform(click());
-        Screengrab.screenshot("VPN_disconnected");
-
-        mainButtonStop.perform(click());
-        Thread.sleep(50);
-        Screengrab.screenshot("VPN_connecting");
-    }
-
-    @Override
-    public boolean configureProviderIfNeeded() {
-        return false;
-    }
-}
\ No newline at end of file