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
de4e26b4
Commit
de4e26b4
authored
Sep 23, 2020
by
vvb2060
Committed by
John Wu
Sep 24, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow download modules when Magisk is not installed
parent
fa3865e9
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
14 deletions
+21
-14
ModuleInstallDialog.kt
...com/topjohnwu/magisk/events/dialog/ModuleInstallDialog.kt
+11
-6
MainActivity.kt
app/src/main/java/com/topjohnwu/magisk/ui/MainActivity.kt
+2
-3
ModuleViewModel.kt
...in/java/com/topjohnwu/magisk/ui/module/ModuleViewModel.kt
+8
-5
No files found.
app/src/main/java/com/topjohnwu/magisk/events/dialog/ModuleInstallDialog.kt
View file @
de4e26b4
package
com.topjohnwu.magisk.events.dialog
package
com.topjohnwu.magisk.events.dialog
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.core.Info
import
com.topjohnwu.magisk.core.download.Action
import
com.topjohnwu.magisk.core.download.Action
import
com.topjohnwu.magisk.core.download.DownloadService
import
com.topjohnwu.magisk.core.download.DownloadService
import
com.topjohnwu.magisk.core.download.Subject
import
com.topjohnwu.magisk.core.download.Subject
...
@@ -21,17 +22,21 @@ class ModuleInstallDialog(private val item: Repo) : DialogEvent() {
...
@@ -21,17 +22,21 @@ class ModuleInstallDialog(private val item: Repo) : DialogEvent() {
applyTitle
(
context
.
getString
(
R
.
string
.
repo_install_title
,
item
.
name
))
applyTitle
(
context
.
getString
(
R
.
string
.
repo_install_title
,
item
.
name
))
.
applyMessage
(
context
.
getString
(
R
.
string
.
repo_install_msg
,
item
.
downloadFilename
))
.
applyMessage
(
context
.
getString
(
R
.
string
.
repo_install_msg
,
item
.
downloadFilename
))
.
cancellable
(
true
)
.
cancellable
(
true
)
.
applyButton
(
MagiskDialog
.
ButtonType
.
POSITIVE
)
{
titleRes
=
R
.
string
.
install
icon
=
R
.
drawable
.
ic_install
onClick
{
download
(
true
)
}
}
.
applyButton
(
MagiskDialog
.
ButtonType
.
NEGATIVE
)
{
.
applyButton
(
MagiskDialog
.
ButtonType
.
NEGATIVE
)
{
titleRes
=
R
.
string
.
download
titleRes
=
R
.
string
.
download
icon
=
R
.
drawable
.
ic_download_md2
icon
=
R
.
drawable
.
ic_download_md2
onClick
{
download
(
false
)
}
onClick
{
download
(
false
)
}
}
}
.
reveal
()
if
(
Info
.
env
.
isActive
)
{
applyButton
(
MagiskDialog
.
ButtonType
.
POSITIVE
)
{
titleRes
=
R
.
string
.
install
icon
=
R
.
drawable
.
ic_install
onClick
{
download
(
true
)
}
}
}
reveal
()
}
}
}
}
...
...
app/src/main/java/com/topjohnwu/magisk/ui/MainActivity.kt
View file @
de4e26b4
...
@@ -116,9 +116,8 @@ open class MainActivity : BaseUIActivity<MainViewModel, ActivityMainMd2Binding>(
...
@@ -116,9 +116,8 @@ open class MainActivity : BaseUIActivity<MainViewModel, ActivityMainMd2Binding>(
override
fun
onResume
()
{
override
fun
onResume
()
{
super
.
onResume
()
super
.
onResume
()
binding
.
mainNavigation
.
menu
.
apply
{
binding
.
mainNavigation
.
menu
.
apply
{
val
isRoot
=
Shell
.
rootAccess
()
findItem
(
R
.
id
.
superuserFragment
)
?.
isEnabled
=
Info
.
env
.
isActive
findItem
(
R
.
id
.
modulesFragment
)
?.
isEnabled
=
isRoot
findItem
(
R
.
id
.
logFragment
)
?.
isEnabled
=
Info
.
env
.
isActive
findItem
(
R
.
id
.
superuserFragment
)
?.
isEnabled
=
isRoot
}
}
}
}
...
...
app/src/main/java/com/topjohnwu/magisk/ui/module/ModuleViewModel.kt
View file @
de4e26b4
...
@@ -7,6 +7,7 @@ import com.topjohnwu.magisk.BR
...
@@ -7,6 +7,7 @@ import com.topjohnwu.magisk.BR
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.arch.*
import
com.topjohnwu.magisk.arch.*
import
com.topjohnwu.magisk.core.Config
import
com.topjohnwu.magisk.core.Config
import
com.topjohnwu.magisk.core.Info
import
com.topjohnwu.magisk.core.download.Subject
import
com.topjohnwu.magisk.core.download.Subject
import
com.topjohnwu.magisk.core.model.module.Module
import
com.topjohnwu.magisk.core.model.module.Module
import
com.topjohnwu.magisk.core.tasks.RepoUpdater
import
com.topjohnwu.magisk.core.tasks.RepoUpdater
...
@@ -100,11 +101,13 @@ class ModuleViewModel(
...
@@ -100,11 +101,13 @@ class ModuleViewModel(
val
adapter
=
adapterOf
<
RvItem
>()
val
adapter
=
adapterOf
<
RvItem
>()
val
items
=
MergeObservableList
<
RvItem
>()
val
items
=
MergeObservableList
<
RvItem
>()
.
insertItem
(
InstallModule
)
.
also
{
if
(
Info
.
env
.
isActive
)
{
it
.
insertItem
(
InstallModule
)
.
insertList
(
updatableSectionList
)
.
insertList
(
updatableSectionList
)
.
insertList
(
itemsUpdatable
)
.
insertList
(
itemsUpdatable
)
.
insertList
(
installSectionList
)
.
insertList
(
installSectionList
)
.
insertList
(
itemsInstalled
)
.
insertList
(
itemsInstalled
)
}
}
.
insertItem
(
sectionOnline
)
.
insertItem
(
sectionOnline
)
.
insertList
(
itemsOnline
)
.
insertList
(
itemsOnline
)
val
itemBinding
=
itemBindingOf
<
RvItem
>
{
val
itemBinding
=
itemBindingOf
<
RvItem
>
{
...
...
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