diff options
| author | fupduck <fupduck@riseup.net> | 2018-02-21 09:18:15 -0800 |
|---|---|---|
| committer | fupduck <fupduck@riseup.net> | 2018-02-21 09:18:15 -0800 |
| commit | 420792c833f0ad6ecf55824fd8d9bb5d7eaa2aed (patch) | |
| tree | e7c05ee05086f3646e30b1246801070218005e57 /app/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java | |
| parent | d6db9433d9f9e0e2f1dc21cd3de7d88d1e473861 (diff) | |
| parent | 339251605b689d6afd4708d851d42d91fd1d3fa5 (diff) | |
Merge branch '#8853_error_handling_adding_providers' into '0.9.8'
#8853 error handling adding providers
See merge request leap/bitmask_android!46
Diffstat (limited to 'app/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java')
| -rw-r--r-- | app/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java | 6 |
1 files changed, 3 insertions, 3 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 6c312c87..f701b7aa 100644 --- a/app/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java +++ b/app/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java @@ -913,7 +913,7 @@ public class OpenVPNService extends VpnService implements StateListener, Callbac // CONNECTED // Does not work :( notificationManager.buildOpenVpnNotification( - mProfile.mName, + mProfile != null ? mProfile.mName : "", VpnStatus.getLastCleanLogMessage(this), VpnStatus.getLastCleanLogMessage(this), level, @@ -944,7 +944,7 @@ public class OpenVPNService extends VpnService implements StateListener, Callbac humanReadableByteCount(out, false, getResources()), humanReadableByteCount(diffOut / OpenVPNManagement.mBytecountInterval, true, getResources())); notificationManager.buildOpenVpnNotification( - mProfile.mName, + mProfile != null ? mProfile.mName : "", netstat, null, LEVEL_CONNECTED, @@ -987,7 +987,7 @@ public class OpenVPNService extends VpnService implements StateListener, Callbac public void requestInputFromUser(int resid, String needed) { VpnStatus.updateStateString("NEED", "need " + needed, resid, LEVEL_WAITING_FOR_USER_INPUT); notificationManager.buildOpenVpnNotification( - mProfile.mName, + mProfile != null ? mProfile.mName : "", getString(resid), getString(resid), LEVEL_WAITING_FOR_USER_INPUT, |