Sultan
/
invoice
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Fix for Android photos/storage permission

This commit is contained in:
Hillel Coren 2023-11-14 09:39:22 +02:00
parent 009a32e154
commit af8c4ee553
9 changed files with 48 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/app/src/debug/AndroidManifest.xml
View File

@ -8,6 +8,7 @@
<uses-permission android:name="android.permission.WRITE_CONTACTS"/>
<uses-permission android:name="android.permission.GET_ACCOUNTS"/>
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
<uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.CALL_PHONE"/>
@ -15,6 +16,7 @@
<uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
<uses-feature android:name="android.hardware.camera.front" android:required="false"/>
<uses-feature android:name="android.hardware.READ_EXTERNAL_STORAGE" android:required="false"/>
<uses-feature android:name="android.hardware.READ_MEDIA_IMAGES" android:required="false"/>
<uses-feature android:name="android.hardware.CALL_PHONE" android:required="false"/>
</manifest>

2
android/app/src/main/AndroidManifest.foss.xml
View File

@ -8,6 +8,7 @@
<uses-permission android:name="android.permission.WRITE_CONTACTS"/>
<uses-permission android:name="android.permission.GET_ACCOUNTS"/>
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
<uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.CALL_PHONE"/>
@ -15,6 +16,7 @@
<uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
<uses-feature android:name="android.hardware.camera.front" android:required="false"/>
<uses-feature android:name="android.hardware.READ_EXTERNAL_STORAGE" android:required="false"/>
<uses-feature android:name="android.hardware.READ_MEDIA_IMAGES" android:required="false"/>
<uses-feature android:name="android.hardware.CALL_PHONE" android:required="false"/>
<application

2
android/app/src/main/AndroidManifest.xml
View File

@ -8,6 +8,7 @@
<uses-permission android:name="android.permission.WRITE_CONTACTS"/>
<uses-permission android:name="android.permission.GET_ACCOUNTS"/>
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
<uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.CALL_PHONE"/>
@ -15,6 +16,7 @@
<uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
<uses-feature android:name="android.hardware.camera.front" android:required="false"/>
<uses-feature android:name="android.hardware.READ_EXTERNAL_STORAGE" android:required="false"/>
<uses-feature android:name="android.hardware.READ_MEDIA_IMAGES" android:required="false"/>
<uses-feature android:name="android.hardware.CALL_PHONE" android:required="false"/>
<application

2
android/app/src/profile/AndroidManifest.xml
View File

@ -8,6 +8,7 @@
<uses-permission android:name="android.permission.WRITE_CONTACTS"/>
<uses-permission android:name="android.permission.GET_ACCOUNTS"/>
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
<uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.CALL_PHONE"/>
@ -15,6 +16,7 @@
<uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
<uses-feature android:name="android.hardware.camera.front" android:required="false"/>
<uses-feature android:name="android.hardware.READ_EXTERNAL_STORAGE" android:required="false"/>
<uses-feature android:name="android.hardware.READ_MEDIA_IMAGES" android:required="false"/>
<uses-feature android:name="android.hardware.CALL_PHONE" android:required="false"/>
</manifest>

16
lib/utils/files.dart
View File

@ -3,6 +3,7 @@ import 'dart:io';
import 'dart:io' as file;
// Flutter imports:
import 'package:device_info_plus/device_info_plus.dart';
import 'package:flutter/foundation.dart';
// Package imports:
@ -39,11 +40,18 @@ Future<List<MultipartFile>?> pickFiles({
allowMultiple: allowMultiple,
);
} else {
final permission = await (fileType == FileType.image && Platform.isIOS
? Permission.photos.request()
: Permission.storage.request());
final androidInfo = await DeviceInfoPlugin().androidInfo;
PermissionStatus status;
if (permission == PermissionStatus.granted) {
if (Platform.isIOS && fileType == FileType.image) {
status = await Permission.photos.request();
} else if (Platform.isAndroid && androidInfo.version.sdkInt >= 33) {
status = await Permission.photos.request();
} else {
status = await Permission.storage.request();
}
if (status == PermissionStatus.granted) {
return _pickFiles(
fileIndex: fileIndex,
fileType: fileType,

2
macos/Flutter/GeneratedPluginRegistrant.swift
View File

@ -6,6 +6,7 @@ import FlutterMacOS
import Foundation
import desktop_drop
import device_info_plus
import file_selector_macos
import in_app_purchase_storekit
import in_app_review
@ -26,6 +27,7 @@ import window_manager
func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
DesktopDropPlugin.register(with: registry.registrar(forPlugin: "DesktopDropPlugin"))
DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin"))
FileSelectorPlugin.register(with: registry.registrar(forPlugin: "FileSelectorPlugin"))
InAppPurchasePlugin.register(with: registry.registrar(forPlugin: "InAppPurchasePlugin"))
InAppReviewPlugin.register(with: registry.registrar(forPlugin: "InAppReviewPlugin"))

1
pubspec.foss.yaml
View File

@ -89,6 +89,7 @@ dependencies:
# idb_shim: ^1.11.1+1
collection: ^1.15.0-nullsafety.4
filesystem_picker: ^4.0.0
device_info_plus: ^9.1.0
dependency_overrides:
intl: any

24
pubspec.lock
View File

@ -306,6 +306,22 @@ packages:
url: "https://pub.dev"
source: hosted
version: "0.4.4"
device_info_plus:
dependency: "direct main"
description:
name: device_info_plus
sha256: "7035152271ff67b072a211152846e9f1259cf1be41e34cd3e0b5463d2d6b8419"
url: "https://pub.dev"
source: hosted
version: "9.1.0"
device_info_plus_platform_interface:
dependency: transitive
description:
name: device_info_plus_platform_interface
sha256: d3b01d5868b50ae571cd1dc6e502fc94d956b665756180f7b16ead09e836fd64
url: "https://pub.dev"
source: hosted
version: "7.0.0"
diacritic:
dependency: "direct main"
description:
@ -1862,6 +1878,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "5.0.9"
win32_registry:
dependency: transitive
description:
name: win32_registry
sha256: "41fd8a189940d8696b1b810efb9abcf60827b6cbfab90b0c43e8439e3a39d85a"
url: "https://pub.dev"
source: hosted
version: "1.1.2"
window_manager:
dependency: "direct main"
description:

1
pubspec.yaml
View File

@ -95,6 +95,7 @@ dependencies:
# idb_shim: ^1.11.1+1
collection: ^1.15.0-nullsafety.4
filesystem_picker: ^4.0.0
device_info_plus: ^9.1.0
dependency_overrides:
intl: any