OnDemandModuleManager: InstallSession.State now contains downloadedBytes
authorDa Risk <da_risk@geekorum.com>
Fri, 31 May 2019 16:03:17 -0700
changeset 204 399c96f80d44
parent 203 e7edb332d468
child 205 c048ba6682f9
OnDemandModuleManager: InstallSession.State now contains downloadedBytes
app/src/google/java/com/geekorum/ttrss/PlayStoreModuleManager.kt
app/src/main/java/com/geekorum/ttrss/features_manager/ImmutableModuleManager.kt
app/src/main/java/com/geekorum/ttrss/features_manager/InstallModuleViewModel.kt
app/src/main/java/com/geekorum/ttrss/features_manager/OnDemandModuleManager.kt
--- a/app/src/google/java/com/geekorum/ttrss/PlayStoreModuleManager.kt	Thu May 30 18:55:36 2019 -0700
+++ b/app/src/google/java/com/geekorum/ttrss/PlayStoreModuleManager.kt	Fri May 31 16:03:17 2019 -0700
@@ -146,7 +146,7 @@
         SplitInstallSessionStatus.CANCELED -> InstallSession.State.Status.CANCELED
         else -> TODO("unhandled status $status")
     }
-    return InstallSession.State(status)
+    return InstallSession.State(status, bytesDownloaded(), totalBytesToDownload())
 }
 
 
--- a/app/src/main/java/com/geekorum/ttrss/features_manager/ImmutableModuleManager.kt	Thu May 30 18:55:36 2019 -0700
+++ b/app/src/main/java/com/geekorum/ttrss/features_manager/ImmutableModuleManager.kt	Fri May 31 16:03:17 2019 -0700
@@ -60,7 +60,7 @@
  * An InstallSession for an pre installed module
  */
 internal class CompleteSession(id: Int) : InstallSession(id) {
-    private val state = State(State.Status.INSTALLED)
+    private val state = State(State.Status.INSTALLED, 0, 0)
 
     override suspend fun getSessionState(): State = state
 
@@ -88,7 +88,8 @@
  */
 
 private class FailedSession(id: Int) : InstallSession(id) {
-    private val state = State(State.Status.FAILED)
+
+    private val state = State(State.Status.FAILED, 0, 0)
 
     override suspend fun getSessionState(): State = state
 
--- a/app/src/main/java/com/geekorum/ttrss/features_manager/InstallModuleViewModel.kt	Thu May 30 18:55:36 2019 -0700
+++ b/app/src/main/java/com/geekorum/ttrss/features_manager/InstallModuleViewModel.kt	Fri May 31 16:03:17 2019 -0700
@@ -20,10 +20,12 @@
  */
 package com.geekorum.ttrss.features_manager
 
+import androidx.annotation.StringRes
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.liveData
+import androidx.lifecycle.map
 import androidx.lifecycle.viewModelScope
 import kotlinx.coroutines.async
 import timber.log.Timber
--- a/app/src/main/java/com/geekorum/ttrss/features_manager/OnDemandModuleManager.kt	Thu May 30 18:55:36 2019 -0700
+++ b/app/src/main/java/com/geekorum/ttrss/features_manager/OnDemandModuleManager.kt	Fri May 31 16:03:17 2019 -0700
@@ -79,7 +79,9 @@
     }
 
     data class State(
-        val status: Status
+        val status: Status,
+        val bytesDownloaded: Long,
+        val totalBytesDownloaded: Long
     ) {
         enum class Status {
             PENDING,