Compare commits

...

28 Commits

Author SHA1 Message Date
Aunali321
0b2572a730 Bump version to v0.0.31 2022-10-11 02:56:27 +05:30
Aunali321
6fc46d632b feat: make applied patches dialog scrollable. 2022-10-11 02:55:35 +05:30
Aunali321
b2a35813f6 fix: disable update functionality for now. 2022-10-11 02:32:23 +05:30
Aunali321
279b76ad53 fix: don't show previously patched apps after clearing data. 2022-10-11 02:17:13 +05:30
Aunali321
b550016681 fix: use original package name to load patches. 2022-10-10 19:02:42 +05:30
Aunali321
3ab5d12f3e fix: use original package name for changelog. 2022-10-10 18:57:32 +05:30
Aunali321
53bcb8b85f Merge branch 'flutter' of https://github.com/revanced/revanced-manager into flutter 2022-10-10 18:46:02 +05:30
Aunali321
94397dcb4c feat: store original package name of patches apps. 2022-10-10 18:45:58 +05:30
afn
53fbee2d44 refactor: Reorder sections in readme. 2022-10-10 00:21:49 +05:30
aliernfrog
e46ad3595d fix: permanent keystore path if available (#375) 2022-10-10 00:05:43 +05:30
Aunali321
f2b03b6e69 Merge branch 'flutter' of https://github.com/revanced/revanced-manager into flutter 2022-10-09 23:01:18 +05:30
Aunali321
0df2a6bdc0 feat: brotli support. 2022-10-09 23:01:10 +05:30
Aunali321
df31e5ccd1 feat: add building from source instructions. 2022-10-09 02:59:50 +05:30
Aunali321
4dfa0dada6 build: bump version to v0.0.30 2022-10-08 22:08:03 +05:30
Aunali321
857a523f84 fix: changelog for youtube. 2022-10-08 22:06:45 +05:30
Aunali321
ceac838706 feat: use new api url. 2022-10-08 19:03:45 +05:30
Aunali321
e8cb6d27fc Merge branch 'flutter' of https://github.com/revanced/revanced-manager into flutter 2022-10-07 18:23:49 +05:30
Aunali321
78428f6bd3 feat: HTTP/3 Support. 2022-10-07 18:23:43 +05:30
Ushie
da94dfba70 build: Android Studio project build config 2022-10-06 12:40:25 +03:00
oSumAtrIX
8275792f45 chore: bump patcher dependency version to v6.0.0 (#355) 2022-10-06 11:26:20 +02:00
j4k0xb
a90923011a feat: allow searching for displayed patch names (#348) 2022-10-03 21:06:12 +03:00
oSumAtrIX
1aa24e2871 fix: print stack trace of patch exceptions (#314) 2022-10-03 22:34:46 +05:30
oSumAtrIX
68ce751745 build: bump version to v0.0.27 2022-10-01 02:15:47 +02:00
oSumAtrIX
74ff64d41a chore: bump patcher dependency version to v5.1.2 2022-10-01 02:15:08 +02:00
Ushie
6d45ccecc2 build: Bump version to v0.0.27 2022-09-30 21:38:15 +03:00
Ushie
5418c36716 feat: use patcher for resourcePatch detection (#337)
Co-authored-by: Aunali321 <aunvakil.aa@gmail.com>
2022-09-30 21:36:39 +03:00
Aunali321
ca0657e8f9 feat: decrease cache duration of patches and integrations. 2022-09-28 22:26:54 +05:30
Canny
a5511c2a2c feat: update unsupported button title 2022-09-26 23:36:17 +03:00
18 changed files with 213 additions and 188 deletions

6
.run/main.dart.run.xml Normal file
View File

@@ -0,0 +1,6 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="main.dart" type="FlutterRunConfigurationType" factoryName="Flutter">
<option name="filePath" value="$PROJECT_DIR$/lib/main.dart" />
<method v="2" />
</configuration>
</component>

View File

@@ -5,16 +5,26 @@ The official ReVanced Manager based on Flutter.
## 🔽 Download ## 🔽 Download
To download the Alpha version of Manager, go [here](https://github.com/revanced/revanced-manager/releases/latest) and install the provided APK file. To download the Alpha version of Manager, go [here](https://github.com/revanced/revanced-manager/releases/latest) and install the provided APK file.
## 🔴 Issues ## 📝 Prerequisites
For suggestions and bug reports, open an issue [here](https://github.com/revanced/revanced-manager/issues/new/choose). 1. Android 8 or higher
2. Does not work on some armv7 devices
## 💭 Discussion 3. [Vanced MicroG](https://github.com/TeamVanced/VancedMicroG/releases) required for YouTube and YouTube Music (Only for non-root)
If you wish to discuss the Manager, a thread has been made under the [#chat](https://discord.com/channels/952946952348270622/1002922226443632761) channel in the Discord server, please note that this thread may be temporary and may be removed in the future.
## ⚠️ Disclaimer ## ⚠️ Disclaimer
*Please note that even though we're releasing the Manager, it is an ALPHA version. Meaning there's a big chance that the Manager might not work at all for you.* *Please note that even though we're releasing the Manager, it is an ALPHA version. There's a big chance that the Manager might not work at all for you.*
## Prerequisites ## 🔴 Issues
1. Android 8 or higher. For suggestions and bug reports, open an issue [here](https://github.com/revanced/revanced-manager/issues/new/choose).
2. Does not work on armv7
3. For YouTube and YouTube Music - Vanced MicroG(Only for non-root). ## 💭 Discussion
If you wish to discuss the Manager, a thread has been made under the [#development](https://discord.com/channels/952946952348270622/1002922226443632761) channel in the Discord server, please note that this thread may be temporary and may be removed in the future.
## 🛠️ Building Manager from source
1. Setup flutter environment for your [platform](https://docs.flutter.dev/get-started/install)
2. Clone the repository locally
3. Add your github token in gradle.properties like [this](https://github.com/revanced/revanced-documentation/wiki/Building-from-source)
4. Open the project in terminal
5. Run `flutter pub get` in terminal
6. Then `flutter packages pub run build_runner build --delete-conflicting-outputs` (Must be done on each git pull)
7. To build release apk run `flutter build apk`

View File

@@ -71,7 +71,7 @@ dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
// ReVanced // ReVanced
implementation "app.revanced:revanced-patcher:5.1.0" implementation "app.revanced:revanced-patcher:6.0.0"
// Signing & aligning // Signing & aligning
implementation("org.bouncycastle:bcpkix-jdk15on:1.70") implementation("org.bouncycastle:bcpkix-jdk15on:1.70")

View File

@@ -1,5 +1,6 @@
package app.revanced.manager.flutter package app.revanced.manager.flutter
import android.os.Build
import android.os.Handler import android.os.Handler
import android.os.Looper import android.os.Looper
import androidx.annotation.NonNull import androidx.annotation.NonNull
@@ -12,7 +13,7 @@ import app.revanced.patcher.Patcher
import app.revanced.patcher.PatcherOptions import app.revanced.patcher.PatcherOptions
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.util.patch.impl.DexPatchBundle import app.revanced.patcher.util.patch.PatchBundle
import dalvik.system.DexClassLoader import dalvik.system.DexClassLoader
import io.flutter.embedding.android.FlutterActivity import io.flutter.embedding.android.FlutterActivity
import io.flutter.embedding.engine.FlutterEngine import io.flutter.embedding.engine.FlutterEngine
@@ -42,7 +43,6 @@ class MainActivity : FlutterActivity() {
val selectedPatches = call.argument<List<String>>("selectedPatches") val selectedPatches = call.argument<List<String>>("selectedPatches")
val cacheDirPath = call.argument<String>("cacheDirPath") val cacheDirPath = call.argument<String>("cacheDirPath")
val mergeIntegrations = call.argument<Boolean>("mergeIntegrations") val mergeIntegrations = call.argument<Boolean>("mergeIntegrations")
val resourcePatching = call.argument<Boolean>("resourcePatching")
val keyStoreFilePath = call.argument<String>("keyStoreFilePath") val keyStoreFilePath = call.argument<String>("keyStoreFilePath")
if (patchBundleFilePath != null && if (patchBundleFilePath != null &&
originalFilePath != null && originalFilePath != null &&
@@ -53,7 +53,6 @@ class MainActivity : FlutterActivity() {
selectedPatches != null && selectedPatches != null &&
cacheDirPath != null && cacheDirPath != null &&
mergeIntegrations != null && mergeIntegrations != null &&
resourcePatching != null &&
keyStoreFilePath != null keyStoreFilePath != null
) { ) {
runPatcher( runPatcher(
@@ -67,7 +66,6 @@ class MainActivity : FlutterActivity() {
selectedPatches, selectedPatches,
cacheDirPath, cacheDirPath,
mergeIntegrations, mergeIntegrations,
resourcePatching,
keyStoreFilePath keyStoreFilePath
) )
} else { } else {
@@ -90,7 +88,6 @@ class MainActivity : FlutterActivity() {
selectedPatches: List<String>, selectedPatches: List<String>,
cacheDirPath: String, cacheDirPath: String,
mergeIntegrations: Boolean, mergeIntegrations: Boolean,
resourcePatching: Boolean,
keyStoreFilePath: String keyStoreFilePath: String
) { ) {
val originalFile = File(originalFilePath) val originalFile = File(originalFilePath)
@@ -102,16 +99,20 @@ class MainActivity : FlutterActivity() {
Thread { Thread {
try { try {
val patches = DexPatchBundle( val patches = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.CUPCAKE) {
patchBundleFilePath, PatchBundle.Dex(
DexClassLoader(
patchBundleFilePath, patchBundleFilePath,
cacheDirPath, DexClassLoader(
null, patchBundleFilePath,
javaClass.classLoader cacheDirPath,
) null,
).loadPatches().filter { patch -> selectedPatches.any { it == patch.patchName } } javaClass.classLoader
)
).loadPatches().filter { patch -> selectedPatches.any { it == patch.patchName } }
} else {
TODO("VERSION.SDK_INT < CUPCAKE")
}
handler.post { handler.post {
installerChannel.invokeMethod( installerChannel.invokeMethod(
"update", "update",
@@ -139,7 +140,6 @@ class MainActivity : FlutterActivity() {
PatcherOptions( PatcherOptions(
inputFile, inputFile,
cacheDirPath, cacheDirPath,
resourcePatching,
Aapt.binary(applicationContext).absolutePath, Aapt.binary(applicationContext).absolutePath,
cacheDirPath, cacheDirPath,
logger = ManagerLogger() logger = ManagerLogger()
@@ -178,7 +178,7 @@ class MainActivity : FlutterActivity() {
} }
patcher.addPatches(patches) patcher.addPatches(patches)
patcher.applyPatches().forEach { (patch, res) -> patcher.executePatches().forEach { (patch, res) ->
if (res.isSuccess) { if (res.isSuccess) {
val msg = "[success] $patch" val msg = "[success] $patch"
handler.post { handler.post {
@@ -193,7 +193,7 @@ class MainActivity : FlutterActivity() {
} }
return@forEach return@forEach
} }
val msg = "[error] $patch:" + res.exceptionOrNull()!! val msg = "[error] $patch:" + res.exceptionOrNull()!!.printStackTrace()
handler.post { handler.post {
installerChannel.invokeMethod( installerChannel.invokeMethod(
"update", "update",

View File

@@ -80,7 +80,7 @@
"selectAllPatchesWarningContent": "You are about to select all patches, that includes unrecommended patches and can cause unwanted behavior." "selectAllPatchesWarningContent": "You are about to select all patches, that includes unrecommended patches and can cause unwanted behavior."
}, },
"patchItem": { "patchItem": {
"unsupportedWarningButton": "Unsupported version", "unsupportedWarningButton": "Warning",
"unsupportedDialogTitle": "Warning", "unsupportedDialogTitle": "Warning",
"unsupportedDialogText": "Selecting this patch may result in patching errors.\n\nApp version: {packageVersion}\nCurrent supported versions:\n{supportedVersions}" "unsupportedDialogText": "Selecting this patch may result in patching errors.\n\nApp version: {packageVersion}\nCurrent supported versions:\n{supportedVersions}"
}, },
@@ -142,13 +142,15 @@
"rootDialogTitle": "Error", "rootDialogTitle": "Error",
"rootDialogText": "App was installed with root mode enabled but currently root mode is disabled.\nPlease enable root mode first.", "rootDialogText": "App was installed with root mode enabled but currently root mode is disabled.\nPlease enable root mode first.",
"packageNameLabel": "Package Name", "packageNameLabel": "Package Name",
"originalPackageNameLabel": "Original Package Name",
"installTypeLabel": "Installation Type", "installTypeLabel": "Installation Type",
"rootTypeLabel": "Root", "rootTypeLabel": "Root",
"nonRootTypeLabel": "Non-root", "nonRootTypeLabel": "Non-root",
"patchedDateLabel": "Patched Date", "patchedDateLabel": "Patched Date",
"patchedDateHint": "{date} at {time}", "patchedDateHint": "{date} at {time}",
"appliedPatchesLabel": "Applied Patches", "appliedPatchesLabel": "Applied Patches",
"appliedPatchesHint": "{quantity} applied patches" "appliedPatchesHint": "{quantity} applied patches",
"updateNotImplemented": "Update functionality not implemented yet"
}, },
"contributorsView": { "contributorsView": {
"widgetTitle": "Contributors", "widgetTitle": "Contributors",

View File

@@ -8,6 +8,7 @@ part 'patched_application.g.dart';
class PatchedApplication { class PatchedApplication {
String name; String name;
String packageName; String packageName;
String originalPackageName;
String version; String version;
final String apkFilePath; final String apkFilePath;
@JsonKey( @JsonKey(
@@ -25,6 +26,7 @@ class PatchedApplication {
PatchedApplication({ PatchedApplication({
required this.name, required this.name,
required this.packageName, required this.packageName,
required this.originalPackageName,
required this.version, required this.version,
required this.apkFilePath, required this.apkFilePath,
required this.icon, required this.icon,

View File

@@ -2,26 +2,27 @@ import 'dart:convert';
import 'dart:io'; import 'dart:io';
import 'package:collection/collection.dart'; import 'package:collection/collection.dart';
import 'package:dio/dio.dart'; import 'package:dio/dio.dart';
import 'package:dio_brotli_transformer/dio_brotli_transformer.dart';
import 'package:dio_http_cache_lts/dio_http_cache_lts.dart'; import 'package:dio_http_cache_lts/dio_http_cache_lts.dart';
import 'package:flutter_cache_manager/flutter_cache_manager.dart'; import 'package:flutter_cache_manager/flutter_cache_manager.dart';
import 'package:injectable/injectable.dart'; import 'package:injectable/injectable.dart';
import 'package:native_dio_client/native_dio_client.dart';
import 'package:revanced_manager/models/patch.dart'; import 'package:revanced_manager/models/patch.dart';
import 'package:dio_http2_adapter/dio_http2_adapter.dart';
@lazySingleton @lazySingleton
class GithubAPI { class GithubAPI {
final Dio _dio = Dio( final Dio _dio = Dio(
BaseOptions(baseUrl: 'https://api.github.com'), BaseOptions(
)..httpClientAdapter = Http2Adapter( baseUrl: 'https://api.github.com',
ConnectionManager( headers: {
idleTimeout: 10000, 'accept-encoding': 'br',
onClientCreate: (_, config) => config.onBadCertificate = (_) => true, },
), ),
); )..httpClientAdapter = NativeAdapter();
final DioCacheManager _dioCacheManager = DioCacheManager(CacheConfig()); final DioCacheManager _dioCacheManager = DioCacheManager(CacheConfig());
final Options _cacheOptions = buildCacheOptions( final Options _cacheOptions = buildCacheOptions(
const Duration(days: 1), const Duration(hours: 6),
maxStale: const Duration(days: 7), maxStale: const Duration(days: 1),
); );
final Map<String, String> repoAppPath = { final Map<String, String> repoAppPath = {
'com.google.android.youtube': 'youtube', 'com.google.android.youtube': 'youtube',
@@ -31,10 +32,12 @@ class GithubAPI {
'com.zhiliaoapp.musically': 'tiktok', 'com.zhiliaoapp.musically': 'tiktok',
'de.dwd.warnapp': 'warnwetter', 'de.dwd.warnapp': 'warnwetter',
'com.garzotto.pflotsh.ecmwf_a': 'ecmwf', 'com.garzotto.pflotsh.ecmwf_a': 'ecmwf',
'com.spotify.music': 'spotify',
}; };
void initialize() { void initialize() {
_dio.interceptors.add(_dioCacheManager.interceptor); _dio.interceptors.add(_dioCacheManager.interceptor);
_dio.transformer = DioBrotliTransformer(transformer: DefaultTransformer());
} }
Future<void> clearAllCache() async { Future<void> clearAllCache() async {
@@ -65,17 +68,20 @@ class GithubAPI {
'/repos/$repoName/commits', '/repos/$repoName/commits',
queryParameters: { queryParameters: {
'path': path, 'path': path,
'per_page': 3,
'since': since.toIso8601String(), 'since': since.toIso8601String(),
}, },
options: _cacheOptions, options: _cacheOptions,
); );
List<dynamic> commits = response.data; List<dynamic> commits = response.data;
return commits return commits
.map((commit) => .map(
(commit['commit']['message'] as String).split('\n')[0]) (commit) => (commit['commit']['message']).split('\n')[0] +
' - ' +
commit['commit']['author']['name'] +
'\n' as String,
)
.toList(); .toList();
} on Exception { } catch (e) {
return List.empty(); return List.empty();
} }
} }

View File

@@ -19,7 +19,7 @@ class ManagerAPI {
final String patcherRepo = 'revanced-patcher'; final String patcherRepo = 'revanced-patcher';
final String cliRepo = 'revanced-cli'; final String cliRepo = 'revanced-cli';
late SharedPreferences _prefs; late SharedPreferences _prefs;
String defaultApiUrl = 'https://revanced-releases-api.afterst0rm.xyz'; String defaultApiUrl = 'https://releases.rvcd.win/';
String defaultPatcherRepo = 'revanced/revanced-patcher'; String defaultPatcherRepo = 'revanced/revanced-patcher';
String defaultPatchesRepo = 'revanced/revanced-patches'; String defaultPatchesRepo = 'revanced/revanced-patches';
String defaultIntegrationsRepo = 'revanced/revanced-integrations'; String defaultIntegrationsRepo = 'revanced/revanced-integrations';
@@ -213,6 +213,7 @@ class ManagerAPI {
PatchedApplication( PatchedApplication(
name: application.appName, name: application.appName,
packageName: application.packageName, packageName: application.packageName,
originalPackageName: application.packageName,
version: application.versionName!, version: application.versionName!,
apkFilePath: application.apkFilePath, apkFilePath: application.apkFilePath,
icon: application.icon, icon: application.icon,
@@ -241,6 +242,7 @@ class ManagerAPI {
PatchedApplication( PatchedApplication(
name: application.appName, name: application.appName,
packageName: application.packageName, packageName: application.packageName,
originalPackageName: application.packageName,
version: application.versionName!, version: application.versionName!,
apkFilePath: application.apkFilePath, apkFilePath: application.apkFilePath,
icon: application.icon, icon: application.icon,
@@ -254,33 +256,6 @@ class ManagerAPI {
return unsavedApps; return unsavedApps;
} }
Future<void> reAssessSavedApps() async {
List<PatchedApplication> patchedApps = getPatchedApps();
List<PatchedApplication> unsavedApps = await getUnsavedApps(patchedApps);
patchedApps.addAll(unsavedApps);
List<PatchedApplication> toRemove = await getAppsToRemove(patchedApps);
patchedApps.removeWhere((a) => toRemove.contains(a));
for (PatchedApplication app in patchedApps) {
app.hasUpdates = await hasAppUpdates(app.packageName, app.patchDate);
app.changelog = await getAppChangelog(app.packageName, app.patchDate);
if (!app.hasUpdates) {
String? currentInstalledVersion =
(await DeviceApps.getApp(app.packageName))?.versionName;
if (currentInstalledVersion != null) {
String currentSavedVersion = app.version;
int currentInstalledVersionInt = int.parse(
currentInstalledVersion.replaceAll(RegExp('[^0-9]'), ''));
int currentSavedVersionInt =
int.parse(currentSavedVersion.replaceAll(RegExp('[^0-9]'), ''));
if (currentInstalledVersionInt > currentSavedVersionInt) {
app.hasUpdates = true;
}
}
}
}
await setPatchedApps(patchedApps);
}
Future<bool> isAppUninstalled(PatchedApplication app) async { Future<bool> isAppUninstalled(PatchedApplication app) async {
bool existsRoot = false; bool existsRoot = false;
bool existsNonRoot = await DeviceApps.isAppInstalled(app.packageName); bool existsNonRoot = await DeviceApps.isAppInstalled(app.packageName);
@@ -314,7 +289,7 @@ class ManagerAPI {
newCommits = await _githubAPI.getCommits( newCommits = await _githubAPI.getCommits(
packageName, packageName,
getPatchesRepo(), getPatchesRepo(),
DateTime(2022, 3, 20, 21, 06, 01), patchDate,
); );
} }
return newCommits; return newCommits;

View File

@@ -18,6 +18,7 @@ class PatcherAPI {
MethodChannel('app.revanced.manager.flutter/patcher'); MethodChannel('app.revanced.manager.flutter/patcher');
final ManagerAPI _managerAPI = locator<ManagerAPI>(); final ManagerAPI _managerAPI = locator<ManagerAPI>();
final RootAPI _rootAPI = RootAPI(); final RootAPI _rootAPI = RootAPI();
late Directory _dataDir;
late Directory _tmpDir; late Directory _tmpDir;
late File _keyStoreFile; late File _keyStoreFile;
List<Patch> _patches = []; List<Patch> _patches = [];
@@ -26,8 +27,9 @@ class PatcherAPI {
Future<void> initialize() async { Future<void> initialize() async {
await _loadPatches(); await _loadPatches();
Directory appCache = await getTemporaryDirectory(); Directory appCache = await getTemporaryDirectory();
_dataDir = await getExternalStorageDirectory() ?? appCache;
_tmpDir = Directory('${appCache.path}/patcher'); _tmpDir = Directory('${appCache.path}/patcher');
_keyStoreFile = File('${appCache.path}/revanced-manager.keystore'); _keyStoreFile = File('${_dataDir.path}/revanced-manager.keystore');
cleanPatcher(); cleanPatcher();
} }
@@ -70,14 +72,10 @@ class PatcherAPI {
} }
Future<List<Patch>> getFilteredPatches(String packageName) async { Future<List<Patch>> getFilteredPatches(String packageName) async {
String newPackageName = packageName.replaceFirst(
'app.revanced.',
'com.google.',
);
return _patches return _patches
.where((patch) => .where((patch) =>
!patch.name.contains('settings') && !patch.name.contains('settings') &&
patch.compatiblePackages.any((pack) => pack.name == newPackageName)) patch.compatiblePackages.any((pack) => pack.name == packageName))
.toList(); .toList();
} }
@@ -142,7 +140,6 @@ class PatcherAPI {
List<Patch> selectedPatches, List<Patch> selectedPatches,
) async { ) async {
bool mergeIntegrations = await needsIntegrations(selectedPatches); bool mergeIntegrations = await needsIntegrations(selectedPatches);
bool resourcePatching = await needsResourcePatching(selectedPatches);
bool includeSettings = await needsSettingsPatch(selectedPatches); bool includeSettings = await needsSettingsPatch(selectedPatches);
if (includeSettings) { if (includeSettings) {
try { try {
@@ -164,6 +161,7 @@ class PatcherAPI {
integrationsFile = await _managerAPI.downloadIntegrations(); integrationsFile = await _managerAPI.downloadIntegrations();
} }
if (patchBundleFile != null) { if (patchBundleFile != null) {
_dataDir.createSync();
_tmpDir.createSync(); _tmpDir.createSync();
Directory workDir = _tmpDir.createTempSync('tmp-'); Directory workDir = _tmpDir.createTempSync('tmp-');
File inputFile = File('${workDir.path}/base.apk'); File inputFile = File('${workDir.path}/base.apk');
@@ -186,7 +184,6 @@ class PatcherAPI {
'selectedPatches': selectedPatches.map((p) => p.name).toList(), 'selectedPatches': selectedPatches.map((p) => p.name).toList(),
'cacheDirPath': cacheDir.path, 'cacheDirPath': cacheDir.path,
'mergeIntegrations': mergeIntegrations, 'mergeIntegrations': mergeIntegrations,
'resourcePatching': resourcePatching,
'keyStoreFilePath': _keyStoreFile.path, 'keyStoreFilePath': _keyStoreFile.path,
}, },
); );

View File

@@ -1,33 +1,33 @@
import 'dart:io'; import 'dart:io';
import 'package:collection/collection.dart'; import 'package:collection/collection.dart';
import 'package:dio_brotli_transformer/dio_brotli_transformer.dart';
import 'package:native_dio_client/native_dio_client.dart';
import 'package:dio/dio.dart'; import 'package:dio/dio.dart';
import 'package:dio_http_cache_lts/dio_http_cache_lts.dart'; import 'package:dio_http_cache_lts/dio_http_cache_lts.dart';
import 'package:flutter_cache_manager/flutter_cache_manager.dart'; import 'package:flutter_cache_manager/flutter_cache_manager.dart';
import 'package:injectable/injectable.dart'; import 'package:injectable/injectable.dart';
import 'package:revanced_manager/models/patch.dart'; import 'package:revanced_manager/models/patch.dart';
import 'package:timeago/timeago.dart'; import 'package:timeago/timeago.dart';
import 'package:dio_http2_adapter/dio_http2_adapter.dart';
@lazySingleton @lazySingleton
class RevancedAPI { class RevancedAPI {
late Dio _dio = Dio(); late Dio _dio = Dio();
final DioCacheManager _dioCacheManager = DioCacheManager(CacheConfig()); final DioCacheManager _dioCacheManager = DioCacheManager(CacheConfig());
final Options _cacheOptions = buildCacheOptions( final Options _cacheOptions = buildCacheOptions(
const Duration(days: 1), const Duration(hours: 6),
maxStale: const Duration(days: 7), maxStale: const Duration(days: 1),
); );
Future<void> initialize(String apiUrl) async { Future<void> initialize(String apiUrl) async {
_dio = Dio(BaseOptions( _dio = Dio(BaseOptions(
baseUrl: apiUrl, baseUrl: apiUrl,
headers: {
'accept-encoding': 'br',
},
)) ))
..httpClientAdapter = Http2Adapter( ..httpClientAdapter = NativeAdapter();
ConnectionManager(
idleTimeout: 10000,
onClientCreate: (_, config) => config.onBadCertificate = (_) => true,
),
);
_dio.interceptors.add(_dioCacheManager.interceptor); _dio.interceptors.add(_dioCacheManager.interceptor);
_dio.transformer = DioBrotliTransformer(transformer: DefaultTransformer());
} }
Future<void> clearAllCache() async { Future<void> clearAllCache() async {

View File

@@ -26,6 +26,7 @@ class AppSelectorViewModel extends BaseViewModel {
locator<PatcherViewModel>().selectedApp = PatchedApplication( locator<PatcherViewModel>().selectedApp = PatchedApplication(
name: application.appName, name: application.appName,
packageName: application.packageName, packageName: application.packageName,
originalPackageName: application.packageName,
version: application.versionName!, version: application.versionName!,
apkFilePath: application.apkFilePath, apkFilePath: application.apkFilePath,
icon: application.icon, icon: application.icon,
@@ -51,6 +52,7 @@ class AppSelectorViewModel extends BaseViewModel {
locator<PatcherViewModel>().selectedApp = PatchedApplication( locator<PatcherViewModel>().selectedApp = PatchedApplication(
name: application.appName, name: application.appName,
packageName: application.packageName, packageName: application.packageName,
originalPackageName: application.packageName,
version: application.versionName!, version: application.versionName!,
apkFilePath: result.files.single.path!, apkFilePath: result.files.single.path!,
icon: application.icon, icon: application.icon,

View File

@@ -49,7 +49,6 @@ class HomeViewModel extends BaseViewModel {
_toast.show('homeView.noConnection'); _toast.show('homeView.noConnection');
} }
_getPatchedApps(); _getPatchedApps();
_managerAPI.reAssessSavedApps().then((_) => _getPatchedApps());
} }
void navigateToAppInfo(PatchedApplication app) { void navigateToAppInfo(PatchedApplication app) {

View File

@@ -17,7 +17,7 @@ class PatchesSelectorViewModel extends BaseViewModel {
Future<void> initialize() async { Future<void> initialize() async {
patches.addAll(await _patcherAPI.getFilteredPatches( patches.addAll(await _patcherAPI.getFilteredPatches(
locator<PatcherViewModel>().selectedApp!.packageName, locator<PatcherViewModel>().selectedApp!.originalPackageName,
)); ));
patches.sort((a, b) => a.name.compareTo(b.name)); patches.sort((a, b) => a.name.compareTo(b.name));
notifyListeners(); notifyListeners();
@@ -73,9 +73,8 @@ class PatchesSelectorViewModel extends BaseViewModel {
.where((patch) => .where((patch) =>
query.isEmpty || query.isEmpty ||
query.length < 2 || query.length < 2 ||
patch.name.toLowerCase().contains( patch.name.toLowerCase().contains(query.toLowerCase()) ||
query.toLowerCase(), patch.getSimpleName().toLowerCase().contains(query.toLowerCase()))
))
.toList(); .toList();
} }

View File

@@ -160,8 +160,9 @@ class AppInfoView extends StatelessWidget {
child: InkWell( child: InkWell(
borderRadius: BorderRadius.circular(16.0), borderRadius: BorderRadius.circular(16.0),
onTap: () { onTap: () {
model.navigateToPatcher(app); model.updateNotImplemented(context);
Navigator.of(context).pop(); // model.navigateToPatcher(app);
// Navigator.of(context).pop();
}, },
child: Column( child: Column(
mainAxisAlignment: mainAxisAlignment:
@@ -260,6 +261,22 @@ class AppInfoView extends StatelessWidget {
subtitle: Text(app.packageName), subtitle: Text(app.packageName),
), ),
const SizedBox(height: 4), const SizedBox(height: 4),
ListTile(
contentPadding:
const EdgeInsets.symmetric(horizontal: 20.0),
title: I18nText(
'appInfoView.originalPackageNameLabel',
child: const Text(
'',
style: TextStyle(
fontSize: 20,
fontWeight: FontWeight.w500,
),
),
),
subtitle: Text(app.originalPackageName),
),
const SizedBox(height: 4),
ListTile( ListTile(
contentPadding: contentPadding:
const EdgeInsets.symmetric(horizontal: 20.0), const EdgeInsets.symmetric(horizontal: 20.0),

View File

@@ -8,6 +8,7 @@ import 'package:revanced_manager/models/patched_application.dart';
import 'package:revanced_manager/services/manager_api.dart'; import 'package:revanced_manager/services/manager_api.dart';
import 'package:revanced_manager/services/patcher_api.dart'; import 'package:revanced_manager/services/patcher_api.dart';
import 'package:revanced_manager/services/root_api.dart'; import 'package:revanced_manager/services/root_api.dart';
import 'package:revanced_manager/services/toast.dart';
import 'package:revanced_manager/ui/views/home/home_viewmodel.dart'; import 'package:revanced_manager/ui/views/home/home_viewmodel.dart';
import 'package:revanced_manager/ui/views/navigation/navigation_viewmodel.dart'; import 'package:revanced_manager/ui/views/navigation/navigation_viewmodel.dart';
import 'package:revanced_manager/ui/views/patcher/patcher_viewmodel.dart'; import 'package:revanced_manager/ui/views/patcher/patcher_viewmodel.dart';
@@ -19,6 +20,7 @@ class AppInfoViewModel extends BaseViewModel {
final ManagerAPI _managerAPI = locator<ManagerAPI>(); final ManagerAPI _managerAPI = locator<ManagerAPI>();
final PatcherAPI _patcherAPI = locator<PatcherAPI>(); final PatcherAPI _patcherAPI = locator<PatcherAPI>();
final RootAPI _rootAPI = RootAPI(); final RootAPI _rootAPI = RootAPI();
final Toast _toast = locator<Toast>();
Future<void> uninstallApp( Future<void> uninstallApp(
BuildContext context, BuildContext context,
@@ -51,6 +53,10 @@ class AppInfoViewModel extends BaseViewModel {
locator<NavigationViewModel>().setIndex(1); locator<NavigationViewModel>().setIndex(1);
} }
void updateNotImplemented(BuildContext context) {
_toast.show('appInfoView.updateNotImplemented');
}
Future<void> showUninstallDialog( Future<void> showUninstallDialog(
BuildContext context, BuildContext context,
PatchedApplication app, PatchedApplication app,
@@ -127,7 +133,8 @@ class AppInfoViewModel extends BaseViewModel {
builder: (context) => AlertDialog( builder: (context) => AlertDialog(
title: I18nText('appInfoView.appliedPatchesLabel'), title: I18nText('appInfoView.appliedPatchesLabel'),
backgroundColor: Theme.of(context).colorScheme.secondaryContainer, backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
content: Text(getAppliedPatchesString(app.appliedPatches)), content: SingleChildScrollView(
child: Text(getAppliedPatchesString(app.appliedPatches))),
actions: <Widget>[ actions: <Widget>[
CustomMaterialButton( CustomMaterialButton(
label: I18nText('okButton'), label: I18nText('okButton'),

View File

@@ -45,15 +45,17 @@ class AvailableUpdatesCard extends StatelessWidget {
physics: const NeverScrollableScrollPhysics(), physics: const NeverScrollableScrollPhysics(),
children: apps children: apps
.map((app) => ApplicationItem( .map((app) => ApplicationItem(
icon: app.icon, icon: app.icon,
name: app.name, name: app.name,
patchDate: app.patchDate, patchDate: app.patchDate,
changelog: app.changelog, changelog: app.changelog,
isUpdatableApp: true, isUpdatableApp: true,
onPressed: () => //TODO: Find a better way to do update functionality
locator<HomeViewModel>().navigateToPatcher( onPressed: () {}
app, // () =>
), // locator<HomeViewModel>().navigateToPatcher(
// app,
// ),
)) ))
.toList(), .toList(),
); );

View File

@@ -51,93 +51,93 @@ class _ApplicationItemState extends State<ApplicationItem>
Widget build(BuildContext context) { Widget build(BuildContext context) {
ExpandableController expController = ExpandableController(); ExpandableController expController = ExpandableController();
return Container( return Container(
margin: const EdgeInsets.only(bottom: 16.0), margin: const EdgeInsets.only(bottom: 16.0),
child: CustomCard( child: CustomCard(
onTap: () { onTap: () {
expController.toggle(); expController.toggle();
_animationController.isCompleted _animationController.isCompleted
? _animationController.reverse() ? _animationController.reverse()
: _animationController.forward(); : _animationController.forward();
}, },
child: ExpandablePanel( child: ExpandablePanel(
controller: expController, controller: expController,
theme: const ExpandableThemeData( theme: const ExpandableThemeData(
inkWellBorderRadius: BorderRadius.all(Radius.circular(16)), inkWellBorderRadius: BorderRadius.all(Radius.circular(16)),
tapBodyToCollapse: false, tapBodyToCollapse: false,
tapBodyToExpand: false, tapBodyToExpand: false,
tapHeaderToExpand: false, tapHeaderToExpand: false,
hasIcon: false, hasIcon: false,
animationDuration: Duration(milliseconds: 450), animationDuration: Duration(milliseconds: 450),
), ),
header: Row( header: Row(
children: <Widget>[ children: <Widget>[
SizedBox( SizedBox(
width: 40, width: 40,
child: Image.memory(widget.icon, height: 40, width: 40), child: Image.memory(widget.icon, height: 40, width: 40),
), ),
const SizedBox(width: 4), const SizedBox(width: 4),
Padding( Padding(
padding: const EdgeInsets.only(left: 15.0), padding: const EdgeInsets.only(left: 15.0),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Text(
widget.name.length > 12
? '${widget.name.substring(0, 12)}...'
: widget.name,
style: const TextStyle(
fontSize: 16,
fontWeight: FontWeight.w500,
),
),
Text(format(widget.patchDate)),
],
),
),
const Spacer(),
RotationTransition(
turns: Tween(begin: 0.0, end: 0.50)
.animate(_animationController),
child: const Padding(
padding: EdgeInsets.all(8.0),
child: Icon(Icons.arrow_drop_down),
),
),
const SizedBox(width: 8),
Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.end,
children: <Widget>[ children: <Widget>[
CustomMaterialButton( Text(
label: widget.isUpdatableApp widget.name.length > 12
? I18nText('applicationItem.patchButton') ? '${widget.name.substring(0, 12)}...'
: I18nText('applicationItem.infoButton'), : widget.name,
onPressed: widget.onPressed, style: const TextStyle(
fontSize: 16,
fontWeight: FontWeight.w500,
),
), ),
Text(format(widget.patchDate)),
], ],
), ),
], ),
), const Spacer(),
collapsed: const SizedBox(), RotationTransition(
expanded: Padding( turns: Tween(begin: 0.0, end: 0.50)
padding: const EdgeInsets.only(top: 16.0, left: 4.0, right: 4.0, bottom: 4.0), .animate(_animationController),
child: Column( child: const Padding(
crossAxisAlignment: CrossAxisAlignment.start, padding: EdgeInsets.all(8.0),
children: <Widget>[ child: Icon(Icons.arrow_drop_down),
I18nText(
'applicationItem.changelogLabel',
child: const Text(
'',
style: TextStyle(fontWeight: FontWeight.w700),
), ),
), ),
const SizedBox(height: 4), const SizedBox(width: 8),
Text('\u2022 ${widget.changelog.join('\n\u2022 ')}'), Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.end,
children: <Widget>[
CustomMaterialButton(
label: widget.isUpdatableApp
? I18nText('applicationItem.infoButton')
: I18nText('applicationItem.infoButton'),
onPressed: widget.onPressed,
),
],
),
], ],
), ),
collapsed: const SizedBox(),
expanded: Padding(
padding: const EdgeInsets.only(
top: 16.0, left: 4.0, right: 4.0, bottom: 4.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
I18nText(
'applicationItem.changelogLabel',
child: const Text(
'',
style: TextStyle(fontWeight: FontWeight.w700),
),
),
const SizedBox(height: 4),
Text('\u2022 ${widget.changelog.join('\n\u2022 ')}'),
],
),
),
), ),
), ));
)
);
} }
} }

View File

@@ -4,7 +4,7 @@ homepage: https://github.com/revanced/revanced-manager
publish_to: 'none' publish_to: 'none'
version: 0.0.26+26 version: 0.0.31+31
environment: environment:
sdk: ">=2.17.5 <3.0.0" sdk: ">=2.17.5 <3.0.0"
@@ -20,7 +20,7 @@ dependencies:
ref: revanced-manager ref: revanced-manager
device_info_plus: ^4.1.2 device_info_plus: ^4.1.2
dio: ^4.0.6 dio: ^4.0.6
dio_http2_adapter: ^2.0.0 dio_brotli_transformer: ^1.0.1
dio_http_cache_lts: ^0.4.1 dio_http_cache_lts: ^0.4.1
dynamic_color: ^1.5.4 dynamic_color: ^1.5.4
dynamic_themes: ^1.1.0 dynamic_themes: ^1.1.0
@@ -51,6 +51,7 @@ dependencies:
git: git:
url: https://github.com/SuaMusica/logcat url: https://github.com/SuaMusica/logcat
ref: feature/nullSafe ref: feature/nullSafe
native_dio_client: ^0.0.1-dev+1
package_info_plus: ^1.4.3+1 package_info_plus: ^1.4.3+1
path_provider: ^2.0.11 path_provider: ^2.0.11
permission_handler: ^10.0.0 permission_handler: ^10.0.0