diff options
| author | cyBerta <cyberta@riseup.net> | 2018-02-20 14:09:53 +0100 |
|---|---|---|
| committer | cyBerta <cyberta@riseup.net> | 2018-02-20 14:09:53 +0100 |
| commit | 1943d9d2dd8fd605e218f81f3403867c6ce75dd5 (patch) | |
| tree | 545fe0249b33d906b6d9c2eaf5cef40c80e94776 | |
| parent | d6db9433d9f9e0e2f1dc21cd3de7d88d1e473861 (diff) | |
#8860 fix potential nullpointer exception on openvpnservice
| -rw-r--r-- | app/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java | 6 | ||||
| m--------- | ics-openvpn | 0 |
2 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, diff --git a/ics-openvpn b/ics-openvpn -Subproject 984e58fea146fff53d2348d869ca4e1076cb9c9 +Subproject a727180b24969f7320c562925dabf27afd57c40 |