diff options
author | Pacien TRAN-GIRARD | 2017-07-06 21:57:47 +0200 |
---|---|---|
committer | Pacien TRAN-GIRARD | 2017-07-06 22:02:12 +0200 |
commit | 29c989ad157e1b03b867c7a98158c32358df082f (patch) | |
tree | 737115688672ffeff31db3daeed1bfa82a804aa8 /app/src/main/java/org/pacien/tincapp/service | |
parent | 819b3a44920e303a670928ee56e32b5ae02efca1 (diff) | |
download | tincapp-29c989ad157e1b03b867c7a98158c32358df082f.tar.gz |
Small cleanup
Diffstat (limited to 'app/src/main/java/org/pacien/tincapp/service')
-rw-r--r-- | app/src/main/java/org/pacien/tincapp/service/TincVpnService.kt | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/app/src/main/java/org/pacien/tincapp/service/TincVpnService.kt b/app/src/main/java/org/pacien/tincapp/service/TincVpnService.kt index 7813601..90b7b87 100644 --- a/app/src/main/java/org/pacien/tincapp/service/TincVpnService.kt +++ b/app/src/main/java/org/pacien/tincapp/service/TincVpnService.kt | |||
@@ -27,16 +27,18 @@ class TincVpnService : VpnService() { | |||
27 | return Service.START_STICKY | 27 | return Service.START_STICKY |
28 | } | 28 | } |
29 | 29 | ||
30 | override fun onDestroy() = try { | 30 | override fun onDestroy() { |
31 | Tinc.stop(netName!!) | 31 | try { |
32 | fd!!.close() | 32 | Tinc.stop(netName!!) |
33 | } catch (e: IOException) { | 33 | fd?.close() |
34 | e.printStackTrace() | 34 | } catch (e: IOException) { |
35 | } finally { | 35 | e.printStackTrace() |
36 | netName = null | 36 | } finally { |
37 | interfaceCfg = null | 37 | netName = null |
38 | fd = null | 38 | interfaceCfg = null |
39 | super.onDestroy() | 39 | fd = null |
40 | super.onDestroy() | ||
41 | } | ||
40 | } | 42 | } |
41 | 43 | ||
42 | private fun startVpn(netName: String) { | 44 | private fun startVpn(netName: String) { |