From a411b8e978aebd195001f211d9fd9e5b8a73139f Mon Sep 17 00:00:00 2001
From: haroon amjad <amjad.haroon@cloudsolutions.com.sa>
Date: Wed, 3 Jan 2024 14:37:52 +0300
Subject: [PATCH] File picker permission issue fixed

---
 lib/api/chat/chat_api_client.dart |  2 ++
 lib/app_state/app_state.dart      |  2 +-
 lib/widgets/image_picker.dart     | 56 +++++++++++++++++++++----------
 pubspec.yaml                      |  6 ++--
 4 files changed, 45 insertions(+), 21 deletions(-)

diff --git a/lib/api/chat/chat_api_client.dart b/lib/api/chat/chat_api_client.dart
index d077026..daafa92 100644
--- a/lib/api/chat/chat_api_client.dart
+++ b/lib/api/chat/chat_api_client.dart
@@ -29,6 +29,7 @@ class ChatApiClient {
 
   Future<user.UserAutoLoginModel> getUserLoginToken() async {
     user.UserAutoLoginModel userLoginResponse = user.UserAutoLoginModel();
+    String? deviceToken = AppState().getIsHuawei ? AppState().getHuaweiPushToken : AppState().getDeviceToken;
     Response response = await ApiClient().postJsonForResponse(
       "${ApiConsts.chatLoginTokenUrl}externaluserlogin",
       {
@@ -38,6 +39,7 @@ class ChatApiClient {
         "platform": Platform.isIOS ? "ios" : "android",
         "deviceToken": AppState().getIsHuawei ? AppState().getHuaweiPushToken : AppState().getDeviceToken,
         "isHuaweiDevice": AppState().getIsHuawei,
+        "voipToken": "",
       },
     );
 
diff --git a/lib/app_state/app_state.dart b/lib/app_state/app_state.dart
index 2cfc751..1039b20 100644
--- a/lib/app_state/app_state.dart
+++ b/lib/app_state/app_state.dart
@@ -90,7 +90,7 @@ class AppState {
 
   String get getHuaweiPushToken => _huaweiPushToken;
 
-  final PostParamsModel _postParamsInitConfig = PostParamsModel(channel: 31, versionID: 5.3, mobileType: Platform.isAndroid ? "android" : "ios");
+  final PostParamsModel _postParamsInitConfig = PostParamsModel(channel: 31, versionID: 5.4, mobileType: Platform.isAndroid ? "android" : "ios");
 
   void setPostParamsInitConfig() {
     isAuthenticated = false;
diff --git a/lib/widgets/image_picker.dart b/lib/widgets/image_picker.dart
index ef04f84..19b1e00 100644
--- a/lib/widgets/image_picker.dart
+++ b/lib/widgets/image_picker.dart
@@ -8,6 +8,8 @@ import 'package:mohem_flutter_app/classes/colors.dart';
 import 'package:mohem_flutter_app/extensions/string_extensions.dart';
 import 'package:mohem_flutter_app/widgets/bottom_sheet.dart';
 import 'package:mohem_flutter_app/widgets/bottom_sheets/attachment_options.dart';
+import 'package:mohem_flutter_app/widgets/dialogs/confirm_dialog.dart';
+import 'package:permission_handler/permission_handler.dart';
 
 class ImageOptions {
   static void showImageOptionsNew(BuildContext context, bool showFilesOption, Function(String, File) image) {
@@ -43,24 +45,42 @@ class ImageOptions {
           }
         },
         onFilesTap: () async {
-          FilePickerResult? result = await FilePicker.platform.pickFiles(
-            type: FileType.custom,
-            allowedExtensions: [
-              'jpg',
-              'jpeg ',
-              'pdf',
-              'txt',
-              'docx',
-              'doc',
-              'pptx',
-              'xlsx',
-              'png',
-              'rar',
-              'zip',
-            ],
-          );
-          List<File> files = result!.paths.map((path) => File(path!)).toList();
-          image(result.files.first.path.toString(), files.first);
+          Permission.storage.isGranted.then((isGranted) {
+            if (!isGranted) {
+              Permission.manageExternalStorage.request().then((granted) async {
+                if (granted == PermissionStatus.granted) {
+                  FilePickerResult? result = await FilePicker.platform.pickFiles(
+                    type: FileType.custom,
+                    allowedExtensions: [
+                      'jpg',
+                      'jpeg ',
+                      'pdf',
+                      'txt',
+                      'docx',
+                      'doc',
+                      'pptx',
+                      'xlsx',
+                      'png',
+                      'rar',
+                      'zip',
+                    ],
+                  );
+                  List<File> files = result!.paths.map((path) => File(path!)).toList();
+                  image(result.files.first.path.toString(), files.first);
+                } else {
+                  showDialog(
+                    context: context,
+                    builder: (BuildContext cxt) => ConfirmDialog(
+                      message: "You need to give storage permission to upload files.",
+                      onTap: () {
+                        Navigator.pop(context);
+                      },
+                    ),
+                  );
+                }
+              });
+            }
+          });
         },
       ),
     );
diff --git a/pubspec.yaml b/pubspec.yaml
index e3b15bd..82ae41b 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -17,7 +17,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 #version: 3.3.01+300040
-version: 3.7.7+1
+version: 3.3.6+300046
 
 environment:
   sdk: ">=2.16.0 <3.0.0"
@@ -60,7 +60,7 @@ dependencies:
   #  android_id: ^0.1.3+1
   platform_device_id: ^1.0.1
   image_picker: ^0.8.5+3
-  file_picker: ^4.6.1
+  file_picker: 5.2.5
   geolocator: ^9.0.2
   month_year_picker: ^0.2.0+1
   month_picker_dialog_2: 0.5.5
@@ -124,6 +124,8 @@ dependencies:
   #todo its for temporary purpose, later will remove this.
   dotted_border: ^2.0.0+3
 
+#  saf: ^1.0.3+4
+
 
 dependency_overrides:
   firebase_core_platform_interface: 4.5.1