Compare commits

...

39 Commits

Author SHA1 Message Date
e563049f6a build: bump version to v0.0.38 2022-11-01 19:04:23 +03:00
cc00d0dc08 bump: kotlin gradle plugin (#461) 2022-11-01 19:03:26 +03:00
2a220c3984 fix: custom sources. 2022-11-01 19:03:30 +05:30
1d440d25be fix: dont select all patches if experimental toggle is off. 2022-11-01 15:36:06 +05:30
ba5234e850 feat: experimental settings to allow patch on any app version. 2022-11-01 15:26:15 +05:30
293f7150f1 build: bump version to v0.0.37 2022-10-31 00:59:57 +03:00
41b1cec8d3 feat: move to new API domain 2022-10-31 00:57:12 +03:00
c129c1eeae build: bump version to v0.0.36
totally didnt forget to bump last night
2022-10-20 10:08:33 +03:00
caa9694543 feat: improve explanation of update being unusable 2022-10-20 00:15:48 +03:00
ac79765372 fix: keystore name typo. 2022-10-19 18:55:27 +05:30
39500f054d feat: disable sentry for time being. 2022-10-19 18:53:13 +05:30
f2d5cc91db Merge branch 'flutter' of https://github.com/revanced/revanced-manager into flutter 2022-10-19 16:33:00 +05:30
84a788fd9e feat: toast for disabled updates. 2022-10-19 16:32:54 +05:30
3778bfe1b5 feat(installer): remove restriction of Share APK, closes #410 (#412)
Share APK has a requirement of needing to install the patched app before sharing, this PR removes that as I see no reason for this restriction
2022-10-18 16:16:04 +03:00
63b2d8e0bd build: remove create env step from actions. 2022-10-17 21:51:18 +05:30
e7490b8d75 refactor: disable sentry for now. 2022-10-17 21:39:46 +05:30
2e050d06e8 feat: remove firebase. (#405)
* feat: remove firebase.

* build: remove firebase config.
2022-10-17 20:24:47 +05:30
5fd1154039 build: bump version to 0.0.34 2022-10-17 19:53:46 +05:30
39401a78ec refactor: disable firebase for now. 2022-10-17 19:52:47 +05:30
273aa42b17 refactor: redo the environment system. 2022-10-17 16:48:39 +05:30
603917d21e feat: create env with github actions. 2022-10-17 16:25:22 +05:30
e55cd6a938 feat: add env vars to repo. 2022-10-17 15:06:33 +05:30
2aaed14a3a fix: add firebase options to repo. 2022-10-17 13:59:39 +05:30
511c25163d refactor: delete empty env. 2022-10-17 12:58:26 +05:30
c24e50f3a0 feat: add empty .env config. 2022-10-17 02:09:45 +05:30
2d732288a7 feat: option to delete manager logs. 2022-10-17 01:58:50 +05:30
56e715cd3c build: bump version to v0.0.33 2022-10-17 01:41:11 +05:30
074d8005bc feat: show patch bundle version in patch selector screen. 2022-10-17 01:40:16 +05:30
5b38c9442a fix: increase sleep timer for mount script. 2022-10-17 00:46:48 +05:30
3b8dc66da6 feat: option to delete temporary directory. 2022-10-17 00:41:20 +05:30
f5ebfc92fc feat: decrease time for force refresh of patches. 2022-10-17 00:32:45 +05:30
9de063aced feat: ability to delete keystores. 2022-10-17 00:22:07 +05:30
331691cc9d fix: add env file to repo. 2022-10-16 23:55:09 +05:30
1a97cdf91d refactor: remove useless prints. 2022-10-16 23:54:07 +05:30
fbd4359d61 fix: add missing else block. 2022-10-16 23:43:33 +05:30
f31a60d9bb feat: make firebase crashlytics optional. 2022-10-15 18:29:50 +05:30
79aca0e579 feat: firebase crashlytics for improving manager. 2022-10-15 15:01:31 +05:30
6d35c47b6b feat: make sentry logging optional. 2022-10-15 01:52:10 +05:30
f1261398e9 feat: sentry integration. 2022-10-14 23:35:33 +05:30
25 changed files with 699 additions and 260 deletions

3
.env Normal file
View File

@ -0,0 +1,3 @@
sentryDSN=
apiKey=
appId=

View File

@ -9,6 +9,10 @@
# packages, and plugins designed to encourage good coding practices. # packages, and plugins designed to encourage good coding practices.
include: package:flutter_lints/flutter.yaml include: package:flutter_lints/flutter.yaml
analyzer:
exclude:
- lib/utils/env_class.g.dart
linter: linter:
# The lint rules applied to this project can be customized in the # The lint rules applied to this project can be customized in the
# section below to disable rules from the `package:flutter_lints/flutter.yaml` # section below to disable rules from the `package:flutter_lints/flutter.yaml`

View File

@ -241,7 +241,16 @@ class MainActivity : FlutterActivity() {
) )
) )
} }
Signer("ReVanced", "s3cur3p@ssw0rd").signApk(patchedFile, outFile, keyStoreFile)
// Signer("ReVanced", "s3cur3p@ssw0rd").signApk(patchedFile, outFile, keyStoreFile)
try {
Signer("ReVanced", "s3cur3p@ssw0rd").signApk(patchedFile, outFile, keyStoreFile)
} catch (e: Exception) {
//log to console
print("Error signing apk: ${e.message}")
e.printStackTrace()
}
handler.post { handler.post {
installerChannel.invokeMethod( installerChannel.invokeMethod(

View File

@ -1,6 +1,6 @@
buildscript { buildscript {
ext.cronetVersion = '102.5005.125' ext.cronetVersion = '102.5005.125'
ext.kotlin_version = '1.7.10' ext.kotlin_version = '1.7.20'
repositories { repositories {
google() google()
mavenCentral() mavenCentral()

View File

@ -16,6 +16,7 @@
"patchedSubtitle": "Patched Applications", "patchedSubtitle": "Patched Applications",
"updatesAvailable": "Updates available", "updatesAvailable": "Updates available",
"noUpdates": "No updates available", "noUpdates": "No updates available",
"WIP": "Work In Progress",
"noInstallations": "No patched applications installed", "noInstallations": "No patched applications installed",
"installed": "Installed", "installed": "Installed",
"updateDialogTitle": "Update Manager", "updateDialogTitle": "Update Manager",
@ -26,7 +27,8 @@
"installingMessage": "Installing update...", "installingMessage": "Installing update...",
"errorDownloadMessage": "Unable to download update", "errorDownloadMessage": "Unable to download update",
"errorInstallMessage": "Unable to install update", "errorInstallMessage": "Unable to install update",
"noConnection": "No internet connection" "noConnection": "No internet connection",
"updatesDisabled": "Updating a patched app is currently disabled. Repatch the app again."
}, },
"applicationItem": { "applicationItem": {
"patchButton": "Patch", "patchButton": "Patch",
@ -82,7 +84,8 @@
"patchItem": { "patchItem": {
"unsupportedWarningButton": "Warning", "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}",
"unsupportedPatchVersion": "Patch is not supported for this app version. Enable experimental toggle in settings to proceed."
}, },
"installerView": { "installerView": {
"widgetTitle": "Installer", "widgetTitle": "Installer",
@ -106,6 +109,7 @@
"teamSectionTitle": "Team", "teamSectionTitle": "Team",
"infoSectionTitle": "Info", "infoSectionTitle": "Info",
"advancedSectionTitle": "Advanced", "advancedSectionTitle": "Advanced",
"logsSectionTitle": "Logs",
"darkThemeLabel": "Dark Mode", "darkThemeLabel": "Dark Mode",
"darkThemeHint": "Welcome to the Dark Side", "darkThemeHint": "Welcome to the Dark Side",
"dynamicThemeLabel": "Material You", "dynamicThemeLabel": "Material You",
@ -129,8 +133,23 @@
"apiURLLabel": "API URL", "apiURLLabel": "API URL",
"apiURLHint": "Configure your custom API URL", "apiURLHint": "Configure your custom API URL",
"selectApiURL": "Select URL", "selectApiURL": "Select URL",
"experimentalPatchesLabel": "Experimental Patch support",
"experimentalPatchesHint": "Enable to use unsupported patches in any app version",
"enabledExperimentalPatches": "Experimental patches enabled",
"aboutLabel": "About", "aboutLabel": "About",
"snackbarMessage": "Copied to clipboard" "snackbarMessage": "Copied to clipboard",
"sentryLabel": "Sentry Logging",
"sentryHint": "Send anonymous logs to help us improve ReVanced Manager",
"restartAppForChanges": "Restart the app to apply changes",
"deleteKeystoreLabel": "Delete keystore",
"deleteKeystoreHint": "Delete the keystore used to sign the app",
"deletedKeystore": "Keystore deleted",
"deleteTempDirLabel": "Delete temp directory",
"deleteTempDirHint": "Delete the temporary directory used to store temporary files",
"deletedTempDir": "Temp directory deleted",
"deleteLogsLabel": "Delete logs",
"deleteLogsHint": "Delete collected manager logs",
"deletedLogs": "Logs deleted"
}, },
"appInfoView": { "appInfoView": {
"widgetTitle": "App Info", "widgetTitle": "App Info",

View File

@ -9,6 +9,7 @@ import 'package:revanced_manager/services/revanced_api.dart';
import 'package:revanced_manager/ui/theme/dynamic_theme_builder.dart'; import 'package:revanced_manager/ui/theme/dynamic_theme_builder.dart';
import 'package:revanced_manager/ui/views/navigation/navigation_view.dart'; import 'package:revanced_manager/ui/views/navigation/navigation_view.dart';
import 'package:stacked_themes/stacked_themes.dart'; import 'package:stacked_themes/stacked_themes.dart';
import 'package:sentry_flutter/sentry_flutter.dart';
import 'package:timezone/data/latest.dart' as tz; import 'package:timezone/data/latest.dart' as tz;
Future main() async { Future main() async {
@ -18,9 +19,34 @@ Future main() async {
await locator<ManagerAPI>().initialize(); await locator<ManagerAPI>().initialize();
String apiUrl = locator<ManagerAPI>().getApiUrl(); String apiUrl = locator<ManagerAPI>().getApiUrl();
await locator<RevancedAPI>().initialize(apiUrl); await locator<RevancedAPI>().initialize(apiUrl);
// bool isSentryEnabled = locator<ManagerAPI>().isSentryEnabled();
locator<GithubAPI>().initialize(); locator<GithubAPI>().initialize();
await locator<PatcherAPI>().initialize(); await locator<PatcherAPI>().initialize();
tz.initializeTimeZones(); tz.initializeTimeZones();
// Remove this section if you are building from source and don't have sentry configured
// await SentryFlutter.init(
// (options) {
// options
// ..dsn = isSentryEnabled ? '' : ''
// ..environment = 'alpha'
// ..release = '0.1'
// ..tracesSampleRate = 1.0
// ..anrEnabled = true
// ..enableOutOfMemoryTracking = true
// ..sampleRate = isSentryEnabled ? 1.0 : 0.0
// ..beforeSend = (event, hint) {
// if (isSentryEnabled) {
// return event;
// } else {
// return null;
// }
// } as BeforeSendCallback?;
// },
// appRunner: () {
// runApp(const MyApp());
// },
// );
runApp(const MyApp()); runApp(const MyApp());
} }

View File

@ -5,9 +5,9 @@ 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:native_dio_client/native_dio_client.dart';
import 'package:revanced_manager/models/patch.dart'; import 'package:revanced_manager/models/patch.dart';
import 'package:revanced_manager/utils/check_for_gms.dart'; import 'package:sentry_flutter/sentry_flutter.dart';
import 'package:sentry_dio/sentry_dio.dart';
@lazySingleton @lazySingleton
class GithubAPI { class GithubAPI {
@ -29,25 +29,26 @@ class GithubAPI {
}; };
void initialize() async { void initialize() async {
bool isGMSInstalled = await checkForGMS(); try {
if (!isGMSInstalled) {
_dio = Dio(BaseOptions( _dio = Dio(BaseOptions(
baseUrl: 'https://api.github.com', baseUrl: 'https://api.github.com',
)); ));
print('GitHub API: Using default engine + $isGMSInstalled');
} else { _dio.interceptors.add(_dioCacheManager.interceptor);
_dio = Dio(BaseOptions( _dio.addSentry(
baseUrl: 'https://api.github.com', captureFailedRequests: true,
)) );
..httpClientAdapter = NativeAdapter(); } on Exception catch (e, s) {
print('ReVanced API: Using CronetEngine + $isGMSInstalled'); await Sentry.captureException(e, stackTrace: s);
} }
_dio.interceptors.add(_dioCacheManager.interceptor);
} }
Future<void> clearAllCache() async { Future<void> clearAllCache() async {
await _dioCacheManager.clearAll(); try {
await _dioCacheManager.clearAll();
} on Exception catch (e, s) {
await Sentry.captureException(e, stackTrace: s);
}
} }
Future<Map<String, dynamic>?> _getLatestRelease(String repoName) async { Future<Map<String, dynamic>?> _getLatestRelease(String repoName) async {
@ -57,7 +58,8 @@ class GithubAPI {
options: _cacheOptions, options: _cacheOptions,
); );
return response.data; return response.data;
} on Exception { } on Exception catch (e, s) {
await Sentry.captureException(e, stackTrace: s);
return null; return null;
} }
} }
@ -87,7 +89,8 @@ class GithubAPI {
'\n' as String, '\n' as String,
) )
.toList(); .toList();
} catch (e) { } on Exception catch (e, s) {
await Sentry.captureException(e, stackTrace: s);
return List.empty(); return List.empty();
} }
} }
@ -106,7 +109,8 @@ class GithubAPI {
); );
} }
} }
} on Exception { } on Exception catch (e, s) {
await Sentry.captureException(e, stackTrace: s);
return null; return null;
} }
return null; return null;
@ -120,7 +124,8 @@ class GithubAPI {
List<dynamic> list = jsonDecode(f.readAsStringSync()); List<dynamic> list = jsonDecode(f.readAsStringSync());
patches = list.map((patch) => Patch.fromJson(patch)).toList(); patches = list.map((patch) => Patch.fromJson(patch)).toList();
} }
} on Exception { } on Exception catch (e, s) {
await Sentry.captureException(e, stackTrace: s);
return List.empty(); return List.empty();
} }
return patches; return patches;

View File

@ -9,6 +9,7 @@ import 'package:revanced_manager/models/patched_application.dart';
import 'package:revanced_manager/services/github_api.dart'; import 'package:revanced_manager/services/github_api.dart';
import 'package:revanced_manager/services/revanced_api.dart'; import 'package:revanced_manager/services/revanced_api.dart';
import 'package:revanced_manager/services/root_api.dart'; import 'package:revanced_manager/services/root_api.dart';
import 'package:sentry_flutter/sentry_flutter.dart';
import 'package:shared_preferences/shared_preferences.dart'; import 'package:shared_preferences/shared_preferences.dart';
@lazySingleton @lazySingleton
@ -19,7 +20,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://releases.rvcd.win/'; String defaultApiUrl = 'https://releases.revanced.app/';
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';
@ -81,6 +82,37 @@ class ManagerAPI {
await _prefs.setBool('useDarkTheme', value); await _prefs.setBool('useDarkTheme', value);
} }
// bool isSentryEnabled() {
// return _prefs.getBool('sentryEnabled') ?? true;
// }
// Future<void> setSentryStatus(bool value) async {
// await _prefs.setBool('sentryEnabled', value);
// }
bool areExperimentalPatchesEnabled() {
return _prefs.getBool('experimentalPatchesEnabled') ?? false;
}
Future<void> enableExperimentalPatchesStatus(bool value) async {
await _prefs.setBool('experimentalPatchesEnabled', value);
}
Future<void> deleteTempFolder() async {
final Directory dir = Directory('/data/local/tmp/revanced-manager');
if (await dir.exists()) {
await dir.delete(recursive: true);
}
}
Future<void> deleteKeystore() async {
final File keystore = File(
'/sdcard/Android/data/app.revanced.manager.flutter/files/revanced-manager.keystore');
if (await keystore.exists()) {
await keystore.delete();
}
}
List<PatchedApplication> getPatchedApps() { List<PatchedApplication> getPatchedApps() {
List<String> apps = _prefs.getStringList('patchedApps') ?? []; List<String> apps = _prefs.getStringList('patchedApps') ?? [];
return apps.map((a) => PatchedApplication.fromJson(jsonDecode(a))).toList(); return apps.map((a) => PatchedApplication.fromJson(jsonDecode(a))).toList();
@ -116,9 +148,13 @@ class ManagerAPI {
await setPatchedApps(patchedApps); await setPatchedApps(patchedApps);
} }
void clearAllData() { void clearAllData() async {
_revancedAPI.clearAllCache(); try {
_githubAPI.clearAllCache(); _revancedAPI.clearAllCache();
_githubAPI.clearAllCache();
} on Exception catch (e, s) {
await Sentry.captureException(e, stackTrace: s);
}
} }
Future<Map<String, List<dynamic>>> getContributors() async { Future<Map<String, List<dynamic>>> getContributors() async {
@ -126,35 +162,50 @@ class ManagerAPI {
} }
Future<List<Patch>> getPatches() async { Future<List<Patch>> getPatches() async {
String repoName = getPatchesRepo(); try {
if (repoName == defaultPatchesRepo) { String repoName = getPatchesRepo();
return await _revancedAPI.getPatches(); if (repoName == defaultPatchesRepo) {
} else { return await _revancedAPI.getPatches();
return await _githubAPI.getPatches(repoName); } else {
return await _githubAPI.getPatches(repoName);
}
} on Exception catch (e, s) {
await Sentry.captureException(e, stackTrace: s);
return [];
} }
} }
Future<File?> downloadPatches() async { Future<File?> downloadPatches() async {
String repoName = getPatchesRepo(); try {
if (repoName == defaultPatchesRepo) { String repoName = getPatchesRepo();
return await _revancedAPI.getLatestReleaseFile( if (repoName == defaultPatchesRepo) {
'.jar', return await _revancedAPI.getLatestReleaseFile(
defaultPatchesRepo, '.jar',
); defaultPatchesRepo,
} else { );
return await _githubAPI.getLatestReleaseFile('.jar', repoName); } else {
return await _githubAPI.getLatestReleaseFile('.jar', repoName);
}
} on Exception catch (e, s) {
await Sentry.captureException(e, stackTrace: s);
return null;
} }
} }
Future<File?> downloadIntegrations() async { Future<File?> downloadIntegrations() async {
String repoName = getIntegrationsRepo(); try {
if (repoName == defaultIntegrationsRepo) { String repoName = getIntegrationsRepo();
return await _revancedAPI.getLatestReleaseFile( if (repoName == defaultIntegrationsRepo) {
'.apk', return await _revancedAPI.getLatestReleaseFile(
defaultIntegrationsRepo, '.apk',
); defaultIntegrationsRepo,
} else { );
return await _githubAPI.getLatestReleaseFile('.apk', repoName); } else {
return await _githubAPI.getLatestReleaseFile('.apk', repoName);
}
} on Exception catch (e, s) {
await Sentry.captureException(e, stackTrace: s);
return null;
} }
} }
@ -177,6 +228,13 @@ class ManagerAPI {
); );
} }
Future<String?> getLatestPatchesVersion() async {
return await _revancedAPI.getLatestReleaseVersion(
'.json',
defaultPatchesRepo,
);
}
Future<String> getCurrentManagerVersion() async { Future<String> getCurrentManagerVersion() async {
PackageInfo packageInfo = await PackageInfo.fromPlatform(); PackageInfo packageInfo = await PackageInfo.fromPlatform();
return packageInfo.version; return packageInfo.version;

View File

@ -10,6 +10,7 @@ import 'package:revanced_manager/models/patch.dart';
import 'package:revanced_manager/models/patched_application.dart'; 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/root_api.dart'; import 'package:revanced_manager/services/root_api.dart';
import 'package:sentry_flutter/sentry_flutter.dart';
import 'package:share_extend/share_extend.dart'; import 'package:share_extend/share_extend.dart';
@lazySingleton @lazySingleton
@ -44,7 +45,8 @@ class PatcherAPI {
if (_patches.isEmpty) { if (_patches.isEmpty) {
_patches = await _managerAPI.getPatches(); _patches = await _managerAPI.getPatches();
} }
} on Exception { } on Exception catch (e, s) {
await Sentry.captureException(e, stackTrace: s);
_patches = List.empty(); _patches = List.empty();
} }
} }
@ -63,7 +65,8 @@ class PatcherAPI {
filteredApps.add(app); filteredApps.add(app);
} }
} }
} catch (e) { } on Exception catch (e, s) {
await Sentry.captureException(e, stackTrace: s);
continue; continue;
} }
} }
@ -124,14 +127,19 @@ class PatcherAPI {
String packageName, String packageName,
String originalFilePath, String originalFilePath,
) async { ) async {
bool hasRootPermissions = await _rootAPI.hasRootPermissions(); try {
if (hasRootPermissions) { bool hasRootPermissions = await _rootAPI.hasRootPermissions();
originalFilePath = await _rootAPI.getOriginalFilePath( if (hasRootPermissions) {
packageName, originalFilePath = await _rootAPI.getOriginalFilePath(
originalFilePath, packageName,
); originalFilePath,
);
}
return originalFilePath;
} on Exception catch (e, s) {
await Sentry.captureException(e, stackTrace: s);
return originalFilePath;
} }
return originalFilePath;
} }
Future<void> runPatcher( Future<void> runPatcher(
@ -151,7 +159,8 @@ class PatcherAPI {
if (settingsPatch != null) { if (settingsPatch != null) {
selectedPatches.add(settingsPatch); selectedPatches.add(settingsPatch);
} }
} catch (e) { } on Exception catch (e, s) {
await Sentry.captureException(e, stackTrace: s);
// ignore // ignore
} }
} }
@ -169,24 +178,29 @@ class PatcherAPI {
_outFile = File('${workDir.path}/out.apk'); _outFile = File('${workDir.path}/out.apk');
Directory cacheDir = Directory('${workDir.path}/cache'); Directory cacheDir = Directory('${workDir.path}/cache');
cacheDir.createSync(); cacheDir.createSync();
await patcherChannel.invokeMethod( try {
'runPatcher', await patcherChannel.invokeMethod(
{ 'runPatcher',
'patchBundleFilePath': patchBundleFile.path, {
'originalFilePath': await getOriginalFilePath( 'patchBundleFilePath': patchBundleFile.path,
packageName, 'originalFilePath': await getOriginalFilePath(
originalFilePath, packageName,
), originalFilePath,
'inputFilePath': inputFile.path, ),
'patchedFilePath': patchedFile.path, 'inputFilePath': inputFile.path,
'outFilePath': _outFile!.path, 'patchedFilePath': patchedFile.path,
'integrationsPath': mergeIntegrations ? integrationsFile!.path : '', 'outFilePath': _outFile!.path,
'selectedPatches': selectedPatches.map((p) => p.name).toList(), 'integrationsPath': mergeIntegrations ? integrationsFile!.path : '',
'cacheDirPath': cacheDir.path, 'selectedPatches': selectedPatches.map((p) => p.name).toList(),
'mergeIntegrations': mergeIntegrations, 'cacheDirPath': cacheDir.path,
'keyStoreFilePath': _keyStoreFile.path, 'mergeIntegrations': mergeIntegrations,
}, 'keyStoreFilePath': _keyStoreFile.path,
); },
);
} on Exception catch (e, s) {
print(e);
throw await Sentry.captureException(e, stackTrace: s);
}
} }
} }
@ -206,7 +220,8 @@ class PatcherAPI {
await AppInstaller.installApk(_outFile!.path); await AppInstaller.installApk(_outFile!.path);
return await DeviceApps.isAppInstalled(patchedApp.packageName); return await DeviceApps.isAppInstalled(patchedApp.packageName);
} }
} on Exception { } on Exception catch (e, s) {
await Sentry.captureException(e, stackTrace: s);
return false; return false;
} }
} }
@ -214,13 +229,18 @@ class PatcherAPI {
} }
void sharePatchedFile(String appName, String version) { void sharePatchedFile(String appName, String version) {
if (_outFile != null) { try {
String prefix = appName.toLowerCase().replaceAll(' ', '-'); if (_outFile != null) {
String newName = '$prefix-revanced_v$version.apk'; String prefix = appName.toLowerCase().replaceAll(' ', '-');
int lastSeparator = _outFile!.path.lastIndexOf('/'); String newName = '$prefix-revanced_v$version.apk';
String newPath = _outFile!.path.substring(0, lastSeparator + 1) + newName; int lastSeparator = _outFile!.path.lastIndexOf('/');
File shareFile = _outFile!.copySync(newPath); String newPath =
ShareExtend.share(shareFile.path, 'file'); _outFile!.path.substring(0, lastSeparator + 1) + newName;
File shareFile = _outFile!.copySync(newPath);
ShareExtend.share(shareFile.path, 'file');
}
} on Exception catch (e, s) {
Sentry.captureException(e, stackTrace: s);
} }
} }

View File

@ -8,6 +8,8 @@ import 'package:injectable/injectable.dart';
import 'package:revanced_manager/models/patch.dart'; import 'package:revanced_manager/models/patch.dart';
import 'package:revanced_manager/utils/check_for_gms.dart'; import 'package:revanced_manager/utils/check_for_gms.dart';
import 'package:timeago/timeago.dart'; import 'package:timeago/timeago.dart';
import 'package:sentry_flutter/sentry_flutter.dart';
import 'package:sentry_dio/sentry_dio.dart';
@lazySingleton @lazySingleton
class RevancedAPI { class RevancedAPI {
@ -19,25 +21,36 @@ class RevancedAPI {
); );
Future<void> initialize(String apiUrl) async { Future<void> initialize(String apiUrl) async {
bool isGMSInstalled = await checkForGMS(); try {
bool isGMSInstalled = await checkForGMS();
if (!isGMSInstalled) { if (!isGMSInstalled) {
_dio = Dio(BaseOptions( _dio = Dio(BaseOptions(
baseUrl: apiUrl, baseUrl: apiUrl,
)); ));
print('ReVanced API: Using default engine + $isGMSInstalled'); print('ReVanced API: Using default engine + $isGMSInstalled');
} else { } else {
_dio = Dio(BaseOptions( _dio = Dio(BaseOptions(
baseUrl: apiUrl, baseUrl: apiUrl,
)) ))
..httpClientAdapter = NativeAdapter(); ..httpClientAdapter = NativeAdapter();
print('ReVanced API: Using CronetEngine + $isGMSInstalled'); print('ReVanced API: Using CronetEngine + $isGMSInstalled');
}
_dio.interceptors.add(_dioCacheManager.interceptor);
_dio.addSentry(
captureFailedRequests: true,
);
} on Exception catch (e, s) {
await Sentry.captureException(e, stackTrace: s);
} }
_dio.interceptors.add(_dioCacheManager.interceptor);
} }
Future<void> clearAllCache() async { Future<void> clearAllCache() async {
await _dioCacheManager.clearAll(); try {
await _dioCacheManager.clearAll();
} on Exception catch (e, s) {
await Sentry.captureException(e, stackTrace: s);
}
} }
Future<Map<String, List<dynamic>>> getContributors() async { Future<Map<String, List<dynamic>>> getContributors() async {
@ -49,7 +62,8 @@ class RevancedAPI {
String name = repo['name']; String name = repo['name'];
contributors[name] = repo['contributors']; contributors[name] = repo['contributors'];
} }
} on Exception { } on Exception catch (e, s) {
await Sentry.captureException(e, stackTrace: s);
return {}; return {};
} }
return contributors; return contributors;
@ -60,7 +74,8 @@ class RevancedAPI {
var response = await _dio.get('/patches', options: _cacheOptions); var response = await _dio.get('/patches', options: _cacheOptions);
List<dynamic> patches = response.data; List<dynamic> patches = response.data;
return patches.map((patch) => Patch.fromJson(patch)).toList(); return patches.map((patch) => Patch.fromJson(patch)).toList();
} on Exception { } on Exception catch (e, s) {
await Sentry.captureException(e, stackTrace: s);
return List.empty(); return List.empty();
} }
} }
@ -77,7 +92,8 @@ class RevancedAPI {
t['repository'] == repoName && t['repository'] == repoName &&
(t['name'] as String).endsWith(extension), (t['name'] as String).endsWith(extension),
); );
} on Exception { } on Exception catch (e, s) {
await Sentry.captureException(e, stackTrace: s);
return null; return null;
} }
} }
@ -94,7 +110,8 @@ class RevancedAPI {
if (release != null) { if (release != null) {
return release['version']; return release['version'];
} }
} on Exception { } on Exception catch (e, s) {
await Sentry.captureException(e, stackTrace: s);
return null; return null;
} }
return null; return null;
@ -110,7 +127,8 @@ class RevancedAPI {
String url = release['browser_download_url']; String url = release['browser_download_url'];
return await DefaultCacheManager().getSingleFile(url); return await DefaultCacheManager().getSingleFile(url);
} }
} on Exception { } on Exception catch (e, s) {
await Sentry.captureException(e, stackTrace: s);
return null; return null;
} }
return null; return null;
@ -129,7 +147,8 @@ class RevancedAPI {
DateTime timestamp = DateTime.parse(release['timestamp'] as String); DateTime timestamp = DateTime.parse(release['timestamp'] as String);
return format(timestamp, locale: 'en_short'); return format(timestamp, locale: 'en_short');
} }
} on Exception { } on Exception catch (e, s) {
await Sentry.captureException(e, stackTrace: s);
return null; return null;
} }
return null; return null;

View File

@ -1,4 +1,5 @@
import 'package:root/root.dart'; import 'package:root/root.dart';
import 'package:sentry_flutter/sentry_flutter.dart';
class RootAPI { class RootAPI {
final String _managerDirPath = '/data/local/tmp/revanced-manager'; final String _managerDirPath = '/data/local/tmp/revanced-manager';
@ -9,7 +10,8 @@ class RootAPI {
try { try {
bool? isRooted = await Root.isRootAvailable(); bool? isRooted = await Root.isRootAvailable();
return isRooted != null && isRooted; return isRooted != null && isRooted;
} on Exception { } on Exception catch (e, s) {
await Sentry.captureException(e, stackTrace: s);
return false; return false;
} }
} }
@ -22,7 +24,8 @@ class RootAPI {
return isRooted != null && isRooted; return isRooted != null && isRooted;
} }
return false; return false;
} on Exception { } on Exception catch (e, s) {
await Sentry.captureException(e, stackTrace: s);
return false; return false;
} }
} }
@ -75,7 +78,8 @@ class RootAPI {
apps.removeWhere((pack) => pack.isEmpty); apps.removeWhere((pack) => pack.isEmpty);
return apps.map((pack) => pack.trim()).toList(); return apps.map((pack) => pack.trim()).toList();
} }
} on Exception { } on Exception catch (e, s) {
await Sentry.captureException(e, stackTrace: s);
return List.empty(); return List.empty();
} }
return List.empty(); return List.empty();
@ -121,14 +125,15 @@ class RootAPI {
await installApk(packageName, patchedFilePath); await installApk(packageName, patchedFilePath);
await mountApk(packageName, originalFilePath); await mountApk(packageName, originalFilePath);
return true; return true;
} on Exception { } on Exception catch (e, s) {
await Sentry.captureException(e, stackTrace: s);
return false; return false;
} }
} }
Future<void> installServiceDScript(String packageName) async { Future<void> installServiceDScript(String packageName) async {
String content = '#!/system/bin/sh\n' String content = '#!/system/bin/sh\n'
'while [ "\$(getprop sys.boot_completed | tr -d \'"\'"\'\\\\r\'"\'"\')" != "1" ]; do sleep 1; done\n' 'while [ "\$(getprop sys.boot_completed | tr -d \'"\'"\'\\\\r\'"\'"\')" != "1" ]; do sleep 3; done\n'
'base_path=$_managerDirPath/$packageName/base.apk\n' 'base_path=$_managerDirPath/$packageName/base.apk\n'
'stock_path=\$(pm path $packageName | grep base | sed \'"\'"\'s/package://g\'"\'"\')\n' 'stock_path=\$(pm path $packageName | grep base | sed \'"\'"\'s/package://g\'"\'"\')\n'
'[ ! -z \$stock_path ] && mount -o bind \$base_path \$stock_path'; '[ ! -z \$stock_path ] && mount -o bind \$base_path \$stock_path';

View File

@ -20,4 +20,15 @@ class Toast {
gravity: t.ToastGravity.CENTER, gravity: t.ToastGravity.CENTER,
); );
} }
void showBottom(String text) {
t.Fluttertoast.showToast(
msg: FlutterI18n.translate(
_fToast.context!,
text,
),
toastLength: t.Toast.LENGTH_LONG,
gravity: t.ToastGravity.BOTTOM,
);
}
} }

View File

@ -7,6 +7,7 @@ import 'package:revanced_manager/models/patched_application.dart';
import 'package:revanced_manager/services/patcher_api.dart'; import 'package:revanced_manager/services/patcher_api.dart';
import 'package:revanced_manager/services/toast.dart'; import 'package:revanced_manager/services/toast.dart';
import 'package:revanced_manager/ui/views/patcher/patcher_viewmodel.dart'; import 'package:revanced_manager/ui/views/patcher/patcher_viewmodel.dart';
import 'package:sentry_flutter/sentry_flutter.dart';
import 'package:stacked/stacked.dart'; import 'package:stacked/stacked.dart';
class AppSelectorViewModel extends BaseViewModel { class AppSelectorViewModel extends BaseViewModel {
@ -63,7 +64,8 @@ class AppSelectorViewModel extends BaseViewModel {
locator<PatcherViewModel>().notifyListeners(); locator<PatcherViewModel>().notifyListeners();
} }
} }
} on Exception { } on Exception catch (e, s) {
await Sentry.captureException(e, stackTrace: s);
_toast.show('appSelectorView.errorMessage'); _toast.show('appSelectorView.errorMessage');
} }
} }

View File

@ -67,20 +67,20 @@ class HomeView extends StatelessWidget {
const SizedBox(height: 8), const SizedBox(height: 8),
Row( Row(
children: <Widget>[ children: <Widget>[
DashboardChip(
label: I18nText('homeView.updatesAvailable'),
isSelected: model.showUpdatableApps,
onSelected: (value) {
model.toggleUpdatableApps(true);
},
),
const SizedBox(width: 10),
DashboardChip( DashboardChip(
label: I18nText('homeView.installed'), label: I18nText('homeView.installed'),
isSelected: !model.showUpdatableApps, isSelected: !model.showUpdatableApps,
onSelected: (value) { onSelected: (value) {
model.toggleUpdatableApps(false); model.toggleUpdatableApps(false);
}, },
),
const SizedBox(width: 10),
DashboardChip(
label: I18nText('homeView.updatesAvailable'),
isSelected: model.showUpdatableApps,
onSelected: (value) {
model.toggleUpdatableApps(true);
},
) )
], ],
), ),

View File

@ -16,6 +16,7 @@ import 'package:revanced_manager/services/toast.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';
import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart'; import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
import 'package:sentry_flutter/sentry_flutter.dart';
import 'package:stacked/stacked.dart'; import 'package:stacked/stacked.dart';
import 'package:stacked_services/stacked_services.dart'; import 'package:stacked_services/stacked_services.dart';
import 'package:timezone/timezone.dart' as tz; import 'package:timezone/timezone.dart' as tz;
@ -28,7 +29,7 @@ class HomeViewModel extends BaseViewModel {
final Toast _toast = locator<Toast>(); final Toast _toast = locator<Toast>();
final flutterLocalNotificationsPlugin = FlutterLocalNotificationsPlugin(); final flutterLocalNotificationsPlugin = FlutterLocalNotificationsPlugin();
DateTime? _lastUpdate; DateTime? _lastUpdate;
bool showUpdatableApps = true; bool showUpdatableApps = false;
List<PatchedApplication> patchedInstalledApps = []; List<PatchedApplication> patchedInstalledApps = [];
List<PatchedApplication> patchedUpdatableApps = []; List<PatchedApplication> patchedUpdatableApps = [];
@ -94,7 +95,8 @@ class HomeViewModel extends BaseViewModel {
int currentVersionInt = int currentVersionInt =
int.parse(currentVersion.replaceAll(RegExp('[^0-9]'), '')); int.parse(currentVersion.replaceAll(RegExp('[^0-9]'), ''));
return latestVersionInt > currentVersionInt; return latestVersionInt > currentVersionInt;
} on Exception { } on Exception catch (e, s) {
await Sentry.captureException(e, stackTrace: s);
return false; return false;
} }
} }
@ -135,11 +137,16 @@ class HomeViewModel extends BaseViewModel {
} else { } else {
_toast.show('homeView.errorDownloadMessage'); _toast.show('homeView.errorDownloadMessage');
} }
} on Exception { } on Exception catch (e, s) {
await Sentry.captureException(e, stackTrace: s);
_toast.show('homeView.errorInstallMessage'); _toast.show('homeView.errorInstallMessage');
} }
} }
void updatesAreDisabled() {
_toast.show('homeView.updatesDisabled');
}
Future<void> showUpdateConfirmationDialog(BuildContext parentContext) async { Future<void> showUpdateConfirmationDialog(BuildContext parentContext) async {
return showDialog( return showDialog(
context: parentContext, context: parentContext,
@ -176,7 +183,7 @@ class HomeViewModel extends BaseViewModel {
Future<void> forceRefresh(BuildContext context) async { Future<void> forceRefresh(BuildContext context) async {
await Future.delayed(const Duration(seconds: 1)); await Future.delayed(const Duration(seconds: 1));
if (_lastUpdate == null || if (_lastUpdate == null ||
_lastUpdate!.difference(DateTime.now()).inSeconds > 60) { _lastUpdate!.difference(DateTime.now()).inSeconds > 2) {
_managerAPI.clearAllData(); _managerAPI.clearAllData();
} }
initialize(context); initialize(context);

View File

@ -14,6 +14,7 @@ import 'package:revanced_manager/services/root_api.dart';
import 'package:revanced_manager/services/toast.dart'; import 'package:revanced_manager/services/toast.dart';
import 'package:revanced_manager/ui/views/patcher/patcher_viewmodel.dart'; import 'package:revanced_manager/ui/views/patcher/patcher_viewmodel.dart';
import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart'; import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
import 'package:sentry_flutter/sentry_flutter.dart';
import 'package:stacked/stacked.dart'; import 'package:stacked/stacked.dart';
import 'package:wakelock/wakelock.dart'; import 'package:wakelock/wakelock.dart';
@ -57,7 +58,8 @@ class InstallerViewModel extends BaseViewModel {
), ),
), ),
).then((value) => FlutterBackground.enableBackgroundExecution()); ).then((value) => FlutterBackground.enableBackgroundExecution());
} on Exception { } on Exception catch (e, s) {
await Sentry.captureException(e, stackTrace: s);
// ignore // ignore
} }
} }
@ -121,91 +123,106 @@ class InstallerViewModel extends BaseViewModel {
} }
Future<void> runPatcher() async { Future<void> runPatcher() async {
update(0.0, 'Initializing...', 'Initializing installer'); try {
if (_patches.isNotEmpty) { update(0.0, 'Initializing...', 'Initializing installer');
try { if (_patches.isNotEmpty) {
update(0.1, '', 'Creating working directory'); try {
await _patcherAPI.runPatcher( update(0.1, '', 'Creating working directory');
_app.packageName, await _patcherAPI.runPatcher(
_app.apkFilePath, _app.packageName,
_patches, _app.apkFilePath,
); _patches,
} catch (e) { );
update( } on Exception catch (e, s) {
-100.0, update(
'Aborting...', -100.0,
'An error occurred! Aborting\nError:\n$e', 'Aborting...',
); 'An error occurred! Aborting\nError:\n$e',
);
await Sentry.captureException(e, stackTrace: s);
throw await Sentry.captureException(e, stackTrace: s);
}
} else {
update(-100.0, 'Aborting...', 'No app or patches selected! Aborting');
} }
} else { if (FlutterBackground.isBackgroundExecutionEnabled) {
update(-100.0, 'Aborting...', 'No app or patches selected! Aborting'); try {
} FlutterBackground.disableBackgroundExecution();
if (FlutterBackground.isBackgroundExecutionEnabled) { } on Exception catch (e, s) {
try { await Sentry.captureException(e, stackTrace: s);
FlutterBackground.disableBackgroundExecution(); // ignore
} on Exception { }
// ignore
} }
await Wakelock.disable();
} on Exception catch (e, s) {
await Sentry.captureException(e, stackTrace: s);
} }
await Wakelock.disable();
} }
void installResult(BuildContext context, bool installAsRoot) async { void installResult(BuildContext context, bool installAsRoot) async {
_app.isRooted = installAsRoot; try {
bool hasMicroG = _patches.any((p) => p.name.endsWith('microg-support')); _app.isRooted = installAsRoot;
bool rootMicroG = installAsRoot && hasMicroG; bool hasMicroG = _patches.any((p) => p.name.endsWith('microg-support'));
bool rootFromStorage = installAsRoot && _app.isFromStorage; bool rootMicroG = installAsRoot && hasMicroG;
bool ytWithoutRootMicroG = bool rootFromStorage = installAsRoot && _app.isFromStorage;
!installAsRoot && !hasMicroG && _app.packageName.contains('youtube'); bool ytWithoutRootMicroG =
if (rootMicroG || rootFromStorage || ytWithoutRootMicroG) { !installAsRoot && !hasMicroG && _app.packageName.contains('youtube');
return showDialog( if (rootMicroG || rootFromStorage || ytWithoutRootMicroG) {
context: context, return showDialog(
builder: (context) => AlertDialog( context: context,
title: I18nText('installerView.installErrorDialogTitle'), builder: (context) => AlertDialog(
backgroundColor: Theme.of(context).colorScheme.secondaryContainer, title: I18nText('installerView.installErrorDialogTitle'),
content: I18nText( backgroundColor: Theme.of(context).colorScheme.secondaryContainer,
rootMicroG content: I18nText(
? 'installerView.installErrorDialogText1' rootMicroG
: rootFromStorage ? 'installerView.installErrorDialogText1'
? 'installerView.installErrorDialogText3' : rootFromStorage
: 'installerView.installErrorDialogText2', ? 'installerView.installErrorDialogText3'
: 'installerView.installErrorDialogText2',
),
actions: <Widget>[
CustomMaterialButton(
label: I18nText('okButton'),
onPressed: () => Navigator.of(context).pop(),
)
],
), ),
actions: <Widget>[ );
CustomMaterialButton( } else {
label: I18nText('okButton'), update(
onPressed: () => Navigator.of(context).pop(), 1.0,
) 'Installing...',
], _app.isRooted
), ? 'Installing patched file using root method'
); : 'Installing patched file using nonroot method',
} else { );
update( isInstalled = await _patcherAPI.installPatchedFile(_app);
1.0, if (isInstalled) {
'Installing...', update(1.0, 'Installed!', 'Installed!');
_app.isRooted _app.isFromStorage = false;
? 'Installing patched file using root method' _app.patchDate = DateTime.now();
: 'Installing patched file using nonroot method', _app.appliedPatches = _patches.map((p) => p.name).toList();
); if (hasMicroG) {
isInstalled = await _patcherAPI.installPatchedFile(_app); _app.name += ' ReVanced';
if (isInstalled) { _app.packageName = _app.packageName.replaceFirst(
update(1.0, 'Installed!', 'Installed!'); 'com.google.',
_app.isFromStorage = false; 'app.revanced.',
_app.patchDate = DateTime.now(); );
_app.appliedPatches = _patches.map((p) => p.name).toList(); }
if (hasMicroG) { await _managerAPI.savePatchedApp(_app);
_app.name += ' ReVanced';
_app.packageName = _app.packageName.replaceFirst(
'com.google.',
'app.revanced.',
);
} }
await _managerAPI.savePatchedApp(_app);
} }
} on Exception catch (e, s) {
await Sentry.captureException(e, stackTrace: s);
} }
} }
void shareResult() { void shareResult() {
_patcherAPI.sharePatchedFile(_app.name, _app.version); try {
_patcherAPI.sharePatchedFile(_app.name, _app.version);
} on Exception catch (e, s) {
Sentry.captureException(e, stackTrace: s);
}
} }
void shareLog() { void shareLog() {
@ -213,10 +230,14 @@ class InstallerViewModel extends BaseViewModel {
} }
Future<void> cleanPatcher() async { Future<void> cleanPatcher() async {
_patcherAPI.cleanPatcher(); try {
locator<PatcherViewModel>().selectedApp = null; _patcherAPI.cleanPatcher();
locator<PatcherViewModel>().selectedPatches.clear(); locator<PatcherViewModel>().selectedApp = null;
locator<PatcherViewModel>().notifyListeners(); locator<PatcherViewModel>().selectedPatches.clear();
locator<PatcherViewModel>().notifyListeners();
} on Exception catch (e, s) {
await Sentry.captureException(e, stackTrace: s);
}
} }
void openApp() { void openApp() {

View File

@ -55,6 +55,25 @@ class _PatchesSelectorViewState extends State<PatchesSelectorView> {
), ),
onPressed: () => Navigator.of(context).pop(), onPressed: () => Navigator.of(context).pop(),
), ),
actions: [
Container(
height: 2,
margin: const EdgeInsets.only(right: 16, top: 12, bottom: 12),
padding:
const EdgeInsets.symmetric(horizontal: 6, vertical: 6),
decoration: BoxDecoration(
color:
Theme.of(context).colorScheme.tertiary.withOpacity(0.5),
borderRadius: BorderRadius.circular(6),
),
child: Text(
model.patchesVersion!,
style: TextStyle(
color: Theme.of(context).textTheme.headline6!.color,
),
),
),
],
bottom: PreferredSize( bottom: PreferredSize(
preferredSize: const Size.fromHeight(64.0), preferredSize: const Size.fromHeight(64.0),
child: Padding( child: Padding(

View File

@ -3,6 +3,7 @@ import 'package:flutter_i18n/widgets/I18nText.dart';
import 'package:revanced_manager/app/app.locator.dart'; import 'package:revanced_manager/app/app.locator.dart';
import 'package:revanced_manager/models/patch.dart'; import 'package:revanced_manager/models/patch.dart';
import 'package:revanced_manager/models/patched_application.dart'; import 'package:revanced_manager/models/patched_application.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/ui/views/patcher/patcher_viewmodel.dart'; import 'package:revanced_manager/ui/views/patcher/patcher_viewmodel.dart';
import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart'; import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
@ -11,11 +12,14 @@ import 'package:flutter/material.dart';
class PatchesSelectorViewModel extends BaseViewModel { class PatchesSelectorViewModel extends BaseViewModel {
final PatcherAPI _patcherAPI = locator<PatcherAPI>(); final PatcherAPI _patcherAPI = locator<PatcherAPI>();
final ManagerAPI _managerAPI = locator<ManagerAPI>();
final List<Patch> patches = []; final List<Patch> patches = [];
final List<Patch> selectedPatches = final List<Patch> selectedPatches =
locator<PatcherViewModel>().selectedPatches; locator<PatcherViewModel>().selectedPatches;
String? patchesVersion = '';
Future<void> initialize() async { Future<void> initialize() async {
getPatchesVersion();
patches.addAll(await _patcherAPI.getFilteredPatches( patches.addAll(await _patcherAPI.getFilteredPatches(
locator<PatcherViewModel>().selectedApp!.originalPackageName, locator<PatcherViewModel>().selectedApp!.originalPackageName,
)); ));
@ -57,9 +61,16 @@ class PatchesSelectorViewModel extends BaseViewModel {
void selectAllPatches(bool isSelected) { void selectAllPatches(bool isSelected) {
selectedPatches.clear(); selectedPatches.clear();
if (isSelected) {
if (isSelected && _managerAPI.areExperimentalPatchesEnabled() == false) {
selectedPatches
.addAll(patches.where((element) => isPatchSupported(element)));
}
if (isSelected && _managerAPI.areExperimentalPatchesEnabled()) {
selectedPatches.addAll(patches); selectedPatches.addAll(patches);
} }
notifyListeners(); notifyListeners();
} }
@ -68,6 +79,12 @@ class PatchesSelectorViewModel extends BaseViewModel {
locator<PatcherViewModel>().notifyListeners(); locator<PatcherViewModel>().notifyListeners();
} }
Future<String?> getPatchesVersion() async {
patchesVersion = await _managerAPI.getLatestPatchesVersion();
// print('Patches version: $patchesVersion');
return patchesVersion ?? '0.0.0';
}
List<Patch> getQueriedPatches(String query) { List<Patch> getQueriedPatches(String query) {
return patches return patches
.where((patch) => .where((patch) =>

View File

@ -136,9 +136,96 @@ class SettingsView extends StatelessWidget {
subtitle: 'settingsView.sourcesLabelHint', subtitle: 'settingsView.sourcesLabelHint',
onTap: () => model.showSourcesDialog(context), onTap: () => model.showSourcesDialog(context),
), ),
CustomSwitchTile(
padding: const EdgeInsets.symmetric(horizontal: 20.0),
title: I18nText(
'settingsView.experimentalPatchesLabel',
child: const Text(
'',
style: TextStyle(
fontSize: 20,
fontWeight: FontWeight.w500,
),
),
),
subtitle:
I18nText('settingsView.experimentalPatchesHint'),
value: model.areExperimentalPatchesEnabled(),
onTap: (value) =>
model.useExperimentalPatches(value)),
ListTile(
contentPadding:
const EdgeInsets.symmetric(horizontal: 20.0),
title: I18nText(
'settingsView.deleteKeystoreLabel',
child: const Text(
'',
style: TextStyle(
fontSize: 20,
fontWeight: FontWeight.w500,
),
),
),
subtitle: I18nText('settingsView.deleteKeystoreHint'),
onTap: () => model.deleteKeystore,
),
ListTile(
contentPadding:
const EdgeInsets.symmetric(horizontal: 20.0),
title: I18nText(
'settingsView.deleteTempDirLabel',
child: const Text(
'',
style: TextStyle(
fontSize: 20,
fontWeight: FontWeight.w500,
),
),
),
subtitle: I18nText('settingsView.deleteTempDirHint'),
onTap: () => model.deleteTempDir(),
),
ListTile(
contentPadding:
const EdgeInsets.symmetric(horizontal: 20.0),
title: I18nText(
'settingsView.deleteLogsLabel',
child: const Text(
'',
style: TextStyle(
fontSize: 20,
fontWeight: FontWeight.w500,
),
),
),
subtitle: I18nText('settingsView.deleteLogsHint'),
onTap: () => model.deleteLogs(),
),
], ],
), ),
_settingsDivider, _settingsDivider,
// SettingsSection(
// title: 'settingsView.logsSectionTitle',
// children: <Widget>[
// CustomSwitchTile(
// padding: const EdgeInsets.symmetric(horizontal: 20.0),
// title: I18nText(
// 'settingsView.sentryLabel',
// child: const Text(
// '',
// style: TextStyle(
// fontSize: 20,
// fontWeight: FontWeight.w500,
// ),
// ),
// ),
// subtitle: I18nText('settingsView.sentryHint'),
// value: model.isSentryEnabled(),
// onTap: (value) => model.useSentry(value),
// ),
// ],
// ),
// _settingsDivider,
SettingsSection( SettingsSection(
title: 'settingsView.infoSectionTitle', title: 'settingsView.infoSectionTitle',
children: <Widget>[ children: <Widget>[

View File

@ -10,6 +10,7 @@ import 'package:path_provider/path_provider.dart';
import 'package:revanced_manager/app/app.locator.dart'; import 'package:revanced_manager/app/app.locator.dart';
import 'package:revanced_manager/app/app.router.dart'; import 'package:revanced_manager/app/app.router.dart';
import 'package:revanced_manager/services/manager_api.dart'; import 'package:revanced_manager/services/manager_api.dart';
import 'package:revanced_manager/services/toast.dart';
import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart'; import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
import 'package:revanced_manager/ui/widgets/settingsView/custom_text_field.dart'; import 'package:revanced_manager/ui/widgets/settingsView/custom_text_field.dart';
import 'package:share_extend/share_extend.dart'; import 'package:share_extend/share_extend.dart';
@ -23,6 +24,7 @@ const int ANDROID_12_SDK_VERSION = 31;
class SettingsViewModel extends BaseViewModel { class SettingsViewModel extends BaseViewModel {
final NavigationService _navigationService = locator<NavigationService>(); final NavigationService _navigationService = locator<NavigationService>();
final ManagerAPI _managerAPI = locator<ManagerAPI>(); final ManagerAPI _managerAPI = locator<ManagerAPI>();
final Toast _toast = locator<Toast>();
final TextEditingController _orgPatSourceController = TextEditingController(); final TextEditingController _orgPatSourceController = TextEditingController();
final TextEditingController _patSourceController = TextEditingController(); final TextEditingController _patSourceController = TextEditingController();
final TextEditingController _orgIntSourceController = TextEditingController(); final TextEditingController _orgIntSourceController = TextEditingController();
@ -313,11 +315,52 @@ class SettingsViewModel extends BaseViewModel {
); );
} }
// bool isSentryEnabled() {
// return _managerAPI.isSentryEnabled();
// }
// void useSentry(bool value) {
// _managerAPI.setSentryStatus(value);
// _toast.showBottom('settingsView.restartAppForChanges');
// notifyListeners();
// }
bool areExperimentalPatchesEnabled() {
return _managerAPI.areExperimentalPatchesEnabled();
}
void useExperimentalPatches(bool value) {
_managerAPI.enableExperimentalPatchesStatus(value);
_toast.showBottom('settingsView.enabledExperimentalPatches');
notifyListeners();
}
void deleteKeystore() {
_managerAPI.deleteKeystore();
_toast.showBottom('settingsView.deletedKeystore');
notifyListeners();
}
void deleteTempDir() {
_managerAPI.deleteTempFolder();
_toast.showBottom('settingsView.deletedTempDir');
notifyListeners();
}
Future<int> getSdkVersion() async { Future<int> getSdkVersion() async {
AndroidDeviceInfo info = await DeviceInfoPlugin().androidInfo; AndroidDeviceInfo info = await DeviceInfoPlugin().androidInfo;
return info.version.sdkInt ?? -1; return info.version.sdkInt ?? -1;
} }
Future<void> deleteLogs() async {
Directory appCacheDir = await getTemporaryDirectory();
Directory logsDir = Directory('${appCacheDir.path}/logs');
if (logsDir.existsSync()) {
logsDir.deleteSync(recursive: true);
}
_toast.showBottom('settingsView.deletedLogs');
}
Future<void> exportLogcatLogs() async { Future<void> exportLogcatLogs() async {
Directory appCache = await getTemporaryDirectory(); Directory appCache = await getTemporaryDirectory();
Directory logDir = Directory('${appCache.path}/logs'); Directory logDir = Directory('${appCache.path}/logs');

View File

@ -14,50 +14,74 @@ class AvailableUpdatesCard extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return apps.isEmpty return CustomCard(
? CustomCard( child: Center(
child: Center( child: Column(
child: Column( children: <Widget>[
children: <Widget>[ Icon(
Icon( size: 40,
size: 40, Icons.update_disabled,
Icons.update_disabled, color: Theme.of(context).colorScheme.secondary,
color: Theme.of(context).colorScheme.secondary,
),
const SizedBox(height: 16),
I18nText(
'homeView.noUpdates',
child: Text(
'',
textAlign: TextAlign.center,
style: Theme.of(context).textTheme.subtitle1!.copyWith(
color: Theme.of(context).colorScheme.secondary,
),
),
)
],
),
), ),
) const SizedBox(height: 16),
: ListView( I18nText(
shrinkWrap: true, 'homeView.WIP',
padding: EdgeInsets.zero, child: Text(
physics: const NeverScrollableScrollPhysics(), '',
children: apps textAlign: TextAlign.center,
.map((app) => ApplicationItem( style: Theme.of(context).textTheme.subtitle1!.copyWith(
icon: app.icon, color: Theme.of(context).colorScheme.secondary,
name: app.name, ),
patchDate: app.patchDate, ),
changelog: app.changelog, )
isUpdatableApp: true, ],
//TODO: Find a better way to do update functionality ),
onPressed: () {} ),
// () => );
// locator<HomeViewModel>().navigateToPatcher( // return apps.isEmpty
// app, // ? CustomCard(
// ), // child: Center(
)) // child: Column(
.toList(), // children: <Widget>[
); // Icon(
// size: 40,
// Icons.update_disabled,
// color: Theme.of(context).colorScheme.secondary,
// ),
// const SizedBox(height: 16),
// I18nText(
// 'homeView.noUpdates',
// child: Text(
// '',
// textAlign: TextAlign.center,
// style: Theme.of(context).textTheme.subtitle1!.copyWith(
// color: Theme.of(context).colorScheme.secondary,
// ),
// ),
// )
// ],
// ),
// ),
// )
// : ListView(
// shrinkWrap: true,
// padding: EdgeInsets.zero,
// physics: const NeverScrollableScrollPhysics(),
// children: apps
// .map((app) => ApplicationItem(
// icon: app.icon,
// name: app.name,
// patchDate: app.patchDate,
// changelog: app.changelog,
// isUpdatableApp: true,
// //TODO: Find a better way to do update functionality
// onPressed: () {}
// // () =>
// // locator<HomeViewModel>().navigateToPatcher(
// // app,
// // ),
// ))
// .toList(),
// );
} }
} }

View File

@ -1,5 +1,8 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_i18n/flutter_i18n.dart'; import 'package:flutter_i18n/flutter_i18n.dart';
import 'package:revanced_manager/app/app.locator.dart';
import 'package:revanced_manager/services/manager_api.dart';
import 'package:revanced_manager/services/toast.dart';
import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart'; import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
import 'package:revanced_manager/ui/widgets/shared/custom_card.dart'; import 'package:revanced_manager/ui/widgets/shared/custom_card.dart';
@ -15,6 +18,8 @@ class PatchItem extends StatefulWidget {
bool isSelected; bool isSelected;
final Function(bool) onChanged; final Function(bool) onChanged;
final Widget? child; final Widget? child;
final toast = locator<Toast>();
final _managerAPI = locator<ManagerAPI>();
PatchItem( PatchItem(
{Key? key, {Key? key,
@ -40,8 +45,21 @@ class _PatchItemState extends State<PatchItem> {
return Padding( return Padding(
padding: const EdgeInsets.symmetric(vertical: 4.0), padding: const EdgeInsets.symmetric(vertical: 4.0),
child: CustomCard( child: CustomCard(
backgroundColor: widget.isUnsupported &&
widget._managerAPI.areExperimentalPatchesEnabled() == false
? Theme.of(context).colorScheme.brightness == Brightness.light
? Colors.grey[400]
: Colors.grey[700]
: null,
onTap: () { onTap: () {
setState(() => widget.isSelected = !widget.isSelected); setState(() {
if (widget.isUnsupported) {
widget.isSelected = false;
widget.toast.showBottom('patchItem.unsupportedPatchVersion');
} else {
widget.isSelected = !widget.isSelected;
}
});
widget.onChanged(widget.isSelected); widget.onChanged(widget.isSelected);
}, },
child: Column( child: Column(
@ -83,7 +101,9 @@ class _PatchItemState extends State<PatchItem> {
overflow: TextOverflow.visible, overflow: TextOverflow.visible,
style: TextStyle( style: TextStyle(
fontSize: 14, fontSize: 14,
color: Theme.of(context).colorScheme.onSecondaryContainer, color: Theme.of(context)
.colorScheme
.onSecondaryContainer,
), ),
), ),
], ],
@ -101,7 +121,18 @@ class _PatchItemState extends State<PatchItem> {
color: Theme.of(context).colorScheme.primary, color: Theme.of(context).colorScheme.primary,
), ),
onChanged: (newValue) { onChanged: (newValue) {
setState(() => widget.isSelected = newValue!); setState(() {
if (widget.isUnsupported &&
widget._managerAPI
.areExperimentalPatchesEnabled() ==
false) {
widget.isSelected = false;
widget.toast
.showBottom('patchItem.unsupportedPatchVersion');
} else {
widget.isSelected = newValue!;
}
});
widget.onChanged(widget.isSelected); widget.onChanged(widget.isSelected);
}, },
), ),

View File

@ -110,7 +110,7 @@ class _ApplicationItemState extends State<ApplicationItem>
children: <Widget>[ children: <Widget>[
CustomMaterialButton( CustomMaterialButton(
label: widget.isUpdatableApp label: widget.isUpdatableApp
? I18nText('applicationItem.infoButton') ? I18nText('applicationItem.patchButton')
: I18nText('applicationItem.infoButton'), : I18nText('applicationItem.infoButton'),
onPressed: widget.onPressed, onPressed: widget.onPressed,
), ),

View File

@ -5,22 +5,25 @@ class CustomCard extends StatelessWidget {
final Widget child; final Widget child;
final Function()? onTap; final Function()? onTap;
final EdgeInsetsGeometry? padding; final EdgeInsetsGeometry? padding;
final Color? backgroundColor;
const CustomCard({ const CustomCard(
Key? key, {Key? key,
this.isFilled = true, this.isFilled = true,
required this.child, required this.child,
this.onTap, this.onTap,
this.padding, this.padding,
}) : super(key: key); this.backgroundColor})
: super(key: key);
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Material( return Material(
type: isFilled ? MaterialType.card : MaterialType.transparency, type: isFilled ? MaterialType.card : MaterialType.transparency,
color: isFilled color: isFilled
? Theme.of(context).colorScheme.secondaryContainer.withOpacity(0.4) ? backgroundColor?.withOpacity(0.4) ??
: Colors.transparent, Theme.of(context).colorScheme.secondaryContainer.withOpacity(0.4)
: backgroundColor ?? Colors.transparent,
borderRadius: BorderRadius.circular(16), borderRadius: BorderRadius.circular(16),
child: InkWell( child: InkWell(
onTap: onTap, onTap: onTap,

View File

@ -4,12 +4,13 @@ homepage: https://github.com/revanced/revanced-manager
publish_to: 'none' publish_to: 'none'
version: 0.0.32+32 version: 0.0.38+38
environment: environment:
sdk: ">=2.17.5 <3.0.0" sdk: ">=2.17.5 <3.0.0"
dependencies: dependencies:
sentry_flutter: ^6.12.2
animations: ^2.0.4 animations: ^2.0.4
app_installer: ^1.1.0 app_installer: ^1.1.0
collection: ^1.16.0 collection: ^1.16.0
@ -71,17 +72,22 @@ dependencies:
timezone: ^0.8.0 timezone: ^0.8.0
url_launcher: ^6.1.5 url_launcher: ^6.1.5
wakelock: ^0.6.2 wakelock: ^0.6.2
sentry_dio: ^6.12.2
flutter_dotenv: ^5.0.2
dev_dependencies: dev_dependencies:
json_serializable: ^6.3.1
build_runner: any build_runner: any
flutter_launcher_icons: ^0.10.0 flutter_launcher_icons: ^0.10.0
flutter_lints: ^2.0.1 flutter_lints: ^2.0.1
flutter_test: flutter_test:
sdk: flutter sdk: flutter
injectable_generator: ^1.5.4 injectable_generator: ^1.5.4
json_serializable: ^6.3.1
flutter: flutter:
uses-material-design: true uses-material-design: true
assets: assets:
- assets/i18n/ - assets/i18n/
- .env