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
69b00d37
Commit
69b00d37
authored
Apr 17, 2021
by
vvb2060
Committed by
John Wu
Apr 18, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update dependencies
Jcenter will sunset
parent
a328e2bf
Show whitespace changes
Inline
Side-by-side
Showing
21 changed files
with
40 additions
and
47 deletions
+40
-47
build.gradle.kts
app/build.gradle.kts
+7
-10
BaseViewModel.kt
app/src/main/java/com/topjohnwu/magisk/arch/BaseViewModel.kt
+1
-1
Receiver.kt
app/src/main/java/com/topjohnwu/magisk/core/Receiver.kt
+1
-1
UpdateCheckService.kt
...main/java/com/topjohnwu/magisk/core/UpdateCheckService.kt
+2
-2
BaseActivity.kt
.../main/java/com/topjohnwu/magisk/core/base/BaseActivity.kt
+1
-0
BaseReceiver.kt
.../main/java/com/topjohnwu/magisk/core/base/BaseReceiver.kt
+1
-1
BaseService.kt
...c/main/java/com/topjohnwu/magisk/core/base/BaseService.kt
+1
-1
BaseDownloader.kt
...java/com/topjohnwu/magisk/core/download/BaseDownloader.kt
+2
-2
FlashZip.kt
...src/main/java/com/topjohnwu/magisk/core/tasks/FlashZip.kt
+3
-2
MagiskInstaller.kt
...n/java/com/topjohnwu/magisk/core/tasks/MagiskInstaller.kt
+2
-6
BiometricHelper.kt
...n/java/com/topjohnwu/magisk/core/utils/BiometricHelper.kt
+2
-2
ManagerInstallDialog.kt
...om/topjohnwu/magisk/events/dialog/ManagerInstallDialog.kt
+2
-2
MarkDownDialog.kt
...java/com/topjohnwu/magisk/events/dialog/MarkDownDialog.kt
+2
-2
XKoin.kt
app/src/main/java/com/topjohnwu/magisk/ktx/XKoin.kt
+2
-2
InstallViewModel.kt
.../java/com/topjohnwu/magisk/ui/install/InstallViewModel.kt
+1
-1
CheckSafetyNetEvent.kt
.../com/topjohnwu/magisk/ui/safetynet/CheckSafetyNetEvent.kt
+2
-2
BaseSettingsItem.kt
...java/com/topjohnwu/magisk/ui/settings/BaseSettingsItem.kt
+2
-2
SettingsViewModel.kt
...ava/com/topjohnwu/magisk/ui/settings/SettingsViewModel.kt
+1
-1
build.gradle.kts
build.gradle.kts
+3
-5
build.gradle.kts
buildSrc/build.gradle.kts
+1
-1
gradle-wrapper.properties
gradle/wrapper/gradle-wrapper.properties
+1
-1
No files found.
app/build.gradle.kts
View file @
69b00d37
...
@@ -16,20 +16,18 @@ kapt {
...
@@ -16,20 +16,18 @@ kapt {
javacOptions
{
javacOptions
{
option
(
"-Xmaxerrs"
,
1000
)
option
(
"-Xmaxerrs"
,
1000
)
}
}
arguments
{
arg
(
"room.incremental"
,
"true"
)
}
}
}
android
{
android
{
defaultConfig
{
defaultConfig
{
applicationId
=
"com.topjohnwu.magisk"
applicationId
=
"com.topjohnwu.magisk"
vectorDrawables
.
useSupportLibrary
=
true
vectorDrawables
.
useSupportLibrary
=
true
multiDexEnabled
=
true
versionName
=
Config
.
version
versionName
=
Config
.
version
versionCode
=
Config
.
versionCode
versionCode
=
Config
.
versionCode
ndk
.
abiFilters
(
"armeabi-v7a"
,
"arm64-v8a"
,
"x86"
,
"x86_64"
)
ndk
.
abiFilters
(
"armeabi-v7a"
,
"arm64-v8a"
,
"x86"
,
"x86_64"
)
javaCompileOptions
.
annotationProcessorOptions
.
arguments
(
mapOf
(
"room.incremental"
to
"true"
)
)
}
}
buildTypes
{
buildTypes
{
...
@@ -211,10 +209,9 @@ dependencies {
...
@@ -211,10 +209,9 @@ dependencies {
implementation
(
"com.github.topjohnwu.libsu:core:${vLibsu}"
)
implementation
(
"com.github.topjohnwu.libsu:core:${vLibsu}"
)
implementation
(
"com.github.topjohnwu.libsu:io:${vLibsu}"
)
implementation
(
"com.github.topjohnwu.libsu:io:${vLibsu}"
)
val
vKoin
=
"2.1.6"
val
vKoin
=
"2.2.2"
implementation
(
"org.koin:koin-core:${vKoin}"
)
implementation
(
"io.insert-koin:koin-android:${vKoin}"
)
implementation
(
"org.koin:koin-android:${vKoin}"
)
implementation
(
"io.insert-koin:koin-androidx-viewmodel:${vKoin}"
)
implementation
(
"org.koin:koin-androidx-viewmodel:${vKoin}"
)
val
vRetrofit
=
"2.9.0"
val
vRetrofit
=
"2.9.0"
implementation
(
"com.squareup.retrofit2:retrofit:${vRetrofit}"
)
implementation
(
"com.squareup.retrofit2:retrofit:${vRetrofit}"
)
...
@@ -226,7 +223,7 @@ dependencies {
...
@@ -226,7 +223,7 @@ dependencies {
implementation
(
"com.squareup.okhttp3:logging-interceptor:${vOkHttp}"
)
implementation
(
"com.squareup.okhttp3:logging-interceptor:${vOkHttp}"
)
implementation
(
"com.squareup.okhttp3:okhttp-dnsoverhttps:${vOkHttp}"
)
implementation
(
"com.squareup.okhttp3:okhttp-dnsoverhttps:${vOkHttp}"
)
val
vMoshi
=
"1.1
1
.0"
val
vMoshi
=
"1.1
2
.0"
implementation
(
"com.squareup.moshi:moshi:${vMoshi}"
)
implementation
(
"com.squareup.moshi:moshi:${vMoshi}"
)
kapt
(
"com.squareup.moshi:moshi-kotlin-codegen:${vMoshi}"
)
kapt
(
"com.squareup.moshi:moshi-kotlin-codegen:${vMoshi}"
)
...
...
app/src/main/java/com/topjohnwu/magisk/arch/BaseViewModel.kt
View file @
69b00d37
...
@@ -19,7 +19,7 @@ import com.topjohnwu.magisk.events.*
...
@@ -19,7 +19,7 @@ import com.topjohnwu.magisk.events.*
import
com.topjohnwu.magisk.utils.ObservableHost
import
com.topjohnwu.magisk.utils.ObservableHost
import
com.topjohnwu.magisk.utils.set
import
com.topjohnwu.magisk.utils.set
import
kotlinx.coroutines.Job
import
kotlinx.coroutines.Job
import
org.koin.core.KoinComponent
import
org.koin.core.
component.
KoinComponent
abstract
class
BaseViewModel
(
abstract
class
BaseViewModel
(
initialState
:
State
=
State
.
LOADING
initialState
:
State
=
State
.
LOADING
...
...
app/src/main/java/com/topjohnwu/magisk/core/Receiver.kt
View file @
69b00d37
...
@@ -5,11 +5,11 @@ import android.content.ContextWrapper
...
@@ -5,11 +5,11 @@ import android.content.ContextWrapper
import
android.content.Intent
import
android.content.Intent
import
com.topjohnwu.magisk.core.base.BaseReceiver
import
com.topjohnwu.magisk.core.base.BaseReceiver
import
com.topjohnwu.magisk.core.magiskdb.PolicyDao
import
com.topjohnwu.magisk.core.magiskdb.PolicyDao
import
com.topjohnwu.magisk.ktx.inject
import
com.topjohnwu.magisk.view.Shortcuts
import
com.topjohnwu.magisk.view.Shortcuts
import
com.topjohnwu.superuser.Shell
import
com.topjohnwu.superuser.Shell
import
kotlinx.coroutines.GlobalScope
import
kotlinx.coroutines.GlobalScope
import
kotlinx.coroutines.launch
import
kotlinx.coroutines.launch
import
org.koin.core.inject
open
class
Receiver
:
BaseReceiver
()
{
open
class
Receiver
:
BaseReceiver
()
{
...
...
app/src/main/java/com/topjohnwu/magisk/core/UpdateCheckService.kt
View file @
69b00d37
...
@@ -5,9 +5,9 @@ import android.content.Context
...
@@ -5,9 +5,9 @@ import android.content.Context
import
androidx.work.*
import
androidx.work.*
import
com.topjohnwu.magisk.BuildConfig
import
com.topjohnwu.magisk.BuildConfig
import
com.topjohnwu.magisk.data.repository.NetworkService
import
com.topjohnwu.magisk.data.repository.NetworkService
import
com.topjohnwu.magisk.ktx.inject
import
com.topjohnwu.magisk.view.Notifications
import
com.topjohnwu.magisk.view.Notifications
import
org.koin.core.KoinComponent
import
org.koin.core.component.KoinComponent
import
org.koin.core.inject
import
java.util.concurrent.TimeUnit
import
java.util.concurrent.TimeUnit
class
UpdateCheckService
(
context
:
Context
,
workerParams
:
WorkerParameters
)
class
UpdateCheckService
(
context
:
Context
,
workerParams
:
WorkerParameters
)
...
...
app/src/main/java/com/topjohnwu/magisk/core/base/BaseActivity.kt
View file @
69b00d37
...
@@ -83,6 +83,7 @@ abstract class BaseActivity : AppCompatActivity() {
...
@@ -83,6 +83,7 @@ abstract class BaseActivity : AppCompatActivity() {
override
fun
onRequestPermissionsResult
(
override
fun
onRequestPermissionsResult
(
requestCode
:
Int
,
permissions
:
Array
<
out
String
>,
grantResults
:
IntArray
)
{
requestCode
:
Int
,
permissions
:
Array
<
out
String
>,
grantResults
:
IntArray
)
{
super
.
onRequestPermissionsResult
(
requestCode
,
permissions
,
grantResults
)
var
success
=
true
var
success
=
true
for
(
res
in
grantResults
)
{
for
(
res
in
grantResults
)
{
if
(
res
!=
PackageManager
.
PERMISSION_GRANTED
)
{
if
(
res
!=
PackageManager
.
PERMISSION_GRANTED
)
{
...
...
app/src/main/java/com/topjohnwu/magisk/core/base/BaseReceiver.kt
View file @
69b00d37
...
@@ -5,7 +5,7 @@ import android.content.Context
...
@@ -5,7 +5,7 @@ import android.content.Context
import
android.content.ContextWrapper
import
android.content.ContextWrapper
import
android.content.Intent
import
android.content.Intent
import
com.topjohnwu.magisk.core.wrap
import
com.topjohnwu.magisk.core.wrap
import
org.koin.core.KoinComponent
import
org.koin.core.
component.
KoinComponent
abstract
class
BaseReceiver
:
BroadcastReceiver
(),
KoinComponent
{
abstract
class
BaseReceiver
:
BroadcastReceiver
(),
KoinComponent
{
...
...
app/src/main/java/com/topjohnwu/magisk/core/base/BaseService.kt
View file @
69b00d37
...
@@ -3,7 +3,7 @@ package com.topjohnwu.magisk.core.base
...
@@ -3,7 +3,7 @@ package com.topjohnwu.magisk.core.base
import
android.app.Service
import
android.app.Service
import
android.content.Context
import
android.content.Context
import
com.topjohnwu.magisk.core.wrap
import
com.topjohnwu.magisk.core.wrap
import
org.koin.core.KoinComponent
import
org.koin.core.
component.
KoinComponent
abstract
class
BaseService
:
Service
(),
KoinComponent
{
abstract
class
BaseService
:
Service
(),
KoinComponent
{
override
fun
attachBaseContext
(
base
:
Context
)
{
override
fun
attachBaseContext
(
base
:
Context
)
{
...
...
app/src/main/java/com/topjohnwu/magisk/core/download/BaseDownloader.kt
View file @
69b00d37
...
@@ -10,14 +10,14 @@ import com.topjohnwu.magisk.core.ForegroundTracker
...
@@ -10,14 +10,14 @@ import com.topjohnwu.magisk.core.ForegroundTracker
import
com.topjohnwu.magisk.core.base.BaseService
import
com.topjohnwu.magisk.core.base.BaseService
import
com.topjohnwu.magisk.core.utils.ProgressInputStream
import
com.topjohnwu.magisk.core.utils.ProgressInputStream
import
com.topjohnwu.magisk.data.repository.NetworkService
import
com.topjohnwu.magisk.data.repository.NetworkService
import
com.topjohnwu.magisk.ktx.inject
import
com.topjohnwu.magisk.view.Notifications
import
com.topjohnwu.magisk.view.Notifications
import
kotlinx.coroutines.CoroutineScope
import
kotlinx.coroutines.CoroutineScope
import
kotlinx.coroutines.Dispatchers
import
kotlinx.coroutines.Dispatchers
import
kotlinx.coroutines.cancel
import
kotlinx.coroutines.cancel
import
kotlinx.coroutines.launch
import
kotlinx.coroutines.launch
import
okhttp3.ResponseBody
import
okhttp3.ResponseBody
import
org.koin.android.ext.android.inject
import
org.koin.core.component.KoinComponent
import
org.koin.core.KoinComponent
import
timber.log.Timber
import
timber.log.Timber
import
java.io.IOException
import
java.io.IOException
import
java.io.InputStream
import
java.io.InputStream
...
...
app/src/main/java/com/topjohnwu/magisk/core/tasks/FlashZip.kt
View file @
69b00d37
...
@@ -7,12 +7,13 @@ import com.topjohnwu.magisk.core.Const
...
@@ -7,12 +7,13 @@ import com.topjohnwu.magisk.core.Const
import
com.topjohnwu.magisk.core.utils.MediaStoreUtils.displayName
import
com.topjohnwu.magisk.core.utils.MediaStoreUtils.displayName
import
com.topjohnwu.magisk.core.utils.MediaStoreUtils.inputStream
import
com.topjohnwu.magisk.core.utils.MediaStoreUtils.inputStream
import
com.topjohnwu.magisk.core.utils.unzip
import
com.topjohnwu.magisk.core.utils.unzip
import
com.topjohnwu.magisk.ktx.inject
import
com.topjohnwu.magisk.ktx.writeTo
import
com.topjohnwu.magisk.ktx.writeTo
import
com.topjohnwu.superuser.Shell
import
com.topjohnwu.superuser.Shell
import
kotlinx.coroutines.Dispatchers
import
kotlinx.coroutines.Dispatchers
import
kotlinx.coroutines.withContext
import
kotlinx.coroutines.withContext
import
org.koin.core.KoinComponent
import
org.koin.core.
component.
KoinComponent
import
org.koin.core.inject
import
timber.log.Timber
import
timber.log.Timber
import
java.io.File
import
java.io.File
import
java.io.FileNotFoundException
import
java.io.FileNotFoundException
...
...
app/src/main/java/com/topjohnwu/magisk/core/tasks/MagiskInstaller.kt
View file @
69b00d37
...
@@ -14,10 +14,7 @@ import com.topjohnwu.magisk.core.utils.MediaStoreUtils.inputStream
...
@@ -14,10 +14,7 @@ import com.topjohnwu.magisk.core.utils.MediaStoreUtils.inputStream
import
com.topjohnwu.magisk.core.utils.MediaStoreUtils.outputStream
import
com.topjohnwu.magisk.core.utils.MediaStoreUtils.outputStream
import
com.topjohnwu.magisk.data.repository.NetworkService
import
com.topjohnwu.magisk.data.repository.NetworkService
import
com.topjohnwu.magisk.di.Protected
import
com.topjohnwu.magisk.di.Protected
import
com.topjohnwu.magisk.ktx.reboot
import
com.topjohnwu.magisk.ktx.*
import
com.topjohnwu.magisk.ktx.symlink
import
com.topjohnwu.magisk.ktx.withStreams
import
com.topjohnwu.magisk.ktx.writeTo
import
com.topjohnwu.magisk.utils.Utils
import
com.topjohnwu.magisk.utils.Utils
import
com.topjohnwu.signing.SignBoot
import
com.topjohnwu.signing.SignBoot
import
com.topjohnwu.superuser.Shell
import
com.topjohnwu.superuser.Shell
...
@@ -34,8 +31,7 @@ import org.kamranzafar.jtar.TarEntry
...
@@ -34,8 +31,7 @@ import org.kamranzafar.jtar.TarEntry
import
org.kamranzafar.jtar.TarHeader
import
org.kamranzafar.jtar.TarHeader
import
org.kamranzafar.jtar.TarInputStream
import
org.kamranzafar.jtar.TarInputStream
import
org.kamranzafar.jtar.TarOutputStream
import
org.kamranzafar.jtar.TarOutputStream
import
org.koin.core.KoinComponent
import
org.koin.core.component.KoinComponent
import
org.koin.core.inject
import
timber.log.Timber
import
timber.log.Timber
import
java.io.*
import
java.io.*
import
java.nio.ByteBuffer
import
java.nio.ByteBuffer
...
...
app/src/main/java/com/topjohnwu/magisk/core/utils/BiometricHelper.kt
View file @
69b00d37
...
@@ -6,8 +6,8 @@ import androidx.core.content.ContextCompat
...
@@ -6,8 +6,8 @@ import androidx.core.content.ContextCompat
import
androidx.fragment.app.FragmentActivity
import
androidx.fragment.app.FragmentActivity
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.core.Config
import
com.topjohnwu.magisk.core.Config
import
org.koin.core.KoinComponen
t
import
com.topjohnwu.magisk.ktx.ge
t
import
org.koin.core.
ge
t
import
org.koin.core.
component.KoinComponen
t
object
BiometricHelper
:
KoinComponent
{
object
BiometricHelper
:
KoinComponent
{
...
...
app/src/main/java/com/topjohnwu/magisk/events/dialog/ManagerInstallDialog.kt
View file @
69b00d37
...
@@ -6,9 +6,9 @@ import com.topjohnwu.magisk.core.Info
...
@@ -6,9 +6,9 @@ import com.topjohnwu.magisk.core.Info
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
import
com.topjohnwu.magisk.data.repository.NetworkService
import
com.topjohnwu.magisk.data.repository.NetworkService
import
com.topjohnwu.magisk.ktx.get
import
com.topjohnwu.magisk.ktx.inject
import
com.topjohnwu.magisk.view.MagiskDialog
import
com.topjohnwu.magisk.view.MagiskDialog
import
org.koin.core.get
import
org.koin.core.inject
import
java.io.File
import
java.io.File
class
ManagerInstallDialog
:
MarkDownDialog
()
{
class
ManagerInstallDialog
:
MarkDownDialog
()
{
...
...
app/src/main/java/com/topjohnwu/magisk/events/dialog/MarkDownDialog.kt
View file @
69b00d37
...
@@ -6,13 +6,13 @@ import androidx.annotation.CallSuper
...
@@ -6,13 +6,13 @@ import androidx.annotation.CallSuper
import
androidx.lifecycle.lifecycleScope
import
androidx.lifecycle.lifecycleScope
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.core.base.BaseActivity
import
com.topjohnwu.magisk.core.base.BaseActivity
import
com.topjohnwu.magisk.ktx.inject
import
com.topjohnwu.magisk.view.MagiskDialog
import
com.topjohnwu.magisk.view.MagiskDialog
import
io.noties.markwon.Markwon
import
io.noties.markwon.Markwon
import
kotlinx.coroutines.Dispatchers
import
kotlinx.coroutines.Dispatchers
import
kotlinx.coroutines.launch
import
kotlinx.coroutines.launch
import
kotlinx.coroutines.withContext
import
kotlinx.coroutines.withContext
import
org.koin.core.KoinComponent
import
org.koin.core.component.KoinComponent
import
org.koin.core.inject
import
timber.log.Timber
import
timber.log.Timber
import
kotlin.coroutines.cancellation.CancellationException
import
kotlin.coroutines.cancellation.CancellationException
...
...
app/src/main/java/com/topjohnwu/magisk/ktx/XKoin.kt
View file @
69b00d37
package
com.topjohnwu.magisk.ktx
package
com.topjohnwu.magisk.ktx
import
org.koin.core.context.
KoinContextHandler
import
org.koin.core.context.
GlobalContext
import
org.koin.core.parameter.ParametersDefinition
import
org.koin.core.parameter.ParametersDefinition
import
org.koin.core.qualifier.Qualifier
import
org.koin.core.qualifier.Qualifier
fun
getKoin
()
=
KoinContextHandler
.
get
()
fun
getKoin
()
=
GlobalContext
.
get
()
inline
fun
<
reified
T
>
inject
(
inline
fun
<
reified
T
>
inject
(
qualifier
:
Qualifier
?
=
null
,
qualifier
:
Qualifier
?
=
null
,
...
...
app/src/main/java/com/topjohnwu/magisk/ui/install/InstallViewModel.kt
View file @
69b00d37
...
@@ -14,11 +14,11 @@ import com.topjohnwu.magisk.core.Info
...
@@ -14,11 +14,11 @@ import com.topjohnwu.magisk.core.Info
import
com.topjohnwu.magisk.data.repository.NetworkService
import
com.topjohnwu.magisk.data.repository.NetworkService
import
com.topjohnwu.magisk.events.MagiskInstallFileEvent
import
com.topjohnwu.magisk.events.MagiskInstallFileEvent
import
com.topjohnwu.magisk.events.dialog.SecondSlotWarningDialog
import
com.topjohnwu.magisk.events.dialog.SecondSlotWarningDialog
import
com.topjohnwu.magisk.ktx.get
import
com.topjohnwu.magisk.ui.flash.FlashFragment
import
com.topjohnwu.magisk.ui.flash.FlashFragment
import
com.topjohnwu.magisk.utils.set
import
com.topjohnwu.magisk.utils.set
import
com.topjohnwu.superuser.Shell
import
com.topjohnwu.superuser.Shell
import
kotlinx.coroutines.launch
import
kotlinx.coroutines.launch
import
org.koin.core.get
import
timber.log.Timber
import
timber.log.Timber
import
java.io.File
import
java.io.File
import
java.io.IOException
import
java.io.IOException
...
...
app/src/main/java/com/topjohnwu/magisk/ui/safetynet/CheckSafetyNetEvent.kt
View file @
69b00d37
...
@@ -14,6 +14,7 @@ import com.topjohnwu.magisk.core.Const
...
@@ -14,6 +14,7 @@ import com.topjohnwu.magisk.core.Const
import
com.topjohnwu.magisk.data.repository.NetworkService
import
com.topjohnwu.magisk.data.repository.NetworkService
import
com.topjohnwu.magisk.ktx.createClassLoader
import
com.topjohnwu.magisk.ktx.createClassLoader
import
com.topjohnwu.magisk.ktx.reflectField
import
com.topjohnwu.magisk.ktx.reflectField
import
com.topjohnwu.magisk.ktx.inject
import
com.topjohnwu.magisk.ktx.writeTo
import
com.topjohnwu.magisk.ktx.writeTo
import
com.topjohnwu.magisk.view.MagiskDialog
import
com.topjohnwu.magisk.view.MagiskDialog
import
com.topjohnwu.signing.CryptoUtils
import
com.topjohnwu.signing.CryptoUtils
...
@@ -26,8 +27,7 @@ import kotlinx.coroutines.withContext
...
@@ -26,8 +27,7 @@ import kotlinx.coroutines.withContext
import
org.bouncycastle.asn1.ASN1Encoding
import
org.bouncycastle.asn1.ASN1Encoding
import
org.bouncycastle.asn1.ASN1Primitive
import
org.bouncycastle.asn1.ASN1Primitive
import
org.bouncycastle.est.jcajce.JsseDefaultHostnameAuthorizer
import
org.bouncycastle.est.jcajce.JsseDefaultHostnameAuthorizer
import
org.koin.core.KoinComponent
import
org.koin.core.component.KoinComponent
import
org.koin.core.inject
import
timber.log.Timber
import
timber.log.Timber
import
java.io.ByteArrayInputStream
import
java.io.ByteArrayInputStream
import
java.io.File
import
java.io.File
...
...
app/src/main/java/com/topjohnwu/magisk/ui/settings/BaseSettingsItem.kt
View file @
69b00d37
...
@@ -9,12 +9,12 @@ import androidx.databinding.Bindable
...
@@ -9,12 +9,12 @@ import androidx.databinding.Bindable
import
com.topjohnwu.magisk.BR
import
com.topjohnwu.magisk.BR
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.databinding.ObservableItem
import
com.topjohnwu.magisk.databinding.ObservableItem
import
com.topjohnwu.magisk.ktx.get
import
com.topjohnwu.magisk.utils.TextHolder
import
com.topjohnwu.magisk.utils.TextHolder
import
com.topjohnwu.magisk.utils.asText
import
com.topjohnwu.magisk.utils.asText
import
com.topjohnwu.magisk.utils.set
import
com.topjohnwu.magisk.utils.set
import
com.topjohnwu.magisk.view.MagiskDialog
import
com.topjohnwu.magisk.view.MagiskDialog
import
org.koin.core.KoinComponent
import
org.koin.core.component.KoinComponent
import
org.koin.core.get
sealed
class
BaseSettingsItem
:
ObservableItem
<
BaseSettingsItem
>()
{
sealed
class
BaseSettingsItem
:
ObservableItem
<
BaseSettingsItem
>()
{
...
...
app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsViewModel.kt
View file @
69b00d37
...
@@ -22,10 +22,10 @@ import com.topjohnwu.magisk.events.AddHomeIconEvent
...
@@ -22,10 +22,10 @@ import com.topjohnwu.magisk.events.AddHomeIconEvent
import
com.topjohnwu.magisk.events.RecreateEvent
import
com.topjohnwu.magisk.events.RecreateEvent
import
com.topjohnwu.magisk.events.dialog.BiometricEvent
import
com.topjohnwu.magisk.events.dialog.BiometricEvent
import
com.topjohnwu.magisk.ktx.activity
import
com.topjohnwu.magisk.ktx.activity
import
com.topjohnwu.magisk.ktx.get
import
com.topjohnwu.magisk.utils.Utils
import
com.topjohnwu.magisk.utils.Utils
import
com.topjohnwu.superuser.Shell
import
com.topjohnwu.superuser.Shell
import
kotlinx.coroutines.launch
import
kotlinx.coroutines.launch
import
org.koin.core.get
class
SettingsViewModel
(
class
SettingsViewModel
(
private
val
repositoryDao
:
RepoDao
private
val
repositoryDao
:
RepoDao
...
...
build.gradle.kts
View file @
69b00d37
...
@@ -10,8 +10,7 @@ plugins {
...
@@ -10,8 +10,7 @@ plugins {
buildscript
{
buildscript
{
repositories
{
repositories
{
google
()
google
()
jcenter
()
mavenCentral
()
maven
{
url
=
uri
(
"https://kotlin.bintray.com/kotlinx"
)
}
}
}
val
vNav
=
"2.3.5"
val
vNav
=
"2.3.5"
...
@@ -19,7 +18,7 @@ buildscript {
...
@@ -19,7 +18,7 @@ buildscript {
dependencies
{
dependencies
{
classpath
(
"com.android.tools.build:gradle:4.1.3"
)
classpath
(
"com.android.tools.build:gradle:4.1.3"
)
classpath
(
"org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.31"
)
classpath
(
kotlin
(
"gradle-plugin"
,
version
=
"1.4.32"
)
)
classpath
(
"androidx.navigation:navigation-safe-args-gradle-plugin:${vNav}"
)
classpath
(
"androidx.navigation:navigation-safe-args-gradle-plugin:${vNav}"
)
// NOTE: Do not place your application dependencies here; they belong
// NOTE: Do not place your application dependencies here; they belong
...
@@ -53,9 +52,8 @@ fun Task.applyOptimize() = doLast {
...
@@ -53,9 +52,8 @@ fun Task.applyOptimize() = doLast {
subprojects
{
subprojects
{
repositories
{
repositories
{
google
()
google
()
jcenter
()
mavenCentral
()
maven
{
url
=
uri
(
"https://jitpack.io"
)
}
maven
{
url
=
uri
(
"https://jitpack.io"
)
}
maven
{
url
=
uri
(
"http://oss.sonatype.org/content/repositories/snapshots"
)
}
}
}
afterEvaluate
{
afterEvaluate
{
...
...
buildSrc/build.gradle.kts
View file @
69b00d37
...
@@ -2,7 +2,7 @@ plugins {
...
@@ -2,7 +2,7 @@ plugins {
`
kotlin
-
dsl
`
`
kotlin
-
dsl
`
}
}
repositories
{
repositories
{
jcenter
()
mavenCentral
()
}
}
gradlePlugin
{
gradlePlugin
{
...
...
gradle/wrapper/gradle-wrapper.properties
View file @
69b00d37
...
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
...
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath
=
wrapper/dists
distributionPath
=
wrapper/dists
zipStoreBase
=
GRADLE_USER_HOME
zipStoreBase
=
GRADLE_USER_HOME
zipStorePath
=
wrapper/dists
zipStorePath
=
wrapper/dists
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-
6.8.3
-all.zip
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-
7.0
-all.zip
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