From ccdcfdce8a353421daf057e397c3a10874852f76 Mon Sep 17 00:00:00 2001
From: albexk <albexk@proton.me>
Date: Thu, 23 Nov 2023 16:49:32 +0300
Subject: [PATCH] Remove VPNPermissionHelper class

---
 client/android/AndroidManifest.xml            |  9 ----
 .../org/amnezia/vpn/VPNPermissionHelper.kt    | 41 -------------------
 2 files changed, 50 deletions(-)
 delete mode 100644 client/android/src/org/amnezia/vpn/VPNPermissionHelper.kt

diff --git a/client/android/AndroidManifest.xml b/client/android/AndroidManifest.xml
index 18e31f43..62b91cea 100644
--- a/client/android/AndroidManifest.xml
+++ b/client/android/AndroidManifest.xml
@@ -138,15 +138,6 @@
             <property android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE" android:value="vpn" />
         </service>
 
-        <service
-            android:name=".VPNPermissionHelper"
-            android:permission="android.permission.BIND_VPN_SERVICE"
-            android:foregroundServiceType="specialUse"
-            android:exported="true">
-
-            <property android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE" android:value="vpn" />
-        </service>
-
         <!-- For adding service(s) please check: https://wiki.qt.io/AndroidServices -->
         <provider
             android:name="androidx.core.content.FileProvider"
diff --git a/client/android/src/org/amnezia/vpn/VPNPermissionHelper.kt b/client/android/src/org/amnezia/vpn/VPNPermissionHelper.kt
deleted file mode 100644
index 92897f7b..00000000
--- a/client/android/src/org/amnezia/vpn/VPNPermissionHelper.kt
+++ /dev/null
@@ -1,41 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-package org.amnezia.vpn
-
-import android.content.Context
-import android.content.Intent
-import android.util.Log
-
-class VPNPermissionHelper : android.net.VpnService() {
-
-        private val tag = "VPNPermissionHelper"
-    /**
-     * This small service does nothing else then checking if the vpn permission
-     * is present and prompting if not.
-     */
-    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-        Log.i(tag, "onStartCommand")
-        val intent = prepare(this.applicationContext)
-        if (intent != null) {
-            startActivityForResult(intent)
-        }
-        return START_NOT_STICKY
-    }
-
-    companion object {
-        @JvmStatic
-        fun startService(c: Context) {
-            val appC = c.applicationContext
-            appC.startService(Intent(appC, VPNPermissionHelper::class.java))
-        }
-    }
-
-    /**
-     * Fetches the Global QTAndroidActivity and calls startActivityForResult with the given intent
-     * Is used to request the VPN-Permission, if not given.
-     * Actually Implemented in src/platforms/android/AndroidController.cpp
-     */
-    external fun startActivityForResult(i: Intent)
-}