Replaced log calls from magiskdb to repo

app/src/main/java/com/topjohnwu/magisk/ui/log/LogViewModel.kt

@@ -1,10 +1,9 @@
 package com.topjohnwu.magisk.ui.log
 
 import android.content.res.Resources
-import androidx.databinding.ObservableArrayList
 import com.skoumal.teanity.databinding.ComparableRvItem
 import com.skoumal.teanity.extensions.addOnPropertyChangedCallback
-import com.skoumal.teanity.extensions.doOnSuccessUi
+import com.skoumal.teanity.extensions.doOnSubscribeUi
 import com.skoumal.teanity.extensions.subscribeK
 import com.skoumal.teanity.util.DiffObservableList
 import com.skoumal.teanity.util.KObservableField
@@ -12,14 +11,14 @@ import com.skoumal.teanity.viewevents.SnackbarEvent
 import com.topjohnwu.magisk.BR
 import com.topjohnwu.magisk.Const
 import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.data.database.MagiskDB
-import com.topjohnwu.magisk.model.entity.recycler.*
+import com.topjohnwu.magisk.data.repository.LogRepository
+import com.topjohnwu.magisk.model.entity.recycler.ConsoleRvItem
+import com.topjohnwu.magisk.model.entity.recycler.LogItemRvItem
+import com.topjohnwu.magisk.model.entity.recycler.LogRvItem
+import com.topjohnwu.magisk.model.entity.recycler.MagiskLogRvItem
 import com.topjohnwu.magisk.model.events.PageChangedEvent
 import com.topjohnwu.magisk.ui.base.MagiskViewModel
-import com.topjohnwu.magisk.utils.toSingle
-import com.topjohnwu.magisk.utils.zip
 import com.topjohnwu.superuser.Shell
-import io.reactivex.Single
 import me.tatarka.bindingcollectionadapter2.BindingViewPagerAdapter
 import me.tatarka.bindingcollectionadapter2.OnItemBind
 import java.io.File
@@ -28,7 +27,7 @@ import java.util.*
 
 class LogViewModel(
     private val resources: Resources,
-    private val database: MagiskDB
+    private val logRepo: LogRepository
 ) : MagiskViewModel(), BindingViewPagerAdapter.PageTitles<ComparableRvItem<*>> {
 
     val items = DiffObservableList(ComparableRvItem.callback)
@@ -58,9 +57,10 @@ class LogViewModel(
         else -> ""
     }
 
-    fun refresh() = zip(updateLogs(), updateMagiskLog()) { _, _ -> true }
-        .subscribeK()
-        .add()
+    fun refresh() {
+        fetchLogs().subscribeK { logItem.update(it) }
+        fetchMagiskLog().subscribeK { magiskLogItem.update(it) }
+    }
 
     fun saveLog() {
         val now = Calendar.getInstance()
@@ -88,35 +88,25 @@ class LogViewModel(
         else -> Unit
     }
 
-    private fun clearLogs(callback: () -> Unit) {
-        Single.fromCallable { database.clearLogs() }
-            .subscribeK {
-                SnackbarEvent(R.string.logs_cleared).publish()
-                callback()
-            }
-            .add()
-    }
+    private fun clearLogs(callback: () -> Unit) = logRepo.clearLogs()
+        .doOnSubscribeUi(callback)
+        .subscribeK { SnackbarEvent(R.string.logs_cleared).publish() }
+        .add()
 
-    private fun clearMagiskLogs(callback: () -> Unit) {
-        Shell.su("echo -n > " + Const.MAGISK_LOG).submit {
-            SnackbarEvent(R.string.logs_cleared).publish()
-            callback()
-        }
-    }
+    private fun clearMagiskLogs(callback: () -> Unit) = logRepo.clearMagiskLogs()
+        .ignoreElement()
+        .doOnComplete(callback)
+        .subscribeK { SnackbarEvent(R.string.logs_cleared).publish() }
+        .add()
 
-    private fun updateLogs() = Single.fromCallable { database.logs }
+    private fun fetchLogs() = logRepo.fetchLogs()
         .flattenAsFlowable { it }
-        .map { it.map { LogItemEntryRvItem(it) } }
-        .map { LogItemRvItem(ObservableArrayList<ComparableRvItem<*>>().apply { addAll(it) }) }
+        .map { LogItemRvItem(it) }
         .toList()
-        .doOnSuccessUi { logItem.update(it) }
 
-    private fun updateMagiskLog() = Shell.su("tail -n 5000 ${Const.MAGISK_LOG}").toSingle()
-        .map { it.exec() }
-        .map { it.out }
+    private fun fetchMagiskLog() = logRepo.fetchMagiskLogs()
         .flattenAsFlowable { it }
         .map { ConsoleRvItem(it) }
         .toList()
-        .doOnSuccessUi { magiskLogItem.update(it) }
 
 }