mirror of
https://github.com/ReVanced/revanced-manager.git
synced 2025-05-18 15:06:45 +08:00
Compare commits
8 Commits
v1.19.2-de
...
v1.19.3-de
Author | SHA1 | Date | |
---|---|---|---|
7cc6b88e4e | |||
5cd1cba668 | |||
ca365bac6e | |||
f1fc48ce5a | |||
316e440d0d | |||
95018814a7 | |||
b52e49d90a | |||
4acd738353 |
@ -113,9 +113,8 @@ flutter {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.22"
|
||||
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.22")
|
||||
|
||||
// ReVanced
|
||||
implementation "app.revanced:revanced-patcher:19.3.1"
|
||||
implementation "app.revanced:revanced-library:2.1.0"
|
||||
implementation("app.revanced:revanced-patcher:19.3.1")
|
||||
implementation("app.revanced:revanced-library:2.2.1")
|
||||
}
|
||||
|
@ -9,7 +9,6 @@ import android.os.Handler
|
||||
import android.os.Looper
|
||||
import app.revanced.library.ApkUtils
|
||||
import app.revanced.library.ApkUtils.applyTo
|
||||
import app.revanced.library.ApkUtils.sign
|
||||
import app.revanced.manager.flutter.utils.Aapt
|
||||
import app.revanced.manager.flutter.utils.packageInstaller.InstallerReceiver
|
||||
import app.revanced.manager.flutter.utils.packageInstaller.UninstallerReceiver
|
||||
@ -339,16 +338,15 @@ class MainActivity : FlutterActivity() {
|
||||
patcher.get()
|
||||
}
|
||||
|
||||
inFile.copyTo(outFile)
|
||||
if (cancel(patcher::close)) return@Thread
|
||||
|
||||
patcherResult.applyTo(inFile)
|
||||
|
||||
if (cancel(patcher::close)) return@Thread
|
||||
|
||||
patcherResult.applyTo(outFile)
|
||||
|
||||
if (cancel(patcher::close)) return@Thread
|
||||
updateProgress(0.8, "Signing...", "")
|
||||
|
||||
outFile.sign(
|
||||
ApkUtils.sign(
|
||||
inFile,
|
||||
outFile,
|
||||
ApkUtils.SigningOptions(
|
||||
keyStoreFile,
|
||||
keystorePassword,
|
||||
|
@ -171,7 +171,10 @@ class PatcherAPI {
|
||||
if (integrationsFile != null) {
|
||||
_dataDir.createSync();
|
||||
_tmpDir.createSync();
|
||||
final Directory workDir = _tmpDir.createTempSync('tmp-');
|
||||
final Directory workDir = await _tmpDir.createTemp('tmp-');
|
||||
|
||||
final File inApkFile = File('${workDir.path}/in.apk');
|
||||
await File(apkFilePath).copy(inApkFile.path);
|
||||
|
||||
outFile = File('${workDir.path}/out.apk');
|
||||
|
||||
@ -182,7 +185,7 @@ class PatcherAPI {
|
||||
await patcherChannel.invokeMethod(
|
||||
'runPatcher',
|
||||
{
|
||||
'inFilePath': apkFilePath,
|
||||
'inFilePath': inApkFile.path,
|
||||
'outFilePath': outFile!.path,
|
||||
'integrationsPath': integrationsFile.path,
|
||||
'selectedPatches': selectedPatches.map((p) => p.name).toList(),
|
||||
@ -297,6 +300,18 @@ class PatcherAPI {
|
||||
);
|
||||
bool cleanInstall = false;
|
||||
final bool isFixable = statusCode == 4 || statusCode == 5;
|
||||
|
||||
var description = t['installErrorDialog.${statusValue}_description'];
|
||||
if (statusCode == 2) {
|
||||
description = description(
|
||||
packageName: statusCode == 2
|
||||
? {
|
||||
'packageName': status['otherPackageName'],
|
||||
}
|
||||
: null,
|
||||
);
|
||||
}
|
||||
|
||||
await showDialog(
|
||||
context: _managerAPI.ctx!,
|
||||
builder: (context) => AlertDialog(
|
||||
@ -306,15 +321,7 @@ class PatcherAPI {
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
Text(
|
||||
t['installErrorDialog.${statusValue}_description'](
|
||||
packageName: statusCode == 2
|
||||
? {
|
||||
'packageName': status['otherPackageName'],
|
||||
}
|
||||
: null,
|
||||
),
|
||||
),
|
||||
Text(description),
|
||||
],
|
||||
),
|
||||
actions: (status == null)
|
||||
|
8
package-lock.json
generated
8
package-lock.json
generated
@ -5,7 +5,7 @@
|
||||
"packages": {
|
||||
"": {
|
||||
"devDependencies": {
|
||||
"@droidsolutions-oss/semantic-release-update-file": "^1.3.2",
|
||||
"@droidsolutions-oss/semantic-release-update-file": "^1.4.0-beta.1",
|
||||
"@saithodev/semantic-release-backmerge": "^4.0.1",
|
||||
"@semantic-release/changelog": "^6.0.3",
|
||||
"@semantic-release/exec": "^6.0.3",
|
||||
@ -60,9 +60,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/@droidsolutions-oss/semantic-release-update-file": {
|
||||
"version": "1.3.2",
|
||||
"resolved": "https://registry.npmjs.org/@droidsolutions-oss/semantic-release-update-file/-/semantic-release-update-file-1.3.2.tgz",
|
||||
"integrity": "sha512-ahV0OWiEUf20e7lLH3gnBLF1SfRNPN99MeaLVaFX6jT3DegTLzkVPeY2CZWa+K4tAXBALc29Bq/kzjv8PAXFGw==",
|
||||
"version": "1.4.0-beta.1",
|
||||
"resolved": "https://registry.npmjs.org/@droidsolutions-oss/semantic-release-update-file/-/semantic-release-update-file-1.4.0-beta.1.tgz",
|
||||
"integrity": "sha512-CdqG3vIceWFBmwz0qcY0NdqaE+TGNuhhbgFXHIj/M1fYAD1lQ4QyGEaoD3d4F4ZHYsBqR0HrHNMTG4bycBRKNw==",
|
||||
"dev": true,
|
||||
"dependencies": {
|
||||
"aggregate-error": "^3.1.0",
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"devDependencies": {
|
||||
"@droidsolutions-oss/semantic-release-update-file": "^1.3.2",
|
||||
"@droidsolutions-oss/semantic-release-update-file": "^1.4.0-beta.1",
|
||||
"@saithodev/semantic-release-backmerge": "^4.0.1",
|
||||
"@semantic-release/changelog": "^6.0.3",
|
||||
"@semantic-release/exec": "^6.0.3",
|
||||
|
@ -4,7 +4,7 @@ homepage: https://github.com/ReVanced/revanced-manager
|
||||
|
||||
publish_to: 'none'
|
||||
|
||||
version: 1.19.2-dev.1+101800003
|
||||
version: 1.19.3-dev.1+101800005
|
||||
|
||||
environment:
|
||||
sdk: '>=3.0.0 <4.0.0'
|
||||
|
Reference in New Issue
Block a user