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
6e14a727
Commit
6e14a727
authored
Mar 29, 2020
by
Viktor De Pasquale
Committed by
John Wu
Mar 29, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed modules screen not offering reboot when local modules change
parent
ea855837
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
11 deletions
+15
-11
Module.kt
...ain/java/com/topjohnwu/magisk/core/model/module/Module.kt
+8
-6
ModuleRvItem.kt
...om/topjohnwu/magisk/model/entity/recycler/ModuleRvItem.kt
+6
-5
ModuleViewModel.kt
...in/java/com/topjohnwu/magisk/ui/module/ModuleViewModel.kt
+1
-0
No files found.
app/src/main/java/com/topjohnwu/magisk/core/model/module/Module.kt
View file @
6e14a727
...
@@ -18,12 +18,13 @@ class Module(path: String) : BaseModule() {
...
@@ -18,12 +18,13 @@ class Module(path: String) : BaseModule() {
private
val
updateFile
=
SuFile
(
path
,
"update"
)
private
val
updateFile
=
SuFile
(
path
,
"update"
)
private
val
ruleFile
=
SuFile
(
path
,
"sepolicy.rule"
)
private
val
ruleFile
=
SuFile
(
path
,
"sepolicy.rule"
)
val
updated
:
Boolean
=
updateFile
.
exists
()
val
updated
:
Boolean
get
()
=
updateFile
.
exists
()
var
enable
:
Boolean
=
!
disableFile
.
exists
()
var
enable
:
Boolean
get
()
=
!
disableFile
.
exists
()
set
(
enable
)
{
set
(
enable
)
{
val
dir
=
"$PERSIST/$id"
val
dir
=
"$PERSIST/$id"
field
=
if
(
enable
)
{
if
(
enable
)
{
Shell
.
su
(
"mkdir -p $dir"
,
"cp -af $ruleFile $dir"
).
submit
()
Shell
.
su
(
"mkdir -p $dir"
,
"cp -af $ruleFile $dir"
).
submit
()
disableFile
.
delete
()
disableFile
.
delete
()
}
else
{
}
else
{
...
@@ -32,9 +33,10 @@ class Module(path: String) : BaseModule() {
...
@@ -32,9 +33,10 @@ class Module(path: String) : BaseModule() {
}
}
}
}
var
remove
:
Boolean
=
removeFile
.
exists
()
var
remove
:
Boolean
get
()
=
removeFile
.
exists
()
set
(
remove
)
{
set
(
remove
)
{
field
=
if
(
remove
)
{
if
(
remove
)
{
Shell
.
su
(
"rm -rf $PERSIST/$id"
).
submit
()
Shell
.
su
(
"rm -rf $PERSIST/$id"
).
submit
()
removeFile
.
createNewFile
()
removeFile
.
createNewFile
()
}
else
{
}
else
{
...
@@ -67,7 +69,7 @@ class Module(path: String) : BaseModule() {
...
@@ -67,7 +69,7 @@ class Module(path: String) : BaseModule() {
val
moduleList
=
mutableListOf
<
Module
>()
val
moduleList
=
mutableListOf
<
Module
>()
val
path
=
SuFile
(
Const
.
MAGISK_PATH
)
val
path
=
SuFile
(
Const
.
MAGISK_PATH
)
val
modules
=
val
modules
=
path
.
listFiles
{
_
,
name
->
name
!=
"lost+found"
&&
name
!=
".core"
}.
orEmpty
()
path
.
listFiles
{
_
,
name
->
name
!=
"lost+found"
&&
name
!=
".core"
}.
orEmpty
()
for
(
file
in
modules
)
{
for
(
file
in
modules
)
{
if
(
file
.
isFile
)
continue
if
(
file
.
isFile
)
continue
val
module
=
Module
(
Const
.
MAGISK_PATH
+
"/"
+
file
.
name
)
val
module
=
Module
(
Const
.
MAGISK_PATH
+
"/"
+
file
.
name
)
...
...
app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/ModuleRvItem.kt
View file @
6e14a727
...
@@ -110,22 +110,23 @@ class ModuleItem(val item: Module) : ObservableItem<ModuleItem>(), Observable {
...
@@ -110,22 +110,23 @@ class ModuleItem(val item: Module) : ObservableItem<ModuleItem>(), Observable {
}
}
@get
:
Bindable
@get
:
Bindable
var
isEnabled
=
item
.
enable
var
isEnabled
get
()
=
item
.
enable
set
(
value
)
{
set
(
value
)
{
field
=
value
item
.
enable
=
value
item
.
enable
=
value
notifyChange
(
BR
.
enabled
)
notifyChange
(
BR
.
enabled
)
}
}
@get
:
Bindable
@get
:
Bindable
var
isRemoved
=
item
.
remove
var
isRemoved
get
()
=
item
.
remove
set
(
value
)
{
set
(
value
)
{
field
=
value
item
.
remove
=
value
item
.
remove
=
value
notifyChange
(
BR
.
removed
)
notifyChange
(
BR
.
removed
)
}
}
val
isUpdated
get
()
=
item
.
updated
val
isUpdated
get
()
=
item
.
updated
val
isModified
get
()
=
isRemoved
||
i
tem
.
u
pdated
val
isModified
get
()
=
isRemoved
||
i
sU
pdated
fun
toggle
()
{
fun
toggle
()
{
isEnabled
=
!
isEnabled
isEnabled
=
!
isEnabled
...
...
app/src/main/java/com/topjohnwu/magisk/ui/module/ModuleViewModel.kt
View file @
6e14a727
...
@@ -193,6 +193,7 @@ class ModuleViewModel(
...
@@ -193,6 +193,7 @@ class ModuleViewModel(
.
doOnSuccess
{
.
doOnSuccess
{
addInstalledEmptyMessage
()
addInstalledEmptyMessage
()
addUpdatableEmptyMessage
()
addUpdatableEmptyMessage
()
updateActiveState
()
}
}
.
ignoreElement
()
!!
.
ignoreElement
()
!!
...
...
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