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
3f55be96
Commit
3f55be96
authored
Jan 30, 2018
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update the method to handle global su db
parent
b05d2d3a
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
83 additions
and
134 deletions
+83
-134
MagiskManager.java
src/main/java/com/topjohnwu/magisk/MagiskManager.java
+1
-6
HideManager.java
src/main/java/com/topjohnwu/magisk/asyncs/HideManager.java
+1
-1
InstallMagisk.java
src/main/java/com/topjohnwu/magisk/asyncs/InstallMagisk.java
+1
-1
SuDatabaseHelper.java
.../java/com/topjohnwu/magisk/database/SuDatabaseHelper.java
+76
-124
RequestActivity.java
.../java/com/topjohnwu/magisk/superuser/RequestActivity.java
+1
-1
Utils.java
src/main/java/com/topjohnwu/magisk/utils/Utils.java
+3
-1
No files found.
src/main/java/com/topjohnwu/magisk/MagiskManager.java
View file @
3f55be96
...
...
@@ -119,7 +119,7 @@ public class MagiskManager extends Shell.ContainerApp {
}
catch
(
PackageManager
.
NameNotFoundException
ignored
)
{
/* Expected */
}
}
suDB
=
SuDatabaseHelper
.
get
SuDB
(
false
);
suDB
=
SuDatabaseHelper
.
get
Instance
(
this
);
repoDB
=
new
RepoDatabaseHelper
(
this
);
defaultLocale
=
Locale
.
getDefault
();
setLocale
();
...
...
@@ -219,11 +219,6 @@ public class MagiskManager extends Shell.ContainerApp {
ret
=
Shell
.
Sync
.
su
(
"echo \"$BOOTIMAGE\""
);
if
(
Utils
.
isValidShellResponse
(
ret
))
bootBlock
=
ret
.
get
(
0
);
if
(
suDB
!=
null
&&
!
SuDatabaseHelper
.
verified
)
{
suDB
.
close
();
suDB
=
SuDatabaseHelper
.
getSuDB
(
true
);
}
}
public
void
getDefaultInstallFlags
()
{
...
...
src/main/java/com/topjohnwu/magisk/asyncs/HideManager.java
View file @
3f55be96
...
...
@@ -4,13 +4,13 @@ import android.app.Activity;
import
android.app.ProgressDialog
;
import
android.widget.Toast
;
import
com.topjohnwu.utils.JarMap
;
import
com.topjohnwu.magisk.MagiskManager
;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.utils.Const
;
import
com.topjohnwu.magisk.utils.Utils
;
import
com.topjohnwu.magisk.utils.ZipUtils
;
import
com.topjohnwu.superuser.Shell
;
import
com.topjohnwu.utils.JarMap
;
import
java.io.File
;
import
java.io.FileInputStream
;
...
...
src/main/java/com/topjohnwu/magisk/asyncs/InstallMagisk.java
View file @
3f55be96
...
...
@@ -7,7 +7,6 @@ import android.os.Build;
import
android.text.TextUtils
;
import
android.view.View
;
import
com.topjohnwu.utils.SignBoot
;
import
com.topjohnwu.magisk.FlashActivity
;
import
com.topjohnwu.magisk.MagiskManager
;
import
com.topjohnwu.magisk.container.TarEntry
;
...
...
@@ -15,6 +14,7 @@ import com.topjohnwu.magisk.utils.Const;
import
com.topjohnwu.magisk.utils.Utils
;
import
com.topjohnwu.magisk.utils.ZipUtils
;
import
com.topjohnwu.superuser.Shell
;
import
com.topjohnwu.utils.SignBoot
;
import
org.kamranzafar.jtar.TarInputStream
;
import
org.kamranzafar.jtar.TarOutputStream
;
...
...
src/main/java/com/topjohnwu/magisk/database/SuDatabaseHelper.java
View file @
3f55be96
This diff is collapsed.
Click to expand it.
src/main/java/com/topjohnwu/magisk/superuser/RequestActivity.java
View file @
3f55be96
...
...
@@ -68,7 +68,7 @@ public class RequestActivity extends Activity {
pm
=
getPackageManager
();
mm
=
Utils
.
getMagiskManager
(
this
);
mm
.
suDB
.
clea
nup
();
mm
.
suDB
.
clea
rOutdated
();
Intent
intent
=
getIntent
();
socketPath
=
intent
.
getStringExtra
(
"socket"
);
...
...
src/main/java/com/topjohnwu/magisk/utils/Utils.java
View file @
3f55be96
...
...
@@ -28,6 +28,7 @@ import com.topjohnwu.magisk.MagiskManager;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.SplashActivity
;
import
com.topjohnwu.magisk.components.SnackbarMaker
;
import
com.topjohnwu.magisk.database.SuDatabaseHelper
;
import
com.topjohnwu.magisk.receivers.DownloadReceiver
;
import
com.topjohnwu.superuser.Shell
;
...
...
@@ -80,7 +81,8 @@ public class Utils {
}
public
static
void
uninstallPkg
(
String
pkg
)
{
Shell
.
Sync
.
su
(
fmt
(
"umount -l /data/user*/*/%s/*/*.db 2>/dev/null; pm uninstall %s"
,
pkg
,
pkg
));
SuDatabaseHelper
.
cleanup
();
Shell
.
Sync
.
su
(
"pm uninstall "
+
pkg
);
}
public
static
void
dlAndReceive
(
Context
context
,
DownloadReceiver
receiver
,
String
link
,
String
filename
)
{
...
...
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