ReVanced/revanced-manager
1
0
Fork 0
mirror of https://github.com/revanced/revanced-manager.git synced 2025-06-12 20:57:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Improve code readability & additional refactoring

Commits:
chore: exclude generated from analyzer

refactor: add SharedPreferences to locator

refactor: access shared pref from locator, and code refactor

refactor: remove unwanted `await`

refactor: remove `const` from `CacheConfig`
This commit is contained in:
Sailesh Dahal
2023-02-21 18:06:56 +05:45
committed by EvadeMaster
parent 3ae4d69110
commit 6829d3cdea
15 changed files with 97 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/services/crowdin_api.dart
View File

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

14
lib/services/github_api.dart
View File

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

12
lib/services/manager_api.dart
View File

@ -1,5 +1,6 @@
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';
@ -17,10 +18,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';
@ -31,7 +32,6 @@ 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) {
await Sentry.captureException(e, stackTrace: s);
Sentry.captureException(e, stackTrace: s).ignore();
}
}
@ -197,7 +197,7 @@ class ManagerAPI {
return await _githubAPI.getPatches(repoName);
}
} on Exception catch (e, s) {
await Sentry.captureException(e, stackTrace: s);
Sentry.captureException(e, stackTrace: s).ignore();
return [];
}
}
@ -214,7 +214,7 @@ class ManagerAPI {
return await _githubAPI.getLatestReleaseFile('.jar', repoName);
}
} on Exception catch (e, s) {
await Sentry.captureException(e, stackTrace: s);
Sentry.captureException(e, stackTrace: s).ignore();
return null;
}
}
@ -231,7 +231,7 @@ class ManagerAPI {
return await _githubAPI.getLatestReleaseFile('.apk', repoName);
}
} on Exception catch (e, s) {
await Sentry.captureException(e, stackTrace: s);
Sentry.captureException(e, stackTrace: s).ignore();
return null;
}
}

26
lib/services/patcher_api.dart
View File

@ -50,7 +50,7 @@ class PatcherAPI {
_patches = await _managerAPI.getPatches();
}
} on Exception catch (e, s) {
await Sentry.captureException(e, stackTrace: s);
Sentry.captureException(e, stackTrace: s).ignore();
_patches = List.empty();
}
}
@ -92,7 +92,7 @@ class PatcherAPI {
}
}
} on Exception catch (e, s) {
await Sentry.captureException(e, stackTrace: s);
Sentry.captureException(e, stackTrace: s).ignore();
continue;
}
}
@ -171,7 +171,7 @@ class PatcherAPI {
}
return originalFilePath;
} on Exception catch (e, s) {
await Sentry.captureException(e, stackTrace: s);
Sentry.captureException(e, stackTrace: s).ignore();
return originalFilePath;
}
}
@ -194,7 +194,7 @@ class PatcherAPI {
selectedPatches.add(settingsPatch);
}
} on Exception catch (e, s) {
await Sentry.captureException(e, stackTrace: s);
Sentry.captureException(e, stackTrace: s).ignore();
// ignore
}
}
@ -231,11 +231,11 @@ class PatcherAPI {
'keyStoreFilePath': _keyStoreFile.path,
},
);
} on Exception catch (e, s) {
} on Exception catch (e) {
if (kDebugMode) {
print(e);
}
throw await Sentry.captureException(e, stackTrace: s);
rethrow;
}
}
}
@ -257,7 +257,7 @@ class PatcherAPI {
return await DeviceApps.isAppInstalled(patchedApp.packageName);
}
} on Exception catch (e, s) {
await Sentry.captureException(e, stackTrace: s);
Sentry.captureException(e, stackTrace: s).ignore();
return false;
}
}
@ -268,11 +268,15 @@ 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);
Sentry.captureException(e, stackTrace: s).ignore();
}
}
@ -287,7 +291,7 @@ class PatcherAPI {
ShareExtend.share(shareFile.path, 'file');
}
} on Exception catch (e, s) {
Sentry.captureException(e, stackTrace: s);
Sentry.captureException(e, stackTrace: s).ignore();
}
}

16
lib/services/revanced_api.dart
View File

@ -46,7 +46,7 @@ class RevancedAPI {
captureFailedRequests: true,
);
} on Exception catch (e, s) {
await Sentry.captureException(e, stackTrace: s);
Sentry.captureException(e, stackTrace: s).ignore();
}
}
@ -54,7 +54,7 @@ class RevancedAPI {
try {
await _dioCacheManager.clearAll();
} on Exception catch (e, s) {
await Sentry.captureException(e, stackTrace: s);
Sentry.captureException(e, stackTrace: s).ignore();
}
}
@ -68,7 +68,7 @@ class RevancedAPI {
contributors[name] = repo['contributors'];
}
} on Exception catch (e, s) {
await Sentry.captureException(e, stackTrace: s);
Sentry.captureException(e, stackTrace: s).ignore();
return {};
}
return contributors;
@ -80,7 +80,7 @@ class RevancedAPI {
final List<dynamic> patches = response.data;
return patches.map((patch) => Patch.fromJson(patch)).toList();
} on Exception catch (e, s) {
await Sentry.captureException(e, stackTrace: s);
Sentry.captureException(e, stackTrace: s).ignore();
return List.empty();
}
}
@ -98,7 +98,7 @@ class RevancedAPI {
(t['name'] as String).endsWith(extension),
);
} on Exception catch (e, s) {
await Sentry.captureException(e, stackTrace: s);
Sentry.captureException(e, stackTrace: s).ignore();
return null;
}
}
@ -116,7 +116,7 @@ class RevancedAPI {
return release['version'];
}
} on Exception catch (e, s) {
await Sentry.captureException(e, stackTrace: s);
Sentry.captureException(e, stackTrace: s).ignore();
return null;
}
return null;
@ -133,7 +133,7 @@ class RevancedAPI {
return await DefaultCacheManager().getSingleFile(url);
}
} on Exception catch (e, s) {
await Sentry.captureException(e, stackTrace: s);
Sentry.captureException(e, stackTrace: s).ignore();
return null;
}
return null;
@ -154,7 +154,7 @@ class RevancedAPI {
return format(timestamp, locale: 'en_short');
}
} on Exception catch (e, s) {
await Sentry.captureException(e, stackTrace: s);
Sentry.captureException(e, stackTrace: s).ignore();
return null;
}
return null;

8
lib/services/root_api.dart
View File

@ -11,7 +11,7 @@ class RootAPI {
final bool? isRooted = await Root.isRootAvailable();
return isRooted != null && isRooted;
} on Exception catch (e, s) {
await Sentry.captureException(e, stackTrace: s);
Sentry.captureException(e, stackTrace: s).ignore();
return false;
}
}
@ -25,7 +25,7 @@ class RootAPI {
}
return false;
} on Exception catch (e, s) {
await Sentry.captureException(e, stackTrace: s);
Sentry.captureException(e, stackTrace: s).ignore();
return false;
}
}
@ -79,7 +79,7 @@ class RootAPI {
return apps.map((pack) => pack.trim()).toList();
}
} on Exception catch (e, s) {
await Sentry.captureException(e, stackTrace: s);
Sentry.captureException(e, stackTrace: s).ignore();
return List.empty();
}
return List.empty();
@ -126,7 +126,7 @@ class RootAPI {
await mountApk(packageName, originalFilePath);
return true;
} on Exception catch (e, s) {
await Sentry.captureException(e, stackTrace: s);
Sentry.captureException(e, stackTrace: s).ignore();
return false;
}
}