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
5c333dec
Commit
5c333dec
authored
May 10, 2021
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Minor changes
parent
775d095b
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
14 deletions
+9
-14
BaseViewModel.kt
app/src/main/java/com/topjohnwu/magisk/arch/BaseViewModel.kt
+4
-11
ServiceLocator.kt
app/src/main/java/com/topjohnwu/magisk/di/ServiceLocator.kt
+2
-0
CheckSafetyNetEvent.kt
.../com/topjohnwu/magisk/ui/safetynet/CheckSafetyNetEvent.kt
+1
-1
SafetynetViewModel.kt
...a/com/topjohnwu/magisk/ui/safetynet/SafetynetViewModel.kt
+2
-2
No files found.
app/src/main/java/com/topjohnwu/magisk/arch/BaseViewModel.kt
View file @
5c333dec
...
@@ -2,7 +2,6 @@ package com.topjohnwu.magisk.arch
...
@@ -2,7 +2,6 @@ package com.topjohnwu.magisk.arch
import
android.Manifest
import
android.Manifest
import
androidx.annotation.CallSuper
import
androidx.annotation.CallSuper
import
androidx.core.graphics.Insets
import
androidx.databinding.Bindable
import
androidx.databinding.Bindable
import
androidx.databinding.Observable
import
androidx.databinding.Observable
import
androidx.databinding.PropertyChangeRegistry
import
androidx.databinding.PropertyChangeRegistry
...
@@ -14,8 +13,10 @@ import androidx.navigation.NavDirections
...
@@ -14,8 +13,10 @@ import androidx.navigation.NavDirections
import
com.topjohnwu.magisk.BR
import
com.topjohnwu.magisk.BR
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.core.Info
import
com.topjohnwu.magisk.core.Info
import
com.topjohnwu.magisk.core.base.BaseActivity
import
com.topjohnwu.magisk.events.BackPressEvent
import
com.topjohnwu.magisk.events.*
import
com.topjohnwu.magisk.events.NavigationEvent
import
com.topjohnwu.magisk.events.PermissionEvent
import
com.topjohnwu.magisk.events.SnackbarEvent
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
...
@@ -40,10 +41,6 @@ abstract class BaseViewModel(
...
@@ -40,10 +41,6 @@ abstract class BaseViewModel(
val
isConnected
get
()
=
Info
.
isConnected
val
isConnected
get
()
=
Info
.
isConnected
val
viewEvents
:
LiveData
<
ViewEvent
>
get
()
=
_viewEvents
val
viewEvents
:
LiveData
<
ViewEvent
>
get
()
=
_viewEvents
@get
:
Bindable
var
insets
=
Insets
.
NONE
set
(
value
)
=
set
(
value
,
field
,
{
field
=
it
},
BR
.
insets
)
var
state
=
initialState
var
state
=
initialState
set
(
value
)
=
set
(
value
,
field
,
{
field
=
it
},
BR
.
loading
,
BR
.
loaded
,
BR
.
loadFailed
)
set
(
value
)
=
set
(
value
,
field
,
{
field
=
it
},
BR
.
loading
,
BR
.
loaded
,
BR
.
loadFailed
)
...
@@ -76,10 +73,6 @@ abstract class BaseViewModel(
...
@@ -76,10 +73,6 @@ abstract class BaseViewModel(
super
.
onCleared
()
super
.
onCleared
()
}
}
fun
withView
(
action
:
BaseActivity
.()
->
Unit
)
{
ViewActionEvent
(
action
).
publish
()
}
fun
withPermission
(
permission
:
String
,
callback
:
(
Boolean
)
->
Unit
)
{
fun
withPermission
(
permission
:
String
,
callback
:
(
Boolean
)
->
Unit
)
{
PermissionEvent
(
permission
,
callback
).
publish
()
PermissionEvent
(
permission
,
callback
).
publish
()
}
}
...
...
app/src/main/java/com/topjohnwu/magisk/di/ServiceLocator.kt
View file @
5c333dec
package
com.topjohnwu.magisk.di
package
com.topjohnwu.magisk.di
import
android.annotation.SuppressLint
import
android.content.Context
import
android.content.Context
import
androidx.lifecycle.ViewModel
import
androidx.lifecycle.ViewModel
import
androidx.lifecycle.ViewModelProvider
import
androidx.lifecycle.ViewModelProvider
...
@@ -25,6 +26,7 @@ import com.topjohnwu.magisk.ui.surequest.SuRequestViewModel
...
@@ -25,6 +26,7 @@ import com.topjohnwu.magisk.ui.surequest.SuRequestViewModel
val
AppContext
:
Context
inline
get
()
=
ServiceLocator
.
context
val
AppContext
:
Context
inline
get
()
=
ServiceLocator
.
context
@SuppressLint
(
"StaticFieldLeak"
)
object
ServiceLocator
{
object
ServiceLocator
{
lateinit
var
context
:
Context
lateinit
var
context
:
Context
...
...
app/src/main/java/com/topjohnwu/magisk/ui/safetynet/CheckSafetyNetEvent.kt
View file @
5c333dec
...
@@ -137,7 +137,7 @@ class CheckSafetyNetEvent(
...
@@ -137,7 +137,7 @@ class CheckSafetyNetEvent(
}
}
private
fun
String
.
decode
():
ByteArray
{
private
fun
String
.
decode
():
ByteArray
{
return
if
(
contains
(
"
\\+|/
"
.
toRegex
()))
return
if
(
contains
(
"
[+/]
"
.
toRegex
()))
Base64
.
decode
(
this
,
Base64
.
DEFAULT
)
Base64
.
decode
(
this
,
Base64
.
DEFAULT
)
else
else
Base64
.
decode
(
this
,
Base64
.
URL_SAFE
)
Base64
.
decode
(
this
,
Base64
.
URL_SAFE
)
...
...
app/src/main/java/com/topjohnwu/magisk/ui/safetynet/SafetynetViewModel.kt
View file @
5c333dec
...
@@ -79,13 +79,13 @@ class SafetynetViewModel : BaseViewModel() {
...
@@ -79,13 +79,13 @@ class SafetynetViewModel : BaseViewModel() {
if
(
success
)
R
.
string
.
safetynet_attest_success
if
(
success
)
R
.
string
.
safetynet_attest_success
else
R
.
string
.
safetynet_attest_failure
else
R
.
string
.
safetynet_attest_failure
}
}
}
?:
{
}
?:
run
{
isSuccess
=
false
isSuccess
=
false
ctsState
=
false
ctsState
=
false
basicIntegrityState
=
false
basicIntegrityState
=
false
evalType
=
"N/A"
evalType
=
"N/A"
safetyNetTitle
=
R
.
string
.
safetynet_api_error
safetyNetTitle
=
R
.
string
.
safetynet_api_error
}
()
}
}
}
companion
object
{
companion
object
{
...
...
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