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
349b3e96
Commit
349b3e96
authored
Dec 28, 2017
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
More robust sudb handling
parent
96650c06
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
10 deletions
+15
-10
MagiskManager.java
src/main/java/com/topjohnwu/magisk/MagiskManager.java
+2
-2
SuDatabaseHelper.java
.../java/com/topjohnwu/magisk/database/SuDatabaseHelper.java
+13
-8
No files found.
src/main/java/com/topjohnwu/magisk/MagiskManager.java
View file @
349b3e96
...
...
@@ -106,7 +106,7 @@ public class MagiskManager extends Application {
}
catch
(
PackageManager
.
NameNotFoundException
ignored
)
{
/* Expected */
}
}
suDB
=
new
SuDatabaseHelper
(
false
);
suDB
=
SuDatabaseHelper
.
getSuDB
(
false
);
repoDB
=
new
RepoDatabaseHelper
(
this
);
defaultLocale
=
Locale
.
getDefault
();
setLocale
();
...
...
@@ -214,7 +214,7 @@ public class MagiskManager extends Application {
if
(
suDB
!=
null
&&
!
SuDatabaseHelper
.
verified
)
{
suDB
.
close
();
suDB
=
new
SuDatabaseHelper
(
);
suDB
=
SuDatabaseHelper
.
getSuDB
(
true
);
}
}
...
...
src/main/java/com/topjohnwu/magisk/database/SuDatabaseHelper.java
View file @
349b3e96
...
...
@@ -62,7 +62,7 @@ public class SuDatabaseHelper extends SQLiteOpenHelper {
File
db
=
Utils
.
getDB
(
context
,
DB_NAME
);
if
(!
verify
)
{
if
(
db
.
length
()
==
0
)
{
if
(
db
.
exists
()
&&
db
.
length
()
==
0
)
{
ce
.
loadMagiskInfo
();
// Continue verification
}
else
{
...
...
@@ -108,7 +108,7 @@ public class SuDatabaseHelper extends SQLiteOpenHelper {
// New global su db
Shell
.
su
(
Utils
.
fmt
(
"mkdir %s 2>/dev/null; chmod 700 %s"
,
GLOBAL_DB
.
getParent
(),
GLOBAL_DB
.
getParent
()));
if
(!
Utils
.
itemExist
(
GLOBAL_DB
))
{
Utils
.
javaCreateFile
(
db
);
context
.
openOrCreateDatabase
(
DB_NAME
,
0
,
null
).
close
(
);
Shell
.
su
(
Utils
.
fmt
(
"cp -af %s %s; rm -f %s*"
,
db
,
GLOBAL_DB
,
db
));
}
verified
=
TextUtils
.
equals
(
Utils
.
checkInode
(
GLOBAL_DB
),
Utils
.
checkInode
(
db
));
...
...
@@ -125,12 +125,17 @@ public class SuDatabaseHelper extends SQLiteOpenHelper {
return
context
;
}
public
SuDatabaseHelper
()
{
this
(
true
);
}
public
SuDatabaseHelper
(
boolean
verify
)
{
this
(
initDB
(
verify
));
public
static
SuDatabaseHelper
getSuDB
(
boolean
verify
)
{
try
{
return
new
SuDatabaseHelper
(
initDB
(
verify
));
}
catch
(
Exception
e
)
{
// Try to catch runtime exceptions and remove all db for retry
unmntDB
();
Shell
.
su
(
Utils
.
fmt
(
"rm -rf /data/user*/*/magisk.db /data/adb/magisk.db /data/user*/*/%s/databases"
),
MagiskManager
.
get
().
getPackageName
());
e
.
printStackTrace
();
return
new
SuDatabaseHelper
(
initDB
(
false
));
}
}
private
SuDatabaseHelper
(
Context
context
)
{
...
...
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