diff --git a/android/app/build.gradle b/android/app/build.gradle index a9c10eb2..dd210b2b 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -79,10 +79,6 @@ dependencies { implementation("org.bouncycastle:bcpkix-jdk15on:1.70") implementation("com.android.tools.build:apksig:7.2.2") - // MicroG cronet - implementation("org.microg:cronet-common:$cronetVersion") - implementation("org.microg:cronet-native:$cronetVersion") - // Core libraries coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5' diff --git a/android/build.gradle b/android/build.gradle index 2d13b78c..0910f549 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,5 +1,4 @@ buildscript { - ext.cronetVersion = '102.5005.125' ext.kotlin_version = '1.7.10' repositories { google() diff --git a/lib/services/github_api.dart b/lib/services/github_api.dart index 73169538..b453e645 100644 --- a/lib/services/github_api.dart +++ b/lib/services/github_api.dart @@ -7,13 +7,12 @@ import 'package:dio_cache_interceptor/dio_cache_interceptor.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter_cache_manager/flutter_cache_manager.dart'; import 'package:injectable/injectable.dart'; -import 'package:native_dio_adapter/native_dio_adapter.dart'; import 'package:revanced_manager/models/patch.dart'; @lazySingleton class GithubAPI { late Dio _dio = Dio(); - + final _cacheOptions = CacheOptions( store: MemCacheStore(), maxStale: const Duration(days: 1), @@ -33,22 +32,6 @@ class GithubAPI { Future initialize(String repoUrl) async { try { - if (Platform.isIOS || Platform.isMacOS || Platform.isAndroid) { - final CronetEngine androidCronetEngine = await CronetEngine.build( - userAgent: 'ReVanced Manager', - enableBrotli: true, - enableQuic: true, - ); - _dio.httpClientAdapter = - NativeAdapter(androidCronetEngine: androidCronetEngine); - - _dio = Dio( - BaseOptions( - baseUrl: repoUrl, - ), - ); - } - _dio = Dio( BaseOptions( baseUrl: repoUrl, @@ -126,8 +109,7 @@ class GithubAPI { String repoName, ) async { try { - final Map? release = - await getLatestRelease(repoName); + final Map? release = await getLatestRelease(repoName); if (release != null) { final Map? asset = (release['assets'] as List).firstWhereOrNull( @@ -166,8 +148,7 @@ class GithubAPI { Future getLastestReleaseVersion(String repoName) async { try { - final Map? release = - await getLatestRelease(repoName); + final Map? release = await getLatestRelease(repoName); if (release != null) { return release['tag_name']; } else { diff --git a/lib/services/revanced_api.dart b/lib/services/revanced_api.dart index 720c4f65..1c6d3f9e 100644 --- a/lib/services/revanced_api.dart +++ b/lib/services/revanced_api.dart @@ -8,9 +8,7 @@ import 'package:dio_cache_interceptor/dio_cache_interceptor.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter_cache_manager/flutter_cache_manager.dart'; import 'package:injectable/injectable.dart'; -import 'package:native_dio_adapter/native_dio_adapter.dart'; import 'package:revanced_manager/models/patch.dart'; -import 'package:revanced_manager/utils/check_for_gms.dart'; import 'package:timeago/timeago.dart'; @lazySingleton @@ -25,34 +23,12 @@ class RevancedAPI { Future initialize(String apiUrl) async { try { - final bool isGMSInstalled = await checkForGMS(); + _dio = Dio( + BaseOptions( + baseUrl: apiUrl, + ), + ); - if (!isGMSInstalled) { - _dio = Dio( - BaseOptions( - baseUrl: apiUrl, - ), - ); - log('ReVanced API: Using default engine + $isGMSInstalled'); - } else { - if (Platform.isIOS || Platform.isMacOS || Platform.isAndroid) { - final CronetEngine androidCronetEngine = await CronetEngine.build( - userAgent: 'ReVanced Manager', - enableBrotli: true, - enableQuic: true, - ); - _dio.httpClientAdapter = - NativeAdapter(androidCronetEngine: androidCronetEngine); - - _dio = Dio( - BaseOptions( - baseUrl: apiUrl, - ), - ); - } - - log('ReVanced API: Using CronetEngine + $isGMSInstalled'); - } _dio.interceptors.add(DioCacheInterceptor(options: _cacheOptions)); } on Exception catch (e) { if (kDebugMode) { diff --git a/lib/ui/views/app_selector/app_selector_view.dart b/lib/ui/views/app_selector/app_selector_view.dart index a70a51ff..487f08a8 100644 --- a/lib/ui/views/app_selector/app_selector_view.dart +++ b/lib/ui/views/app_selector/app_selector_view.dart @@ -78,7 +78,7 @@ class _AppSelectorViewState extends State { child: model.noApps ? Center( child: I18nText( - 'appSelectorView.noApps', + 'appSelectorView.noAppsLabel', child: Text( '', style: TextStyle( diff --git a/lib/utils/check_for_gms.dart b/lib/utils/check_for_gms.dart deleted file mode 100644 index 79474eae..00000000 --- a/lib/utils/check_for_gms.dart +++ /dev/null @@ -1,10 +0,0 @@ -// Check for google mobile services on device - -import 'package:device_apps/device_apps.dart'; - -Future checkForGMS() async { - bool isGMSInstalled = true; - isGMSInstalled = await DeviceApps.isAppInstalled('com.google.android.gms') || - await DeviceApps.isAppInstalled('com.android.vending'); - return isGMSInstalled; -} diff --git a/pubspec.yaml b/pubspec.yaml index 525426a1..351edf41 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -56,7 +56,6 @@ dependencies: package_info_plus: ^3.0.3 path_provider: ^2.0.14 permission_handler: ^10.2.0 - native_dio_adapter: ^0.1.0 pull_to_refresh: ^2.0.0 root: git: