Cleanup DownloadService

app/src/main/java/com/topjohnwu/magisk/ui/install/InstallFragment.kt

@@ -4,6 +4,7 @@ import android.content.Intent
 import androidx.lifecycle.viewModelScope
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.arch.BaseUIFragment
+import com.topjohnwu.magisk.core.download.BaseDownloadService
 import com.topjohnwu.magisk.databinding.FragmentInstallMd2Binding
 import com.topjohnwu.magisk.events.RequestFileEvent
 import org.koin.androidx.viewmodel.ext.android.viewModel
@@ -24,6 +25,7 @@ class InstallFragment : BaseUIFragment<InstallViewModel, FragmentInstallMd2Bindi
 
         // Allow markwon to run in viewmodel scope
         binding.releaseNotes.tag = viewModel.viewModelScope
+        BaseDownloadService.observeProgress(this, viewModel::onProgressUpdate)
     }
 
 }

app/src/main/java/com/topjohnwu/magisk/ui/install/InstallViewModel.kt

@@ -11,7 +11,6 @@ import com.topjohnwu.magisk.core.Info
 import com.topjohnwu.magisk.core.download.Configuration
 import com.topjohnwu.magisk.core.download.DownloadService
 import com.topjohnwu.magisk.core.download.DownloadSubject
-import com.topjohnwu.magisk.core.download.RemoteFileService
 import com.topjohnwu.magisk.data.repository.StringRepository
 import com.topjohnwu.magisk.events.RequestFileEvent
 import com.topjohnwu.magisk.events.dialog.SecondSlotWarningDialog
@@ -60,22 +59,21 @@ class InstallViewModel(
         set(value) = set(value, field, { field = it }, BR.notes)
 
     init {
-        RemoteFileService.reset()
-        RemoteFileService.progressBroadcast.observeForever {
-            val (progress, subject) = it ?: return@observeForever
-            if (subject !is DownloadSubject.Magisk) {
-                return@observeForever
-            }
-            this.progress = progress.times(100).roundToInt()
-            if (this.progress >= 100) {
-                state = State.LOADED
-            }
-        }
         viewModelScope.launch {
             notes = stringRepo.getString(Info.remote.magisk.note)
         }
     }
 
+    fun onProgressUpdate(progress: Float, subject: DownloadSubject) {
+        if (subject !is DownloadSubject.Magisk) {
+            return
+        }
+        this.progress = progress.times(100).roundToInt()
+        if (this.progress >= 100) {
+            state = State.LOADED
+        }
+    }
+
     fun step(nextStep: Int) {
         step = nextStep
     }