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
a6950b8a
Commit
a6950b8a
authored
Sep 23, 2020
by
vvb2060
Committed by
John Wu
Sep 24, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add failed state
parent
8df96ff6
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
48 additions
and
1 deletion
+48
-1
HideViewModel.kt
...c/main/java/com/topjohnwu/magisk/ui/hide/HideViewModel.kt
+5
-0
SuperuserViewModel.kt
...a/com/topjohnwu/magisk/ui/superuser/SuperuserViewModel.kt
+5
-0
Utils.kt
app/src/main/java/com/topjohnwu/magisk/utils/Utils.kt
+1
-1
fragment_hide_md2.xml
app/src/main/res/layout/fragment_hide_md2.xml
+19
-0
fragment_superuser_md2.xml
app/src/main/res/layout/fragment_superuser_md2.xml
+18
-0
No files found.
app/src/main/java/com/topjohnwu/magisk/ui/hide/HideViewModel.kt
View file @
a6950b8a
...
@@ -14,6 +14,7 @@ import com.topjohnwu.magisk.ktx.get
...
@@ -14,6 +14,7 @@ import com.topjohnwu.magisk.ktx.get
import
com.topjohnwu.magisk.ktx.packageInfo
import
com.topjohnwu.magisk.ktx.packageInfo
import
com.topjohnwu.magisk.ktx.packageName
import
com.topjohnwu.magisk.ktx.packageName
import
com.topjohnwu.magisk.ktx.processes
import
com.topjohnwu.magisk.ktx.processes
import
com.topjohnwu.magisk.utils.Utils
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.Dispatchers
import
kotlinx.coroutines.Dispatchers
...
@@ -46,6 +47,10 @@ class HideViewModel : BaseViewModel(), Queryable {
...
@@ -46,6 +47,10 @@ class HideViewModel : BaseViewModel(), Queryable {
}
}
override
fun
refresh
()
=
viewModelScope
.
launch
{
override
fun
refresh
()
=
viewModelScope
.
launch
{
if
(!
Utils
.
showSuperUser
())
{
state
=
State
.
LOADING_FAILED
return
@launch
}
state
=
State
.
LOADING
state
=
State
.
LOADING
val
(
apps
,
diff
)
=
withContext
(
Dispatchers
.
Default
)
{
val
(
apps
,
diff
)
=
withContext
(
Dispatchers
.
Default
)
{
val
pm
=
get
<
PackageManager
>()
val
pm
=
get
<
PackageManager
>()
...
...
app/src/main/java/com/topjohnwu/magisk/ui/superuser/SuperuserViewModel.kt
View file @
a6950b8a
...
@@ -18,6 +18,7 @@ import com.topjohnwu.magisk.databinding.ComparableRvItem
...
@@ -18,6 +18,7 @@ import com.topjohnwu.magisk.databinding.ComparableRvItem
import
com.topjohnwu.magisk.events.SnackbarEvent
import
com.topjohnwu.magisk.events.SnackbarEvent
import
com.topjohnwu.magisk.events.dialog.BiometricEvent
import
com.topjohnwu.magisk.events.dialog.BiometricEvent
import
com.topjohnwu.magisk.events.dialog.SuperuserRevokeDialog
import
com.topjohnwu.magisk.events.dialog.SuperuserRevokeDialog
import
com.topjohnwu.magisk.utils.Utils
import
com.topjohnwu.magisk.view.TappableHeadlineItem
import
com.topjohnwu.magisk.view.TappableHeadlineItem
import
com.topjohnwu.magisk.view.TextItem
import
com.topjohnwu.magisk.view.TextItem
import
kotlinx.coroutines.Dispatchers
import
kotlinx.coroutines.Dispatchers
...
@@ -48,6 +49,10 @@ class SuperuserViewModel(
...
@@ -48,6 +49,10 @@ class SuperuserViewModel(
// ---
// ---
override
fun
refresh
()
=
viewModelScope
.
launch
{
override
fun
refresh
()
=
viewModelScope
.
launch
{
if
(!
Utils
.
showSuperUser
())
{
state
=
State
.
LOADING_FAILED
return
@launch
}
state
=
State
.
LOADING
state
=
State
.
LOADING
val
(
policies
,
diff
)
=
withContext
(
Dispatchers
.
Default
)
{
val
(
policies
,
diff
)
=
withContext
(
Dispatchers
.
Default
)
{
val
policies
=
db
.
fetchAll
{
val
policies
=
db
.
fetchAll
{
...
...
app/src/main/java/com/topjohnwu/magisk/utils/Utils.kt
View file @
a6950b8a
...
@@ -23,7 +23,7 @@ object Utils {
...
@@ -23,7 +23,7 @@ object Utils {
fun
showSuperUser
():
Boolean
{
fun
showSuperUser
():
Boolean
{
return
Info
.
env
.
isActive
&&
(
Const
.
USER_ID
==
0
return
Info
.
env
.
isActive
&&
(
Const
.
USER_ID
==
0
||
Config
.
suMultiuserMode
!=
Config
.
Value
.
MULTIUSER_MODE_OWNER_MANAGED
)
||
Config
.
suMultiuserMode
==
Config
.
Value
.
MULTIUSER_MODE_USER
)
}
}
fun
openLink
(
context
:
Context
,
link
:
Uri
)
{
fun
openLink
(
context
:
Context
,
link
:
Uri
)
{
...
...
app/src/main/res/layout/fragment_hide_md2.xml
View file @
a6950b8a
...
@@ -35,6 +35,7 @@
...
@@ -35,6 +35,7 @@
<com.google.android.material.floatingactionbutton.FloatingActionButton
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id=
"@+id/hide_filter_toggle"
android:id=
"@+id/hide_filter_toggle"
invisibleUnless=
"@{viewModel.loaded || !viewModel.items.empty}"
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_gravity=
"bottom|end"
android:layout_gravity=
"bottom|end"
...
@@ -86,6 +87,24 @@
...
@@ -86,6 +87,24 @@
</LinearLayout>
</LinearLayout>
<LinearLayout
goneUnless=
"@{viewModel.loadFailed}"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_gravity=
"center"
android:gravity=
"center"
android:orientation=
"vertical"
tools:visibility=
"gone"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"@string/not_available"
android:textAppearance=
"@style/AppearanceFoundation.Title"
android:textStyle=
"bold"
/>
</LinearLayout>
</FrameLayout>
</FrameLayout>
</layout>
</layout>
app/src/main/res/layout/fragment_superuser_md2.xml
View file @
a6950b8a
...
@@ -57,6 +57,24 @@
...
@@ -57,6 +57,24 @@
</LinearLayout>
</LinearLayout>
<LinearLayout
goneUnless=
"@{viewModel.loadFailed}"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_gravity=
"center"
android:gravity=
"center"
android:orientation=
"vertical"
tools:visibility=
"gone"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"@string/not_available"
android:textAppearance=
"@style/AppearanceFoundation.Title"
android:textStyle=
"bold"
/>
</LinearLayout>
</FrameLayout>
</FrameLayout>
</layout>
</layout>
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