summaryrefslogtreecommitdiff
path: root/app/src/main
diff options
context:
space:
mode:
authorcyBerta <cyberta@riseup.net>2019-09-27 12:17:52 +0200
committercyBerta <cyberta@riseup.net>2019-09-27 12:17:52 +0200
commit91877ac8ed64927d14c0762cd4402e5ed736fab9 (patch)
treede3c5454ba853020f877e3229e3ab5a9024a7cf4 /app/src/main
parente52d759c635a25969079503991e825b3f373cbcc (diff)
fix flickering when restarting the vpn
Diffstat (limited to 'app/src/main')
-rw-r--r--app/src/main/AndroidManifest.xml4
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/drawer/NavigationDrawerFragment.java4
-rw-r--r--app/src/main/res/values/themes.xml4
3 files changed, 8 insertions, 4 deletions
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a00582cc..9a2b1e43 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -62,10 +62,10 @@
<activity
android:name=".eip.VoidVpnLauncher"
- android:theme="@android:style/Theme.Translucent.NoTitleBar" />
+ android:theme="@style/invisibleTheme" />
<activity
android:name="de.blinkt.openvpn.LaunchVPN"
- android:label="@string/vpn_launch_title" />
+ android:theme="@style/invisibleTheme" />
<activity
android:name=".StartActivity"
android:label="@string/app_name"
diff --git a/app/src/main/java/se/leap/bitmaskclient/drawer/NavigationDrawerFragment.java b/app/src/main/java/se/leap/bitmaskclient/drawer/NavigationDrawerFragment.java
index 7d97dfbb..3db86205 100644
--- a/app/src/main/java/se/leap/bitmaskclient/drawer/NavigationDrawerFragment.java
+++ b/app/src/main/java/se/leap/bitmaskclient/drawer/NavigationDrawerFragment.java
@@ -268,8 +268,8 @@ public class NavigationDrawerFragment extends Fragment {
useBridges.setOnCheckedChangeListener((buttonView, isChecked) -> {
usePluggableTransports(getContext(), isChecked);
if (VpnStatus.isVPNActive()) {
- EipCommand.startVPN(getContext(), false);
- closeDrawerWithDelay();
+ EipCommand.startVPN(getContext(), true);
+ closeDrawer();
}
});
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 51a8ea0e..7e98ccf4 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -20,4 +20,8 @@
<item name="android:windowBackground">@drawable/splash_page</item>
</style>
+ <style name="invisibleTheme" parent="@android:style/Theme.Translucent.NoTitleBar">
+ <item name="android:windowAnimationStyle">@null</item>
+ </style>
+
</resources>