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
9f05b182
Commit
9f05b182
authored
Aug 04, 2018
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Verify existing file checksum to prevent needless downloads
parent
525484e8
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
7 deletions
+19
-7
Data.java
app/src/full/java/com/topjohnwu/magisk/Data.java
+1
-0
CheckUpdates.java
...c/full/java/com/topjohnwu/magisk/asyncs/CheckUpdates.java
+1
-0
InstallMagisk.java
.../full/java/com/topjohnwu/magisk/asyncs/InstallMagisk.java
+17
-7
No files found.
app/src/full/java/com/topjohnwu/magisk/Data.java
View file @
9f05b182
...
...
@@ -33,6 +33,7 @@ public class Data {
public
static
int
remoteMagiskVersionCode
=
-
1
;
public
static
String
magiskLink
;
public
static
String
magiskNoteLink
;
public
static
String
magiskMD5
;
public
static
String
remoteManagerVersionString
;
public
static
int
remoteManagerVersionCode
=
-
1
;
public
static
String
managerLink
;
...
...
app/src/full/java/com/topjohnwu/magisk/asyncs/CheckUpdates.java
View file @
9f05b182
...
...
@@ -68,6 +68,7 @@ public class CheckUpdates {
Data
.
remoteMagiskVersionCode
=
getInt
(
magisk
,
"versionCode"
,
-
1
);
Data
.
magiskLink
=
getString
(
magisk
,
"link"
,
null
);
Data
.
magiskNoteLink
=
getString
(
magisk
,
"note"
,
null
);
Data
.
magiskMD5
=
getString
(
magisk
,
"md5"
,
null
);
JSONObject
manager
=
getJson
(
json
,
"app"
);
Data
.
remoteManagerVersionString
=
getString
(
manager
,
"version"
,
null
);
...
...
app/src/full/java/com/topjohnwu/magisk/asyncs/InstallMagisk.java
View file @
9f05b182
...
...
@@ -35,6 +35,7 @@ import org.kamranzafar.jtar.TarOutputStream;
import
java.io.BufferedInputStream
;
import
java.io.BufferedOutputStream
;
import
java.io.File
;
import
java.io.FileInputStream
;
import
java.io.FileNotFoundException
;
import
java.io.FileOutputStream
;
import
java.io.FilterInputStream
;
...
...
@@ -136,19 +137,28 @@ public class InstallMagisk extends ParallelTask<Void, Void, Boolean> {
}
private
void
extractFiles
(
String
arch
)
throws
IOException
{
console
.
add
(
"- Downloading zip"
);
String
filename
=
Utils
.
fmt
(
"Magisk-v%s(%d).zip"
,
Data
.
remoteMagiskVersionString
,
Data
.
remoteMagiskVersionCode
);
HttpURLConnection
conn
=
WebService
.
mustRequest
(
Data
.
magiskLink
,
null
);
BufferedInputStream
buf
=
new
BufferedInputStream
(
new
ProgressStream
(
conn
));
buf
.
mark
(
Integer
.
MAX_VALUE
);
File
zip
=
new
File
(
Download
.
EXTERNAL_PATH
,
filename
);
zip
.
getParentFile
().
mkdirs
();
try
(
OutputStream
out
=
new
FileOutputStream
(
zip
))
{
ShellUtils
.
pump
(
buf
,
out
);
BufferedInputStream
buf
;
if
(!
ShellUtils
.
checkSum
(
"MD5"
,
zip
,
Data
.
magiskMD5
))
{
console
.
add
(
"- Downloading zip"
);
HttpURLConnection
conn
=
WebService
.
mustRequest
(
Data
.
magiskLink
,
null
);
buf
=
new
BufferedInputStream
(
new
ProgressStream
(
conn
),
conn
.
getContentLength
());
buf
.
mark
(
Integer
.
MAX_VALUE
);
try
(
OutputStream
out
=
new
FileOutputStream
(
zip
))
{
ShellUtils
.
pump
(
buf
,
out
);
}
buf
.
reset
();
conn
.
disconnect
();
}
else
{
console
.
add
(
"- Existing zip found"
);
buf
=
new
BufferedInputStream
(
new
FileInputStream
(
zip
),
(
int
)
zip
.
length
());
buf
.
mark
(
Integer
.
MAX_VALUE
);
}
conn
.
disconnect
();
console
.
add
(
"- Extracting files"
);
try
(
InputStream
in
=
buf
)
{
ZipUtils
.
unzip
(
in
,
installDir
,
arch
+
"/"
,
true
);
...
...
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