[refactor] cleanup function was unneeded

pkg/backend/actions.go

@@ -19,3 +19,7 @@ func stopVPN() {
 		log.Println(err)
 	}
 }
+
+func closeVPN() {
+	ctx.bm.Close()
+}

pkg/backend/api.go

@@ -30,10 +30,11 @@ func Unblock() {
 func Quit() {
 	if ctx.Status != off {
 		go setStatus(stopping)
+		ctx.cfg.SetUserStoppedVPN(false)
+	} else {
 		ctx.cfg.SetUserStoppedVPN(true)
-		stopVPN()
 	}
-	cleanup()
+	closeVPN()
 }
 
 func DonateAccepted() {

pkg/backend/cleanup.go

-package backend
-
-import (
-	"0xacab.org/leap/bitmask-vpn/pkg/vpn"
-)
-
-func cleanup() {
-	vpn.Cleanup()
-}

pkg/vpn/main.go

@@ -19,8 +19,6 @@ import (
 	"io/ioutil"
 	"log"
 	"os"
-	"path"
-	"path/filepath"
 
 	"0xacab.org/leap/bitmask-vpn/pkg/config"
 	"0xacab.org/leap/bitmask-vpn/pkg/vpn/bonafide"
@@ -76,7 +74,7 @@ func (b *Bitmask) GetStatusCh() <-chan string {
 	return b.statusCh
 }
 
-// Close the connection to bitmask
+// Close the connection to bitmask, and does cleanup of temporal files
 func (b *Bitmask) Close() {
 	log.Printf("Close: cleanup and vpn shutdown...")
 	b.StopVPN()
@@ -94,11 +92,3 @@ func (b *Bitmask) Close() {
 func (b *Bitmask) Version() (string, error) {
 	return "", nil
 }
-
-func Cleanup() {
-	dirs, _ := filepath.Glob(path.Join(os.TempDir(), "leap-*"))
-	for _, d := range dirs {
-		log.Println("removing temp dir:", d)
-		os.RemoveAll(d)
-	}
-}