Commit 294db93f authored by topjohnwu's avatar topjohnwu

Copy instead of move

We might be copying from CE to DE storage, which cannot be moved
parent 7f971f71
...@@ -13,6 +13,7 @@ import com.topjohnwu.magisk.extensions.chooser ...@@ -13,6 +13,7 @@ import com.topjohnwu.magisk.extensions.chooser
import com.topjohnwu.magisk.extensions.exists import com.topjohnwu.magisk.extensions.exists
import com.topjohnwu.magisk.extensions.provide import com.topjohnwu.magisk.extensions.provide
import com.topjohnwu.magisk.intent import com.topjohnwu.magisk.intent
import com.topjohnwu.magisk.isRunningAsStub
import com.topjohnwu.magisk.model.entity.internal.Configuration.* import com.topjohnwu.magisk.model.entity.internal.Configuration.*
import com.topjohnwu.magisk.model.entity.internal.Configuration.Flash.Secondary import com.topjohnwu.magisk.model.entity.internal.Configuration.Flash.Secondary
import com.topjohnwu.magisk.model.entity.internal.DownloadSubject import com.topjohnwu.magisk.model.entity.internal.DownloadSubject
...@@ -20,7 +21,6 @@ import com.topjohnwu.magisk.model.entity.internal.DownloadSubject.* ...@@ -20,7 +21,6 @@ import com.topjohnwu.magisk.model.entity.internal.DownloadSubject.*
import com.topjohnwu.magisk.ui.flash.FlashActivity import com.topjohnwu.magisk.ui.flash.FlashActivity
import com.topjohnwu.magisk.utils.APKInstall import com.topjohnwu.magisk.utils.APKInstall
import com.topjohnwu.magisk.utils.DynAPK import com.topjohnwu.magisk.utils.DynAPK
import com.topjohnwu.magisk.isRunningAsStub
import org.koin.core.get import org.koin.core.get
import java.io.File import java.io.File
import kotlin.random.Random.Default.nextInt import kotlin.random.Random.Default.nextInt
...@@ -67,7 +67,8 @@ open class DownloadService : RemoteFileService() { ...@@ -67,7 +67,8 @@ open class DownloadService : RemoteFileService() {
when (subject.configuration) { when (subject.configuration) {
is APK.Upgrade -> { is APK.Upgrade -> {
if (isRunningAsStub) { if (isRunningAsStub) {
subject.file.renameTo(DynAPK.update(this)) subject.file.copyTo(DynAPK.update(this), overwrite = true)
subject.file.delete()
ProcessPhoenix.triggerRebirth(this) ProcessPhoenix.triggerRebirth(this)
} else { } else {
APKInstall.install(this, subject.file) APKInstall.install(this, subject.file)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment