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
5833aade
Commit
5833aade
authored
Oct 15, 2020
by
vvb2060
Committed by
topjohnwu
Oct 17, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Silence kotlin warnings
parent
eb261c80
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
13 deletions
+11
-13
Helpers.kt
app/src/main/java/com/topjohnwu/magisk/arch/Helpers.kt
+3
-3
MagiskInstaller.kt
...n/java/com/topjohnwu/magisk/core/tasks/MagiskInstaller.kt
+1
-1
SnackbarEvent.kt
...rc/main/java/com/topjohnwu/magisk/events/SnackbarEvent.kt
+3
-5
EndlessRecyclerScrollListener.kt
...m/topjohnwu/magisk/utils/EndlessRecyclerScrollListener.kt
+3
-3
MagiskDialog.kt
app/src/main/java/com/topjohnwu/magisk/view/MagiskDialog.kt
+1
-1
No files found.
app/src/main/java/com/topjohnwu/magisk/arch/Helpers.kt
View file @
5833aade
...
@@ -9,18 +9,18 @@ import me.tatarka.bindingcollectionadapter2.BindingRecyclerViewAdapter
...
@@ -9,18 +9,18 @@ import me.tatarka.bindingcollectionadapter2.BindingRecyclerViewAdapter
import
me.tatarka.bindingcollectionadapter2.ItemBinding
import
me.tatarka.bindingcollectionadapter2.ItemBinding
import
me.tatarka.bindingcollectionadapter2.OnItemBind
import
me.tatarka.bindingcollectionadapter2.OnItemBind
inline
fun
<
T
:
ComparableRvItem
<*
>
>
diffListOf
(
fun
<
T
:
ComparableRvItem
<*
>
>
diffListOf
(
vararg
newItems
:
T
vararg
newItems
:
T
)
=
diffListOf
(
newItems
.
toList
())
)
=
diffListOf
(
newItems
.
toList
())
inline
fun
<
T
:
ComparableRvItem
<*
>
>
diffListOf
(
fun
<
T
:
ComparableRvItem
<*
>
>
diffListOf
(
newItems
:
List
<
T
>
newItems
:
List
<
T
>
)
=
DiffObservableList
(
object
:
DiffObservableList
.
Callback
<
T
>
{
)
=
DiffObservableList
(
object
:
DiffObservableList
.
Callback
<
T
>
{
override
fun
areItemsTheSame
(
oldItem
:
T
,
newItem
:
T
)
=
oldItem
.
genericItemSameAs
(
newItem
)
override
fun
areItemsTheSame
(
oldItem
:
T
,
newItem
:
T
)
=
oldItem
.
genericItemSameAs
(
newItem
)
override
fun
areContentsTheSame
(
oldItem
:
T
,
newItem
:
T
)
=
oldItem
.
genericContentSameAs
(
newItem
)
override
fun
areContentsTheSame
(
oldItem
:
T
,
newItem
:
T
)
=
oldItem
.
genericContentSameAs
(
newItem
)
}).
also
{
it
.
update
(
newItems
)
}
}).
also
{
it
.
update
(
newItems
)
}
inline
fun
<
T
:
ComparableRvItem
<*
>
>
filterableListOf
(
fun
<
T
:
ComparableRvItem
<*
>
>
filterableListOf
(
vararg
newItems
:
T
vararg
newItems
:
T
)
=
FilterableDiffObservableList
(
object
:
DiffObservableList
.
Callback
<
T
>
{
)
=
FilterableDiffObservableList
(
object
:
DiffObservableList
.
Callback
<
T
>
{
override
fun
areItemsTheSame
(
oldItem
:
T
,
newItem
:
T
)
=
oldItem
.
genericItemSameAs
(
newItem
)
override
fun
areItemsTheSame
(
oldItem
:
T
,
newItem
:
T
)
=
oldItem
.
genericItemSameAs
(
newItem
)
...
...
app/src/main/java/com/topjohnwu/magisk/core/tasks/MagiskInstaller.kt
View file @
5833aade
...
@@ -290,7 +290,7 @@ abstract class MagiskInstallImpl : KoinComponent {
...
@@ -290,7 +290,7 @@ abstract class MagiskInstallImpl : KoinComponent {
srcBoot
=
File
(
installDir
,
"boot.img"
).
path
srcBoot
=
File
(
installDir
,
"boot.img"
).
path
}
}
var
isSigned
=
false
var
isSigned
:
Boolean
try
{
try
{
SuFileInputStream
(
srcBoot
).
use
{
SuFileInputStream
(
srcBoot
).
use
{
isSigned
=
SignBoot
.
verifySignature
(
it
,
null
)
isSigned
=
SignBoot
.
verifySignature
(
it
,
null
)
...
...
app/src/main/java/com/topjohnwu/magisk/events/SnackbarEvent.kt
View file @
5833aade
...
@@ -35,11 +35,9 @@ class SnackbarEvent private constructor(
...
@@ -35,11 +35,9 @@ class SnackbarEvent private constructor(
)
=
Snackbar
.
make
(
view
,
message
,
length
).
apply
(
builder
).
show
()
)
=
Snackbar
.
make
(
view
,
message
,
length
).
apply
(
builder
).
show
()
override
fun
invoke
(
activity
:
BaseUIActivity
<
*
,
*
>)
{
override
fun
invoke
(
activity
:
BaseUIActivity
<
*
,
*
>)
{
if
(
activity
is
BaseUIActivity
<*,
*>)
{
snackbar
(
activity
.
snackbarView
,
snackbar
(
activity
.
snackbarView
,
msg
.
getText
(
activity
.
resources
).
toString
(),
msg
.
getText
(
activity
.
resources
).
toString
(),
length
,
builder
)
length
,
builder
)
}
}
}
}
}
app/src/main/java/com/topjohnwu/magisk/utils/EndlessRecyclerScrollListener.kt
View file @
5833aade
...
@@ -55,15 +55,15 @@ class EndlessRecyclerScrollListener(
...
@@ -55,15 +55,15 @@ class EndlessRecyclerScrollListener(
val
visibleItemPosition
=
if
(
direction
==
Direction
.
BOTTOM
)
{
val
visibleItemPosition
=
if
(
direction
==
Direction
.
BOTTOM
)
{
when
(
layoutManager
)
{
when
(
layoutManager
)
{
is
StaggeredGridLayoutManager
->
is
StaggeredGridLayoutManager
->
layoutManager
.
findLastVisibleItemPositions
(
null
).
max
()
?:
0
layoutManager
.
findLastVisibleItemPositions
(
null
).
max
OrNull
()
?:
0
is
GridLayoutManager
->
layoutManager
.
findLastVisibleItemPosition
()
is
GridLayoutManager
->
layoutManager
.
findLastVisibleItemPosition
()
is
LinearLayoutManager
->
layoutManager
.
findLastVisibleItemPosition
()
is
LinearLayoutManager
->
layoutManager
.
findLastVisibleItemPosition
()
else
->
throw
IllegalArgumentException
(
"Only LinearLayoutManager, GridLayoutManager and StaggeredGridLayoutManager are supported"
)
else
->
throw
IllegalArgumentException
(
"Only LinearLayoutManager, GridLayoutManager and StaggeredGridLayoutManager are supported"
)
}
}
}
else
{
}
else
{
when
(
layoutManager
)
{
when
(
layoutManager
)
{
is
StaggeredGridLayoutManager
->
layoutManager
.
findFirstVisibleItemPositions
(
null
).
min
()
is
StaggeredGridLayoutManager
->
?:
0
layoutManager
.
findFirstVisibleItemPositions
(
null
).
minOrNull
()
?:
0
is
GridLayoutManager
->
layoutManager
.
findFirstVisibleItemPosition
()
is
GridLayoutManager
->
layoutManager
.
findFirstVisibleItemPosition
()
is
LinearLayoutManager
->
layoutManager
.
findFirstVisibleItemPosition
()
is
LinearLayoutManager
->
layoutManager
.
findFirstVisibleItemPosition
()
else
->
throw
IllegalArgumentException
(
"Only LinearLayoutManager, GridLayoutManager and StaggeredGridLayoutManager are supported"
)
else
->
throw
IllegalArgumentException
(
"Only LinearLayoutManager, GridLayoutManager and StaggeredGridLayoutManager are supported"
)
...
...
app/src/main/java/com/topjohnwu/magisk/view/MagiskDialog.kt
View file @
5833aade
...
@@ -228,7 +228,7 @@ class MagiskDialog(
...
@@ -228,7 +228,7 @@ class MagiskDialog(
dismiss
()
dismiss
()
}
}
}
}
val
items
=
list
.
mapIndexed
{
i
,
it
->
DialogItem
(
it
,
i
)
}
val
items
=
list
.
mapIndexed
{
i
,
cs
->
DialogItem
(
cs
,
i
)
}
val
binding
=
itemBindingOf
<
DialogItem
>
{
it
.
bindExtra
(
BR
.
listener
,
actualListener
)
}
val
binding
=
itemBindingOf
<
DialogItem
>
{
it
.
bindExtra
(
BR
.
listener
,
actualListener
)
}
.
let
{
ItemBinding
.
of
(
it
)
}
.
let
{
ItemBinding
.
of
(
it
)
}
...
...
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