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
2360adb5
Commit
2360adb5
authored
Feb 03, 2019
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move bootctl binary out of Magisk Manager source
Close #1023
parent
c7301a51
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
4 deletions
+8
-4
Const.java
app-core/src/main/java/com/topjohnwu/magisk/Const.java
+7
-3
MagiskInstaller.java
...main/java/com/topjohnwu/magisk/tasks/MagiskInstaller.java
+1
-1
bootctl
app-core/src/main/res/raw/bootctl
+0
-0
No files found.
app-core/src/main/java/com/topjohnwu/magisk/Const.java
View file @
2360adb5
...
@@ -66,8 +66,11 @@ public class Const {
...
@@ -66,8 +66,11 @@ public class Const {
}
}
public
static
class
Url
{
public
static
class
Url
{
public
static
final
String
STABLE_URL
=
"https://raw.githubusercontent.com/topjohnwu/magisk_files/master/stable.json"
;
private
static
String
getRaw
(
String
where
,
String
name
)
{
public
static
final
String
BETA_URL
=
"https://raw.githubusercontent.com/topjohnwu/magisk_files/master/beta.json"
;
return
String
.
format
(
"https://raw.githubusercontent.com/topjohnwu/magisk_files/%s/%s"
,
where
,
name
);
}
public
static
final
String
STABLE_URL
=
getRaw
(
"master"
,
"stable.json"
);
public
static
final
String
BETA_URL
=
getRaw
(
"master"
,
"beta.json"
);
public
static
final
String
REPO_URL
=
"https://api.github.com/users/Magisk-Modules-Repo/repos?per_page=100&sort=pushed&page=%d"
;
public
static
final
String
REPO_URL
=
"https://api.github.com/users/Magisk-Modules-Repo/repos?per_page=100&sort=pushed&page=%d"
;
public
static
final
String
FILE_URL
=
"https://raw.githubusercontent.com/Magisk-Modules-Repo/%s/master/%s"
;
public
static
final
String
FILE_URL
=
"https://raw.githubusercontent.com/Magisk-Modules-Repo/%s/master/%s"
;
public
static
final
String
ZIP_URL
=
"https://github.com/Magisk-Modules-Repo/%s/archive/master.zip"
;
public
static
final
String
ZIP_URL
=
"https://github.com/Magisk-Modules-Repo/%s/archive/master.zip"
;
...
@@ -76,7 +79,8 @@ public class Const {
...
@@ -76,7 +79,8 @@ public class Const {
public
static
final
String
TWITTER_URL
=
"https://twitter.com/topjohnwu"
;
public
static
final
String
TWITTER_URL
=
"https://twitter.com/topjohnwu"
;
public
static
final
String
XDA_THREAD
=
"http://forum.xda-developers.com/showthread.php?t=3432382"
;
public
static
final
String
XDA_THREAD
=
"http://forum.xda-developers.com/showthread.php?t=3432382"
;
public
static
final
String
SOURCE_CODE_URL
=
"https://github.com/topjohnwu/Magisk"
;
public
static
final
String
SOURCE_CODE_URL
=
"https://github.com/topjohnwu/Magisk"
;
public
static
final
String
SNET_URL
=
"https://raw.githubusercontent.com/topjohnwu/magisk_files/b66b1a914978e5f4c4bbfd74a59f4ad371bac107/snet.apk"
;
public
static
final
String
SNET_URL
=
getRaw
(
"b66b1a914978e5f4c4bbfd74a59f4ad371bac107"
,
"snet.apk"
);
public
static
final
String
BOOTCTL_URL
=
getRaw
(
"9c5dfc1b8245c0b5b524901ef0ff0f8335757b77"
,
"bootctl"
);
}
}
public
static
class
Key
{
public
static
class
Key
{
...
...
app-core/src/main/java/com/topjohnwu/magisk/tasks/MagiskInstaller.java
View file @
2360adb5
...
@@ -286,7 +286,7 @@ public abstract class MagiskInstaller {
...
@@ -286,7 +286,7 @@ public abstract class MagiskInstaller {
protected
boolean
postOTA
()
{
protected
boolean
postOTA
()
{
SuFile
bootctl
=
new
SuFile
(
"/data/adb/bootctl"
);
SuFile
bootctl
=
new
SuFile
(
"/data/adb/bootctl"
);
try
(
InputStream
in
=
App
.
self
.
getResources
().
openRawResource
(
R
.
raw
.
bootctl
);
try
(
InputStream
in
=
Networking
.
get
(
Const
.
Url
.
BOOTCTL_URL
).
execForInputStream
().
getResult
(
);
OutputStream
out
=
new
SuFileOutputStream
(
bootctl
))
{
OutputStream
out
=
new
SuFileOutputStream
(
bootctl
))
{
ShellUtils
.
pump
(
in
,
out
);
ShellUtils
.
pump
(
in
,
out
);
}
catch
(
IOException
e
)
{
}
catch
(
IOException
e
)
{
...
...
app-core/src/main/res/raw/bootctl
deleted
100644 → 0
View file @
c7301a51
File deleted
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