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
c5e5b70e
Commit
c5e5b70e
authored
Jan 21, 2020
by
Viktor De Pasquale
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added safe mode notice to modules
parent
327b1862
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
0 deletions
+12
-0
ModuleViewModel.kt
...in/java/com/topjohnwu/magisk/ui/module/ModuleViewModel.kt
+12
-0
No files found.
app/src/main/java/com/topjohnwu/magisk/ui/module/ModuleViewModel.kt
View file @
c5e5b70e
...
@@ -81,12 +81,14 @@ class ModuleViewModel(
...
@@ -81,12 +81,14 @@ class ModuleViewModel(
it
.
add
(
itemNoneUpdatable
)
it
.
add
(
itemNoneUpdatable
)
}
}
private
val
itemsCoreOnly
=
ObservableArrayList
<
SafeModeNotice
>()
private
val
itemsInstalled
=
diffListOf
<
ModuleItem
>()
private
val
itemsInstalled
=
diffListOf
<
ModuleItem
>()
private
val
itemsUpdatable
=
diffListOf
<
RepoItem
.
Update
>()
private
val
itemsUpdatable
=
diffListOf
<
RepoItem
.
Update
>()
private
val
itemsRemote
=
diffListOf
<
RepoItem
.
Remote
>()
private
val
itemsRemote
=
diffListOf
<
RepoItem
.
Remote
>()
val
adapter
=
adapterOf
<
ComparableRvItem
<*>>()
val
adapter
=
adapterOf
<
ComparableRvItem
<*>>()
val
items
=
MergeObservableList
<
ComparableRvItem
<*>>()
val
items
=
MergeObservableList
<
ComparableRvItem
<*>>()
.
insertList
(
itemsCoreOnly
)
.
insertItem
(
sectionActive
)
.
insertItem
(
sectionActive
)
.
insertList
(
itemsInstalledHelpers
)
.
insertList
(
itemsInstalledHelpers
)
.
insertList
(
itemsInstalled
)
.
insertList
(
itemsInstalled
)
...
@@ -159,6 +161,7 @@ class ModuleViewModel(
...
@@ -159,6 +161,7 @@ class ModuleViewModel(
// ---
// ---
override
fun
refresh
():
Disposable
{
override
fun
refresh
():
Disposable
{
updateCoreOnlyWarning
()
if
(
itemsRemote
.
isEmpty
())
if
(
itemsRemote
.
isEmpty
())
loadRemote
()
loadRemote
()
return
loadInstalled
().
subscribeK
()
return
loadInstalled
().
subscribeK
()
...
@@ -268,6 +271,15 @@ class ModuleViewModel(
...
@@ -268,6 +271,15 @@ class ModuleViewModel(
.
subscribeK
{
it
.
progress
.
value
=
progress
}
.
subscribeK
{
it
.
progress
.
value
=
progress
}
.
add
()
.
add
()
private
fun
updateCoreOnlyWarning
()
{
if
(
Config
.
coreOnly
)
{
if
(
itemsCoreOnly
.
isNotEmpty
())
return
itemsCoreOnly
.
add
(
SafeModeNotice
)
}
else
{
itemsCoreOnly
.
clear
()
}
}
// ---
// ---
@WorkerThread
@WorkerThread
...
...
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