Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
M
Magisk
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Magisk
Commits
c495b3d1
Commit
c495b3d1
authored
Jun 05, 2022
by
vvb2060
Committed by
John Wu
Jun 06, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove request uninstall code
unreachable
parent
8b16bfbb
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
2 additions
and
44 deletions
+2
-44
AndroidManifest.xml
app/src/main/AndroidManifest.xml
+0
-2
BaseActivity.kt
.../main/java/com/topjohnwu/magisk/core/base/BaseActivity.kt
+0
-16
UninstallPackage.kt
.../java/com/topjohnwu/magisk/core/utils/UninstallPackage.kt
+0
-21
SplashActivity.kt
app/src/main/java/com/topjohnwu/magisk/ui/SplashActivity.kt
+2
-5
No files found.
app/src/main/AndroidManifest.xml
View file @
c495b3d1
...
@@ -2,8 +2,6 @@
...
@@ -2,8 +2,6 @@
<manifest
xmlns:android=
"http://schemas.android.com/apk/res/android"
<manifest
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:tools=
"http://schemas.android.com/tools"
>
xmlns:tools=
"http://schemas.android.com/tools"
>
<uses-permission
android:name=
"android.permission.REQUEST_DELETE_PACKAGES"
/>
<application
<application
android:name=
".core.App"
android:name=
".core.App"
android:extractNativeLibs=
"true"
android:extractNativeLibs=
"true"
...
...
app/src/main/java/com/topjohnwu/magisk/core/base/BaseActivity.kt
View file @
c495b3d1
...
@@ -14,17 +14,13 @@ import android.widget.Toast
...
@@ -14,17 +14,13 @@ import android.widget.Toast
import
androidx.activity.result.ActivityResultCallback
import
androidx.activity.result.ActivityResultCallback
import
androidx.activity.result.contract.ActivityResultContracts.GetContent
import
androidx.activity.result.contract.ActivityResultContracts.GetContent
import
androidx.activity.result.contract.ActivityResultContracts.RequestPermission
import
androidx.activity.result.contract.ActivityResultContracts.RequestPermission
import
androidx.annotation.WorkerThread
import
androidx.appcompat.app.AppCompatActivity
import
androidx.appcompat.app.AppCompatActivity
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.core.isRunningAsStub
import
com.topjohnwu.magisk.core.isRunningAsStub
import
com.topjohnwu.magisk.core.utils.RequestInstall
import
com.topjohnwu.magisk.core.utils.RequestInstall
import
com.topjohnwu.magisk.core.utils.UninstallPackage
import
com.topjohnwu.magisk.core.wrap
import
com.topjohnwu.magisk.core.wrap
import
com.topjohnwu.magisk.ktx.reflectField
import
com.topjohnwu.magisk.ktx.reflectField
import
com.topjohnwu.magisk.utils.Utils
import
com.topjohnwu.magisk.utils.Utils
import
java.util.concurrent.CountDownLatch
import
java.util.concurrent.TimeUnit
interface
ContentResultCallback
:
ActivityResultCallback
<
Uri
>,
Parcelable
{
interface
ContentResultCallback
:
ActivityResultCallback
<
Uri
>,
Parcelable
{
fun
onActivityLaunch
()
{}
fun
onActivityLaunch
()
{}
...
@@ -50,11 +46,6 @@ abstract class BaseActivity : AppCompatActivity() {
...
@@ -50,11 +46,6 @@ abstract class BaseActivity : AppCompatActivity() {
contentCallback
=
null
contentCallback
=
null
}
}
private
var
uninstallLatch
=
CountDownLatch
(
1
)
private
val
uninstallPkg
=
registerForActivityResult
(
UninstallPackage
())
{
uninstallLatch
.
countDown
()
}
private
val
mReferrerField
by
lazy
(
LazyThreadSafetyMode
.
NONE
)
{
private
val
mReferrerField
by
lazy
(
LazyThreadSafetyMode
.
NONE
)
{
Activity
::
class
.
java
.
reflectField
(
"mReferrer"
)
Activity
::
class
.
java
.
reflectField
(
"mReferrer"
)
}
}
...
@@ -114,13 +105,6 @@ abstract class BaseActivity : AppCompatActivity() {
...
@@ -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
()
{
override
fun
recreate
()
{
startActivity
(
Intent
().
setComponent
(
intent
.
component
))
startActivity
(
Intent
().
setComponent
(
intent
.
component
))
finish
()
finish
()
...
...
app/src/main/java/com/topjohnwu/magisk/core/utils/UninstallPackage.kt
deleted
100644 → 0
View file @
8b16bfbb
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
<
String
,
Boolean
>()
{
@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
}
app/src/main/java/com/topjohnwu/magisk/ui/SplashActivity.kt
View file @
c495b3d1
...
@@ -135,13 +135,10 @@ abstract class SplashActivity<Binding : ViewDataBinding> : NavigationActivity<Bi
...
@@ -135,13 +135,10 @@ abstract class SplashActivity<Binding : ViewDataBinding> : NavigationActivity<Bi
Shell
.
cmd
(
"(pm uninstall $APPLICATION_ID)& >/dev/null 2>&1"
).
exec
()
Shell
.
cmd
(
"(pm uninstall $APPLICATION_ID)& >/dev/null 2>&1"
).
exec
()
}
}
}
else
{
}
else
{
if
(
Config
.
suManager
.
isNotEmpty
())
if
(
!
Const
.
Version
.
atLeast_25_0
()
&&
Config
.
suManager
.
isNotEmpty
())
Config
.
suManager
=
""
Config
.
suManager
=
""
pkg
?:
return
pkg
?:
return
if
(!
Shell
.
cmd
(
"(pm uninstall $pkg)& >/dev/null 2>&1"
).
exec
().
isSuccess
)
{
Shell
.
cmd
(
"(pm uninstall $pkg)& >/dev/null 2>&1"
).
exec
()
// Uninstall through Android API
uninstallAndWait
(
pkg
)
}
}
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment