From 6ed72d3b65b497d89edc02849090473d07404cce Mon Sep 17 00:00:00 2001
From: X1nto <burtkni@yandex.ru>
Date: Fri, 8 Oct 2021 17:31:47 +0400
Subject: [PATCH] bundle busybox

---
 app/build.gradle.kts                                 |  6 ++++--
 app/src/main/java/com/vanced/manager/core/App.kt     | 12 +++++++++++-
 .../java/com/vanced/manager/utils/PackageHelper.kt   |  9 ---------
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index b137ec81..b1992cc4 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -123,8 +123,10 @@ dependencies {
     implementation("com.squareup.retrofit2:retrofit:2.9.0")
 
     // Root permissions
-    implementation("com.github.topjohnwu.libsu:core:3.1.2")
-    implementation("com.github.topjohnwu.libsu:io:3.1.2")
+    val libsuVersion = "3.1.2"
+    implementation("com.github.topjohnwu.libsu:core:$libsuVersion")
+    implementation("com.github.topjohnwu.libsu:io:$libsuVersion")
+    implementation("com.github.topjohnwu.libsu:busybox:$libsuVersion")
 
     // Layout
     implementation("com.google.android.flexbox:flexbox:3.0.0")
diff --git a/app/src/main/java/com/vanced/manager/core/App.kt b/app/src/main/java/com/vanced/manager/core/App.kt
index 37b468c1..5830a85c 100644
--- a/app/src/main/java/com/vanced/manager/core/App.kt
+++ b/app/src/main/java/com/vanced/manager/core/App.kt
@@ -2,7 +2,9 @@ package com.vanced.manager.core
 
 import android.app.Application
 import androidx.preference.PreferenceManager.getDefaultSharedPreferences
-import com.vanced.manager.BuildConfig.*
+import com.topjohnwu.superuser.BusyBoxInstaller
+import com.topjohnwu.superuser.Shell
+import com.vanced.manager.BuildConfig
 import com.vanced.manager.utils.loadJson
 import com.vanced.manager.utils.managerAccent
 import com.vanced.manager.utils.mutableAccentColor
@@ -20,6 +22,14 @@ class App : Application() {
         scope.launch { loadJson(this@App) }
         super.onCreate()
         mutableAccentColor.value = prefs.managerAccent
+        Shell.enableVerboseLogging = BuildConfig.DEBUG
+        Shell.setDefaultBuilder(
+            Shell.Builder
+                .create()
+                .setFlags(Shell.FLAG_REDIRECT_STDERR)
+                .setInitializers(BusyBoxInstaller::class.java)
+                .setTimeout(10)
+        )
     }
 
 }
diff --git a/app/src/main/java/com/vanced/manager/utils/PackageHelper.kt b/app/src/main/java/com/vanced/manager/utils/PackageHelper.kt
index 9f3d4e9f..b80a7503 100644
--- a/app/src/main/java/com/vanced/manager/utils/PackageHelper.kt
+++ b/app/src/main/java/com/vanced/manager/utils/PackageHelper.kt
@@ -35,15 +35,6 @@ object PackageHelper {
     private val vancedThemes =
         vanced.value?.array<String>("themes")?.value ?: listOf("black", "dark", "pink", "blue")
 
-    init {
-        Shell.enableVerboseLogging = BuildConfig.DEBUG
-        Shell.setDefaultBuilder(
-            Shell.Builder.create()
-                .setFlags(Shell.FLAG_REDIRECT_STDERR)
-                .setTimeout(10)
-        )
-    }
-
     private fun getAppNameRoot(pkg: String): String {
         return when (pkg) {
             vancedRootPkg -> "vanced"