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
8d210b5e
Commit
8d210b5e
authored
Dec 24, 2018
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Enhance EMUI 9 user experience
parent
3c6c0e67
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
24 additions
and
8 deletions
+24
-8
FlashActivity.java
app/src/full/java/com/topjohnwu/magisk/FlashActivity.java
+3
-4
ModulesFragment.java
.../java/com/topjohnwu/magisk/fragments/ModulesFragment.java
+2
-2
Data.java
core/src/main/java/com/topjohnwu/core/Data.java
+1
-0
RootUtils.java
core/src/main/java/com/topjohnwu/core/utils/RootUtils.java
+1
-0
Utils.java
core/src/main/java/com/topjohnwu/core/utils/Utils.java
+4
-0
init.cpp
native/jni/misc/init.cpp
+10
-1
util_functions.sh
scripts/util_functions.sh
+3
-1
No files found.
app/src/full/java/com/topjohnwu/magisk/FlashActivity.java
View file @
8d210b5e
...
@@ -46,7 +46,7 @@ public class FlashActivity extends BaseActivity {
...
@@ -46,7 +46,7 @@ public class FlashActivity extends BaseActivity {
@OnClick
(
R
.
id
.
reboot
)
@OnClick
(
R
.
id
.
reboot
)
void
reboot
()
{
void
reboot
()
{
Shell
.
su
(
"/system/bin/reboot"
).
submi
t
();
Utils
.
reboo
t
();
}
}
@OnClick
(
R
.
id
.
save_logs
)
@OnClick
(
R
.
id
.
save_logs
)
...
@@ -74,9 +74,8 @@ public class FlashActivity extends BaseActivity {
...
@@ -74,9 +74,8 @@ public class FlashActivity extends BaseActivity {
}
}
@OnClick
(
R
.
id
.
close
)
@OnClick
(
R
.
id
.
close
)
@Override
public
void
close
()
{
public
void
finish
()
{
finish
();
super
.
finish
();
}
}
@Override
@Override
...
...
app/src/full/java/com/topjohnwu/magisk/fragments/ModulesFragment.java
View file @
8d210b5e
...
@@ -109,7 +109,7 @@ public class ModulesFragment extends BaseFragment implements Topic.Subscriber {
...
@@ -109,7 +109,7 @@ public class ModulesFragment extends BaseFragment implements Topic.Subscriber {
public
boolean
onOptionsItemSelected
(
MenuItem
item
)
{
public
boolean
onOptionsItemSelected
(
MenuItem
item
)
{
switch
(
item
.
getItemId
())
{
switch
(
item
.
getItemId
())
{
case
R
.
id
.
reboot
:
case
R
.
id
.
reboot
:
Shell
.
su
(
"/system/bin/reboot"
).
submi
t
();
Utils
.
reboo
t
();
return
true
;
return
true
;
case
R
.
id
.
reboot_recovery
:
case
R
.
id
.
reboot_recovery
:
Shell
.
su
(
"/system/bin/reboot recovery"
).
submit
();
Shell
.
su
(
"/system/bin/reboot recovery"
).
submit
();
...
@@ -118,7 +118,7 @@ public class ModulesFragment extends BaseFragment implements Topic.Subscriber {
...
@@ -118,7 +118,7 @@ public class ModulesFragment extends BaseFragment implements Topic.Subscriber {
Shell
.
su
(
"/system/bin/reboot bootloader"
).
submit
();
Shell
.
su
(
"/system/bin/reboot bootloader"
).
submit
();
return
true
;
return
true
;
case
R
.
id
.
reboot_download
:
case
R
.
id
.
reboot_download
:
Shell
.
su
(
"/system/bin/reboot
upgrade
"
).
submit
();
Shell
.
su
(
"/system/bin/reboot
download
"
).
submit
();
return
true
;
return
true
;
default
:
default
:
return
false
;
return
false
;
...
...
core/src/main/java/com/topjohnwu/core/Data.java
View file @
8d210b5e
...
@@ -37,6 +37,7 @@ public class Data {
...
@@ -37,6 +37,7 @@ public class Data {
// Install flags
// Install flags
public
static
boolean
keepVerity
=
false
;
public
static
boolean
keepVerity
=
false
;
public
static
boolean
keepEnc
=
false
;
public
static
boolean
keepEnc
=
false
;
public
static
boolean
recovery
=
false
;
// Configs
// Configs
public
static
boolean
isDarkTheme
;
public
static
boolean
isDarkTheme
;
...
...
core/src/main/java/com/topjohnwu/core/utils/RootUtils.java
View file @
8d210b5e
...
@@ -42,6 +42,7 @@ public class RootUtils extends Shell.Initializer {
...
@@ -42,6 +42,7 @@ public class RootUtils extends Shell.Initializer {
Data
.
keepVerity
=
Boolean
.
parseBoolean
(
ShellUtils
.
fastCmd
(
"echo $KEEPVERITY"
));
Data
.
keepVerity
=
Boolean
.
parseBoolean
(
ShellUtils
.
fastCmd
(
"echo $KEEPVERITY"
));
Data
.
keepEnc
=
Boolean
.
parseBoolean
(
ShellUtils
.
fastCmd
(
"echo $KEEPFORCEENCRYPT"
));
Data
.
keepEnc
=
Boolean
.
parseBoolean
(
ShellUtils
.
fastCmd
(
"echo $KEEPFORCEENCRYPT"
));
Data
.
recovery
=
Boolean
.
parseBoolean
(
ShellUtils
.
fastCmd
(
"echo $RECOVERYMODE"
));
return
true
;
return
true
;
}
}
}
}
core/src/main/java/com/topjohnwu/core/utils/Utils.java
View file @
8d210b5e
...
@@ -122,4 +122,8 @@ public class Utils {
...
@@ -122,4 +122,8 @@ public class Utils {
return
Build
.
VERSION
.
SDK_INT
>=
Build
.
VERSION_CODES
.
N
?
return
Build
.
VERSION
.
SDK_INT
>=
Build
.
VERSION_CODES
.
N
?
App
.
self
.
createDeviceProtectedStorageContext
()
:
App
.
self
;
App
.
self
.
createDeviceProtectedStorageContext
()
:
App
.
self
;
}
}
public
static
void
reboot
()
{
Shell
.
su
(
"/system/bin/reboot"
+
(
Data
.
recovery
?
" recovery"
:
""
)).
submit
();
}
}
}
native/jni/misc/init.cpp
View file @
8d210b5e
...
@@ -95,7 +95,16 @@ static void parse_cmdline(struct cmdline *cmd) {
...
@@ -95,7 +95,16 @@ static void parse_cmdline(struct cmdline *cmd) {
kirin
=
strstr
(
tok
,
"kirin"
)
!=
nullptr
;
kirin
=
strstr
(
tok
,
"kirin"
)
!=
nullptr
;
}
}
}
}
cmd
->
early_boot
=
skip_initramfs
||
(
kirin
&&
enter_recovery
);
if
(
kirin
&&
enter_recovery
)
{
// Inform that we are actually booting as recovery
FILE
*
f
=
fopen
(
"/.backup/.magisk"
,
"a"
);
fprintf
(
f
,
"RECOVERYMODE=true
\n
"
);
fclose
(
f
);
cmd
->
early_boot
=
true
;
}
cmd
->
early_boot
|=
skip_initramfs
;
if
(
cmd
->
dt_dir
[
0
]
==
'\0'
)
if
(
cmd
->
dt_dir
[
0
]
==
'\0'
)
strcpy
(
cmd
->
dt_dir
,
DEFAULT_DT_DIR
);
strcpy
(
cmd
->
dt_dir
,
DEFAULT_DT_DIR
);
...
...
scripts/util_functions.sh
View file @
8d210b5e
...
@@ -116,6 +116,7 @@ get_flags() {
...
@@ -116,6 +116,7 @@ get_flags() {
# override variables
# override variables
getvar KEEPVERITY
getvar KEEPVERITY
getvar KEEPFORCEENCRYPT
getvar KEEPFORCEENCRYPT
getvar RECOVERYMODE
if
[
-z
$KEEPVERITY
]
;
then
if
[
-z
$KEEPVERITY
]
;
then
if
$SYSTEM_ROOT
;
then
if
$SYSTEM_ROOT
;
then
KEEPVERITY
=
true
KEEPVERITY
=
true
...
@@ -135,6 +136,7 @@ get_flags() {
...
@@ -135,6 +136,7 @@ get_flags() {
KEEPFORCEENCRYPT
=
false
KEEPFORCEENCRYPT
=
false
fi
fi
fi
fi
[
-z
$RECOVERYMODE
]
&&
RECOVERYMODE
=
false
}
}
grep_cmdline
()
{
grep_cmdline
()
{
...
@@ -153,7 +155,7 @@ grep_prop() {
...
@@ -153,7 +155,7 @@ grep_prop() {
getvar
()
{
getvar
()
{
local
VARNAME
=
$1
local
VARNAME
=
$1
local
VALUE
=
local
VALUE
=
VALUE
=
`
grep_prop
$VARNAME
/sbin/.magisk/config /
.backup/.magisk /
data/.magisk /cache/.magisk
`
VALUE
=
`
grep_prop
$VARNAME
/sbin/.magisk/config /data/.magisk /cache/.magisk
`
[
!
-z
$VALUE
]
&&
eval
$VARNAME
=
\$
VALUE
[
!
-z
$VALUE
]
&&
eval
$VARNAME
=
\$
VALUE
}
}
...
...
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