ReVanced/revanced-manager-compose-old
1
0
Fork 0
mirror of https://github.com/revanced/revanced-manager-compose-old.git synced 2025-04-30 14:34:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: duplicate dex entries

Browse Source
This commit is contained in:
Canny 2022-09-18 19:21:36 +03:00
parent d12e7721af
commit 4b796f75ee
No known key found for this signature in database
GPG Key ID: 395CCB0AA979F27B
2 changed files with 81 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

159
app/src/main/java/app/revanced/manager/patcher/worker/PatcherWorker.kt
View File

@ -24,10 +24,13 @@ import app.revanced.manager.ui.Resource
import app.revanced.patcher.Patcher import app.revanced.patcher.Patcher
import app.revanced.patcher.PatcherOptions import app.revanced.patcher.PatcherOptions
import app.revanced.patcher.data.Data import app.revanced.patcher.data.Data
import app.revanced.patcher.extensions.PatchExtensions.dependencies
import app.revanced.patcher.extensions.PatchExtensions.patchName import app.revanced.patcher.extensions.PatchExtensions.patchName
import app.revanced.patcher.logging.Logger import app.revanced.patcher.logging.Logger
import app.revanced.patcher.patch.Patch import app.revanced.patcher.patch.Patch
import app.revanced.patcher.patch.impl.ResourcePatch
import java.io.File import java.io.File
import java.nio.file.Files
class PatcherWorker(context: Context, parameters: WorkerParameters) : class PatcherWorker(context: Context, parameters: WorkerParameters) :
CoroutineWorker(context, parameters) { CoroutineWorker(context, parameters) {
@ -77,99 +80,97 @@ class PatcherWorker(context: Context, parameters: WorkerParameters) :
private fun runPatcher( private fun runPatcher(
workdir: File workdir: File
): Boolean { ): Boolean {
val aaptPath = Aapt.binary(applicationContext).absolutePath val aaptPath = Aapt.binary(applicationContext).absolutePath
val frameworkPath = val frameworkPath =
applicationContext.filesDir.resolve("framework").also { it.mkdirs() }.absolutePath applicationContext.filesDir.resolve("framework").also { it.mkdirs() }.absolutePath
Log.d(tag, "Checking prerequisites") Log.d(tag, "Checking prerequisites")
val patches = findPatchesByIds(selectedPatches) val patches = findPatchesByIds(selectedPatches)
if (patches.isEmpty()) return true if (patches.isEmpty()) return true
Log.d(tag, "Creating directories") Log.d(tag, "Creating directories")
File(inputData.getString("input")!!).copyTo( File(inputData.getString("input")!!).copyTo(
applicationContext.filesDir.resolve("base.apk"), applicationContext.filesDir.resolve("base.apk"),
true true
)
val inputFile = File(applicationContext.filesDir, "base.apk")
val patchedFile = File(workdir, "patched.apk")
val outputFile = File(applicationContext.filesDir, "out.apk")
val cacheDirectory = workdir.resolve("cache")
val integrations = workdir.resolve("integrations.apk")
try {
Log.d(tag, "Creating patcher")
val patcher = Patcher( // start patcher
PatcherOptions(
inputFile,
cacheDirectory.absolutePath,
patchResources = false,
aaptPath = aaptPath,
frameworkFolderLocation = frameworkPath,
logger = object : Logger {
override fun error(msg: String) {
Log.e(tag, msg)
}
override fun warn(msg: String) {
Log.w(tag, msg)
}
override fun info(msg: String) {
Log.i(tag, msg)
}
override fun trace(msg: String) {
Log.v(tag, msg)
}
}
)
) )
val inputFile = File(applicationContext.filesDir, "base.apk")
val patchedFile = File(workdir, "patched.apk")
val outputFile = File(applicationContext.filesDir, "out.apk")
val cacheDirectory = workdir.resolve("cache")
val integrations = workdir.resolve("integrations.apk")
try {
Log.d(tag, "Creating patcher")
val patcher = Patcher(
PatcherOptions(
inputFile,
cacheDirectory.absolutePath,
patchResources = false,
aaptPath = aaptPath,
frameworkFolderLocation = frameworkPath,
logger = object : Logger {
override fun error(msg: String) {
Log.e(tag, msg)
}
override fun warn(msg: String) { Log.d(tag, "Adding ${patches.size} patch(es)")
Log.w(tag, msg) patcher.addPatches(patches)
}
override fun info(msg: String) { // patcher.addFiles(listOf(integrations)) {}
Log.i(tag, msg)
}
override fun trace(msg: String) { patcher.applyPatches().forEach { (patch, result) ->
Log.v(tag, msg) if (result.isSuccess) {
} Log.i(tag, "[success] $patch")
} return@forEach
)
)
Log.d(tag, "Adding ${patches.size} patch(es)")
patcher.addPatches(patches)
Log.d(tag, "Applying patches")
patcher.applyPatches().forEach { (patch, result) ->
if (result.isSuccess) {
Log.i(tag, "[success] $patch")
return@forEach
}
Log.e(tag, "[error] $patch:", result.exceptionOrNull()!!)
} }
Log.d(tag, "Saving file") Log.e(tag, "[error] $patch:", result.exceptionOrNull()!!)
val result = patcher.save() // this function uses quite a bit of resources
ZipFile(patchedFile).use { fs ->
result.dexFiles.forEach { it ->
Log.d(tag, "Writing dex file ${it.name}")
fs.addEntryCompressData(
ZipEntry.createWithName(it.name),
it.stream.readBytes()
)
result.resourceFile?.let {
fs.copyEntriesFromFileAligned(ZipFile(it), ZipAligner::getEntryAlignment)
}
fs.copyEntriesFromFileAligned(ZipFile(inputFile), ZipAligner::getEntryAlignment)
}
}
Log.d(tag, "Signing apk")
Signer("ReVanced", "s3cur3p@ssw0rd").signApk(patchedFile, outputFile)
Log.i(tag, "Successfully patched into $outputFile")
} finally {
Log.d(tag, "Deleting workdir")
workdir.deleteRecursively()
} }
return false Log.d(tag, "Saving file")
val result = patcher.save() // compile apk
if (patchedFile.exists()) Files.delete(patchedFile.toPath())
ZipFile(patchedFile).use { fs -> // somehow this function is the most resource intensive
result.dexFiles.forEach { Log.d(tag, "Writing dex file ${it.name}")
fs.addEntryCompressData(ZipEntry.createWithName(it.name), it.stream.readBytes())}
result.resourceFile?.let {
fs.copyEntriesFromFileAligned(ZipFile(it), ZipAligner::getEntryAlignment)
}
fs.copyEntriesFromFileAligned(ZipFile(inputFile), ZipAligner::getEntryAlignment)
}
Signer("ReVanced", "s3cur3p@ssw0rd").signApk(patchedFile, outputFile)
Log.i(tag, "Successfully patched into $outputFile")
} finally {
Log.d(tag, "Deleting workdir")
// workdir.deleteRecursively()
} }
return false
}
private fun findPatchesByIds(ids: Iterable<String>): List<Class<out Patch<Data>>> { private fun findPatchesByIds(ids: Iterable<String>): List<Class<out Patch<Data>>> {
val (patches) = patches.value as? Resource.Success ?: return listOf() val (patches) = patches.value as? Resource.Success ?: return listOf()
return patches.filter { patch -> ids.any { it == patch.patchName } } return patches.filter { patch -> ids.any { it == patch.patchName } }
} }
} }

2
app/src/main/java/app/revanced/manager/ui/viewmodel/PatcherViewModel.kt
View File

@ -144,7 +144,7 @@ class PatcherViewModel(private val app: Application, private val api: API) : Vie
.setInputData( .setInputData(
androidx.work.Data.Builder() androidx.work.Data.Builder()
.putString("workdir", workdir.toString()) .putString("workdir", workdir.toString())
.put("input", .putString("input",
getSelectedPackageInfo()?.applicationInfo?.publicSourceDir getSelectedPackageInfo()?.applicationInfo?.publicSourceDir
) )
.build()).build() .build()).build()