mobi/seedvault
1
0
Fork 0
Code Pull requests Activity

Adjust code for new library versions

Browse source
This commit is contained in:
Torsten Grote 2024-03-06 11:22:44 -03:00 • committed by Chirayu Desai
parent 9c7f4cb191
commit c33486ee00
3 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/com/stevesoltys/seedvault/restore/RestoreViewModel.kt
View file

@ -15,8 +15,8 @@ import androidx.annotation.UiThread
import androidx.annotation.WorkerThread
import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.Transformations.switchMap
import androidx.lifecycle.asLiveData
import androidx.lifecycle.switchMap
import androidx.lifecycle.viewModelScope
import com.stevesoltys.seedvault.BackupMonitor
import com.stevesoltys.seedvault.MAGIC_PACKAGE_MANAGER
@ -100,7 +100,7 @@ internal class RestoreViewModel(
internal val chosenRestorableBackup: LiveData<RestorableBackup> get() = mChosenRestorableBackup
internal val installResult: LiveData<InstallResult> =
switchMap(mChosenRestorableBackup) { backup ->
mChosenRestorableBackup.switchMap { backup ->
getInstallResult(backup)
}
internal val installIntentCreator by lazy { InstallIntentCreator(app.packageManager) }

4
app/src/main/java/com/stevesoltys/seedvault/settings/SettingsViewModel.kt
View file

@ -21,8 +21,8 @@ import androidx.annotation.UiThread
import androidx.core.content.ContextCompat.startForegroundService
import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.Transformations.switchMap
import androidx.lifecycle.liveData
import androidx.lifecycle.switchMap
import androidx.lifecycle.viewModelScope
import androidx.recyclerview.widget.DiffUtil.calculateDiff
import com.stevesoltys.seedvault.BackupWorker
@ -69,7 +69,7 @@ internal class SettingsViewModel(
internal val lastBackupTime = metadataManager.lastBackupTime
private val mAppStatusList = switchMap(lastBackupTime) {
private val mAppStatusList = lastBackupTime.switchMap {
// updates app list when lastBackupTime changes
getAppStatusResult()
}

8
app/src/main/java/com/stevesoltys/seedvault/ui/LiveEvent.kt
View file

@ -25,11 +25,9 @@ open class LiveEvent<T> : LiveData<ConsumableEvent<T>>() {
internal class LiveEventObserver<T>(private val handler: LiveEventHandler<in T>) :
Observer<ConsumableEvent<T>> {
override fun onChanged(consumableEvent: ConsumableEvent<T>?) {
if (consumableEvent != null) {
val content = consumableEvent.contentIfNotConsumed
if (content != null) handler.onEvent(content)
}
override fun onChanged(value: ConsumableEvent<T>) {
val content = value.contentIfNotConsumed
if (content != null) handler.onEvent(content)
}
}