MarcoBuster/Magisk
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Copy instead of move

Browse Source 
We might be copying from CE to DE storage, which cannot be moved
This commit is contained in:
topjohnwu 2019-10-23 17:20:55 -04:00
parent 7f971f7173
commit 294db93fde
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/com/topjohnwu/magisk/model/download/DownloadService.kt
View File

@ -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.*
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() {
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)