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
d1135867
Commit
d1135867
authored
Mar 18, 2021
by
vvb2060
Committed by
John Wu
Mar 24, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix isolated process display
parent
8b5cb4c7
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
6 deletions
+11
-6
HideInfo.kt
app/src/main/java/com/topjohnwu/magisk/ui/hide/HideInfo.kt
+3
-3
HideRvItems.kt
...src/main/java/com/topjohnwu/magisk/ui/hide/HideRvItems.kt
+7
-2
item_hide_process_md2.xml
app/src/main/res/layout/item_hide_process_md2.xml
+1
-1
No files found.
app/src/main/java/com/topjohnwu/magisk/ui/hide/HideInfo.kt
View file @
d1135867
...
@@ -60,7 +60,7 @@ class HideAppInfo(info: ApplicationInfo, pm: PackageManager, hideList: List<Cmdl
...
@@ -60,7 +60,7 @@ class HideAppInfo(info: ApplicationInfo, pm: PackageManager, hideList: List<Cmdl
val
hidden
=
hideList
.
filter
{
it
.
packageName
==
packageName
||
it
.
packageName
==
ISOLATED_MAGIC
}
val
hidden
=
hideList
.
filter
{
it
.
packageName
==
packageName
||
it
.
packageName
==
ISOLATED_MAGIC
}
fun
createProcess
(
name
:
String
,
pkg
:
String
=
packageName
):
HideProcessInfo
{
fun
createProcess
(
name
:
String
,
pkg
:
String
=
packageName
):
HideProcessInfo
{
return
HideProcessInfo
(
name
,
pkg
,
hidden
.
any
{
it
.
process
==
name
})
return
HideProcessInfo
(
name
,
pkg
,
hidden
.
any
{
it
.
process
==
name
&&
it
.
packageName
==
pkg
})
}
}
var
haveAppZygote
=
false
var
haveAppZygote
=
false
...
@@ -86,7 +86,7 @@ class HideAppInfo(info: ApplicationInfo, pm: PackageManager, hideList: List<Cmdl
...
@@ -86,7 +86,7 @@ class HideAppInfo(info: ApplicationInfo, pm: PackageManager, hideList: List<Cmdl
receivers
?.
processes
().
orEmpty
()
+
receivers
?.
processes
().
orEmpty
()
+
providers
?.
processes
().
orEmpty
()
+
providers
?.
processes
().
orEmpty
()
+
listOf
(
if
(
haveAppZygote
)
createProcess
(
"${processName}_zygote"
)
else
null
)
listOf
(
if
(
haveAppZygote
)
createProcess
(
"${processName}_zygote"
)
else
null
)
}.
filterNotNull
().
distinct
By
{
it
.
name
}
.
sortedBy
{
it
.
name
}
}.
filterNotNull
().
distinct
()
.
sortedBy
{
it
.
name
}
}
}
companion
object
{
companion
object
{
...
@@ -102,6 +102,6 @@ data class HideProcessInfo(
...
@@ -102,6 +102,6 @@ data class HideProcessInfo(
val
packageName
:
String
,
val
packageName
:
String
,
var
isHidden
:
Boolean
var
isHidden
:
Boolean
)
{
)
{
val
isIsolated
get
()
=
n
ame
==
ISOLATED_MAGIC
val
isIsolated
get
()
=
packageN
ame
==
ISOLATED_MAGIC
val
isAppZygote
get
()
=
name
.
endsWith
(
"_zygote"
)
val
isAppZygote
get
()
=
name
.
endsWith
(
"_zygote"
)
}
}
app/src/main/java/com/topjohnwu/magisk/ui/hide/HideRvItems.kt
View file @
d1135867
...
@@ -93,6 +93,8 @@ class HideProcessRvItem(
...
@@ -93,6 +93,8 @@ class HideProcessRvItem(
override
val
layoutRes
get
()
=
R
.
layout
.
item_hide_process_md2
override
val
layoutRes
get
()
=
R
.
layout
.
item_hide_process_md2
val
displayName
=
if
(
process
.
isIsolated
)
"(isolated) ${process.name}"
else
process
.
name
@get
:
Bindable
@get
:
Bindable
var
isHidden
var
isHidden
get
()
=
process
.
isHidden
get
()
=
process
.
isHidden
...
@@ -109,7 +111,10 @@ class HideProcessRvItem(
...
@@ -109,7 +111,10 @@ class HideProcessRvItem(
val
defaultSelection
get
()
=
val
defaultSelection
get
()
=
process
.
isIsolated
||
process
.
isAppZygote
||
process
.
name
==
process
.
packageName
process
.
isIsolated
||
process
.
isAppZygote
||
process
.
name
==
process
.
packageName
override
fun
contentSameAs
(
other
:
HideProcessRvItem
)
=
process
==
other
.
process
override
fun
contentSameAs
(
other
:
HideProcessRvItem
)
=
override
fun
itemSameAs
(
other
:
HideProcessRvItem
)
=
process
.
name
==
other
.
process
.
name
process
.
isHidden
==
other
.
process
.
isHidden
override
fun
itemSameAs
(
other
:
HideProcessRvItem
)
=
process
.
name
==
other
.
process
.
name
&&
process
.
packageName
==
other
.
process
.
packageName
}
}
app/src/main/res/layout/item_hide_process_md2.xml
View file @
d1135867
...
@@ -30,7 +30,7 @@
...
@@ -30,7 +30,7 @@
android:layout_marginBottom=
"@dimen/l_75"
android:layout_marginBottom=
"@dimen/l_75"
android:singleLine=
"true"
android:singleLine=
"true"
android:ellipsize=
"middle"
android:ellipsize=
"middle"
android:text=
"@{item.
process.n
ame}"
android:text=
"@{item.
displayN
ame}"
android:textAppearance=
"@style/AppearanceFoundation.Caption.Variant"
android:textAppearance=
"@style/AppearanceFoundation.Caption.Variant"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintEnd_toStartOf=
"@+id/hide_process_checkbox"
app:layout_constraintEnd_toStartOf=
"@+id/hide_process_checkbox"
...
...
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