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
d0a86385
Commit
d0a86385
authored
Feb 08, 2018
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update console messages
parent
50a49e2c
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
InstallMagisk.java
src/main/java/com/topjohnwu/magisk/asyncs/InstallMagisk.java
+4
-4
No files found.
src/main/java/com/topjohnwu/magisk/asyncs/InstallMagisk.java
View file @
d0a86385
...
@@ -108,7 +108,7 @@ public class InstallMagisk extends ParallelTask<Void, Void, Boolean> {
...
@@ -108,7 +108,7 @@ public class InstallMagisk extends ParallelTask<Void, Void, Boolean> {
boolean
highCompression
=
false
;
boolean
highCompression
=
false
;
switch
(
mode
)
{
switch
(
mode
)
{
case
PATCH_MODE:
case
PATCH_MODE:
console
.
add
(
"- Use boot image: "
+
boot
);
console
.
add
(
"- Use boot
/ramdisk
image: "
+
boot
);
// Copy boot image to local
// Copy boot image to local
try
(
try
(
InputStream
in
=
mm
.
getContentResolver
().
openInputStream
(
mBootImg
);
InputStream
in
=
mm
.
getContentResolver
().
openInputStream
(
mBootImg
);
...
@@ -140,7 +140,7 @@ public class InstallMagisk extends ParallelTask<Void, Void, Boolean> {
...
@@ -140,7 +140,7 @@ public class InstallMagisk extends ParallelTask<Void, Void, Boolean> {
}
}
break
;
break
;
case
DIRECT_MODE:
case
DIRECT_MODE:
console
.
add
(
"- Use boot image: "
+
mBootLocation
);
console
.
add
(
"- Use boot
/ramdisk
image: "
+
mBootLocation
);
if
(
mm
.
remoteMagiskVersionCode
>=
1463
)
{
if
(
mm
.
remoteMagiskVersionCode
>=
1463
)
{
List
<
String
>
ret
=
new
ArrayList
<>();
List
<
String
>
ret
=
new
ArrayList
<>();
Shell
.
getShell
().
run
(
ret
,
logs
,
Shell
.
getShell
().
run
(
ret
,
logs
,
...
@@ -168,7 +168,7 @@ public class InstallMagisk extends ParallelTask<Void, Void, Boolean> {
...
@@ -168,7 +168,7 @@ public class InstallMagisk extends ParallelTask<Void, Void, Boolean> {
try
(
InputStream
in
=
new
FileInputStream
(
boot
))
{
try
(
InputStream
in
=
new
FileInputStream
(
boot
))
{
isSigned
=
SignBoot
.
verifySignature
(
in
,
null
);
isSigned
=
SignBoot
.
verifySignature
(
in
,
null
);
if
(
isSigned
)
{
if
(
isSigned
)
{
console
.
add
(
"-
Signed boot image detected
"
);
console
.
add
(
"-
Boot image is signed with AVB 1.0
"
);
}
}
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
console
.
add
(
"! Unable to check signature"
);
console
.
add
(
"! Unable to check signature"
);
...
@@ -200,7 +200,7 @@ public class InstallMagisk extends ParallelTask<Void, Void, Boolean> {
...
@@ -200,7 +200,7 @@ public class InstallMagisk extends ParallelTask<Void, Void, Boolean> {
File
patched_boot
=
new
File
(
install
.
getParent
(),
"new-boot.img"
);
File
patched_boot
=
new
File
(
install
.
getParent
(),
"new-boot.img"
);
if
(
isSigned
)
{
if
(
isSigned
)
{
console
.
add
(
"- Signing boot image"
);
console
.
add
(
"- Signing boot image
with test keys
"
);
File
signed
=
new
File
(
install
.
getParent
(),
"signed.img"
);
File
signed
=
new
File
(
install
.
getParent
(),
"signed.img"
);
AssetManager
assets
=
mm
.
getAssets
();
AssetManager
assets
=
mm
.
getAssets
();
try
(
try
(
...
...
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