feat: allow control over patches update (#1063)

Co-authored-by: oSumAtrIX <johan.melkonyan1@web.de>
This commit is contained in:
aAbed 2023-08-04 02:08:56 +05:45 committed by GitHub
parent e55f427b05
commit f905a52988
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 322 additions and 103 deletions

View File

@ -1,6 +1,7 @@
{ {
"okButton": "OK", "okButton": "OK",
"cancelButton": "Cancel", "cancelButton": "Cancel",
"quitButton": "Quit",
"updateButton": "Update", "updateButton": "Update",
"enabledLabel": "Enabled", "enabledLabel": "Enabled",
"disabledLabel": "Disabled", "disabledLabel": "Disabled",
@ -31,8 +32,14 @@
"installUpdate": "Continue to install the update?", "installUpdate": "Continue to install the update?",
"updateDialogTitle": "Update Manager", "updateDialogTitle": "Update Manager",
"updatePatchesDialogTitle": "Update ReVanced Patches",
"updateChangelogTitle": "Changelog", "updateChangelogTitle": "Changelog",
"patchesConsentDialogText": "ReVanced Patches need to be downloaded to patch apps.",
"patchesConsentDialogText2": "This will reveal your IP address to {url}.",
"patchesConsentDialogText3": "Auto update",
"patchesConsentDialogText3Sub": "You can still change this in the settings later",
"notificationTitle": "Update downloaded", "notificationTitle": "Update downloaded",
"notificationText": "Tap to install the update", "notificationText": "Tap to install the update",
@ -171,6 +178,7 @@
"sourcesResetDialogTitle": "Reset", "sourcesResetDialogTitle": "Reset",
"sourcesResetDialogText": "Are you sure you want to reset custom sources to their default values?", "sourcesResetDialogText": "Are you sure you want to reset custom sources to their default values?",
"apiURLResetDialogText": "Are you sure you want to reset API URL to its default value?", "apiURLResetDialogText": "Are you sure you want to reset API URL to its default value?",
"sourcesUpdateNote": "Note: ReVanced Patches will be updated to the latest version automatically.\n\nThis will reveal your IP address to the server.",
"apiURLLabel": "API URL", "apiURLLabel": "API URL",
"apiURLHint": "Configure your custom API URL", "apiURLHint": "Configure your custom API URL",
@ -186,6 +194,7 @@
"logsLabel": "Logs", "logsLabel": "Logs",
"logsHint": "Share Manager's logs", "logsHint": "Share Manager's logs",
"autoUpdatePatchesHint": "Automatically update ReVanced Patches to the latest version",
"experimentalUniversalPatchesLabel": "Experimental universal patches support", "experimentalUniversalPatchesLabel": "Experimental universal patches support",
"experimentalUniversalPatchesHint": "Display all applications to use with universal patches, loading list of apps may be slower", "experimentalUniversalPatchesHint": "Display all applications to use with universal patches, loading list of apps may be slower",
"experimentalPatchesLabel": "Experimental patches support", "experimentalPatchesLabel": "Experimental patches support",

View File

@ -6,7 +6,6 @@ import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:revanced_manager/app/app.locator.dart'; import 'package:revanced_manager/app/app.locator.dart';
import 'package:revanced_manager/services/github_api.dart'; import 'package:revanced_manager/services/github_api.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/revanced_api.dart'; 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';
@ -24,7 +23,6 @@ Future main() async {
await locator<RevancedAPI>().initialize(apiUrl); await locator<RevancedAPI>().initialize(apiUrl);
final String repoUrl = locator<ManagerAPI>().getRepoUrl(); final String repoUrl = locator<ManagerAPI>().getRepoUrl();
locator<GithubAPI>().initialize(repoUrl); locator<GithubAPI>().initialize(repoUrl);
await locator<PatcherAPI>().initialize();
tz.initializeTimeZones(); tz.initializeTimeZones();
prefs = await SharedPreferences.getInstance(); prefs = await SharedPreferences.getInstance();

View File

@ -72,6 +72,39 @@ class GithubAPI {
} }
} }
Future<Map<String, dynamic>?> getPatchesRelease(
String repoName,
String version,
) async {
try {
final response = await _dio.get(
'/repos/$repoName/releases/tags/$version',
);
return response.data;
} on Exception catch (e) {
if (kDebugMode) {
print(e);
}
return null;
}
}
Future<Map<String, dynamic>?> getLatestPatchesRelease(
String repoName,
) async {
try {
final response = await _dio.get(
'/repos/$repoName/releases/latest',
);
return response.data;
} on Exception catch (e) {
if (kDebugMode) {
print(e);
}
return null;
}
}
Future<Map<String, dynamic>?> getLatestManagerRelease( Future<Map<String, dynamic>?> getLatestManagerRelease(
String repoName, String repoName,
) async { ) async {
@ -164,10 +197,37 @@ class GithubAPI {
return null; return null;
} }
Future<List<Patch>> getPatches(String repoName) async { Future<File?> getPatchesReleaseFile(
String extension,
String repoName,
String version,
) async {
try {
final Map<String, dynamic>? release =
await getPatchesRelease(repoName, version);
if (release != null) {
final Map<String, dynamic>? asset =
(release['assets'] as List<dynamic>).firstWhereOrNull(
(asset) => (asset['name'] as String).endsWith(extension),
);
if (asset != null) {
return await DefaultCacheManager().getSingleFile(
asset['browser_download_url'],
);
}
}
} on Exception catch (e) {
if (kDebugMode) {
print(e);
}
}
return null;
}
Future<List<Patch>> getPatches(String repoName, String version) async {
List<Patch> patches = []; List<Patch> patches = [];
try { try {
final File? f = await getLatestReleaseFile('.json', repoName); final File? f = await getPatchesReleaseFile('.json', repoName, version);
if (f != null) { if (f != null) {
final List<dynamic> list = jsonDecode(f.readAsStringSync()); final List<dynamic> list = jsonDecode(f.readAsStringSync());
patches = list.map((patch) => Patch.fromJson(patch)).toList(); patches = list.map((patch) => Patch.fromJson(patch)).toList();
@ -180,21 +240,4 @@ class GithubAPI {
return patches; return patches;
} }
Future<String> getLastestReleaseVersion(String repoName) async {
try {
final Map<String, dynamic>? release = await getLatestRelease(repoName);
if (release != null) {
return release['tag_name'];
} else {
return 'Unknown';
}
} on Exception catch (e) {
if (kDebugMode) {
print(e);
}
return 'Unknown';
}
}
} }

View File

@ -13,6 +13,7 @@ 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:revanced_manager/utils/check_for_supported_patch.dart'; import 'package:revanced_manager/utils/check_for_supported_patch.dart';
import 'package:shared_preferences/shared_preferences.dart'; import 'package:shared_preferences/shared_preferences.dart';
import 'package:timeago/timeago.dart';
@lazySingleton @lazySingleton
class ManagerAPI { class ManagerAPI {
@ -81,6 +82,22 @@ class ManagerAPI {
await _prefs.setString('patchesRepo', value); await _prefs.setString('patchesRepo', value);
} }
bool getPatchesConsent() {
return _prefs.getBool('patchesConsent') ?? false;
}
Future<void> setPatchesConsent(bool consent) async {
await _prefs.setBool('patchesConsent', consent);
}
bool isPatchesAutoUpdate() {
return _prefs.getBool('patchesAutoUpdate') ?? false;
}
Future<void> setPatchesAutoUpdate(bool value) async {
await _prefs.setBool('patchesAutoUpdate', value);
}
String getIntegrationsRepo() { String getIntegrationsRepo() {
return _prefs.getString('integrationsRepo') ?? defaultIntegrationsRepo; return _prefs.getString('integrationsRepo') ?? defaultIntegrationsRepo;
} }
@ -205,11 +222,8 @@ class ManagerAPI {
Future<List<Patch>> getPatches() async { Future<List<Patch>> getPatches() async {
try { try {
final String repoName = getPatchesRepo(); final String repoName = getPatchesRepo();
if (repoName == defaultPatchesRepo) { final String currentVersion = await getCurrentPatchesVersion();
return await _revancedAPI.getPatches(); return await _githubAPI.getPatches(repoName, currentVersion);
} else {
return await _githubAPI.getPatches(repoName);
}
} on Exception catch (e) { } on Exception catch (e) {
if (kDebugMode) { if (kDebugMode) {
print(e); print(e);
@ -221,14 +235,12 @@ class ManagerAPI {
Future<File?> downloadPatches() async { Future<File?> downloadPatches() async {
try { try {
final String repoName = getPatchesRepo(); final String repoName = getPatchesRepo();
if (repoName == defaultPatchesRepo) { final String currentVersion = await getCurrentPatchesVersion();
return await _revancedAPI.getLatestReleaseFile( return await _githubAPI.getPatchesReleaseFile(
'.jar', '.jar',
defaultPatchesRepo, repoName,
); currentVersion,
} else { );
return await _githubAPI.getLatestReleaseFile('.jar', repoName);
}
} on Exception catch (e) { } on Exception catch (e) {
if (kDebugMode) { if (kDebugMode) {
print(e); print(e);
@ -263,11 +275,23 @@ class ManagerAPI {
); );
} }
Future<String?> getLatestPatcherReleaseTime() async { Future<String?> getLatestPatchesReleaseTime() async {
return await _revancedAPI.getLatestReleaseTime( if (isDefaultPatchesRepo()) {
'.gz', return await _revancedAPI.getLatestReleaseTime(
defaultPatcherRepo, '.json',
); defaultPatchesRepo,
);
} else {
final release =
await _githubAPI.getLatestPatchesRelease(getPatchesRepo());
if (release != null) {
final DateTime timestamp =
DateTime.parse(release['created_at'] as String);
return format(timestamp, locale: 'en_short');
} else {
return null;
}
}
} }
Future<String?> getLatestManagerReleaseTime() async { Future<String?> getLatestManagerReleaseTime() async {
@ -285,10 +309,19 @@ class ManagerAPI {
} }
Future<String?> getLatestPatchesVersion() async { Future<String?> getLatestPatchesVersion() async {
return await _revancedAPI.getLatestReleaseVersion( if (isDefaultPatchesRepo()) {
'.json', return await _revancedAPI.getLatestReleaseVersion(
defaultPatchesRepo, '.json',
); defaultPatchesRepo,
);
} else {
final release = await _githubAPI.getLatestPatchesRelease(getPatchesRepo());
if (release != null) {
return release['tag_name'];
} else {
return null;
}
}
} }
Future<String> getCurrentManagerVersion() async { Future<String> getCurrentManagerVersion() async {
@ -296,16 +329,17 @@ class ManagerAPI {
return packageInfo.version; return packageInfo.version;
} }
Future<String?> getCurrentPatchesVersion() async { Future<String> getCurrentPatchesVersion() async {
if (isDefaultPatchesRepo()) { patchesVersion = _prefs.getString('patchesVersion') ?? '0.0.0';
patchesVersion = await getLatestPatchesVersion(); if (patchesVersion == '0.0.0' || isPatchesAutoUpdate()) {
// print('Patches version: $patchesVersion'); patchesVersion = await getLatestPatchesVersion() ?? '0.0.0';
} else { await setCurrentPatchesVersion(patchesVersion!);
// fetch from github
patchesVersion =
await _githubAPI.getLastestReleaseVersion(getPatchesRepo());
} }
return patchesVersion ?? '0.0.0'; return patchesVersion!;
}
Future<void> setCurrentPatchesVersion(String version) async {
await _prefs.setString('patchesVersion', version);
} }
Future<List<PatchedApplication>> getAppsToRemove( Future<List<PatchedApplication>> getAppsToRemove(

View File

@ -7,7 +7,6 @@ import 'package:dio_cache_interceptor/dio_cache_interceptor.dart';
import 'package:flutter/foundation.dart'; import 'package:flutter/foundation.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:timeago/timeago.dart'; import 'package:timeago/timeago.dart';
@lazySingleton @lazySingleton
@ -64,19 +63,6 @@ class RevancedAPI {
return contributors; return contributors;
} }
Future<List<Patch>> getPatches() async {
try {
final response = await _dio.get('/patches');
final List<dynamic> patches = response.data;
return patches.map((patch) => Patch.fromJson(patch)).toList();
} on Exception catch (e) {
if (kDebugMode) {
print(e);
}
return List.empty();
}
}
Future<Map<String, dynamic>?> _getLatestRelease( Future<Map<String, dynamic>?> _getLatestRelease(
String extension, String extension,
String repoName, String repoName,

View File

@ -10,7 +10,6 @@ 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/patcher_api.dart'; import 'package:revanced_manager/services/patcher_api.dart';
import 'package:revanced_manager/services/revanced_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';
@ -19,7 +18,6 @@ import 'package:stacked/stacked.dart';
class AppSelectorViewModel extends BaseViewModel { class AppSelectorViewModel extends BaseViewModel {
final PatcherAPI _patcherAPI = locator<PatcherAPI>(); final PatcherAPI _patcherAPI = locator<PatcherAPI>();
final ManagerAPI _managerAPI = locator<ManagerAPI>(); final ManagerAPI _managerAPI = locator<ManagerAPI>();
final RevancedAPI _revancedAPI = locator<RevancedAPI>();
final Toast _toast = locator<Toast>(); final Toast _toast = locator<Toast>();
final List<ApplicationWithIcon> apps = []; final List<ApplicationWithIcon> apps = [];
List<String> allApps = []; List<String> allApps = [];
@ -32,7 +30,7 @@ class AppSelectorViewModel extends BaseViewModel {
List<Patch> patches = []; List<Patch> patches = [];
Future<void> initialize() async { Future<void> initialize() async {
patches = await _revancedAPI.getPatches(); patches = await _managerAPI.getPatches();
isRooted = _managerAPI.isRooted; isRooted = _managerAPI.isRooted;
apps.addAll( apps.addAll(

View File

@ -50,11 +50,7 @@ class HomeView extends StatelessWidget {
), ),
), ),
const SizedBox(height: 10), const SizedBox(height: 10),
LatestCommitCard( LatestCommitCard(model: model, parentContext: context),
onPressedManager: () =>
model.showUpdateConfirmationDialog(context),
onPressedPatches: () => model.forceRefresh(context),
),
const SizedBox(height: 23), const SizedBox(height: 23),
I18nText( I18nText(
'homeView.patchedSubtitle', 'homeView.patchedSubtitle',

View File

@ -4,6 +4,7 @@ import 'dart:io';
import 'package:cross_connectivity/cross_connectivity.dart'; import 'package:cross_connectivity/cross_connectivity.dart';
import 'package:flutter/foundation.dart'; import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_i18n/flutter_i18n.dart'; import 'package:flutter_i18n/flutter_i18n.dart';
import 'package:flutter_local_notifications/flutter_local_notifications.dart'; import 'package:flutter_local_notifications/flutter_local_notifications.dart';
import 'package:injectable/injectable.dart'; import 'package:injectable/injectable.dart';
@ -42,6 +43,10 @@ class HomeViewModel extends BaseViewModel {
Future<void> initialize(BuildContext context) async { Future<void> initialize(BuildContext context) async {
_latestManagerVersion = await _managerAPI.getLatestManagerVersion(); _latestManagerVersion = await _managerAPI.getLatestManagerVersion();
if(!_managerAPI.getPatchesConsent()){
await showPatchesConsent(context);
}
await _patcherAPI.initialize();
await flutterLocalNotificationsPlugin.initialize( await flutterLocalNotificationsPlugin.initialize(
const InitializationSettings( const InitializationSettings(
android: AndroidInitializationSettings('ic_notification'), android: AndroidInitializationSettings('ic_notification'),
@ -129,13 +134,13 @@ class HomeViewModel extends BaseViewModel {
Future<bool> hasPatchesUpdates() async { Future<bool> hasPatchesUpdates() async {
final String? latestVersion = await _managerAPI.getLatestPatchesVersion(); final String? latestVersion = await _managerAPI.getLatestPatchesVersion();
final String? currentVersion = await _managerAPI.getCurrentPatchesVersion(); final String currentVersion = await _managerAPI.getCurrentPatchesVersion();
if (latestVersion != null) { if (latestVersion != null) {
try { try {
final int latestVersionInt = final int latestVersionInt =
int.parse(latestVersion.replaceAll(RegExp('[^0-9]'), '')); int.parse(latestVersion.replaceAll(RegExp('[^0-9]'), ''));
final int currentVersionInt = final int currentVersionInt =
int.parse(currentVersion!.replaceAll(RegExp('[^0-9]'), '')); int.parse(currentVersion.replaceAll(RegExp('[^0-9]'), ''));
return latestVersionInt > currentVersionInt; return latestVersionInt > currentVersionInt;
} on Exception catch (e) { } on Exception catch (e) {
if (kDebugMode) { if (kDebugMode) {
@ -163,6 +168,94 @@ class HomeViewModel extends BaseViewModel {
} }
} }
Future<void> showPatchesConsent(BuildContext context) async{
final ValueNotifier<bool> autoUpdate = ValueNotifier(true);
await showDialog(
context: context,
barrierDismissible: false,
builder: (context) => AlertDialog(
title: const Text('ReVanced Patches'),
content: ValueListenableBuilder(
valueListenable: autoUpdate,
builder: (context, value, child) {
return Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
I18nText(
'homeView.patchesConsentDialogText',
child: Text(
'',
style: TextStyle(
fontSize: 16,
fontWeight: FontWeight.w500,
color: Theme.of(context).colorScheme.secondary,
),
),
),
Padding(
padding: const EdgeInsets.symmetric(vertical: 10),
child: I18nText(
'homeView.patchesConsentDialogText2',
translationParams: {'url': _managerAPI.defaultApiUrl.split('/')[2]},
child: Text(
'',
style: TextStyle(
fontSize: 16,
fontWeight: FontWeight.w500,
color: Theme.of(context).colorScheme.error,
),
),
),
),
CheckboxListTile(
value: value,
contentPadding: EdgeInsets.zero,
title: I18nText('homeView.patchesConsentDialogText3',),
subtitle: I18nText('homeView.patchesConsentDialogText3Sub',),
onChanged: (selected) {
autoUpdate.value = selected!;
},
),
],
);
},
),
actions: [
CustomMaterialButton(
isFilled: false,
onPressed: () async {
await _managerAPI.setPatchesConsent(false);
SystemNavigator.pop();
},
label: I18nText('quitButton'),
),
CustomMaterialButton(
onPressed: () async {
await _managerAPI.setPatchesConsent(true);
await _managerAPI.setPatchesAutoUpdate(autoUpdate.value);
Navigator.of(context).pop();
},
label: I18nText('okButton'),
)
],
),
);
}
Future<void> updatePatches(BuildContext context) async {
_toast.showBottom('homeView.downloadingMessage');
final String patchesVersion =
await _managerAPI.getLatestPatchesVersion() ?? '0.0.0';
if (patchesVersion != '0.0.0') {
_toast.showBottom('homeView.downloadedMessage');
await _managerAPI.setCurrentPatchesVersion(patchesVersion);
forceRefresh(context);
} else {
_toast.showBottom('homeView.errorDownloadMessage');
}
}
Future<void> updateManager(BuildContext context) async { Future<void> updateManager(BuildContext context) async {
final ValueNotifier<bool> downloaded = ValueNotifier(false); final ValueNotifier<bool> downloaded = ValueNotifier(false);
try { try {
@ -336,6 +429,7 @@ class HomeViewModel extends BaseViewModel {
Future<void> showUpdateConfirmationDialog( Future<void> showUpdateConfirmationDialog(
BuildContext parentContext, BuildContext parentContext,
bool isPatches,
) { ) {
return showModalBottomSheet( return showModalBottomSheet(
context: parentContext, context: parentContext,
@ -343,7 +437,9 @@ class HomeViewModel extends BaseViewModel {
shape: const RoundedRectangleBorder( shape: const RoundedRectangleBorder(
borderRadius: BorderRadius.vertical(top: Radius.circular(24.0)), borderRadius: BorderRadius.vertical(top: Radius.circular(24.0)),
), ),
builder: (context) => const UpdateConfirmationDialog(), builder: (context) => UpdateConfirmationDialog(
isPatches: isPatches,
),
); );
} }
@ -351,8 +447,12 @@ class HomeViewModel extends BaseViewModel {
return _githubAPI.getLatestManagerRelease(_managerAPI.defaultManagerRepo); return _githubAPI.getLatestManagerRelease(_managerAPI.defaultManagerRepo);
} }
Future<String?> getLatestPatcherReleaseTime() { Future<Map<String, dynamic>?> getLatestPatchesRelease() {
return _managerAPI.getLatestPatcherReleaseTime(); return _githubAPI.getLatestPatchesRelease(_managerAPI.defaultPatchesRepo);
}
Future<String?> getLatestPatchesReleaseTime() {
return _managerAPI.getLatestPatchesReleaseTime();
} }
Future<String?> getLatestManagerReleaseTime() { Future<String?> getLatestManagerReleaseTime() {

View File

@ -2,7 +2,6 @@ import 'package:collection/collection.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/github_api.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/toast.dart'; import 'package:revanced_manager/services/toast.dart';
@ -13,7 +12,6 @@ import 'package:stacked/stacked.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 ManagerAPI _managerAPI = locator<ManagerAPI>();
final GithubAPI _githubAPI = locator<GithubAPI>();
final List<Patch> patches = []; final List<Patch> patches = [];
final List<Patch> selectedPatches = final List<Patch> selectedPatches =
locator<PatcherViewModel>().selectedPatches; locator<PatcherViewModel>().selectedPatches;
@ -78,17 +76,8 @@ class PatchesSelectorViewModel extends BaseViewModel {
locator<PatcherViewModel>().notifyListeners(); locator<PatcherViewModel>().notifyListeners();
} }
Future<String?> getPatchesVersion() async { Future<void> getPatchesVersion() async {
if (isDefaultPatchesRepo()) { patchesVersion = await _managerAPI.getCurrentPatchesVersion();
patchesVersion = await _managerAPI.getLatestPatchesVersion();
// print('Patches version: $patchesVersion');
return patchesVersion ?? '0.0.0';
} else {
// fetch from github
patchesVersion = await _githubAPI
.getLastestReleaseVersion(_managerAPI.getPatchesRepo());
}
return null;
} }
List<Patch> getQueriedPatches(String query) { List<Patch> getQueriedPatches(String query) {

View File

@ -101,6 +101,8 @@ class SManageSources extends BaseViewModel {
hint: integrationsRepo.split('/')[1], hint: integrationsRepo.split('/')[1],
onChanged: (value) => notifyListeners(), onChanged: (value) => notifyListeners(),
), ),
const SizedBox(height: 20),
I18nText('settingsView.sourcesUpdateNote')
], ],
), ),
), ),
@ -126,6 +128,7 @@ class SManageSources extends BaseViewModel {
_managerAPI.setIntegrationsRepo( _managerAPI.setIntegrationsRepo(
'${_orgIntSourceController.text.trim()}/${_intSourceController.text.trim()}', '${_orgIntSourceController.text.trim()}/${_intSourceController.text.trim()}',
); );
_managerAPI.setCurrentPatchesVersion('0.0.0');
_toast.showBottom('settingsView.restartAppForChanges'); _toast.showBottom('settingsView.restartAppForChanges');
Navigator.of(context).pop(); Navigator.of(context).pop();
}, },
@ -154,6 +157,7 @@ class SManageSources extends BaseViewModel {
_managerAPI.setRepoUrl(''); _managerAPI.setRepoUrl('');
_managerAPI.setPatchesRepo(''); _managerAPI.setPatchesRepo('');
_managerAPI.setIntegrationsRepo(''); _managerAPI.setIntegrationsRepo('');
_managerAPI.setCurrentPatchesVersion('0.0.0');
_toast.showBottom('settingsView.restartAppForChanges'); _toast.showBottom('settingsView.restartAppForChanges');
Navigator.of(context) Navigator.of(context)
..pop() ..pop()

View File

@ -28,6 +28,15 @@ class SettingsViewModel extends BaseViewModel {
_navigationService.navigateTo(Routes.contributorsView); _navigationService.navigateTo(Routes.contributorsView);
} }
bool isPatchesAutoUpdate() {
return _managerAPI.isPatchesAutoUpdate();
}
void setPatchesAutoUpdate(bool value) {
_managerAPI.setPatchesAutoUpdate(value);
notifyListeners();
}
bool areUniversalPatchesEnabled() { bool areUniversalPatchesEnabled() {
return _managerAPI.areUniversalPatchesEnabled(); return _managerAPI.areUniversalPatchesEnabled();
} }

View File

@ -8,11 +8,11 @@ import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
class LatestCommitCard extends StatefulWidget { class LatestCommitCard extends StatefulWidget {
const LatestCommitCard({ const LatestCommitCard({
Key? key, Key? key,
required this.onPressedManager, required this.model,
required this.onPressedPatches, required this.parentContext,
}) : super(key: key); }) : super(key: key);
final Function() onPressedManager; final HomeViewModel model;
final Function() onPressedPatches; final BuildContext parentContext;
@override @override
State<LatestCommitCard> createState() => _LatestCommitCardState(); State<LatestCommitCard> createState() => _LatestCommitCardState();
@ -63,7 +63,10 @@ class _LatestCommitCardState extends State<LatestCommitCard> {
child: CustomMaterialButton( child: CustomMaterialButton(
label: I18nText('updateButton'), label: I18nText('updateButton'),
onPressed: snapshot.hasData && snapshot.data! onPressed: snapshot.hasData && snapshot.data!
? widget.onPressedManager ? () => widget.model.showUpdateConfirmationDialog(
widget.parentContext,
false,
)
: () => {}, : () => {},
), ),
), ),
@ -91,7 +94,7 @@ class _LatestCommitCardState extends State<LatestCommitCard> {
Row( Row(
children: <Widget>[ children: <Widget>[
FutureBuilder<String?>( FutureBuilder<String?>(
future: model.getLatestPatcherReleaseTime(), future: model.getLatestPatchesReleaseTime(),
builder: (context, snapshot) => Text( builder: (context, snapshot) => Text(
snapshot.hasData && snapshot.data!.isNotEmpty snapshot.hasData && snapshot.data!.isNotEmpty
? FlutterI18n.translate( ? FlutterI18n.translate(
@ -117,7 +120,10 @@ class _LatestCommitCardState extends State<LatestCommitCard> {
child: CustomMaterialButton( child: CustomMaterialButton(
label: I18nText('updateButton'), label: I18nText('updateButton'),
onPressed: snapshot.hasData && snapshot.data! onPressed: snapshot.hasData && snapshot.data!
? widget.onPressedPatches ? () => widget.model.showUpdateConfirmationDialog(
widget.parentContext,
true,
)
: () => {}, : () => {},
), ),
), ),

View File

@ -6,8 +6,9 @@ import 'package:revanced_manager/ui/views/home/home_viewmodel.dart';
import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart'; import 'package:revanced_manager/ui/widgets/shared/custom_material_button.dart';
class UpdateConfirmationDialog extends StatelessWidget { class UpdateConfirmationDialog extends StatelessWidget {
const UpdateConfirmationDialog({Key? key}) : super(key: key); const UpdateConfirmationDialog({super.key, required this.isPatches});
final bool isPatches;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final HomeViewModel model = locator<HomeViewModel>(); final HomeViewModel model = locator<HomeViewModel>();
@ -20,7 +21,9 @@ class UpdateConfirmationDialog extends StatelessWidget {
controller: scrollController, controller: scrollController,
child: SafeArea( child: SafeArea(
child: FutureBuilder<Map<String, dynamic>?>( child: FutureBuilder<Map<String, dynamic>?>(
future: model.getLatestManagerRelease(), future: !isPatches
? model.getLatestManagerRelease()
: model.getLatestPatchesRelease(),
builder: (_, snapshot) { builder: (_, snapshot) {
if (!snapshot.hasData) { if (!snapshot.hasData) {
return const SizedBox( return const SizedBox(
@ -48,7 +51,9 @@ class UpdateConfirmationDialog extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
I18nText( I18nText(
'homeView.updateDialogTitle', isPatches
? 'homeView.updatePatchesDialogTitle'
: 'homeView.updateDialogTitle',
child: const Text( child: const Text(
'', '',
style: TextStyle( style: TextStyle(
@ -86,7 +91,9 @@ class UpdateConfirmationDialog extends StatelessWidget {
label: I18nText('updateButton'), label: I18nText('updateButton'),
onPressed: () { onPressed: () {
Navigator.of(context).pop(); Navigator.of(context).pop();
model.updateManager(context); isPatches
? model.updatePatches(context)
: model.updateManager(context);
}, },
) )
], ],

View File

@ -5,6 +5,7 @@ import 'package:flutter_i18n/widgets/I18nText.dart';
import 'package:revanced_manager/ui/views/settings/settingsFragment/settings_manage_api_url.dart'; import 'package:revanced_manager/ui/views/settings/settingsFragment/settings_manage_api_url.dart';
import 'package:revanced_manager/ui/views/settings/settingsFragment/settings_manage_sources.dart'; import 'package:revanced_manager/ui/views/settings/settingsFragment/settings_manage_sources.dart';
import 'package:revanced_manager/ui/views/settings/settings_viewmodel.dart'; import 'package:revanced_manager/ui/views/settings/settings_viewmodel.dart';
import 'package:revanced_manager/ui/widgets/settingsView/settings_auto_update_patches.dart';
import 'package:revanced_manager/ui/widgets/settingsView/settings_experimental_patches.dart'; import 'package:revanced_manager/ui/widgets/settingsView/settings_experimental_patches.dart';
import 'package:revanced_manager/ui/widgets/settingsView/settings_experimental_universal_patches.dart'; import 'package:revanced_manager/ui/widgets/settingsView/settings_experimental_universal_patches.dart';
import 'package:revanced_manager/ui/widgets/settingsView/settings_section.dart'; import 'package:revanced_manager/ui/widgets/settingsView/settings_section.dart';
@ -23,6 +24,7 @@ class SAdvancedSection extends StatelessWidget {
SManageApiUrlUI(), SManageApiUrlUI(),
SManageSourcesUI(), SManageSourcesUI(),
// SManageKeystorePasswordUI(), // SManageKeystorePasswordUI(),
SAutoUpdatePatches(),
SExperimentalUniversalPatches(), SExperimentalUniversalPatches(),
SExperimentalPatches(), SExperimentalPatches(),
ListTile( ListTile(

View File

@ -0,0 +1,38 @@
import 'package:flutter/material.dart';
import 'package:flutter_i18n/widgets/I18nText.dart';
import 'package:revanced_manager/ui/views/settings/settings_viewmodel.dart';
class SAutoUpdatePatches extends StatefulWidget {
const SAutoUpdatePatches({super.key});
@override
State<SAutoUpdatePatches> createState() => _SAutoUpdatePatchesState();
}
final _settingsViewModel = SettingsViewModel();
class _SAutoUpdatePatchesState extends State<SAutoUpdatePatches> {
@override
Widget build(BuildContext context) {
return SwitchListTile(
contentPadding: const EdgeInsets.symmetric(horizontal: 20.0),
title: I18nText(
'homeView.patchesConsentDialogText3',
child: const Text(
'',
style: TextStyle(
fontSize: 20,
fontWeight: FontWeight.w500,
),
),
),
subtitle: I18nText('settingsView.autoUpdatePatchesHint'),
value: _settingsViewModel.isPatchesAutoUpdate(),
onChanged: (value) {
setState(() {
_settingsViewModel.setPatchesAutoUpdate(value);
});
},
);
}
}