From 6bd400665211974ec6b716edebad413fac3f4262 Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Fri, 28 Aug 2020 04:50:46 -0700
Subject: [PATCH] Rename method

---
 .../com/topjohnwu/magisk/core/download/DownloadService.kt   | 2 +-
 .../java/com/topjohnwu/magisk/events/dialog/EnvFixDialog.kt | 2 +-
 .../topjohnwu/magisk/events/dialog/ManagerInstallDialog.kt  | 2 +-
 .../topjohnwu/magisk/events/dialog/ModuleInstallDialog.kt   | 2 +-
 .../com/topjohnwu/magisk/events/dialog/UninstallDialog.kt   | 2 +-
 .../com/topjohnwu/magisk/ui/install/InstallViewModel.kt     | 6 ++++--
 .../com/topjohnwu/magisk/ui/settings/SettingsViewModel.kt   | 2 +-
 7 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/topjohnwu/magisk/core/download/DownloadService.kt b/app/src/main/java/com/topjohnwu/magisk/core/download/DownloadService.kt
index c07b553d9..67708b47e 100644
--- a/app/src/main/java/com/topjohnwu/magisk/core/download/DownloadService.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/core/download/DownloadService.kt
@@ -100,7 +100,7 @@ open class DownloadService : BaseDownloader() {
             }
         }
 
-        operator fun invoke(context: Context, subject: Subject) {
+        fun start(context: Context, subject: Subject) {
             val app = context.applicationContext
             if (Build.VERSION.SDK_INT >= 26) {
                 app.startForegroundService(intent(app, subject))
diff --git a/app/src/main/java/com/topjohnwu/magisk/events/dialog/EnvFixDialog.kt b/app/src/main/java/com/topjohnwu/magisk/events/dialog/EnvFixDialog.kt
index a1aa206ba..d47869265 100644
--- a/app/src/main/java/com/topjohnwu/magisk/events/dialog/EnvFixDialog.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/events/dialog/EnvFixDialog.kt
@@ -31,7 +31,7 @@ class EnvFixDialog : DialogEvent() {
                         lbm.unregisterReceiver(this)
                     }
                 }, IntentFilter(DISMISS))
-                DownloadService(dialog.context, Magisk(EnvFix))
+                DownloadService.start(dialog.context, Magisk(EnvFix))
             }
         }
         .applyButton(MagiskDialog.ButtonType.NEGATIVE) {
diff --git a/app/src/main/java/com/topjohnwu/magisk/events/dialog/ManagerInstallDialog.kt b/app/src/main/java/com/topjohnwu/magisk/events/dialog/ManagerInstallDialog.kt
index 52eeec6a9..871fa88e8 100644
--- a/app/src/main/java/com/topjohnwu/magisk/events/dialog/ManagerInstallDialog.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/events/dialog/ManagerInstallDialog.kt
@@ -25,7 +25,7 @@ class ManagerInstallDialog : DialogEvent() {
 
             applyButton(MagiskDialog.ButtonType.POSITIVE) {
                 titleRes = R.string.install
-                onClick { DownloadService(context, subject) }
+                onClick { DownloadService.start(context, subject) }
             }
 
             if (Info.remote.app.note.isEmpty()) return
diff --git a/app/src/main/java/com/topjohnwu/magisk/events/dialog/ModuleInstallDialog.kt b/app/src/main/java/com/topjohnwu/magisk/events/dialog/ModuleInstallDialog.kt
index 3d5a465cb..56f679d8f 100644
--- a/app/src/main/java/com/topjohnwu/magisk/events/dialog/ModuleInstallDialog.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/events/dialog/ModuleInstallDialog.kt
@@ -15,7 +15,7 @@ class ModuleInstallDialog(private val item: Repo) : DialogEvent() {
             fun download(install: Boolean) {
                 val config = if (install) Action.Flash.Primary else Action.Download
                 val subject = Subject.Module(item, config)
-                DownloadService(context, subject)
+                DownloadService.start(context, subject)
             }
 
             applyTitle(context.getString(R.string.repo_install_title, item.name))
diff --git a/app/src/main/java/com/topjohnwu/magisk/events/dialog/UninstallDialog.kt b/app/src/main/java/com/topjohnwu/magisk/events/dialog/UninstallDialog.kt
index 17475aea4..27428d5e8 100644
--- a/app/src/main/java/com/topjohnwu/magisk/events/dialog/UninstallDialog.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/events/dialog/UninstallDialog.kt
@@ -47,7 +47,7 @@ class UninstallDialog : DialogEvent() {
     }
 
     private fun completeUninstall() {
-        DownloadService(dialog.context, Subject.Magisk(Action.Uninstall))
+        DownloadService.start(dialog.context, Subject.Magisk(Action.Uninstall))
     }
 
 }
diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/install/InstallViewModel.kt b/app/src/main/java/com/topjohnwu/magisk/ui/install/InstallViewModel.kt
index c2c32f423..d34dc667e 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ui/install/InstallViewModel.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/install/InstallViewModel.kt
@@ -78,8 +78,10 @@ class InstallViewModel(
         step = nextStep
     }
 
-    fun install() =
-        DownloadService(get(), Subject.Magisk(resolveAction())).also { state = State.LOADING }
+    fun install() {
+        DownloadService.start(get(), Subject.Magisk(resolveAction()))
+        state = State.LOADING
+    }
 
     // ---
 
diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsViewModel.kt b/app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsViewModel.kt
index 4b1d60c55..424819b21 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsViewModel.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsViewModel.kt
@@ -145,7 +145,7 @@ class SettingsViewModel(
     }
 
     private fun restoreManager() {
-        DownloadService(get(), Subject.Manager(Action.APK.Restore))
+        DownloadService.start(get(), Subject.Manager(Action.APK.Restore))
     }
 
 }