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
36025d6d
Commit
36025d6d
authored
Nov 08, 2017
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use direct path
parent
e171362e
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
17 additions
and
7 deletions
+17
-7
SettingsActivity.java
app/src/main/java/com/topjohnwu/magisk/SettingsActivity.java
+3
-3
SplashActivity.java
app/src/main/java/com/topjohnwu/magisk/SplashActivity.java
+1
-1
LoadModules.java
...rc/main/java/com/topjohnwu/magisk/asyncs/LoadModules.java
+1
-1
Const.java
app/src/main/java/com/topjohnwu/magisk/utils/Const.java
+12
-2
No files found.
app/src/main/java/com/topjohnwu/magisk/SettingsActivity.java
View file @
36025d6d
...
@@ -218,12 +218,12 @@ public class SettingsActivity extends Activity implements Topic.Subscriber {
...
@@ -218,12 +218,12 @@ public class SettingsActivity extends Activity implements Topic.Subscriber {
enabled
=
prefs
.
getBoolean
(
Const
.
Key
.
HOSTS
,
false
);
enabled
=
prefs
.
getBoolean
(
Const
.
Key
.
HOSTS
,
false
);
if
(
enabled
)
{
if
(
enabled
)
{
Shell
.
su_raw
(
Shell
.
su_raw
(
"cp -af /system/etc/hosts "
+
Const
.
MAGISK_HOST_FILE
,
"cp -af /system/etc/hosts "
+
Const
.
MAGISK_HOST_FILE
()
,
"mount -o bind "
+
Const
.
MAGISK_HOST_FILE
+
" /system/etc/hosts"
);
"mount -o bind "
+
Const
.
MAGISK_HOST_FILE
()
+
" /system/etc/hosts"
);
}
else
{
}
else
{
Shell
.
su_raw
(
Shell
.
su_raw
(
"umount -l /system/etc/hosts"
,
"umount -l /system/etc/hosts"
,
"rm -f "
+
Const
.
MAGISK_HOST_FILE
);
"rm -f "
+
Const
.
MAGISK_HOST_FILE
()
);
}
}
break
;
break
;
case
Const
.
Key
.
ROOT_ACCESS
:
case
Const
.
Key
.
ROOT_ACCESS
:
...
...
app/src/main/java/com/topjohnwu/magisk/SplashActivity.java
View file @
36025d6d
...
@@ -112,7 +112,7 @@ public class SplashActivity extends Activity {
...
@@ -112,7 +112,7 @@ public class SplashActivity extends Activity {
.
putBoolean
(
Const
.
Key
.
DARK_THEME
,
mm
.
isDarkTheme
)
.
putBoolean
(
Const
.
Key
.
DARK_THEME
,
mm
.
isDarkTheme
)
.
putBoolean
(
Const
.
Key
.
MAGISKHIDE
,
mm
.
magiskHide
)
.
putBoolean
(
Const
.
Key
.
MAGISKHIDE
,
mm
.
magiskHide
)
.
putBoolean
(
Const
.
Key
.
UPDATE_NOTIFICATION
,
mm
.
updateNotification
)
.
putBoolean
(
Const
.
Key
.
UPDATE_NOTIFICATION
,
mm
.
updateNotification
)
.
putBoolean
(
Const
.
Key
.
HOSTS
,
Utils
.
itemExist
(
Const
.
MAGISK_HOST_FILE
))
.
putBoolean
(
Const
.
Key
.
HOSTS
,
Utils
.
itemExist
(
Const
.
MAGISK_HOST_FILE
()
))
.
putBoolean
(
Const
.
Key
.
DISABLE
,
Utils
.
itemExist
(
Const
.
MAGISK_DISABLE_FILE
))
.
putBoolean
(
Const
.
Key
.
DISABLE
,
Utils
.
itemExist
(
Const
.
MAGISK_DISABLE_FILE
))
.
putBoolean
(
Const
.
Key
.
SU_REAUTH
,
mm
.
suReauth
)
.
putBoolean
(
Const
.
Key
.
SU_REAUTH
,
mm
.
suReauth
)
.
putString
(
Const
.
Key
.
SU_REQUEST_TIMEOUT
,
String
.
valueOf
(
mm
.
suRequestTimeout
))
.
putString
(
Const
.
Key
.
SU_REQUEST_TIMEOUT
,
String
.
valueOf
(
mm
.
suRequestTimeout
))
...
...
app/src/main/java/com/topjohnwu/magisk/asyncs/LoadModules.java
View file @
36025d6d
...
@@ -11,7 +11,7 @@ import java.util.List;
...
@@ -11,7 +11,7 @@ import java.util.List;
public
class
LoadModules
extends
ParallelTask
<
Void
,
Void
,
Void
>
{
public
class
LoadModules
extends
ParallelTask
<
Void
,
Void
,
Void
>
{
private
List
<
String
>
getModList
()
{
private
List
<
String
>
getModList
()
{
String
command
=
"ls -d "
+
Const
.
MAGISK_PATH
+
"/* | grep -v lost+found"
;
String
command
=
"ls -d "
+
Const
.
MAGISK_PATH
()
+
"/* | grep -v lost+found"
;
return
Shell
.
su
(
command
);
return
Shell
.
su
(
command
);
}
}
...
...
app/src/main/java/com/topjohnwu/magisk/utils/Const.java
View file @
36025d6d
...
@@ -20,12 +20,22 @@ public class Const {
...
@@ -20,12 +20,22 @@ public class Const {
// Paths
// Paths
public
static
final
String
MAGISK_DISABLE_FILE
=
"/cache/.disable_magisk"
;
public
static
final
String
MAGISK_DISABLE_FILE
=
"/cache/.disable_magisk"
;
public
static
final
String
MAGISK_HOST_FILE
=
"/magisk/.core/hosts"
;
public
static
final
String
TMP_FOLDER_PATH
=
"/dev/tmp"
;
public
static
final
String
TMP_FOLDER_PATH
=
"/dev/tmp"
;
public
static
final
String
MAGISK_PATH
=
"/magisk"
;
public
static
final
String
MAGISK_LOG
=
"/cache/magisk.log"
;
public
static
final
String
MAGISK_LOG
=
"/cache/magisk.log"
;
public
static
final
String
BUSYBOXPATH
=
"/dev/magisk/bin"
;
public
static
final
String
BUSYBOXPATH
=
"/dev/magisk/bin"
;
public
static
String
MAGISK_PATH
()
{
if
(
Utils
.
itemExist
(
"/dev/magisk/img"
))
{
return
"/dev/magisk/img"
;
}
else
{
return
"/magisk"
;
}
}
public
static
String
MAGISK_HOST_FILE
()
{
return
MAGISK_PATH
()
+
"/.core/hosts"
;
}
/* A list of apps that should not be shown as hide-able */
/* A list of apps that should not be shown as hide-able */
public
static
final
List
<
String
>
SN_BLACKLIST
=
Arrays
.
asList
(
public
static
final
List
<
String
>
SN_BLACKLIST
=
Arrays
.
asList
(
"android"
,
"android"
,
...
...
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