diff options
| author | cyberta <cyberta@riseup.net> | 2017-10-31 16:09:52 +0000 |
|---|---|---|
| committer | cyberta <cyberta@riseup.net> | 2017-10-31 16:09:52 +0000 |
| commit | bc77b7ee08b2944f2d9526bbaf6289f1267ec650 (patch) | |
| tree | c94be2b372b5aa8143bdbd6ad8c689375bff25fa | |
| parent | 0b146ea7ce6b628c7ff56a20318e7495960dfb7c (diff) | |
| parent | 0a937a2269f9df1f0a9ce3815e74d1b90d9d8011 (diff) | |
Merge branch '8760_remove_pause_button' into 'master'
#8760 remove pause vpn button from notification
See merge request leap/bitmask_android!13
| -rw-r--r-- | app/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java | 3 | ||||
| m--------- | ics-openvpn | 0 |
2 files changed, 2 insertions, 1 deletions
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 |