external/revanced-manager
1
0
Fork 0
mirror of https://github.com/ReVanced/revanced-manager.git synced 2024-09-19 20:51:30 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix: Revert commit b26760b2 to fix file and folder selection

Browse source
This commit is contained in:
oSumAtrIX 2024-07-29 21:59:29 +02:00
parent 1cea9600a2
commit e707e51719
No known key found for this signature in database
GPG key ID: A9B3094ACDB604B4
3 changed files with 22 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/services/manager_api.dart
View file

@ -38,8 +38,6 @@ class ManagerAPI {
bool releaseBuild = false; bool releaseBuild = false;
bool suggestedAppVersionSelected = true; bool suggestedAppVersionSelected = true;
bool isDynamicThemeAvailable = false; bool isDynamicThemeAvailable = false;
bool isScopedStorageAvailable = false;
int sdkVersion = 0;
String storedPatchesFile = '/selected-patches.json'; String storedPatchesFile = '/selected-patches.json';
String keystoreFile = String keystoreFile =
'/sdcard/Android/data/app.revanced.manager.flutter/files/revanced-manager.keystore'; '/sdcard/Android/data/app.revanced.manager.flutter/files/revanced-manager.keystore';
@ -57,13 +55,8 @@ class ManagerAPI {
Future<void> initialize() async { Future<void> initialize() async {
_prefs = await SharedPreferences.getInstance(); _prefs = await SharedPreferences.getInstance();
isRooted = await _rootAPI.isRooted(); isRooted = await _rootAPI.isRooted();
if (sdkVersion == 0) {
sdkVersion = await getSdkVersion();
}
isDynamicThemeAvailable = isDynamicThemeAvailable =
sdkVersion >= 31; // ANDROID_12_SDK_VERSION = 31 (await getSdkVersion()) >= 31; // ANDROID_12_SDK_VERSION = 31
isScopedStorageAvailable =
sdkVersion >= 30; // ANDROID_11_SDK_VERSION = 30
storedPatchesFile = storedPatchesFile =
(await getApplicationDocumentsDirectory()).path + storedPatchesFile; (await getApplicationDocumentsDirectory()).path + storedPatchesFile;
if (kReleaseMode) { if (kReleaseMode) {

66
lib/ui/widgets/patchesSelectorView/patch_options_fields.dart
View file

@ -1,11 +1,8 @@
import 'package:file_picker/file_picker.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:permission_handler/permission_handler.dart'; import 'package:flutter_file_dialog/flutter_file_dialog.dart';
import 'package:revanced_manager/app/app.locator.dart';
import 'package:revanced_manager/gen/strings.g.dart'; import 'package:revanced_manager/gen/strings.g.dart';
import 'package:revanced_manager/models/patch.dart'; import 'package:revanced_manager/models/patch.dart';
import 'package:revanced_manager/services/manager_api.dart';
import 'package:revanced_manager/ui/views/patch_options/patch_options_viewmodel.dart'; import 'package:revanced_manager/ui/views/patch_options/patch_options_viewmodel.dart';
import 'package:revanced_manager/ui/widgets/shared/custom_card.dart'; import 'package:revanced_manager/ui/widgets/shared/custom_card.dart';
@ -401,7 +398,6 @@ class TextFieldForPatchOption extends StatefulWidget {
} }
class _TextFieldForPatchOptionState extends State<TextFieldForPatchOption> { class _TextFieldForPatchOptionState extends State<TextFieldForPatchOption> {
final ManagerAPI _managerAPI = locator<ManagerAPI>();
final TextEditingController controller = TextEditingController(); final TextEditingController controller = TextEditingController();
String? selectedKey; String? selectedKey;
String? defaultValue; String? defaultValue;
@ -528,49 +524,29 @@ class _TextFieldForPatchOptionState extends State<TextFieldForPatchOption> {
]; ];
}, },
onSelected: (String selection) async { onSelected: (String selection) async {
// manageExternalStorage permission is required for file/folder selection switch (selection) {
// otherwise, the app will not complain, but the patches will error out case 'file':
// the same way as if the user selected an empty file/folder. final String? result = await FlutterFileDialog.pickFile();
// Android 11 and above requires the manageExternalStorage permission if (result != null) {
final Map<String, dynamic> availableActions = { controller.text = result;
t.patchOptionsView.selectFilePath: () async { widget.onChanged(controller.text);
if (_managerAPI.isScopedStorageAvailable) {
final permission =
await Permission.manageExternalStorage.request();
if (!permission.isGranted) {
return;
}
} }
final FilePickerResult? result = break;
await FilePicker.platform.pickFiles(); case 'folder':
if (result == null) { final DirectoryLocation? result =
return; await FlutterFileDialog.pickDirectory();
if (result != null) {
controller.text = result.toString();
widget.onChanged(controller.text);
} }
controller.text = result.files.single.path!; break;
widget.onChanged(controller.text); case 'remove':
},
t.patchOptionsView.selectFolder: () async {
if (_managerAPI.isScopedStorageAvailable) {
final permission =
await Permission.manageExternalStorage.request();
if (!permission.isGranted) {
return;
}
}
final String? result =
await FilePicker.platform.getDirectoryPath();
if (result == null) {
return;
}
controller.text = result;
widget.onChanged(controller.text);
},
t.remove: () {
widget.removeValue!(); widget.removeValue!();
}, break;
}; case 'null':
if (availableActions.containsKey(selection)) { controller.text = '';
await availableActions[selection]!(); widget.onChanged(null);
break;
} }
}, },
), ),

1
pubspec.yaml
View file

@ -23,7 +23,6 @@ dependencies:
dynamic_color: ^1.7.0 dynamic_color: ^1.7.0
dynamic_themes: ^1.1.0 dynamic_themes: ^1.1.0
expandable: ^5.0.1 expandable: ^5.0.1
file_picker: ^8.0.3
flutter: flutter:
sdk: flutter sdk: flutter
flutter_background: flutter_background: