From 5833aadef5b1126bea3c90cec8f1d3f69267c8ae Mon Sep 17 00:00:00 2001
From: vvb2060 <vvb2060@gmail.com>
Date: Thu, 15 Oct 2020 17:50:35 +0800
Subject: [PATCH] Silence kotlin warnings

---
 app/src/main/java/com/topjohnwu/magisk/arch/Helpers.kt    | 6 +++---
 .../com/topjohnwu/magisk/core/tasks/MagiskInstaller.kt    | 2 +-
 .../java/com/topjohnwu/magisk/events/SnackbarEvent.kt     | 8 +++-----
 .../magisk/utils/EndlessRecyclerScrollListener.kt         | 6 +++---
 .../main/java/com/topjohnwu/magisk/view/MagiskDialog.kt   | 2 +-
 5 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/com/topjohnwu/magisk/arch/Helpers.kt b/app/src/main/java/com/topjohnwu/magisk/arch/Helpers.kt
index a18d1822c..16d43327d 100644
--- a/app/src/main/java/com/topjohnwu/magisk/arch/Helpers.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/arch/Helpers.kt
@@ -9,18 +9,18 @@ import me.tatarka.bindingcollectionadapter2.BindingRecyclerViewAdapter
 import me.tatarka.bindingcollectionadapter2.ItemBinding
 import me.tatarka.bindingcollectionadapter2.OnItemBind
 
-inline fun <T : ComparableRvItem<*>> diffListOf(
+fun <T : ComparableRvItem<*>> diffListOf(
     vararg newItems: T
 ) = diffListOf(newItems.toList())
 
-inline fun <T : ComparableRvItem<*>> diffListOf(
+fun <T : ComparableRvItem<*>> diffListOf(
     newItems: List<T>
 ) = DiffObservableList(object : DiffObservableList.Callback<T> {
     override fun areItemsTheSame(oldItem: T, newItem: T) = oldItem.genericItemSameAs(newItem)
     override fun areContentsTheSame(oldItem: T, newItem: T) = oldItem.genericContentSameAs(newItem)
 }).also { it.update(newItems) }
 
-inline fun <T : ComparableRvItem<*>> filterableListOf(
+fun <T : ComparableRvItem<*>> filterableListOf(
     vararg newItems: T
 ) = FilterableDiffObservableList(object : DiffObservableList.Callback<T> {
     override fun areItemsTheSame(oldItem: T, newItem: T) = oldItem.genericItemSameAs(newItem)
diff --git a/app/src/main/java/com/topjohnwu/magisk/core/tasks/MagiskInstaller.kt b/app/src/main/java/com/topjohnwu/magisk/core/tasks/MagiskInstaller.kt
index 3e14ca431..acdfb8e6a 100644
--- a/app/src/main/java/com/topjohnwu/magisk/core/tasks/MagiskInstaller.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/core/tasks/MagiskInstaller.kt
@@ -290,7 +290,7 @@ abstract class MagiskInstallImpl : KoinComponent {
             srcBoot = File(installDir, "boot.img").path
         }
 
-        var isSigned = false
+        var isSigned: Boolean
         try {
             SuFileInputStream(srcBoot).use {
                 isSigned = SignBoot.verifySignature(it, null)
diff --git a/app/src/main/java/com/topjohnwu/magisk/events/SnackbarEvent.kt b/app/src/main/java/com/topjohnwu/magisk/events/SnackbarEvent.kt
index dab3a84f4..9b0cd3fd7 100644
--- a/app/src/main/java/com/topjohnwu/magisk/events/SnackbarEvent.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/events/SnackbarEvent.kt
@@ -35,11 +35,9 @@ class SnackbarEvent private constructor(
     ) = Snackbar.make(view, message, length).apply(builder).show()
 
     override fun invoke(activity: BaseUIActivity<*, *>) {
-        if (activity is BaseUIActivity<*, *>) {
-            snackbar(activity.snackbarView,
-                msg.getText(activity.resources).toString(),
-                length, builder)
-        }
+        snackbar(activity.snackbarView,
+            msg.getText(activity.resources).toString(),
+            length, builder)
     }
 
 }
diff --git a/app/src/main/java/com/topjohnwu/magisk/utils/EndlessRecyclerScrollListener.kt b/app/src/main/java/com/topjohnwu/magisk/utils/EndlessRecyclerScrollListener.kt
index 76aa0b97c..5f607208c 100644
--- a/app/src/main/java/com/topjohnwu/magisk/utils/EndlessRecyclerScrollListener.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/utils/EndlessRecyclerScrollListener.kt
@@ -55,15 +55,15 @@ class EndlessRecyclerScrollListener(
         val visibleItemPosition = if (direction == Direction.BOTTOM) {
             when (layoutManager) {
                 is StaggeredGridLayoutManager ->
-                    layoutManager.findLastVisibleItemPositions(null).max() ?: 0
+                    layoutManager.findLastVisibleItemPositions(null).maxOrNull() ?: 0
                 is GridLayoutManager -> layoutManager.findLastVisibleItemPosition()
                 is LinearLayoutManager -> layoutManager.findLastVisibleItemPosition()
                 else -> throw IllegalArgumentException("Only LinearLayoutManager, GridLayoutManager and StaggeredGridLayoutManager are supported")
             }
         } else {
             when (layoutManager) {
-                is StaggeredGridLayoutManager -> layoutManager.findFirstVisibleItemPositions(null).min()
-                    ?: 0
+                is StaggeredGridLayoutManager ->
+                    layoutManager.findFirstVisibleItemPositions(null).minOrNull() ?: 0
                 is GridLayoutManager -> layoutManager.findFirstVisibleItemPosition()
                 is LinearLayoutManager -> layoutManager.findFirstVisibleItemPosition()
                 else -> throw IllegalArgumentException("Only LinearLayoutManager, GridLayoutManager and StaggeredGridLayoutManager are supported")
diff --git a/app/src/main/java/com/topjohnwu/magisk/view/MagiskDialog.kt b/app/src/main/java/com/topjohnwu/magisk/view/MagiskDialog.kt
index ec197bbb1..696be17f1 100644
--- a/app/src/main/java/com/topjohnwu/magisk/view/MagiskDialog.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/view/MagiskDialog.kt
@@ -228,7 +228,7 @@ class MagiskDialog(
                     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) }
                 .let { ItemBinding.of(it) }