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
d1b5ebad
Commit
d1b5ebad
authored
Feb 06, 2017
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Several fixes
parent
f4ce813d
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
22 additions
and
11 deletions
+22
-11
build.gradle
app/build.gradle
+2
-2
MagiskManager.java
app/src/main/java/com/topjohnwu/magisk/MagiskManager.java
+1
-1
SplashActivity.java
app/src/main/java/com/topjohnwu/magisk/SplashActivity.java
+9
-3
BootReceiver.java
...ain/java/com/topjohnwu/magisk/receivers/BootReceiver.java
+7
-2
Async.java
app/src/main/java/com/topjohnwu/magisk/utils/Async.java
+3
-3
No files found.
app/build.gradle
View file @
d1b5ebad
...
...
@@ -8,8 +8,8 @@ android {
applicationId
"com.topjohnwu.magisk"
minSdkVersion
21
targetSdkVersion
25
versionCode
2
0
versionName
"4.
0
"
versionCode
2
2
versionName
"4.
1
"
jackOptions
{
enabled
true
jackInProcess
true
...
...
app/src/main/java/com/topjohnwu/magisk/MagiskManager.java
View file @
d1b5ebad
...
...
@@ -56,8 +56,8 @@ public class MagiskManager extends Application {
// Configurations
public
static
boolean
shellLogging
;
public
static
boolean
devLogging
;
public
static
boolean
magiskHide
;
public
boolean
magiskHide
;
public
boolean
isDarkTheme
;
public
int
suRequestTimeout
;
public
int
suLogTimeout
=
14
;
...
...
app/src/main/java/com/topjohnwu/magisk/SplashActivity.java
View file @
d1b5ebad
...
...
@@ -5,8 +5,11 @@ import android.os.Bundle;
import
com.topjohnwu.magisk.components.Activity
;
import
com.topjohnwu.magisk.utils.Async
;
import
com.topjohnwu.magisk.utils.Shell
;
import
com.topjohnwu.magisk.utils.Utils
;
import
java.util.List
;
public
class
SplashActivity
extends
Activity
{
@Override
...
...
@@ -18,13 +21,16 @@ public class SplashActivity extends Activity {
// Init the info and configs and root shell
magiskManager
.
init
();
boolean
boot_done
=
Utils
.
itemExist
(
MagiskManager
.
MAGISK_MANAGER_BOOT
);
// Check MagiskHide status
List
<
String
>
ret
=
Shell
.
sh
(
"getprop persist.magisk.hide"
);
boolean
started
=
Utils
.
isValidShellResponse
(
ret
)
&&
Integer
.
parseInt
(
ret
.
get
(
0
))
!=
0
;
// Now fire all async tasks
new
Async
.
CheckUpdates
(
magiskManager
).
exec
();
new
Async
.
GetBootBlocks
(
magiskManager
).
exec
();
if
(
magiskManager
.
prefs
.
getBoolean
(
"magiskhide"
,
false
)
&&
!
magiskManager
.
disabled
&&
magiskManager
.
magiskVersion
>
1
0.3
&&
boot_done
)
{
if
(
magiskManager
.
magiskHide
&&
!
magiskManager
.
disabled
&&
magiskManager
.
magiskVersion
>
1
1
&&
!
started
)
{
new
Async
.
MagiskHide
().
enable
();
}
new
Async
.
LoadModules
(
magiskManager
)
{
...
...
app/src/main/java/com/topjohnwu/magisk/receivers/BootReceiver.java
View file @
d1b5ebad
...
...
@@ -10,6 +10,9 @@ import com.topjohnwu.magisk.MagiskManager;
import
com.topjohnwu.magisk.R
;
import
com.topjohnwu.magisk.utils.Async
;
import
com.topjohnwu.magisk.utils.Shell
;
import
com.topjohnwu.magisk.utils.Utils
;
import
java.util.List
;
public
class
BootReceiver
extends
BroadcastReceiver
{
...
...
@@ -29,11 +32,13 @@ public class BootReceiver extends BroadcastReceiver {
MagiskManager
magiskManager
=
(
MagiskManager
)
getApplicationContext
();
magiskManager
.
initSuAccess
();
magiskManager
.
updateMagiskInfo
();
List
<
String
>
ret
=
Shell
.
sh
(
"getprop persist.magisk.hide"
);
boolean
started
=
Utils
.
isValidShellResponse
(
ret
)
&&
Integer
.
parseInt
(
ret
.
get
(
0
))
!=
0
;
if
(
magiskManager
.
prefs
.
getBoolean
(
"magiskhide"
,
false
)
&&
!
magiskManager
.
disabled
&&
magiskManager
.
magiskVersion
>
10.3
)
{
!
magiskManager
.
disabled
&&
!
started
&&
magiskManager
.
magiskVersion
>
11
)
{
magiskManager
.
toast
(
R
.
string
.
start_magiskhide
,
Toast
.
LENGTH_LONG
);
Shell
.
su
(
true
,
Async
.
MAGISK_HIDE_PATH
+
"enable"
,
"
touch "
+
MagiskManager
.
MAGISK_MANAGER_BOOT
);
"
setprop persist.magisk.hide 1"
);
}
}
}
...
...
app/src/main/java/com/topjohnwu/magisk/utils/Async.java
View file @
d1b5ebad
...
...
@@ -229,7 +229,7 @@ public class Async {
@Override
protected
void
onPreExecute
()
{
progress
=
new
ProgressDialog
(
m
agiskManager
);
progress
=
new
ProgressDialog
(
m
Context
);
progress
.
setTitle
(
R
.
string
.
zip_install_progress_title
);
progress
.
show
();
}
...
...
@@ -323,11 +323,11 @@ public class Async {
}
public
void
enable
()
{
exec
(
"enable"
);
exec
(
"enable
; setprop persist.magisk.hide 1
"
);
}
public
void
disable
()
{
exec
(
"disable"
);
exec
(
"disable
; setprop persist.magisk.hide 0
"
);
}
}
...
...
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