From b81633b1e75267ce98097a5f2283d978672e3c19 Mon Sep 17 00:00:00 2001
From: Mygod <contact-git@mygod.be>
Date: Wed, 8 Dec 2021 14:02:48 -0500
Subject: [PATCH] Skip unblocking for root process

---
 mobile/src/main/java/be/mygod/vpnhotspot/root/RootManager.kt   | 3 +++
 .../src/main/java/be/mygod/vpnhotspot/util/UnblockCentral.kt   | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/root/RootManager.kt b/mobile/src/main/java/be/mygod/vpnhotspot/root/RootManager.kt
index a9bebf3b..bdf8889f 100644
--- a/mobile/src/main/java/be/mygod/vpnhotspot/root/RootManager.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/root/RootManager.kt
@@ -1,11 +1,13 @@
 package be.mygod.vpnhotspot.root
 
 import android.annotation.SuppressLint
+import android.os.Build
 import android.os.Parcelable
 import android.util.Log
 import be.mygod.librootkotlinx.*
 import be.mygod.vpnhotspot.App.Companion.app
 import be.mygod.vpnhotspot.util.Services
+import be.mygod.vpnhotspot.util.UnblockCentral
 import kotlinx.parcelize.Parcelize
 import timber.log.Timber
 
@@ -31,6 +33,7 @@ object RootManager : RootSession(), Logger {
             })
             Logger.me = RootManager
             Services.init { systemContext }
+            if (Build.VERSION.SDK_INT >= 28) UnblockCentral.needInit = false
             return null
         }
     }
diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/util/UnblockCentral.kt b/mobile/src/main/java/be/mygod/vpnhotspot/util/UnblockCentral.kt
index ec4f71d8..c9a8f74d 100644
--- a/mobile/src/main/java/be/mygod/vpnhotspot/util/UnblockCentral.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/util/UnblockCentral.kt
@@ -15,10 +15,11 @@ import be.mygod.vpnhotspot.App.Companion.app
 @SuppressLint("BlockedPrivateApi", "DiscouragedPrivateApi")
 @Suppress("FunctionName")
 object UnblockCentral {
+    var needInit = true
     /**
      * Retrieve this property before doing dangerous shit.
      */
-    private val init by lazy { UnblockHelper(app.deviceStorage) }
+    private val init by lazy { if (needInit) UnblockHelper(app.deviceStorage) }
 
     @RequiresApi(31)
     fun setUserConfiguration(clazz: Class<*>) = init.let {