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
1ee75b6a
Commit
1ee75b6a
authored
Jun 08, 2019
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Download snet package without legacy impl
parent
4b30b224
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
9 deletions
+16
-9
Const.kt
app/src/main/java/com/topjohnwu/magisk/Const.kt
+0
-2
MagiskRepository.kt
.../com/topjohnwu/magisk/data/repository/MagiskRepository.kt
+1
-3
HomeFragment.kt
...rc/main/java/com/topjohnwu/magisk/ui/home/HomeFragment.kt
+15
-4
No files found.
app/src/main/java/com/topjohnwu/magisk/Const.kt
View file @
1ee75b6a
...
@@ -67,8 +67,6 @@ object Const {
...
@@ -67,8 +67,6 @@ object Const {
const
val
XDA_THREAD
=
"http://forum.xda-developers.com/showthread.php?t=3432382"
const
val
XDA_THREAD
=
"http://forum.xda-developers.com/showthread.php?t=3432382"
const
val
SOURCE_CODE_URL
=
"https://github.com/topjohnwu/Magisk"
const
val
SOURCE_CODE_URL
=
"https://github.com/topjohnwu/Magisk"
@JvmField
@JvmField
val
SNET_URL
=
getRaw
(
"b66b1a914978e5f4c4bbfd74a59f4ad371bac107"
,
"snet.apk"
)
@JvmField
val
BOOTCTL_URL
=
getRaw
(
"9c5dfc1b8245c0b5b524901ef0ff0f8335757b77"
,
"bootctl"
)
val
BOOTCTL_URL
=
getRaw
(
"9c5dfc1b8245c0b5b524901ef0ff0f8335757b77"
,
"bootctl"
)
const
val
GITHUB_RAW_API_URL
=
"https://raw.githubusercontent.com/"
const
val
GITHUB_RAW_API_URL
=
"https://raw.githubusercontent.com/"
...
...
app/src/main/java/com/topjohnwu/magisk/data/repository/MagiskRepository.kt
View file @
1ee75b6a
...
@@ -37,9 +37,7 @@ class MagiskRepository(
...
@@ -37,9 +37,7 @@ class MagiskRepository(
.
flatMap
{
apiRaw
.
fetchFile
(
it
.
uninstaller
.
link
)
}
.
flatMap
{
apiRaw
.
fetchFile
(
it
.
uninstaller
.
link
)
}
.
map
{
it
.
writeToFile
(
context
,
FILE_UNINSTALLER_ZIP
)
}
.
map
{
it
.
writeToFile
(
context
,
FILE_UNINSTALLER_ZIP
)
}
fun
fetchSafetynet
()
=
apiRaw
fun
fetchSafetynet
()
=
apiRaw
.
fetchSafetynet
()
.
fetchSafetynet
()
.
map
{
it
.
writeToFile
(
context
,
FILE_SAFETY_NET_APK
)
}
fun
fetchBootctl
()
=
apiRaw
fun
fetchBootctl
()
=
apiRaw
.
fetchBootctl
()
.
fetchBootctl
()
...
...
app/src/main/java/com/topjohnwu/magisk/ui/home/HomeFragment.kt
View file @
1ee75b6a
package
com.topjohnwu.magisk.ui.home
package
com.topjohnwu.magisk.ui.home
import
android.app.Activity
import
android.app.Activity
import
android.os.Bundle
import
com.skoumal.teanity.extensions.subscribeK
import
com.skoumal.teanity.viewevents.ViewEvent
import
com.skoumal.teanity.viewevents.ViewEvent
import
com.topjohnwu.magisk.*
import
com.topjohnwu.magisk.*
import
com.topjohnwu.magisk.data.repository.MagiskRepository
import
com.topjohnwu.magisk.databinding.FragmentMagiskBinding
import
com.topjohnwu.magisk.databinding.FragmentMagiskBinding
import
com.topjohnwu.magisk.model.events.*
import
com.topjohnwu.magisk.model.events.*
import
com.topjohnwu.magisk.ui.base.MagiskActivity
import
com.topjohnwu.magisk.ui.base.MagiskActivity
import
com.topjohnwu.magisk.ui.base.MagiskFragment
import
com.topjohnwu.magisk.ui.base.MagiskFragment
import
com.topjohnwu.magisk.utils.ISafetyNetHelper
import
com.topjohnwu.magisk.utils.ISafetyNetHelper
import
com.topjohnwu.magisk.utils.copyTo
import
com.topjohnwu.magisk.utils.inject
import
com.topjohnwu.magisk.view.MarkDownWindow
import
com.topjohnwu.magisk.view.MarkDownWindow
import
com.topjohnwu.magisk.view.dialogs.*
import
com.topjohnwu.magisk.view.dialogs.*
import
com.topjohnwu.net.Networking
import
com.topjohnwu.superuser.Shell
import
com.topjohnwu.superuser.Shell
import
dalvik.system.DexClassLoader
import
dalvik.system.DexClassLoader
import
org.koin.androidx.viewmodel.ext.android.viewModel
import
org.koin.androidx.viewmodel.ext.android.viewModel
...
@@ -21,6 +25,8 @@ class HomeFragment : MagiskFragment<HomeViewModel, FragmentMagiskBinding>(),
...
@@ -21,6 +25,8 @@ class HomeFragment : MagiskFragment<HomeViewModel, FragmentMagiskBinding>(),
override
val
layoutRes
:
Int
=
R
.
layout
.
fragment_magisk
override
val
layoutRes
:
Int
=
R
.
layout
.
fragment_magisk
override
val
viewModel
:
HomeViewModel
by
viewModel
()
override
val
viewModel
:
HomeViewModel
by
viewModel
()
val
magiskRepo
:
MagiskRepository
by
inject
()
lateinit
var
EXT_FILE
:
File
override
fun
onResponse
(
responseCode
:
Int
)
=
viewModel
.
finishSafetyNetCheck
(
responseCode
)
override
fun
onResponse
(
responseCode
:
Int
)
=
viewModel
.
finishSafetyNetCheck
(
responseCode
)
...
@@ -37,6 +43,11 @@ class HomeFragment : MagiskFragment<HomeViewModel, FragmentMagiskBinding>(),
...
@@ -37,6 +43,11 @@ class HomeFragment : MagiskFragment<HomeViewModel, FragmentMagiskBinding>(),
}
}
}
}
override
fun
onCreate
(
savedInstanceState
:
Bundle
?)
{
super
.
onCreate
(
savedInstanceState
)
EXT_FILE
=
File
(
"${requireActivity().filesDir.parent}/snet"
,
"snet.apk"
)
}
override
fun
onStart
()
{
override
fun
onStart
()
{
super
.
onStart
()
super
.
onStart
()
setHasOptionsMenu
(
true
)
setHasOptionsMenu
(
true
)
...
@@ -61,9 +72,9 @@ class HomeFragment : MagiskFragment<HomeViewModel, FragmentMagiskBinding>(),
...
@@ -61,9 +72,9 @@ class HomeFragment : MagiskFragment<HomeViewModel, FragmentMagiskBinding>(),
.
show
(
requireActivity
(),
null
,
resources
.
openRawResource
(
R
.
raw
.
changelog
))
.
show
(
requireActivity
(),
null
,
resources
.
openRawResource
(
R
.
raw
.
changelog
))
private
fun
downloadSafetyNet
(
requiresUserInput
:
Boolean
=
true
)
{
private
fun
downloadSafetyNet
(
requiresUserInput
:
Boolean
=
true
)
{
fun
download
()
=
Networking
fun
download
()
=
magiskRepo
.
fetchSafetynet
()
.
get
(
Const
.
Url
.
SNET_URL
)
.
map
{
it
.
byteStream
().
copyTo
(
EXT_FILE
)
}
.
getAsFile
(
EXT_APK
)
{
updateSafetyNet
(
true
)
}
.
subscribeK
{
updateSafetyNet
(
true
)
}
if
(!
requiresUserInput
)
{
if
(!
requiresUserInput
)
{
download
()
download
()
...
...
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