From d5d48703f9dc2e4e0f3a16186a2c0110f2b6b068 Mon Sep 17 00:00:00 2001
From: Sultan Khan <sultan.khan@hmg.local>
Date: Wed, 14 Jul 2021 10:32:07 +0300
Subject: [PATCH] camera permission fixed

---
 lib/pages/settings/general_setting.dart         | 14 ++++++++------
 lib/services/permission/permission_service.dart |  5 +----
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/lib/pages/settings/general_setting.dart b/lib/pages/settings/general_setting.dart
index 9a062eac..20c42aa6 100644
--- a/lib/pages/settings/general_setting.dart
+++ b/lib/pages/settings/general_setting.dart
@@ -32,10 +32,7 @@ class _GeneralSettings extends State<GeneralSettings>
   var mediaQueryData;
   @override
   void initState() {
-    setState(() {
-      getValues();
-    });
-
+    this.getValues();
     super.initState();
   }
 
@@ -204,6 +201,7 @@ class _GeneralSettings extends State<GeneralSettings>
                   setState(() {
                     camera = value;
                   });
+                  this.permission.openSettings();
                 },
                 activeTrackColor: Colors.lightGreenAccent,
                 activeColor: Colors.green,
@@ -305,8 +303,12 @@ class _GeneralSettings extends State<GeneralSettings>
       // accsibility = mediaQueryData.accessibleNavigation;
       //setTheme(blindValue);
     }
-
-    this.location = await this.permission.isLocationEnabled();
+    var camera = await this.permission.isCameraEnabled();
+    var location = await this.permission.isLocationEnabled();
+    setState(() {
+      this.camera = camera;
+      this.location = location;
+    });
   }
 
   getTheme(value) async {
diff --git a/lib/services/permission/permission_service.dart b/lib/services/permission/permission_service.dart
index ab82172e..3b31e27e 100644
--- a/lib/services/permission/permission_service.dart
+++ b/lib/services/permission/permission_service.dart
@@ -55,10 +55,7 @@ class PermissionService extends BaseService {
   }
 
   isCameraEnabled() async {
-    print(await Permission.camera.status);
-    return await Permission.camera.status == PermissionStatus.granted
-        ? true
-        : false;
+    return await Permission.camera.isGranted;
   }
 
   setCameraLocationPermission(context) async {