summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README.md3
-rw-r--r--app/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java3
m---------ics-openvpn0
3 files changed, 5 insertions, 1 deletions
diff --git a/README.md b/README.md
index a938bd30..0f2fc20d 100644
--- a/README.md
+++ b/README.md
@@ -462,6 +462,9 @@ A bunch of conflicts may arise. The guidelines are:
This project bases its work in [ics-openvpn project](https://code.google.com/p/ics-openvpn/).
+## Reporting Bugs <a name="reporting-bugs"></a>
+Please file bug tickets on our main [development platform](https://0xacab.org/leap/bitmask_android/issues). You can either create an account on 0xacab.org or simply login with your github.com or gitlab.com account to create new tickets.
+
## Contributing <a name="contributing"></a>
Please fork this repository and contribute back using [pull requests](https://github.com/leapcode/leap_android/pulls).
diff --git a/app/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java b/app/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java
index 835e69b3..ded7490a 100644
--- a/app/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java
+++ b/app/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java
@@ -331,6 +331,7 @@ public class OpenVPNService extends VpnService implements StateListener, Callbac
nbuilder.addAction(R.drawable.ic_menu_close_clear_cancel,
getString(R.string.cancel_connection), disconnectPendingIntent);
+ /* NO PAUSE VPN functionality for Bitmask (yet)
Intent pauseVPN = new Intent(this, OpenVPNService.class);
if (mDeviceStateReceiver == null || !mDeviceStateReceiver.isUserPaused()) {
pauseVPN.setAction(PAUSE_VPN);
@@ -343,7 +344,7 @@ public class OpenVPNService extends VpnService implements StateListener, Callbac
PendingIntent resumeVPNPending = PendingIntent.getService(this, 0, pauseVPN, 0);
nbuilder.addAction(R.drawable.ic_menu_play,
getString(R.string.resumevpn), resumeVPNPending);
- }
+ } */
//ignore exception
diff --git a/ics-openvpn b/ics-openvpn
-Subproject 455ec6337157118b6d2e49808f25fd80d164956
+Subproject 95403c6cb19b2f08df187eeb5bf67030d58bb87