From 0167bd76f13d5e7cc793e74e397e02deb2082c4d Mon Sep 17 00:00:00 2001
From: Viktor De Pasquale <info@depasquale.wiki>
Date: Sun, 5 May 2019 12:46:28 +0200
Subject: [PATCH] Removed unnecessary overriding of observable list and
 replaced it copy function within observable changed callback

---
 .../magisk/ui/flash/FlashViewModel.kt         | 14 +---
 .../java/com/topjohnwu/magisk/utils/XList.kt  | 74 +++++++++++--------
 2 files changed, 49 insertions(+), 39 deletions(-)

diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/flash/FlashViewModel.kt b/app/src/main/java/com/topjohnwu/magisk/ui/flash/FlashViewModel.kt
index 968faeab4..99d72aa13 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ui/flash/FlashViewModel.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/flash/FlashViewModel.kt
@@ -24,8 +24,7 @@ import com.topjohnwu.magisk.utils.*
 import com.topjohnwu.superuser.Shell
 import me.tatarka.bindingcollectionadapter2.ItemBinding
 import java.io.File
-import java.util.Collections
-import kotlin.collections.ArrayList
+import java.util.*
 
 class FlashViewModel(
     action: String,
@@ -44,17 +43,12 @@ class FlashViewModel(
         itemBinding.bindExtra(BR.viewModel, this@FlashViewModel)
     }
 
-    private val outItems = object : ObservableArrayList<String>() {
-        override fun add(element: String?): Boolean {
-            if (element != null)
-                logItems.add(element)
-            return super.add(element)
-        }
-    }
-    private val logItems = Collections.synchronizedList(ArrayList<String>())
+    private val outItems = ObservableArrayList<String>()
+    private val logItems = Collections.synchronizedList(mutableListOf<String>())
 
     init {
         outItems.sendUpdatesTo(items) { it.map { ConsoleRvItem(it) } }
+        outItems.copyNewInputInto(logItems)
 
         state = State.LOADING
 
diff --git a/app/src/main/java/com/topjohnwu/magisk/utils/XList.kt b/app/src/main/java/com/topjohnwu/magisk/utils/XList.kt
index 26b5009fa..fd4ddc2e5 100644
--- a/app/src/main/java/com/topjohnwu/magisk/utils/XList.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/utils/XList.kt
@@ -10,7 +10,7 @@ fun <T> MutableList<T>.update(newList: List<T>) {
     addAll(newList)
 }
 
-fun List<String>.toShellCmd() : String {
+fun List<String>.toShellCmd(): String {
     val sb = StringBuilder()
     for (s in this) {
         if (s.contains(" ")) {
@@ -27,37 +27,53 @@ fun List<String>.toShellCmd() : String {
 fun <T1, T2> ObservableList<T1>.sendUpdatesTo(
     target: DiffObservableList<T2>,
     mapper: (List<T1>) -> List<T2>
-) {
-    addOnListChangedCallback(object :
-        ObservableList.OnListChangedCallback<ObservableList<T1>>() {
-        override fun onChanged(sender: ObservableList<T1>?) {
-            updateAsync(sender ?: return)
-        }
+) = addOnListChangedCallback(object :
+    ObservableList.OnListChangedCallback<ObservableList<T1>>() {
+    override fun onChanged(sender: ObservableList<T1>?) {
+        updateAsync(sender ?: return)
+    }
 
-        override fun onItemRangeRemoved(sender: ObservableList<T1>?, p0: Int, p1: Int) {
-            updateAsync(sender ?: return)
-        }
+    override fun onItemRangeRemoved(sender: ObservableList<T1>?, p0: Int, p1: Int) {
+        updateAsync(sender ?: return)
+    }
 
-        override fun onItemRangeMoved(sender: ObservableList<T1>?, p0: Int, p1: Int, p2: Int) {
-            updateAsync(sender ?: return)
-        }
+    override fun onItemRangeMoved(sender: ObservableList<T1>?, p0: Int, p1: Int, p2: Int) {
+        updateAsync(sender ?: return)
+    }
 
-        override fun onItemRangeInserted(sender: ObservableList<T1>?, p0: Int, p1: Int) {
-            updateAsync(sender ?: return)
-        }
+    override fun onItemRangeInserted(sender: ObservableList<T1>?, p0: Int, p1: Int) {
+        updateAsync(sender ?: return)
+    }
 
-        override fun onItemRangeChanged(sender: ObservableList<T1>?, p0: Int, p1: Int) {
-            updateAsync(sender ?: return)
-        }
+    override fun onItemRangeChanged(sender: ObservableList<T1>?, p0: Int, p1: Int) {
+        updateAsync(sender ?: return)
+    }
 
-        private var updater: Disposable? = null
+    private var updater: Disposable? = null
 
-        private fun updateAsync(sender: List<T1>) {
-            updater?.dispose()
-            updater = sender.toSingle()
-                .map { mapper(it) }
-                .map { it to target.calculateDiff(it) }
-                .subscribeK { target.update(it.first, it.second) }
-        }
-    })
-}
\ No newline at end of file
+    private fun updateAsync(sender: List<T1>) {
+        updater?.dispose()
+        updater = sender.toSingle()
+            .map { mapper(it) }
+            .map { it to target.calculateDiff(it) }
+            .subscribeK { target.update(it.first, it.second) }
+    }
+})
+
+fun <T1> ObservableList<T1>.copyNewInputInto(
+    target: MutableList<T1>
+) = addOnListChangedCallback(object : ObservableList.OnListChangedCallback<ObservableList<T1>>() {
+    override fun onChanged(p0: ObservableList<T1>?) = Unit
+    override fun onItemRangeRemoved(p0: ObservableList<T1>?, p1: Int, p2: Int) = Unit
+    override fun onItemRangeMoved(p0: ObservableList<T1>?, p1: Int, p2: Int, p3: Int) = Unit
+    override fun onItemRangeChanged(p0: ObservableList<T1>?, p1: Int, p2: Int) = Unit
+    override fun onItemRangeInserted(
+        sender: ObservableList<T1>?,
+        positionStart: Int,
+        itemCount: Int
+    ) {
+        val positionEnd = positionStart + itemCount
+        val addedValues = sender?.slice(positionStart until positionEnd).orEmpty()
+        target.addAll(addedValues)
+    }
+})
\ No newline at end of file