Reduce running of background tasks on sleep mode

netenv/network-change.go

@@ -41,10 +41,13 @@ serviceLoop:
 	for {
 		trigger := false
 
-		timeout := 15 * time.Second
-		if !Online() {
-			timeout = time.Second
+		var ticker *time.Ticker
+		if Online() {
+			ticker = monitorNetworkChangeOnlineTicker
+		} else {
+			ticker = monitorNetworkChangeOfflineTicker
 		}
+
 		// wait for trigger
 		select {
 		case <-ctx.Done():
@@ -54,7 +57,7 @@ serviceLoop:
 			// triggers the networkChangeCheck this way. If we would set
 			// trigger == true we would trigger the online check again
 			// resulting in a loop of pointless checks.
-		case <-time.After(timeout):
+		case <-ticker.C:
 			trigger = true
 		}
 

netenv/os_android.go

@@ -3,8 +3,20 @@ package netenv
 import (
 	"github.com/safing/portmaster-android/go/app_interface"
 	"net"
+	"time"
 )
 
+var (
+	monitorNetworkChangeOnlineTicker  = time.NewTicker(time.Second)
+	monitorNetworkChangeOfflineTicker = time.NewTicker(time.Second)
+)
+
+func init() {
+	// Network change event is monitored by the android system.
+	monitorNetworkChangeOnlineTicker.Stop()
+	monitorNetworkChangeOfflineTicker.Stop()
+}
+
 func osGetInterfaceAddrs() ([]net.Addr, error) {
 	list, err := app_interface.GetNetworkAddresses()
 	if err != nil {

netenv/os_default.go

@@ -4,6 +4,12 @@ package netenv
 
 import (
 	"net"
+	"time"
+)
+
+var (
+	monitorNetworkChangeOnlineTicker  = time.NewTicker(15 * time.Second)
+	monitorNetworkChangeOfflineTicker = time.NewTicker(time.Second)
 )
 
 func osGetInterfaceAddrs() ([]net.Addr, error) {