From e20d6eca3f27fc958618de582b3bb39b8204b8a8 Mon Sep 17 00:00:00 2001
From: haroon amjad <amjad.haroon@cloudsolutions.com.sa>
Date: Mon, 30 Dec 2024 10:43:24 +0300
Subject: [PATCH] Safe device issue fixed

---
 lib/ui/login/login_screen.dart | 34 +++++++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/lib/ui/login/login_screen.dart b/lib/ui/login/login_screen.dart
index 3a35222..2aa2da3 100644
--- a/lib/ui/login/login_screen.dart
+++ b/lib/ui/login/login_screen.dart
@@ -59,8 +59,7 @@ class _LoginScreenState extends State<LoginScreen> {
   bool? isAppOpenBySystem;
 
   bool isJailBroken = false;
-  bool isRealDevice = false;
-  bool isOnExternalStorage = false;
+  bool isRealDevice = true;
   bool isDevelopmentModeEnable = false;
 
   BasicMemberInformationModel? _basicMemberInformation;
@@ -78,16 +77,20 @@ class _LoginScreenState extends State<LoginScreen> {
     }
   }
 
-  void checkDeviceSafety() async {
+  void checkDeviceSafety() {
     try {
-      isJailBroken = await SafeDevice.isJailBroken;
-      isRealDevice = await SafeDevice.isRealDevice;
+      SafeDevice.isJailBroken.then((bool value) {
+        isJailBroken = value;
+      });
+      SafeDevice.isRealDevice.then((value) {
+        isRealDevice = value;
+      });
+
       if (Platform.isAndroid) {
-        isOnExternalStorage = await SafeDevice.isOnExternalStorage;
-        isDevelopmentModeEnable = await SafeDevice.isDevelopmentModeEnable;
-      }
-      if (isJailBroken || !isRealDevice || isOnExternalStorage || isDevelopmentModeEnable) {
-        Navigator.pushNamedAndRemoveUntil(context, AppRoutes.unsafeDeviceScreen, (_) => false);
+        // isOnExternalStorage = await SafeDevice.isOnExternalStorage;
+        SafeDevice.isDevelopmentModeEnable.then((value) {
+          isDevelopmentModeEnable = value;
+        });
       }
     } catch (error) {
       print(error);
@@ -123,7 +126,14 @@ class _LoginScreenState extends State<LoginScreen> {
               firebaseToken = "";
             }
             AppNotifications().init(firebaseToken, context);
-            checkLoginInfo();
+
+            if (isJailBroken || !isRealDevice || isDevelopmentModeEnable) {
+              Utils.hideLoading(context);
+              Navigator.pushNamedAndRemoveUntil(context, AppRoutes.unsafeDeviceScreen, (_) => false);
+            } else {
+              checkLoginInfo();
+            }
+
             await FirebaseCrashlytics.instance.setCrashlyticsCollectionEnabled(true);
           }
           // });
@@ -201,6 +211,8 @@ class _LoginScreenState extends State<LoginScreen> {
       }
       Utils.saveStringFromPrefs(SharedPrefsConsts.password, password.text);
     } catch (ex) {
+      print(ex);
+      print(ex.toString());
       Utils.hideLoading(context);
       Utils.handleException(ex, context, (msg) {
         Utils.confirmDialog(