Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Nathan OBrian
Nebulo
Commits
6a472bfa
Commit
6a472bfa
authored
Aug 08, 2019
by
Daniel Wolf
Browse files
Restart the vpn when the screen has been turned off for more than 60 seconds
Implements #149
parent
d3cef67f
Changes
1
Hide whitespace changes
Inline
Side-by-side
app/src/main/java/com/frostnerd/smokescreen/service/DnsVpnService.kt
View file @
6a472bfa
...
...
@@ -3,6 +3,7 @@ package com.frostnerd.smokescreen.service
import
android.app.NotificationManager
import
android.app.PendingIntent
import
android.app.Service
import
android.content.BroadcastReceiver
import
android.content.Context
import
android.content.Intent
import
android.content.SharedPreferences
...
...
@@ -94,6 +95,8 @@ class DnsVpnService : VpnService(), Runnable {
private
var
queryCountOffset
:
Long
=
0
private
var
packageBypassAmount
=
0
private
var
connectedToANetwork
:
Boolean
?
=
null
private
var
lastScreenOff
:
Long
?
=
null
private
lateinit
var
screenStateReceiver
:
BroadcastReceiver
/*
URLs passed to the Service, which haven't been retrieved from the settings.
...
...
@@ -185,6 +188,15 @@ class DnsVpnService : VpnService(), Runnable {
updateServiceTile
()
subscribeToSettings
()
addNetworkChangeListener
()
screenStateReceiver
=
registerReceiver
(
listOf
(
Intent
.
ACTION_SCREEN_OFF
,
Intent
.
ACTION_SCREEN_ON
))
{
if
(
it
?.
action
==
Intent
.
ACTION_SCREEN_OFF
)
{
lastScreenOff
=
System
.
currentTimeMillis
()
}
else
{
if
(
lastScreenOff
!=
null
&&
System
.
currentTimeMillis
()
-
lastScreenOff
!!
>=
60000
)
{
if
(
fileDescriptor
!=
null
)
recreateVpn
(
false
,
null
)
}
}
}
log
(
"Service created."
)
}
...
...
@@ -513,9 +525,14 @@ class DnsVpnService : VpnService(), Runnable {
queryCountOffset
+=
currentTrafficStats
?.
packetsReceivedFromDevice
?:
0
vpnProxy
?.
stop
()
fileDescriptor
?.
close
()
if
(
isStoppingCompletely
&&
networkCallback
!=
null
)
{
(
getSystemService
(
Context
.
CONNECTIVITY_SERVICE
)
as
ConnectivityManager
).
unregisterNetworkCallback
(
networkCallback
)
networkCallback
=
null
if
(
isStoppingCompletely
)
{
if
(
networkCallback
!=
null
)
{
(
getSystemService
(
Context
.
CONNECTIVITY_SERVICE
)
as
ConnectivityManager
).
unregisterNetworkCallback
(
networkCallback
)
networkCallback
=
null
}
unregisterReceiver
(
screenStateReceiver
)
}
vpnProxy
=
null
fileDescriptor
=
null
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment