diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
index 10d81d8..6b2286d 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -6,12 +6,72 @@ body:
- type: markdown
attributes:
value: |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
# ReVanced Library bug report
- Please check for existing bug reports
- [here](https://github.com/ReVanced/revanced-library/labels/Bug%20report)
- before creating a new one.
+ Before creating a new bug report, please keep the following in mind:
+ - **Do not submit a duplicate bug report**: You can review existing bug reports [here](https://github.com/ReVanced/revanced-library/labels/Bug%20report).
+ - **Do not use the issue page for support**: If you need help or have questions, check out other platforms on [revanced.app](https://revanced.app).
- type: textarea
attributes:
label: Bug description
@@ -19,7 +79,6 @@ body:
- Describe your bug in detail
- Add steps to reproduce the bug if possible (Step 1. ... Step 2. ...)
- Add images and videos if possible
- - List used patches if applicable
validations:
required: true
- type: textarea
@@ -39,11 +98,12 @@ body:
id: acknowledgements
attributes:
label: Acknowledgements
- description: Your issue will be closed if you don't follow the checklist below.
+ description: Your bug report will be closed if you don't follow the checklist below.
options:
- - label: This request is not a duplicate of an existing issue.
+ - label: This issue is not a duplicate of an existing bug report.
required: true
- label: I have chosen an appropriate title.
required: true
- label: All requested information has been provided properly.
required: true
+
diff --git a/.github/ISSUE_TEMPLATE/feature-request.yml b/.github/ISSUE_TEMPLATE/feature-request.yml
index 434ac1c..6ec076b 100644
--- a/.github/ISSUE_TEMPLATE/feature-request.yml
+++ b/.github/ISSUE_TEMPLATE/feature-request.yml
@@ -6,12 +6,73 @@ body:
- type: markdown
attributes:
value: |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
# ReVanced Library feature request
- Please check for existing feature requests
- [here](https://github.com/ReVanced/revanced-library/labels/Feature%20request)
- before creating a new one.
+ Before creating a new feature request, please keep the following in mind:
+ - **Do not submit a duplicate feature request**: You can review existing feature requests [here](https://github.com/ReVanced/revanced-library/labels/Feature%20request).
+ - **Review the contribution guidelines**: Make sure your bug report adheres to it. You can find the guidelines [here](https://github.com/ReVanced/revanced-library/blob/main/CONTRIBUTING.md).
+ - **Do not use the issue page for support**: If you need help or have questions, check out other platforms on [revanced.app](https://revanced.app).
- type: textarea
attributes:
label: Feature description
@@ -35,9 +96,9 @@ body:
id: acknowledgements
attributes:
label: Acknowledgements
- description: Your issue will be closed if you don't follow the checklist below.
+ description: Your feature request will be closed if you don't follow the checklist below.
options:
- - label: This request is not a duplicate of an existing issue.
+ - label: This issue is not a duplicate of an existing feature request.
required: true
- label: I have chosen an appropriate title.
required: true
diff --git a/.github/config.yml b/.github/config.yml
index 09ed019..075f56b 100644
--- a/.github/config.yml
+++ b/.github/config.yml
@@ -1,2 +1,2 @@
firstPRMergeComment: >
- Thank you for contributing to ReVanced. Join us on [Discord](https://revanced.app/discord) if you want to receive a contributor role.
+ Thank you for contributing to ReVanced. Join us on [Discord](https://revanced.app/discord) to receive a role for your contribution.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 54a2e8b..1d5cc08 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -23,23 +23,26 @@ jobs:
# https://github.com/cycjimmy/semantic-release-action#private-packages
persist-credentials: false
fetch-depth: 0
- - name: Cache
+
+ - name: Cache Node modules
uses: actions/cache@v3
with:
path: |
- ${{ runner.home }}/.gradle/caches
- ${{ runner.home }}/.gradle/wrapper
- .gradle
- build
node_modules
- key: ${{ runner.os }}-gradle-npm-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties', 'package-lock.json') }}
+ key: npm-${{ hashFiles('package-lock.json') }}
+
+ - name: Cache Gradle
+ uses: burrunan/gradle-cache-action@v1
+
- name: Build
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# Cleaning is necessary to avoid uploading two identical artifacts with different versions
run: ./gradlew clean --no-daemon
+
- name: Setup semantic-release
run: npm install
+
- name: Release
env:
GITHUB_TOKEN: ${{ secrets.REPOSITORY_PUSH_ACCESS }}
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index 188fb70..75b8e67 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -16,6 +16,7 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v4
+
- name: Open pull request
uses: repo-sync/pull-request@v2
with:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b47b077..15f9944 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,23 @@
+# [1.3.0-dev.1](https://github.com/ReVanced/revanced-library/compare/v1.2.1-dev.1...v1.3.0-dev.1) (2023-11-26)
+
+
+### Bug Fixes
+
+* Delete mount script ([4fe0fb0](https://github.com/ReVanced/revanced-library/commit/4fe0fb0a617082b24199331671193e4fa7f485e2))
+
+
+### Features
+
+* Increase certainty of the possibility to mount ([10f8cd1](https://github.com/ReVanced/revanced-library/commit/10f8cd1470fd29cfefe53bf00a4a014f71a3f706))
+* Select first Adb device, if none supplied automatically ([1a5f868](https://github.com/ReVanced/revanced-library/commit/1a5f868ecd0d278d574c12664ee95139c2423c17))
+
+## [1.2.1-dev.1](https://github.com/ReVanced/revanced-library/compare/v1.2.0...v1.2.1-dev.1) (2023-11-13)
+
+
+### Bug Fixes
+
+* Add missing log when calling `UserAdbManager#install` ([90b612b](https://github.com/ReVanced/revanced-library/commit/90b612bee8591c01b8befabde4147c7de7a2a09f))
+
# [1.2.0](https://github.com/ReVanced/revanced-library/compare/v1.1.5...v1.2.0) (2023-11-03)
diff --git a/assets/revanced-headline/revanced-headline-vertical-dark.svg b/assets/revanced-headline/revanced-headline-vertical-dark.svg
new file mode 100644
index 0000000..a59bfb5
--- /dev/null
+++ b/assets/revanced-headline/revanced-headline-vertical-dark.svg
@@ -0,0 +1 @@
+
- ): KeyStore {
+ fun newKeyStore(entries: List): KeyStore {
logger.fine("Creating keystore")
return KeyStore.getInstance("BKS", BouncyCastleProvider.PROVIDER_NAME).apply {
@@ -124,7 +126,7 @@ object ApkSigner {
entry.alias,
entry.privateKeyCertificatePair.privateKey,
entry.password.toCharArray(),
- arrayOf(entry.privateKeyCertificatePair.certificate)
+ arrayOf(entry.privateKeyCertificatePair.certificate),
)
}
}
@@ -140,10 +142,10 @@ object ApkSigner {
fun newKeyStore(
keyStoreOutputStream: OutputStream,
keyStorePassword: String,
- entries: List
+ entries: List,
) = newKeyStore(entries).store(
keyStoreOutputStream,
- keyStorePassword.toCharArray()
+ keyStorePassword.toCharArray(),
) // Save the keystore.
/**
@@ -156,7 +158,7 @@ object ApkSigner {
*/
fun readKeyStore(
keyStoreInputStream: InputStream,
- keyStorePassword: String?
+ keyStorePassword: String?,
): KeyStore {
logger.fine("Reading keystore")
@@ -164,10 +166,11 @@ object ApkSigner {
try {
load(keyStoreInputStream, keyStorePassword?.toCharArray())
} catch (exception: IOException) {
- if (exception.cause is UnrecoverableKeyException)
+ if (exception.cause is UnrecoverableKeyException) {
throw IllegalArgumentException("Invalid keystore password")
- else
+ } else {
throw exception
+ }
}
}
}
@@ -183,20 +186,21 @@ object ApkSigner {
fun newApkSignerBuilder(
privateKeyCertificatePair: PrivateKeyCertificatePair,
signer: String,
- createdBy: String
+ createdBy: String,
): ApkSigner.Builder {
logger.fine(
"Creating new ApkSigner " +
- "with $signer as signer and " +
- "$createdBy as Created-By attribute in the APK's manifest"
+ "with $signer as signer and " +
+ "$createdBy as Created-By attribute in the APK's manifest",
)
// Create the signer config.
- val signerConfig = ApkSigner.SignerConfig.Builder(
- signer,
- privateKeyCertificatePair.privateKey,
- listOf(privateKeyCertificatePair.certificate)
- ).build()
+ val signerConfig =
+ ApkSigner.SignerConfig.Builder(
+ signer,
+ privateKeyCertificatePair.privateKey,
+ listOf(privateKeyCertificatePair.certificate),
+ ).build()
// Create the signer.
return ApkSigner.Builder(listOf(signerConfig)).apply {
@@ -227,10 +231,13 @@ object ApkSigner {
) = newApkSignerBuilder(
readKeyCertificatePair(keyStore, keyStoreEntryAlias, keyStoreEntryPassword),
signer,
- createdBy
+ createdBy,
)
- fun ApkSigner.Builder.signApk(input: File, output: File) {
+ fun ApkSigner.Builder.signApk(
+ input: File,
+ output: File,
+ ) {
logger.info("Signing ${input.name}")
setInputApk(input)
@@ -250,7 +257,7 @@ object ApkSigner {
class KeyStoreEntry(
val alias: String,
val password: String,
- val privateKeyCertificatePair: PrivateKeyCertificatePair = newPrivateKeyCertificatePair()
+ val privateKeyCertificatePair: PrivateKeyCertificatePair = newPrivateKeyCertificatePair(),
)
/**
@@ -263,4 +270,4 @@ object ApkSigner {
val privateKey: PrivateKey,
val certificate: X509Certificate,
)
-}
\ No newline at end of file
+}
diff --git a/src/main/kotlin/app/revanced/library/ApkUtils.kt b/src/main/kotlin/app/revanced/library/ApkUtils.kt
index f208d17..542d2db 100644
--- a/src/main/kotlin/app/revanced/library/ApkUtils.kt
+++ b/src/main/kotlin/app/revanced/library/ApkUtils.kt
@@ -22,7 +22,11 @@ object ApkUtils {
* @param outputFile The apk to write the new entries to.
* @param patchedEntriesSource The result of the patcher to add the patched dex files and resources.
*/
- fun copyAligned(apkFile: File, outputFile: File, patchedEntriesSource: PatcherResult) {
+ fun copyAligned(
+ apkFile: File,
+ outputFile: File,
+ patchedEntriesSource: PatcherResult,
+ ) {
logger.info("Aligning ${apkFile.name}")
outputFile.toPath().deleteIfExists()
@@ -30,13 +34,15 @@ object ApkUtils {
ZipFile(outputFile).use { file ->
patchedEntriesSource.dexFiles.forEach {
file.addEntryCompressData(
- ZipEntry(it.name), it.stream.readBytes()
+ ZipEntry(it.name),
+ it.stream.readBytes(),
)
}
patchedEntriesSource.resourceFile?.let {
file.copyEntriesFromFileAligned(
- ZipFile(it), ZipFile.apkZipEntryAlignment
+ ZipFile(it),
+ ZipFile.apkZipEntryAlignment,
)
}
@@ -44,7 +50,8 @@ object ApkUtils {
// TODO: Fix copying resources that are not needed anymore.
file.copyEntriesFromFileAligned(
- ZipFile(apkFile), ZipFile.apkZipEntryAlignment
+ ZipFile(apkFile),
+ ZipFile.apkZipEntryAlignment,
)
}
}
@@ -62,26 +69,27 @@ object ApkUtils {
signingOptions: SigningOptions,
) {
// Get the keystore from the file or create a new one.
- val keyStore = if (signingOptions.keyStore.exists()) {
- ApkSigner.readKeyStore(signingOptions.keyStore.inputStream(), signingOptions.keyStorePassword)
- } else {
- val entry = ApkSigner.KeyStoreEntry(signingOptions.alias, signingOptions.password)
+ val keyStore =
+ if (signingOptions.keyStore.exists()) {
+ ApkSigner.readKeyStore(signingOptions.keyStore.inputStream(), signingOptions.keyStorePassword)
+ } else {
+ val entry = ApkSigner.KeyStoreEntry(signingOptions.alias, signingOptions.password)
- // Create a new keystore with a new keypair and saves it.
- ApkSigner.newKeyStore(listOf(entry)).also { keyStore ->
- keyStore.store(
- signingOptions.keyStore.outputStream(),
- signingOptions.keyStorePassword?.toCharArray()
- )
+ // Create a new keystore with a new keypair and saves it.
+ ApkSigner.newKeyStore(listOf(entry)).also { keyStore ->
+ keyStore.store(
+ signingOptions.keyStore.outputStream(),
+ signingOptions.keyStorePassword?.toCharArray(),
+ )
+ }
}
- }
ApkSigner.newApkSignerBuilder(
keyStore,
signingOptions.alias,
signingOptions.password,
signingOptions.signer,
- signingOptions.signer
+ signingOptions.signer,
).signApk(apk, output)
}
@@ -101,4 +109,4 @@ object ApkUtils {
val password: String = "",
val signer: String = "ReVanced",
)
-}
\ No newline at end of file
+}
diff --git a/src/main/kotlin/app/revanced/library/Options.kt b/src/main/kotlin/app/revanced/library/Options.kt
index d6fe351..75b1f0e 100644
--- a/src/main/kotlin/app/revanced/library/Options.kt
+++ b/src/main/kotlin/app/revanced/library/Options.kt
@@ -2,7 +2,6 @@
package app.revanced.library
-
import app.revanced.library.Options.Patch.Option
import app.revanced.patcher.PatchClass
import app.revanced.patcher.PatchSet
@@ -25,31 +24,37 @@ object Options {
* @param prettyPrint Whether to pretty print the JSON.
* @return The JSON string containing the options.
*/
- fun serialize(patches: PatchSet, prettyPrint: Boolean = false): String = patches
- .filter { it.options.any() }
- .map { patch ->
- Patch(
- patch.name!!,
- patch.options.values.map { option ->
- val optionValue = try {
- option.value
- } catch (e: PatchOptionException) {
- logger.warning("Using default option value for the ${patch.name} patch: ${e.message}")
- option.default
- }
+ fun serialize(
+ patches: PatchSet,
+ prettyPrint: Boolean = false,
+ ): String =
+ patches
+ .filter { it.options.any() }
+ .map { patch ->
+ Patch(
+ patch.name!!,
+ patch.options.values.map { option ->
+ val optionValue =
+ try {
+ option.value
+ } catch (e: PatchOptionException) {
+ logger.warning("Using default option value for the ${patch.name} patch: ${e.message}")
+ option.default
+ }
- Option(option.key, optionValue)
+ Option(option.key, optionValue)
+ },
+ )
+ }
+ // See https://github.com/revanced/revanced-patches/pull/2434/commits/60e550550b7641705e81aa72acfc4faaebb225e7.
+ .distinctBy { it.patchName }
+ .let {
+ if (prettyPrint) {
+ mapper.writerWithDefaultPrettyPrinter().writeValueAsString(it)
+ } else {
+ mapper.writeValueAsString(it)
}
- )
- }
- // See https://github.com/revanced/revanced-patches/pull/2434/commits/60e550550b7641705e81aa72acfc4faaebb225e7.
- .distinctBy { it.patchName }
- .let {
- if (prettyPrint)
- mapper.writerWithDefaultPrettyPrinter().writeValueAsString(it)
- else
- mapper.writeValueAsString(it)
- }
+ }
/**
* Deserializes the options for the patches in the list.
@@ -70,9 +75,10 @@ object Options {
filter { it.options.any() }.let { patches ->
if (patches.isEmpty()) return
- val jsonPatches = deserialize(json).associate {
- it.patchName to it.options.associate { option -> option.key to option.value }
- }
+ val jsonPatches =
+ deserialize(json).associate {
+ it.patchName to it.options.associate { option -> option.key to option.value }
+ }
patches.forEach { patch ->
jsonPatches[patch.name]?.let { jsonPatchOptions ->
@@ -104,9 +110,8 @@ object Options {
*/
class Patch internal constructor(
val patchName: String,
- val options: List
+ val options: List ,
) {
-
/**
* Data class for patch option.
*
@@ -115,4 +120,4 @@ object Options {
*/
class Option internal constructor(val key: String, val value: Any?)
}
-}
\ No newline at end of file
+}
diff --git a/src/main/kotlin/app/revanced/library/PatchUtils.kt b/src/main/kotlin/app/revanced/library/PatchUtils.kt
index 831b517..716814c 100644
--- a/src/main/kotlin/app/revanced/library/PatchUtils.kt
+++ b/src/main/kotlin/app/revanced/library/PatchUtils.kt
@@ -14,7 +14,10 @@ object PatchUtils {
* @param packageName The name of the compatible package.
* @return The most common version of.
*/
- fun getMostCommonCompatibleVersion(patches: PatchSet, packageName: String) = patches
+ fun getMostCommonCompatibleVersion(
+ patches: PatchSet,
+ packageName: String,
+ ) = patches
.mapNotNull {
// Map all patches to their compatible packages with version constraints.
it.compatiblePackages?.firstOrNull { compatiblePackage ->
@@ -25,4 +28,4 @@ object PatchUtils {
.groupingBy { it }
.eachCount()
.maxByOrNull { it.value }?.key
-}
\ No newline at end of file
+}
diff --git a/src/main/kotlin/app/revanced/library/adb/AdbManager.kt b/src/main/kotlin/app/revanced/library/adb/AdbManager.kt
index 123e4f2..d6d868f 100644
--- a/src/main/kotlin/app/revanced/library/adb/AdbManager.kt
+++ b/src/main/kotlin/app/revanced/library/adb/AdbManager.kt
@@ -3,6 +3,7 @@ package app.revanced.library.adb
import app.revanced.library.adb.AdbManager.Apk
import app.revanced.library.adb.Constants.CREATE_DIR
import app.revanced.library.adb.Constants.DELETE
+import app.revanced.library.adb.Constants.GET_INSTALLED_PATH
import app.revanced.library.adb.Constants.INSTALLATION_PATH
import app.revanced.library.adb.Constants.INSTALL_MOUNT
import app.revanced.library.adb.Constants.INSTALL_PATCHED_APK
@@ -10,7 +11,6 @@ import app.revanced.library.adb.Constants.MOUNT_PATH
import app.revanced.library.adb.Constants.MOUNT_SCRIPT
import app.revanced.library.adb.Constants.PATCHED_APK_PATH
import app.revanced.library.adb.Constants.PLACEHOLDER
-import app.revanced.library.adb.Constants.RESOLVE_ACTIVITY
import app.revanced.library.adb.Constants.RESTART
import app.revanced.library.adb.Constants.TMP_PATH
import app.revanced.library.adb.Constants.UMOUNT
@@ -24,16 +24,24 @@ import java.util.logging.Logger
/**
* Adb manager. Used to install and uninstall [Apk] files.
*
- * @param deviceSerial The serial of the device.
+ * @param deviceSerial The serial of the device. If null, the first connected device will be used.
*/
-sealed class AdbManager private constructor(deviceSerial: String? = null) {
+sealed class AdbManager private constructor(deviceSerial: String?) {
protected val logger: Logger = Logger.getLogger(AdbManager::class.java.name)
- protected val device = JadbConnection().devices.find { device -> device.serial == deviceSerial }
- ?: throw DeviceNotFoundException(deviceSerial)
+ protected val device =
+ with(JadbConnection().devices) {
+ if (isEmpty()) throw DeviceNotFoundException()
+
+ deviceSerial?.let {
+ firstOrNull { it.serial == deviceSerial } ?: throw DeviceNotFoundException(deviceSerial)
+ } ?: first().also {
+ logger.warning("No device serial supplied. Using device with serial ${it.serial}")
+ }
+ }!!
init {
- logger.fine("Established connection to $deviceSerial")
+ logger.fine("Connected to ${device.serial}")
}
/**
@@ -58,18 +66,25 @@ sealed class AdbManager private constructor(deviceSerial: String? = null) {
/**
* Gets an [AdbManager] for the supplied device serial.
*
- * @param deviceSerial The device serial.
+ * @param deviceSerial The device serial. If null, the first connected device will be used.
* @param root Whether to use root or not.
* @return The [AdbManager].
* @throws DeviceNotFoundException If the device can not be found.
*/
- fun getAdbManager(deviceSerial: String, root: Boolean = false): AdbManager =
- if (root) RootAdbManager(deviceSerial) else UserAdbManager(deviceSerial)
+ fun getAdbManager(
+ deviceSerial: String? = null,
+ root: Boolean = false,
+ ): AdbManager = if (root) RootAdbManager(deviceSerial) else UserAdbManager(deviceSerial)
}
- class RootAdbManager internal constructor(deviceSerial: String) : AdbManager(deviceSerial) {
+ /**
+ * Adb manager for rooted devices.
+ *
+ * @param deviceSerial The device serial. If null, the first connected device will be used.
+ */
+ class RootAdbManager internal constructor(deviceSerial: String?) : AdbManager(deviceSerial) {
init {
- if (!device.hasSu()) throw IllegalArgumentException("Root required on $deviceSerial. Task failed")
+ if (!device.hasSu()) throw IllegalArgumentException("Root required on ${device.serial}. Task failed")
}
override fun install(apk: Apk) {
@@ -77,8 +92,8 @@ sealed class AdbManager private constructor(deviceSerial: String? = null) {
val packageName = apk.packageName ?: throw PackageNameRequiredException()
- device.run(RESOLVE_ACTIVITY, packageName).inputStream.bufferedReader().readLine().let { line ->
- if (line != "No activity found") return@let
+ device.run(GET_INSTALLED_PATH, packageName).inputStream.bufferedReader().readLine().let { line ->
+ if (line != null) return@let
throw throw FailedToFindInstalledPackageException(packageName)
}
@@ -103,22 +118,34 @@ sealed class AdbManager private constructor(deviceSerial: String? = null) {
device.run(UMOUNT, packageName)
device.run(DELETE.applyReplacement(PATCHED_APK_PATH), packageName)
- device.run(DELETE, MOUNT_PATH)
+ device.run(DELETE, MOUNT_PATH.applyReplacement(packageName))
device.run(DELETE, TMP_PATH)
+ device.run(RESTART, packageName)
super.uninstall(packageName)
}
companion object Utils {
- private fun JadbDevice.run(command: String, with: String) = run(command.applyReplacement(with))
+ private fun JadbDevice.run(
+ command: String,
+ with: String,
+ ) = run(command.applyReplacement(with))
+
private fun String.applyReplacement(with: String) = replace(PLACEHOLDER, with)
}
}
- class UserAdbManager internal constructor(deviceSerial: String) : AdbManager(deviceSerial) {
+ /**
+ * Adb manager for non-rooted devices.
+ *
+ * @param deviceSerial The device serial. If null, the first connected device will be used.
+ */
+ class UserAdbManager internal constructor(deviceSerial: String?) : AdbManager(deviceSerial) {
private val packageManager = PackageManager(device)
override fun install(apk: Apk) {
+ logger.info("Installing ${apk.file.name}")
+
PackageManager(device).install(apk.file)
super.install(apk)
@@ -141,14 +168,16 @@ sealed class AdbManager private constructor(deviceSerial: String? = null) {
*/
class Apk(val file: File, val packageName: String? = null)
- class DeviceNotFoundException internal constructor(deviceSerial: String?) :
- Exception(deviceSerial?.let {
- "The device with the ADB device serial \"$deviceSerial\" can not be found"
- } ?: "No ADB device found")
+ class DeviceNotFoundException internal constructor(deviceSerial: String? = null) :
+ Exception(
+ deviceSerial?.let {
+ "The device with the ADB device serial \"$deviceSerial\" can not be found"
+ } ?: "No ADB device found",
+ )
class FailedToFindInstalledPackageException internal constructor(packageName: String) :
Exception("Failed to find installed package \"$packageName\" because no activity was found")
class PackageNameRequiredException internal constructor() :
Exception("Package name is required")
-}
\ No newline at end of file
+}
diff --git a/src/main/kotlin/app/revanced/library/adb/Commands.kt b/src/main/kotlin/app/revanced/library/adb/Commands.kt
index 4f7a96a..7db6774 100644
--- a/src/main/kotlin/app/revanced/library/adb/Commands.kt
+++ b/src/main/kotlin/app/revanced/library/adb/Commands.kt
@@ -5,8 +5,10 @@ import se.vidstige.jadb.RemoteFile
import se.vidstige.jadb.ShellProcessBuilder
import java.io.File
-
-internal fun JadbDevice.buildCommand(command: String, su: Boolean = true): ShellProcessBuilder {
+internal fun JadbDevice.buildCommand(
+ command: String,
+ su: Boolean = true,
+): ShellProcessBuilder {
if (su) return shellProcessBuilder("su -c \'$command\'")
val args = command.split(" ") as ArrayList
@@ -15,14 +17,19 @@ internal fun JadbDevice.buildCommand(command: String, su: Boolean = true): Shell
return shellProcessBuilder(cmd, *args.toTypedArray())
}
-internal fun JadbDevice.run(command: String, su: Boolean = true) =
- this.buildCommand(command, su).start()
+internal fun JadbDevice.run(
+ command: String,
+ su: Boolean = true,
+) = this.buildCommand(command, su).start()
-internal fun JadbDevice.hasSu() =
- this.run("whoami", true).waitFor() == 0
+internal fun JadbDevice.hasSu() = this.run("whoami", true).waitFor() == 0
-internal fun JadbDevice.push(file: File, targetFilePath: String) =
- push(file, RemoteFile(targetFilePath))
+internal fun JadbDevice.push(
+ file: File,
+ targetFilePath: String,
+) = push(file, RemoteFile(targetFilePath))
-internal fun JadbDevice.createFile(targetFile: String, content: String) =
- push(content.byteInputStream(), System.currentTimeMillis(), 644, RemoteFile(targetFile))
\ No newline at end of file
+internal fun JadbDevice.createFile(
+ targetFile: String,
+ content: String,
+) = push(content.byteInputStream(), System.currentTimeMillis(), 644, RemoteFile(targetFile))
diff --git a/src/main/kotlin/app/revanced/library/adb/Constants.kt b/src/main/kotlin/app/revanced/library/adb/Constants.kt
index e190fe3..94caabc 100644
--- a/src/main/kotlin/app/revanced/library/adb/Constants.kt
+++ b/src/main/kotlin/app/revanced/library/adb/Constants.kt
@@ -10,11 +10,11 @@ internal object Constants {
internal const val DELETE = "rm -rf $PLACEHOLDER"
internal const val CREATE_DIR = "mkdir -p"
- internal const val RESOLVE_ACTIVITY = "pm resolve-activity --brief $PLACEHOLDER"
- internal const val RESTART = "$RESOLVE_ACTIVITY | tail -n 1 | " +
- "xargs am start -n && kill ${'$'}(pidof -s $PLACEHOLDER)"
+ internal const val RESTART = "am start -S $PLACEHOLDER"
+ internal const val GET_INSTALLED_PATH = "pm path $PLACEHOLDER"
- internal const val INSTALL_PATCHED_APK = "base_path=\"$PATCHED_APK_PATH\" && " +
+ internal const val INSTALL_PATCHED_APK =
+ "base_path=\"$PATCHED_APK_PATH\" && " +
"mv $TMP_PATH ${'$'}base_path && " +
"chmod 644 ${'$'}base_path && " +
"chown system:system ${'$'}base_path && " +
@@ -27,15 +27,17 @@ internal object Constants {
internal val MOUNT_SCRIPT =
"""
- #!/system/bin/sh
- MAGISKTMP="${'$'}(magisk --path)" || MAGISKTMP=/sbin
- MIRROR="${'$'}MAGISKTMP/.magisk/mirror"
- while [ "${'$'}(getprop sys.boot_completed | tr -d '\r')" != "1" ]; do sleep 1; done
-
- base_path="$PATCHED_APK_PATH"
- stock_path=${'$'}( pm path $PLACEHOLDER | grep base | sed 's/package://g' )
+ #!/system/bin/sh
+ MAGISKTMP="${'$'}(magisk --path)" || MAGISKTMP=/sbin
+ MIRROR="${'$'}MAGISKTMP/.magisk/mirror"
- chcon u:object_r:apk_data_file:s0 ${'$'}base_path
- mount -o bind ${'$'}MIRROR${'$'}base_path ${'$'}stock_path
+ until [ "${'$'}(getprop sys.boot_completed)" = 1 ]; do sleep 3; done
+ until [ -d "/sdcard/Android" ]; do sleep 1; done
+
+ base_path="$PATCHED_APK_PATH"
+ stock_path=${'$'}( pm path $PLACEHOLDER | grep base | sed 's/package://g' )
+
+ chcon u:object_r:apk_data_file:s0 ${'$'}base_path
+ mount -o bind ${'$'}MIRROR${'$'}base_path ${'$'}stock_path
""".trimIndent()
}
diff --git a/src/main/kotlin/app/revanced/library/logging/Logger.kt b/src/main/kotlin/app/revanced/library/logging/Logger.kt
index 3216d2c..04669fa 100644
--- a/src/main/kotlin/app/revanced/library/logging/Logger.kt
+++ b/src/main/kotlin/app/revanced/library/logging/Logger.kt
@@ -10,10 +10,11 @@ object Logger {
/**
* Rules for allowed loggers.
*/
- private val allowedLoggersRules = arrayOf Boolean>(
- { startsWith("app.revanced") }, // ReVanced loggers.
- { this == "" } // Logs warnings when compiling resources (Logger in class brut.util.OS).
- )
+ private val allowedLoggersRules =
+ arrayOf Boolean>(
+ { startsWith("app.revanced") }, // ReVanced loggers.
+ { this == "" }, // Logs warnings when compiling resources (Logger in class brut.util.OS).
+ )
private val rootLogger = java.util.logging.Logger.getLogger("")
@@ -48,13 +49,14 @@ object Logger {
fun addHandler(
publishHandler: (log: String, level: Level, loggerName: String?) -> Unit,
flushHandler: () -> Unit,
- closeHandler: () -> Unit
+ closeHandler: () -> Unit,
) = object : Handler() {
- override fun publish(record: LogRecord) = publishHandler(
- formatter.format(record),
- record.level,
- record.loggerName
- )
+ override fun publish(record: LogRecord) =
+ publishHandler(
+ formatter.format(record),
+ record.level,
+ record.loggerName,
+ )
override fun flush() = flushHandler()
@@ -77,10 +79,11 @@ object Logger {
}
log.toByteArray().let {
- if (level.intValue() > Level.WARNING.intValue())
+ if (level.intValue() > Level.WARNING.intValue()) {
System.err.write(it)
- else
+ } else {
System.out.write(it)
+ }
}
}
@@ -91,4 +94,4 @@ object Logger {
addHandler(publishHandler, flushHandler, flushHandler)
}
-}
\ No newline at end of file
+}
diff --git a/src/main/kotlin/app/revanced/library/zip/Extensions.kt b/src/main/kotlin/app/revanced/library/zip/Extensions.kt
index b2a654c..403e899 100644
--- a/src/main/kotlin/app/revanced/library/zip/Extensions.kt
+++ b/src/main/kotlin/app/revanced/library/zip/Extensions.kt
@@ -9,25 +9,34 @@ internal fun UInt.toLittleEndian() =
internal fun UShort.toLittleEndian() = (this.toUInt() shl 16).toLittleEndian().toUShort()
-internal fun UInt.toBigEndian() = (((this.toInt() and 0xff) shl 24) or ((this.toInt() and 0xff00) shl 8)
- or ((this.toInt() and 0x00ff0000) ushr 8) or (this.toInt() ushr 24)).toUInt()
+internal fun UInt.toBigEndian() =
+ (
+ ((this.toInt() and 0xff) shl 24) or ((this.toInt() and 0xff00) shl 8)
+ or ((this.toInt() and 0x00ff0000) ushr 8) or (this.toInt() ushr 24)
+ ).toUInt()
internal fun UShort.toBigEndian() = (this.toUInt() shl 16).toBigEndian().toUShort()
internal fun ByteBuffer.getUShort() = this.getShort().toUShort()
+
internal fun ByteBuffer.getUInt() = this.getInt().toUInt()
internal fun ByteBuffer.putUShort(ushort: UShort) = this.putShort(ushort.toShort())
+
internal fun ByteBuffer.putUInt(uint: UInt) = this.putInt(uint.toInt())
internal fun DataInput.readUShort() = this.readShort().toUShort()
+
internal fun DataInput.readUInt() = this.readInt().toUInt()
internal fun DataOutput.writeUShort(ushort: UShort) = this.writeShort(ushort.toInt())
+
internal fun DataOutput.writeUInt(uint: UInt) = this.writeInt(uint.toInt())
internal fun DataInput.readUShortLE() = this.readUShort().toBigEndian()
+
internal fun DataInput.readUIntLE() = this.readUInt().toBigEndian()
internal fun DataOutput.writeUShortLE(ushort: UShort) = this.writeUShort(ushort.toLittleEndian())
+
internal fun DataOutput.writeUIntLE(uint: UInt) = this.writeUInt(uint.toLittleEndian())
diff --git a/src/main/kotlin/app/revanced/library/zip/ZipFile.kt b/src/main/kotlin/app/revanced/library/zip/ZipFile.kt
index 1b652ec..2063543 100644
--- a/src/main/kotlin/app/revanced/library/zip/ZipFile.kt
+++ b/src/main/kotlin/app/revanced/library/zip/ZipFile.kt
@@ -14,10 +14,11 @@ class ZipFile(file: File) : Closeable {
private var entries: MutableList = mutableListOf()
// Open file for writing if it doesn't exist (because the intention is to write) or is writable.
- private val filePointer: RandomAccessFile = RandomAccessFile(
- file,
- if (!file.exists() || file.canWrite()) "rw" else "r"
- )
+ private val filePointer: RandomAccessFile =
+ RandomAccessFile(
+ file,
+ if (!file.exists() || file.canWrite()) "rw" else "r",
+ )
private var centralDirectoryNeedsRewrite = false
@@ -28,8 +29,9 @@ class ZipFile(file: File) : Closeable {
if (file.length() > 0) {
val endRecord = findEndRecord()
- if (endRecord.diskNumber > 0u || endRecord.totalEntries != endRecord.diskEntries)
+ if (endRecord.diskNumber > 0u || endRecord.totalEntries != endRecord.diskEntries) {
throw IllegalArgumentException("Multi-file archives are not supported")
+ }
entries = readEntries(endRecord).toMutableList()
}
@@ -66,16 +68,17 @@ class ZipFile(file: File) : Closeable {
for (i in 1..numberOfEntries) {
add(
ZipEntry.fromCDE(filePointer).also
- {
- //for some reason the local extra field can be different from the central one
- it.readLocalExtra(
- filePointer.channel.map(
- FileChannel.MapMode.READ_ONLY,
- it.localHeaderOffset.toLong() + 28,
- 2
+ {
+ // for some reason the local extra field can be different from the central one
+ it.readLocalExtra(
+ filePointer.channel.map(
+ FileChannel.MapMode.READ_ONLY,
+ it.localHeaderOffset.toLong() + 28,
+ 2,
+ ),
)
- )
- })
+ },
+ )
}
}
}
@@ -89,20 +92,24 @@ class ZipFile(file: File) : Closeable {
val entriesCount = entries.size.toUShort()
- val endRecord = ZipEndRecord(
- 0u,
- 0u,
- entriesCount,
- entriesCount,
- filePointer.channel.position().toUInt() - centralDirectoryStartOffset,
- centralDirectoryStartOffset,
- ""
- )
+ val endRecord =
+ ZipEndRecord(
+ 0u,
+ 0u,
+ entriesCount,
+ entriesCount,
+ filePointer.channel.position().toUInt() - centralDirectoryStartOffset,
+ centralDirectoryStartOffset,
+ "",
+ )
filePointer.channel.write(endRecord.toECD())
}
- private fun addEntry(entry: ZipEntry, data: ByteBuffer) {
+ private fun addEntry(
+ entry: ZipEntry,
+ data: ByteBuffer,
+ ) {
centralDirectoryNeedsRewrite = true
entry.localHeaderOffset = filePointer.channel.position().toUInt()
@@ -113,7 +120,10 @@ class ZipFile(file: File) : Closeable {
entries.add(entry)
}
- fun addEntryCompressData(entry: ZipEntry, data: ByteArray) {
+ fun addEntryCompressData(
+ entry: ZipEntry,
+ data: ByteArray,
+ ) {
val compressor = Deflater(compressionLevel, true)
compressor.setInput(data)
compressor.finish()
@@ -138,7 +148,11 @@ class ZipFile(file: File) : Closeable {
addEntry(entry, compressedBuffer)
}
- private fun addEntryCopyData(entry: ZipEntry, data: ByteBuffer, alignment: Int? = null) {
+ private fun addEntryCopyData(
+ entry: ZipEntry,
+ data: ByteBuffer,
+ alignment: Int? = null,
+ ) {
alignment?.let {
// Calculate where data would end up.
val dataOffset = filePointer.filePointer + entry.LFHSize
@@ -160,7 +174,7 @@ class ZipFile(file: File) : Closeable {
return filePointer.channel.map(
FileChannel.MapMode.READ_ONLY,
entry.dataOffset.toLong(),
- entry.compressedSize.toLong()
+ entry.compressedSize.toLong(),
)
}
@@ -170,7 +184,10 @@ class ZipFile(file: File) : Closeable {
* @param file The file to copy entries from.
* @param entryAlignment A function that returns the alignment for a given entry.
*/
- fun copyEntriesFromFileAligned(file: ZipFile, entryAlignment: (entry: ZipEntry) -> Int?) {
+ fun copyEntriesFromFileAligned(
+ file: ZipFile,
+ entryAlignment: (entry: ZipEntry) -> Int?,
+ ) {
for (entry in file.entries) {
if (entries.any { it.fileName == entry.fileName }) continue // Skip duplicates
@@ -189,9 +206,13 @@ class ZipFile(file: File) : Closeable {
private const val LIBRARY_ALIGNMENT = 4096
val apkZipEntryAlignment = { entry: ZipEntry ->
- if (entry.compression.toUInt() != 0u) null
- else if (entry.fileName.endsWith(".so")) LIBRARY_ALIGNMENT
- else DEFAULT_ALIGNMENT
+ if (entry.compression.toUInt() != 0u) {
+ null
+ } else if (entry.fileName.endsWith(".so")) {
+ LIBRARY_ALIGNMENT
+ } else {
+ DEFAULT_ALIGNMENT
+ }
}
}
-}
\ No newline at end of file
+}
diff --git a/src/main/kotlin/app/revanced/library/zip/structures/ZipEndRecord.kt b/src/main/kotlin/app/revanced/library/zip/structures/ZipEndRecord.kt
index 0bcafbc..d7fe06d 100644
--- a/src/main/kotlin/app/revanced/library/zip/structures/ZipEndRecord.kt
+++ b/src/main/kotlin/app/revanced/library/zip/structures/ZipEndRecord.kt
@@ -17,7 +17,6 @@ internal class ZipEndRecord(
val centralDirectoryStartOffset: UInt,
val fileComment: String,
) {
-
companion object {
const val ECD_HEADER_SIZE = 22
const val ECD_SIGNATURE = 0x06054b50u
@@ -25,8 +24,9 @@ internal class ZipEndRecord(
fun fromECD(input: DataInput): ZipEndRecord {
val signature = input.readUIntLE()
- if (signature != ECD_SIGNATURE)
+ if (signature != ECD_SIGNATURE) {
throw IllegalArgumentException("Input doesn't start with end record signature")
+ }
val diskNumber = input.readUShortLE()
val startingDiskNumber = input.readUShortLE()
@@ -50,7 +50,7 @@ internal class ZipEndRecord(
totalEntries,
centralDirectorySize,
centralDirectoryStartOffset,
- fileComment
+ fileComment,
)
}
}
diff --git a/src/main/kotlin/app/revanced/library/zip/structures/ZipEntry.kt b/src/main/kotlin/app/revanced/library/zip/structures/ZipEntry.kt
index 52ba9f6..fb04f1b 100644
--- a/src/main/kotlin/app/revanced/library/zip/structures/ZipEntry.kt
+++ b/src/main/kotlin/app/revanced/library/zip/structures/ZipEntry.kt
@@ -22,7 +22,7 @@ class ZipEntry private constructor(
internal val fileName: String,
internal val extraField: ByteArray,
internal val fileComment: String,
- internal var localExtraField: ByteArray = ByteArray(0), //separate for alignment
+ internal var localExtraField: ByteArray = ByteArray(0), // separate for alignment
) {
internal val LFHSize: Int
get() = LFH_HEADER_SIZE + fileName.toByteArray(Charsets.UTF_8).size + localExtraField.size
@@ -31,12 +31,12 @@ class ZipEntry private constructor(
get() = localHeaderOffset + LFHSize.toUInt()
constructor(fileName: String) : this(
- 0x1403u, //made by unix, version 20
+ 0x1403u, // made by unix, version 20
0u,
0u,
0u,
- 0x0821u, //seems to be static time google uses, no idea
- 0x0221u, //same as above
+ 0x0821u, // seems to be static time google uses, no idea
+ 0x0221u, // same as above
0u,
0u,
0u,
@@ -46,21 +46,22 @@ class ZipEntry private constructor(
0u,
fileName,
ByteArray(0),
- ""
+ "",
)
companion object {
internal const val CDE_HEADER_SIZE = 46
internal const val CDE_SIGNATURE = 0x02014b50u
- internal const val LFH_HEADER_SIZE = 30
+ internal const val LFH_HEADER_SIZE = 30
internal const val LFH_SIGNATURE = 0x04034b50u
internal fun fromCDE(input: DataInput): ZipEntry {
val signature = input.readUIntLE()
- if (signature != CDE_SIGNATURE)
+ if (signature != CDE_SIGNATURE) {
throw IllegalArgumentException("Input doesn't start with central directory entry signature")
+ }
val version = input.readUShortLE()
val versionNeeded = input.readUShortLE()
@@ -97,8 +98,11 @@ class ZipEntry private constructor(
fileComment = fileCommentBytes.toString(Charsets.UTF_8)
}
- flags = (flags and 0b1000u.inv()
- .toUShort()) //disable data descriptor flag as they are not used
+ flags = (
+ flags and
+ 0b1000u.inv()
+ .toUShort()
+ ) // disable data descriptor flag as they are not used
return ZipEntry(
version,
@@ -121,7 +125,7 @@ class ZipEntry private constructor(
}
}
- internal fun readLocalExtra(buffer: ByteBuffer) {
+ internal fun readLocalExtra(buffer: ByteBuffer) {
buffer.order(ByteOrder.LITTLE_ENDIAN)
localExtraField = ByteArray(buffer.getUShort().toInt())
}
@@ -129,8 +133,9 @@ class ZipEntry private constructor(
internal fun toLFH(): ByteBuffer {
val nameBytes = fileName.toByteArray(Charsets.UTF_8)
- val buffer = ByteBuffer.allocate(LFH_HEADER_SIZE + nameBytes.size + localExtraField.size)
- .also { it.order(ByteOrder.LITTLE_ENDIAN) }
+ val buffer =
+ ByteBuffer.allocate(LFH_HEADER_SIZE + nameBytes.size + localExtraField.size)
+ .also { it.order(ByteOrder.LITTLE_ENDIAN) }
buffer.putUInt(LFH_SIGNATURE)
buffer.putUShort(versionNeeded)
@@ -184,4 +189,4 @@ class ZipEntry private constructor(
buffer.flip()
return buffer
}
-}
\ No newline at end of file
+}
diff --git a/src/test/kotlin/app/revanced/library/PatchOptionsTest.kt b/src/test/kotlin/app/revanced/library/PatchOptionsTest.kt
index 1d00932..3a9ba0a 100644
--- a/src/test/kotlin/app/revanced/library/PatchOptionsTest.kt
+++ b/src/test/kotlin/app/revanced/library/PatchOptionsTest.kt
@@ -45,4 +45,4 @@ internal object PatchOptionsTest {
// Do nothing
}
}
-}
\ No newline at end of file
+}
diff --git a/src/test/kotlin/app/revanced/library/PatchUtilsTest.kt b/src/test/kotlin/app/revanced/library/PatchUtilsTest.kt
index 3f1293e..9b8ada2 100644
--- a/src/test/kotlin/app/revanced/library/PatchUtilsTest.kt
+++ b/src/test/kotlin/app/revanced/library/PatchUtilsTest.kt
@@ -10,9 +10,10 @@ import kotlin.test.assertEquals
internal object PatchUtilsTest {
@Test
fun `return 'a' because it is the most common version`() {
- val patches = arrayOf("a", "a", "c", "d", "a", "b", "c", "d", "a", "b", "c", "d")
- .map { version -> newPatch("some.package", version) }
- .toSet()
+ val patches =
+ arrayOf("a", "a", "c", "d", "a", "b", "c", "d", "a", "b", "c", "d")
+ .map { version -> newPatch("some.package", version) }
+ .toSet()
assertEqualsVersion("a", patches, "some.package")
}
@@ -31,19 +32,25 @@ internal object PatchUtilsTest {
@Test
fun `return null because no patch compatible package is constrained to a version`() {
- val patches = setOf(
- newPatch("other.package"),
- newPatch("other.package"),
- )
+ val patches =
+ setOf(
+ newPatch("other.package"),
+ newPatch("other.package"),
+ )
assertEqualsVersion(null, patches, "other.package")
}
private fun assertEqualsVersion(
- expected: String?, patches: PatchSet, compatiblePackageName: String
+ expected: String?,
+ patches: PatchSet,
+ compatiblePackageName: String,
) = assertEquals(expected, PatchUtils.getMostCommonCompatibleVersion(patches, compatiblePackageName))
- private fun newPatch(packageName: String, vararg versions: String) = object : BytecodePatch() {
+ private fun newPatch(
+ packageName: String,
+ vararg versions: String,
+ ) = object : BytecodePatch() {
init {
// Set the compatible packages field to the supplied package name and versions reflectively,
// because the setter is private but needed for testing.
@@ -55,4 +62,4 @@ internal object PatchUtilsTest {
override fun execute(context: BytecodeContext) {}
}
-}
\ No newline at end of file
+}
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+