revert: "refactor: update deprecated and minor code refactors (#710)"

This reverts commit 6829d3c.

Signed-off-by: EvadeMaster <[email protected]>

analysis_options.yaml

@@ -12,8 +12,6 @@ include: package:flutter_lints/flutter.yaml
 analyzer:
   exclude:
     - lib/utils/env_class.g.dart
-    - "**/*.locator.dart"
-    - "**/*.router.dart"
 
 linter:
   rules:

lib/app/app.dart

@@ -15,7 +15,6 @@ 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:shared_preferences/shared_preferences.dart';
 import 'package:stacked/stacked_annotations.dart';
 import 'package:stacked_services/stacked_services.dart';
 
@@ -41,10 +40,6 @@ import 'package:stacked_services/stacked_services.dart';
     LazySingleton(classType: GithubAPI),
     LazySingleton(classType: CrowdinAPI),
     LazySingleton(classType: Toast),
-    Presolve(
-      classType: SharedPreferences,
-      presolveUsing: SharedPreferences.getInstance,
-    )
   ],
 )
 class AppSetup {}

lib/main.dart

@@ -4,6 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_i18n/flutter_i18n.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:revanced_manager/app/app.locator.dart';
+import 'package:revanced_manager/services/crowdin_api.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';
@@ -12,25 +13,27 @@ import 'package:revanced_manager/ui/theme/dynamic_theme_builder.dart';
 import 'package:revanced_manager/ui/views/navigation/navigation_view.dart';
 import 'package:revanced_manager/utils/environment.dart';
 import 'package:sentry_flutter/sentry_flutter.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+import 'package:stacked_themes/stacked_themes.dart';
 import 'package:timezone/data/latest.dart' as tz;
 
+late SharedPreferences prefs;
 Future main() async {
-  WidgetsFlutterBinding.ensureInitialized();
+  await ThemeManager.initialise();
   await setupLocator();
-  final manager = locator<ManagerAPI>();
-  await manager.initialize();
-  final String apiUrl = manager.getApiUrl();
-  final bool isSentryEnabled = manager.isSentryEnabled();
-  final String repoUrl = manager.getRepoUrl();
-
-  await Future.wait([
-    locator<RevancedAPI>().initialize(apiUrl),
-    locator<PatcherAPI>().initialize(),
-  ]);
+  WidgetsFlutterBinding.ensureInitialized();
+  await locator<ManagerAPI>().initialize();
+  final String apiUrl = locator<ManagerAPI>().getApiUrl();
+  await locator<RevancedAPI>().initialize(apiUrl);
+  await locator<CrowdinAPI>().initialize();
+  final bool isSentryEnabled = locator<ManagerAPI>().isSentryEnabled();
+  final String repoUrl = locator<ManagerAPI>().getRepoUrl();
   locator<GithubAPI>().initialize(repoUrl);
+  await locator<PatcherAPI>().initialize();
   tz.initializeTimeZones();
+  prefs = await SharedPreferences.getInstance();
 
-  return SentryFlutter.init(
+  await SentryFlutter.init(
     (options) {
       options
         ..dsn = isSentryEnabled ? Environment.sentryDSN : ''
@@ -48,8 +51,11 @@ Future main() async {
           }
         } as BeforeSendCallback?;
     },
-    appRunner: () => runApp(const MyApp()),
+    appRunner: () {
+      runApp(const MyApp());
+    },
   );
+  runApp(const MyApp());
 }
 
 class MyApp extends StatelessWidget {

lib/services/crowdin_api.dart

@@ -7,14 +7,11 @@ import 'package:sentry_flutter/sentry_flutter.dart';
 
 @lazySingleton
 class CrowdinAPI {
-  CrowdinAPI() {
-    initialize();
-  }
-  Dio _dio = Dio();
-  DioCacheManager get _dioCacheManager => DioCacheManager(CacheConfig());
-  String get apiKey => Environment.crowdinKEY;
+  late Dio _dio = Dio();
+  final DioCacheManager _dioCacheManager = DioCacheManager(CacheConfig());
+  final apiKey = Environment.crowdinKEY;
 
-  void initialize() {
+  Future<void> initialize() async {
     try {
       _dio = Dio(
         BaseOptions(
@@ -27,15 +24,15 @@ class CrowdinAPI {
         captureFailedRequests: true,
       );
     } on Exception catch (e, s) {
-      Sentry.captureException(e, stackTrace: s).ignore();
+      await Sentry.captureException(e, stackTrace: s);
     }
   }
 
   Future<void> clearAllCache() async {
     try {
       await _dioCacheManager.clearAll();
     } on Exception catch (e, s) {
-      Sentry.captureException(e, stackTrace: s).ignore();
+      await Sentry.captureException(e, stackTrace: s);
     }
   }
 
@@ -59,7 +56,7 @@ class CrowdinAPI {
 
       return targetLanguages;
     } on Exception catch (e, s) {
-      Sentry.captureException(e, stackTrace: s).ignore();
+      await Sentry.captureException(e, stackTrace: s);
       return [];
     }
   }

lib/services/github_api.dart

@@ -42,15 +42,15 @@ class GithubAPI {
         captureFailedRequests: true,
       );
     } on Exception catch (e, s) {
-      Sentry.captureException(e, stackTrace: s).ignore();
+      await Sentry.captureException(e, stackTrace: s);
     }
   }
 
   Future<void> clearAllCache() async {
     try {
       await _dioCacheManager.clearAll();
     } on Exception catch (e, s) {
-      Sentry.captureException(e, stackTrace: s).ignore();
+      await Sentry.captureException(e, stackTrace: s);
     }
   }
 
@@ -62,7 +62,7 @@ class GithubAPI {
       );
       return response.data[0];
     } on Exception catch (e, s) {
-      Sentry.captureException(e, stackTrace: s).ignore();
+      await Sentry.captureException(e, stackTrace: s);
       return null;
     }
   }
@@ -93,7 +93,7 @@ class GithubAPI {
           )
           .toList();
     } on Exception catch (e, s) {
-      Sentry.captureException(e, stackTrace: s).ignore();
+      await Sentry.captureException(e, stackTrace: s);
       return List.empty();
     }
   }
@@ -113,7 +113,7 @@ class GithubAPI {
         }
       }
     } on Exception catch (e, s) {
-      Sentry.captureException(e, stackTrace: s).ignore();
+      await Sentry.captureException(e, stackTrace: s);
       return null;
     }
     return null;
@@ -128,7 +128,7 @@ class GithubAPI {
         patches = list.map((patch) => Patch.fromJson(patch)).toList();
       }
     } on Exception catch (e, s) {
-      Sentry.captureException(e, stackTrace: s).ignore();
+      await Sentry.captureException(e, stackTrace: s);
       return List.empty();
     }
     return patches;
@@ -143,7 +143,7 @@ class GithubAPI {
         return 'Unknown';
       }
     } on Exception catch (e, s) {
-      Sentry.captureException(e, stackTrace: s).ignore();
+      await Sentry.captureException(e, stackTrace: s);
       return '';
     }
   }

lib/services/manager_api.dart

@@ -1,6 +1,5 @@
 import 'dart:convert';
 import 'dart:io';
-
 import 'package:device_apps/device_apps.dart';
 import 'package:injectable/injectable.dart';
 import 'package:package_info_plus/package_info_plus.dart';
@@ -18,10 +17,10 @@ import 'package:shared_preferences/shared_preferences.dart';
 class ManagerAPI {
   final RevancedAPI _revancedAPI = locator<RevancedAPI>();
   final GithubAPI _githubAPI = locator<GithubAPI>();
-  final SharedPreferences _prefs = locator<SharedPreferences>();
   final RootAPI _rootAPI = RootAPI();
   final String patcherRepo = 'revanced-patcher';
   final String cliRepo = 'revanced-cli';
+  late SharedPreferences _prefs;
   String storedPatchesFile = '/selected-patches.json';
   String defaultApiUrl = 'https://releases.revanced.app/';
   String defaultRepoUrl = 'https://api.github.com';
@@ -32,6 +31,7 @@ class ManagerAPI {
   String defaultManagerRepo = 'revanced/revanced-manager';
 
   Future<void> initialize() async {
+    _prefs = await SharedPreferences.getInstance();
     storedPatchesFile =
         (await getApplicationDocumentsDirectory()).path + storedPatchesFile;
   }
@@ -180,7 +180,7 @@ class ManagerAPI {
       _revancedAPI.clearAllCache();
       _githubAPI.clearAllCache();
     } on Exception catch (e, s) {
-      Sentry.captureException(e, stackTrace: s).ignore();
+      await Sentry.captureException(e, stackTrace: s);
     }
   }
 
@@ -197,7 +197,7 @@ class ManagerAPI {
         return await _githubAPI.getPatches(repoName);
       }
     } on Exception catch (e, s) {
-      Sentry.captureException(e, stackTrace: s).ignore();
+      await Sentry.captureException(e, stackTrace: s);
       return [];
     }
   }
@@ -214,7 +214,7 @@ class ManagerAPI {
         return await _githubAPI.getLatestReleaseFile('.jar', repoName);
       }
     } on Exception catch (e, s) {
-      Sentry.captureException(e, stackTrace: s).ignore();
+      await Sentry.captureException(e, stackTrace: s);
       return null;
     }
   }
@@ -231,7 +231,7 @@ class ManagerAPI {
         return await _githubAPI.getLatestReleaseFile('.apk', repoName);
       }
     } on Exception catch (e, s) {
-      Sentry.captureException(e, stackTrace: s).ignore();
+      await Sentry.captureException(e, stackTrace: s);
       return null;
     }
   }

lib/services/patcher_api.dart

@@ -50,7 +50,7 @@ class PatcherAPI {
         _patches = await _managerAPI.getPatches();
       }
     } on Exception catch (e, s) {
-      Sentry.captureException(e, stackTrace: s).ignore();
+      await Sentry.captureException(e, stackTrace: s);
       _patches = List.empty();
     }
   }
@@ -92,7 +92,7 @@ class PatcherAPI {
             }
           }
         } on Exception catch (e, s) {
-          Sentry.captureException(e, stackTrace: s).ignore();
+          await Sentry.captureException(e, stackTrace: s);
           continue;
         }
       }
@@ -152,7 +152,7 @@ class PatcherAPI {
       }
       return originalFilePath;
     } on Exception catch (e, s) {
-      Sentry.captureException(e, stackTrace: s).ignore();
+      await Sentry.captureException(e, stackTrace: s);
       return originalFilePath;
     }
   }
@@ -174,7 +174,7 @@ class PatcherAPI {
           selectedPatches.add(settingsPatch);
         }
       } on Exception catch (e, s) {
-        Sentry.captureException(e, stackTrace: s).ignore();
+        await Sentry.captureException(e, stackTrace: s);
         // ignore
       }
     }
@@ -207,11 +207,11 @@ class PatcherAPI {
             'keyStoreFilePath': _keyStoreFile.path,
           },
         );
-      } on Exception catch (e) {
+      } on Exception catch (e, s) {
         if (kDebugMode) {
           print(e);
         }
-        rethrow;
+        throw await Sentry.captureException(e, stackTrace: s);
       }
     }
   }
@@ -233,7 +233,7 @@ class PatcherAPI {
           return await DeviceApps.isAppInstalled(patchedApp.packageName);
         }
       } on Exception catch (e, s) {
-        Sentry.captureException(e, stackTrace: s).ignore();
+        await Sentry.captureException(e, stackTrace: s);
         return false;
       }
     }
@@ -244,15 +244,11 @@ class PatcherAPI {
     try {
       if (_outFile != null) {
         final String newName = _getFileName(appName, version);
-        CRFileSaver.saveFileWithDialog(
-          SaveFileDialogParams(
-            sourceFilePath: _outFile!.path,
-            destinationFileName: newName,
-          ),
-        );
+        CRFileSaver.saveFileWithDialog(SaveFileDialogParams(
+            sourceFilePath: _outFile!.path, destinationFileName: newName,),);
       }
     } on Exception catch (e, s) {
-      Sentry.captureException(e, stackTrace: s).ignore();
+      Sentry.captureException(e, stackTrace: s);
     }
   }
 
@@ -267,7 +263,7 @@ class PatcherAPI {
         ShareExtend.share(shareFile.path, 'file');
       }
     } on Exception catch (e, s) {
-      Sentry.captureException(e, stackTrace: s).ignore();
+      Sentry.captureException(e, stackTrace: s);
     }
   }