diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 3168aa40b..126f494b5 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -2,8 +2,6 @@ - - , Parcelable { fun onActivityLaunch() {} @@ -50,11 +46,6 @@ abstract class BaseActivity : AppCompatActivity() { contentCallback = null } - private var uninstallLatch = CountDownLatch(1) - private val uninstallPkg = registerForActivityResult(UninstallPackage()) { - uninstallLatch.countDown() - } - private val mReferrerField by lazy(LazyThreadSafetyMode.NONE) { Activity::class.java.reflectField("mReferrer") } @@ -114,13 +105,6 @@ abstract class BaseActivity : AppCompatActivity() { } } - @WorkerThread - fun uninstallAndWait(pkg: String) { - uninstallLatch = CountDownLatch(1) - uninstallPkg.launch(pkg) - uninstallLatch.await(3, TimeUnit.SECONDS) - } - override fun recreate() { startActivity(Intent().setComponent(intent.component)) finish() diff --git a/app/src/main/java/com/topjohnwu/magisk/core/utils/UninstallPackage.kt b/app/src/main/java/com/topjohnwu/magisk/core/utils/UninstallPackage.kt deleted file mode 100644 index a8446a5c2..000000000 --- a/app/src/main/java/com/topjohnwu/magisk/core/utils/UninstallPackage.kt +++ /dev/null @@ -1,21 +0,0 @@ -package com.topjohnwu.magisk.core.utils - -import android.app.Activity -import android.content.Context -import android.content.Intent -import android.net.Uri -import androidx.activity.result.contract.ActivityResultContract - -class UninstallPackage : ActivityResultContract() { - - @Suppress("DEPRECATION") - override fun createIntent(context: Context, input: String): Intent { - val uri = Uri.Builder().scheme("package").opaquePart(input).build() - val intent = Intent(Intent.ACTION_UNINSTALL_PACKAGE, uri) - intent.putExtra(Intent.EXTRA_RETURN_RESULT, true) - return intent - } - - override fun parseResult(resultCode: Int, intent: Intent?) = - resultCode == Activity.RESULT_OK -} diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/SplashActivity.kt b/app/src/main/java/com/topjohnwu/magisk/ui/SplashActivity.kt index 365ef3d8f..b441413db 100644 --- a/app/src/main/java/com/topjohnwu/magisk/ui/SplashActivity.kt +++ b/app/src/main/java/com/topjohnwu/magisk/ui/SplashActivity.kt @@ -135,13 +135,10 @@ abstract class SplashActivity : NavigationActivity/dev/null 2>&1").exec() } } else { - if (Config.suManager.isNotEmpty()) + if (!Const.Version.atLeast_25_0() && Config.suManager.isNotEmpty()) Config.suManager = "" pkg ?: return - if (!Shell.cmd("(pm uninstall $pkg)& >/dev/null 2>&1").exec().isSuccess) { - // Uninstall through Android API - uninstallAndWait(pkg) - } + Shell.cmd("(pm uninstall $pkg)& >/dev/null 2>&1").exec() } }