From 1e88cd11b6f3f2c6aee2cd7b42720c63397bb075 Mon Sep 17 00:00:00 2001 From: Benjamin Halko Date: Fri, 9 Aug 2024 15:57:51 -0700 Subject: [PATCH 1/2] fix: disabling Save Last APK no longer crashes installer closes: #2125 --- .../views/installer/installer_viewmodel.dart | 3 +- .../settings_last_patched_app.dart | 3 +- pubspec.lock | 42 ++++++------------- 3 files changed, 17 insertions(+), 31 deletions(-) diff --git a/lib/ui/views/installer/installer_viewmodel.dart b/lib/ui/views/installer/installer_viewmodel.dart index 2b197ad5ee..81dea726f1 100644 --- a/lib/ui/views/installer/installer_viewmodel.dart +++ b/lib/ui/views/installer/installer_viewmodel.dart @@ -195,7 +195,8 @@ class InstallerViewModel extends BaseViewModel { } else { _app.patchedFilePath = _patcherAPI.outFile!.path; } - locator().initialize(context); + final homeViewModel = locator(); + _managerAPI.reAssessPatchedApps().then((_) => homeViewModel.getPatchedApps()); } on Exception catch (e) { update( -100.0, diff --git a/lib/ui/widgets/settingsView/settings_last_patched_app.dart b/lib/ui/widgets/settingsView/settings_last_patched_app.dart index 087182b21b..b4795f653f 100644 --- a/lib/ui/widgets/settingsView/settings_last_patched_app.dart +++ b/lib/ui/widgets/settingsView/settings_last_patched_app.dart @@ -1,6 +1,7 @@ import 'package:flutter/material.dart'; import 'package:revanced_manager/gen/strings.g.dart'; import 'package:revanced_manager/ui/views/settings/settings_viewmodel.dart'; +import 'package:revanced_manager/ui/widgets/shared/haptics/haptic_switch_list_tile.dart'; class SLastPatchedApp extends StatefulWidget { const SLastPatchedApp({super.key}); @@ -16,7 +17,7 @@ class _SLastPatchedAppState extends State { @override Widget build(BuildContext context) { - return SwitchListTile( + return HapticSwitchListTile( contentPadding: const EdgeInsets.symmetric(horizontal: 20.0), title: Text( t.settingsView.lastPatchedAppLabel, diff --git a/pubspec.lock b/pubspec.lock index d008c2d44d..db880f64ce 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,23 +5,23 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - sha256: "5aaf60d96c4cd00fe7f21594b5ad6a1b699c80a27420f8a837f4d68473ef09e3" + sha256: f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834 url: "https://pub.dev" source: hosted - version: "68.0.0" + version: "72.0.0" _macros: dependency: transitive description: dart source: sdk - version: "0.1.5" + version: "0.3.2" analyzer: dependency: "direct dev" description: name: analyzer - sha256: "21f1d3720fd1c70316399d5e2bccaebb415c434592d778cce8acb967b8578808" + sha256: b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139 url: "https://pub.dev" source: hosted - version: "6.5.0" + version: "6.7.0" animations: dependency: "direct main" description: @@ -319,14 +319,6 @@ packages: url: "https://pub.dev" source: hosted version: "7.0.0" - file_picker: - dependency: "direct main" - description: - name: file_picker - sha256: "824f5b9f389bfc4dddac3dea76cd70c51092d9dff0b2ece7ef4f53db8547d258" - url: "https://pub.dev" - source: hosted - version: "8.0.6" fixnum: dependency: transitive description: @@ -410,14 +402,6 @@ packages: url: "https://pub.dev" source: hosted version: "0.7.3" - flutter_plugin_android_lifecycle: - dependency: transitive - description: - name: flutter_plugin_android_lifecycle - sha256: "9d98bd47ef9d34e803d438f17fd32b116d31009f534a6fa5ce3a1167f189a6de" - url: "https://pub.dev" - source: hosted - version: "2.0.21" flutter_test: dependency: transitive description: flutter @@ -657,10 +641,10 @@ packages: dependency: transitive description: name: macros - sha256: a8403c89b36483b4cbf9f1fcd24562f483cb34a5c9bf101cf2b0d8a083cf1239 + sha256: "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536" url: "https://pub.dev" source: hosted - version: "0.1.0-main.5" + version: "0.1.2-main.4" markdown: dependency: transitive description: @@ -689,10 +673,10 @@ packages: dependency: transitive description: name: meta - sha256: "25dfcaf170a0190f47ca6355bdd4552cb8924b430512ff0cafb8db9bd41fe33b" + sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 url: "https://pub.dev" source: hosted - version: "1.14.0" + version: "1.15.0" mime: dependency: transitive description: @@ -1185,10 +1169,10 @@ packages: dependency: transitive description: name: test_api - sha256: "2419f20b0c8677b2d67c8ac4d1ac7372d862dc6c460cdbb052b40155408cd794" + sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb" url: "https://pub.dev" source: hosted - version: "0.7.1" + version: "0.7.2" timeago: dependency: "direct main" description: @@ -1313,10 +1297,10 @@ packages: dependency: transitive description: name: vm_service - sha256: "7475cb4dd713d57b6f7464c0e13f06da0d535d8b2067e188962a59bac2cf280b" + sha256: f652077d0bdf60abe4c1f6377448e8655008eef28f128bc023f7b5e8dfeb48fc url: "https://pub.dev" source: hosted - version: "14.2.2" + version: "14.2.4" wakelock_plus: dependency: "direct main" description: From f49640bfbe424e189a41a5f5874cdee244d2c756 Mon Sep 17 00:00:00 2001 From: Benjamin <73490201+BenjaminHalko@users.noreply.github.com> Date: Sun, 11 Aug 2024 07:26:38 -0700 Subject: [PATCH 2/2] Update settings_last_patched_app.dart --- lib/ui/widgets/settingsView/settings_last_patched_app.dart | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/ui/widgets/settingsView/settings_last_patched_app.dart b/lib/ui/widgets/settingsView/settings_last_patched_app.dart index b4795f653f..087182b21b 100644 --- a/lib/ui/widgets/settingsView/settings_last_patched_app.dart +++ b/lib/ui/widgets/settingsView/settings_last_patched_app.dart @@ -1,7 +1,6 @@ import 'package:flutter/material.dart'; import 'package:revanced_manager/gen/strings.g.dart'; import 'package:revanced_manager/ui/views/settings/settings_viewmodel.dart'; -import 'package:revanced_manager/ui/widgets/shared/haptics/haptic_switch_list_tile.dart'; class SLastPatchedApp extends StatefulWidget { const SLastPatchedApp({super.key}); @@ -17,7 +16,7 @@ class _SLastPatchedAppState extends State { @override Widget build(BuildContext context) { - return HapticSwitchListTile( + return SwitchListTile( contentPadding: const EdgeInsets.symmetric(horizontal: 20.0), title: Text( t.settingsView.lastPatchedAppLabel,