From cb722f2634086ac9735c0e08ea0f5ee85aae3fbb Mon Sep 17 00:00:00 2001 From: Benjamin <73490201+BenjaminHalko@users.noreply.github.com> Date: Sun, 11 Aug 2024 08:51:02 -0700 Subject: [PATCH] fix: Don't crash when installing the last patched APK (#2131) --- lib/app/app.dart | 100 +++++++++--------- .../appInfoView/app_info_viewmodel.dart | 1 + 2 files changed, 52 insertions(+), 49 deletions(-) diff --git a/lib/app/app.dart b/lib/app/app.dart index 462ee00b..905f275b 100644 --- a/lib/app/app.dart +++ b/lib/app/app.dart @@ -1,49 +1,51 @@ -import 'package:revanced_manager/services/download_manager.dart'; -import 'package:revanced_manager/services/github_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/toast.dart'; -import 'package:revanced_manager/ui/views/app_selector/app_selector_view.dart'; -import 'package:revanced_manager/ui/views/contributors/contributors_view.dart'; -import 'package:revanced_manager/ui/views/home/home_viewmodel.dart'; -import 'package:revanced_manager/ui/views/installer/installer_view.dart'; -import 'package:revanced_manager/ui/views/navigation/navigation_view.dart'; -import 'package:revanced_manager/ui/views/navigation/navigation_viewmodel.dart'; -import 'package:revanced_manager/ui/views/patch_options/patch_options_view.dart'; -import 'package:revanced_manager/ui/views/patch_options/patch_options_viewmodel.dart'; -import 'package:revanced_manager/ui/views/patcher/patcher_view.dart'; -import 'package:revanced_manager/ui/views/patcher/patcher_viewmodel.dart'; -import 'package:revanced_manager/ui/views/patches_selector/patches_selector_view.dart'; -import 'package:revanced_manager/ui/views/settings/settings_view.dart'; -import 'package:revanced_manager/ui/widgets/appInfoView/app_info_view.dart'; -import 'package:stacked/stacked_annotations.dart'; -import 'package:stacked_services/stacked_services.dart'; - -@StackedApp( - routes: [ - MaterialRoute(page: NavigationView), - MaterialRoute(page: PatcherView), - MaterialRoute(page: AppSelectorView), - MaterialRoute(page: PatchesSelectorView), - MaterialRoute(page: PatchOptionsView), - MaterialRoute(page: InstallerView), - MaterialRoute(page: SettingsView), - MaterialRoute(page: ContributorsView), - MaterialRoute(page: AppInfoView), - ], - dependencies: [ - LazySingleton(classType: NavigationViewModel), - LazySingleton(classType: HomeViewModel), - LazySingleton(classType: PatcherViewModel), - LazySingleton(classType: PatchOptionsViewModel), - LazySingleton(classType: NavigationService), - LazySingleton(classType: ManagerAPI), - LazySingleton(classType: PatcherAPI), - LazySingleton(classType: RevancedAPI), - LazySingleton(classType: GithubAPI), - LazySingleton(classType: DownloadManager), - LazySingleton(classType: Toast), - ], -) -class AppSetup {} +import 'package:revanced_manager/services/download_manager.dart'; +import 'package:revanced_manager/services/github_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/toast.dart'; +import 'package:revanced_manager/ui/views/app_selector/app_selector_view.dart'; +import 'package:revanced_manager/ui/views/contributors/contributors_view.dart'; +import 'package:revanced_manager/ui/views/home/home_viewmodel.dart'; +import 'package:revanced_manager/ui/views/installer/installer_view.dart'; +import 'package:revanced_manager/ui/views/installer/installer_viewmodel.dart'; +import 'package:revanced_manager/ui/views/navigation/navigation_view.dart'; +import 'package:revanced_manager/ui/views/navigation/navigation_viewmodel.dart'; +import 'package:revanced_manager/ui/views/patch_options/patch_options_view.dart'; +import 'package:revanced_manager/ui/views/patch_options/patch_options_viewmodel.dart'; +import 'package:revanced_manager/ui/views/patcher/patcher_view.dart'; +import 'package:revanced_manager/ui/views/patcher/patcher_viewmodel.dart'; +import 'package:revanced_manager/ui/views/patches_selector/patches_selector_view.dart'; +import 'package:revanced_manager/ui/views/settings/settings_view.dart'; +import 'package:revanced_manager/ui/widgets/appInfoView/app_info_view.dart'; +import 'package:stacked/stacked_annotations.dart'; +import 'package:stacked_services/stacked_services.dart'; + +@StackedApp( + routes: [ + MaterialRoute(page: NavigationView), + MaterialRoute(page: PatcherView), + MaterialRoute(page: AppSelectorView), + MaterialRoute(page: PatchesSelectorView), + MaterialRoute(page: PatchOptionsView), + MaterialRoute(page: InstallerView), + MaterialRoute(page: SettingsView), + MaterialRoute(page: ContributorsView), + MaterialRoute(page: AppInfoView), + ], + dependencies: [ + LazySingleton(classType: NavigationViewModel), + LazySingleton(classType: HomeViewModel), + LazySingleton(classType: PatcherViewModel), + LazySingleton(classType: PatchOptionsViewModel), + LazySingleton(classType: InstallerViewModel), + LazySingleton(classType: NavigationService), + LazySingleton(classType: ManagerAPI), + LazySingleton(classType: PatcherAPI), + LazySingleton(classType: RevancedAPI), + LazySingleton(classType: GithubAPI), + LazySingleton(classType: DownloadManager), + LazySingleton(classType: Toast), + ], +) +class AppSetup {} diff --git a/lib/ui/widgets/appInfoView/app_info_viewmodel.dart b/lib/ui/widgets/appInfoView/app_info_viewmodel.dart index 2f67a6c0..d549d28d 100644 --- a/lib/ui/widgets/appInfoView/app_info_viewmodel.dart +++ b/lib/ui/widgets/appInfoView/app_info_viewmodel.dart @@ -27,6 +27,7 @@ class AppInfoViewModel extends BaseViewModel { BuildContext context, PatchedApplication app, ) async { + locator().selectedApp = app; locator().installTypeDialog(context); }