From 586deec4f42606c03210cdbce8355c424db13a8a Mon Sep 17 00:00:00 2001
From: Hamza-Ayed <hamzaayedflutter@gmail.com>
Date: Tue, 21 Jul 2026 20:50:04 +0300
Subject: [PATCH] Update: 2026-07-21 20:50:03

---
 siro_rider/lib/controller/auth/login_controller.dart | 12 ++++++------
 siro_rider/lib/controller/auth/otp_controller.dart   |  4 ++--
 .../lib/controller/functions/upload_image.dart       |  2 +-
 .../home/profile/complaint_controller.dart           |  4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/siro_rider/lib/controller/auth/login_controller.dart b/siro_rider/lib/controller/auth/login_controller.dart
index 4478c0dc..84ad6f6e 100644
--- a/siro_rider/lib/controller/auth/login_controller.dart
+++ b/siro_rider/lib/controller/auth/login_controller.dart
@@ -127,8 +127,8 @@ class LoginController extends GetxController {
 
           if (jwt != null) {
             // نشفر الـ JWT بالتشفير الثلاثي قبل التخزين في GetStorage
-            box.write(BoxName.jwt, (jwt));
-            storage.write(key: BoxName.jwt, value: (jwt));
+            box.write(BoxName.jwt, c(jwt));
+            storage.write(key: BoxName.jwt, value: c(jwt));
           }
 
           await EncryptionHelper.initialize();
@@ -159,8 +159,8 @@ class LoginController extends GetxController {
                   : decoded['jwt']);
 
           if (jwt != null) {
-            box.write(BoxName.jwt, (jwt));
-            storage.write(key: BoxName.jwt, value: (jwt));
+            box.write(BoxName.jwt, c(jwt));
+            storage.write(key: BoxName.jwt, value: c(jwt));
           }
         }
       }
@@ -499,8 +499,8 @@ class LoginController extends GetxController {
 
           // حفظ التوكن
           if (jwt != null) {
-            box.write(BoxName.jwt, (jwt));
-            await storage.write(key: BoxName.jwt, value: (jwt));
+            box.write(BoxName.jwt, c(jwt));
+            await storage.write(key: BoxName.jwt, value: c(jwt));
           }
 
           box.write(BoxName.isVerified, '1');
diff --git a/siro_rider/lib/controller/auth/otp_controller.dart b/siro_rider/lib/controller/auth/otp_controller.dart
index 9e28e861..ac84b6ce 100644
--- a/siro_rider/lib/controller/auth/otp_controller.dart
+++ b/siro_rider/lib/controller/auth/otp_controller.dart
@@ -88,9 +88,9 @@ class PhoneAuthHelper {
                 data['message']?['token'] ??
                 data['message']?['access_token'];
             if (jwtToken != null && jwtToken.toString().isNotEmpty) {
-              box.write(BoxName.jwt, (jwtToken.toString()));
+              box.write(BoxName.jwt, c(jwtToken.toString()));
               await storage.write(
-                  key: BoxName.jwt, value: (jwtToken.toString()));
+                  key: BoxName.jwt, value: c(jwtToken.toString()));
             }
             // ✅ المستخدم موجود مسبقاً -> تسجيل دخول مباشر
             await _handleSuccessfulLogin(data['message']['passenger']);
diff --git a/siro_rider/lib/controller/functions/upload_image.dart b/siro_rider/lib/controller/functions/upload_image.dart
index 27c8bfe2..cd02f733 100644
--- a/siro_rider/lib/controller/functions/upload_image.dart
+++ b/siro_rider/lib/controller/functions/upload_image.dart
@@ -80,7 +80,7 @@ class ImageController extends GetxController {
         box.read(BoxName.deviceFpEncrypted)?.toString() ?? '';
     request.headers.addAll({
       'Authorization':
-          'Bearer ${(box.read(BoxName.jwt)).toString().split(AppInformation.addd)[0]}',
+          'Bearer ${r(box.read(BoxName.jwt)).toString().split(AppInformation.addd)[0]}',
       'X-Device-FP': fingerPrint,
     });
     // Set the file name to the driverID
diff --git a/siro_rider/lib/controller/home/profile/complaint_controller.dart b/siro_rider/lib/controller/home/profile/complaint_controller.dart
index 91e61149..df12c3be 100644
--- a/siro_rider/lib/controller/home/profile/complaint_controller.dart
+++ b/siro_rider/lib/controller/home/profile/complaint_controller.dart
@@ -70,7 +70,7 @@ class ComplaintController extends GetxController {
 
       var uri = Uri.parse('${AppLink.server}/upload_audio.php');
       var request = http.MultipartRequest('POST', uri);
-      String token = (box.read(BoxName.jwt)).toString().split(Env.addd)[0];
+      String token = r(box.read(BoxName.jwt)).toString().split(Env.addd)[0];
       final String fingerPrint =
           box.read(BoxName.deviceFpEncrypted)?.toString() ?? '';
 
@@ -147,7 +147,7 @@ class ComplaintController extends GetxController {
       // 3. استخراج البيانات المطلوبة
       final rideId = feedBack[0]['id'].toString(); // ! تأكد أن اسم حقل ID صحيح
       final complaint = complaintController.text;
-      String token = (box.read(BoxName.jwt)).toString().split(Env.addd)[0];
+      String token = r(box.read(BoxName.jwt)).toString().split(Env.addd)[0];
 
       // 4. استدعاء سكربت PHP الجديد باستخدام http.post
       final response = await http.post(