25-9-1-1

lib/controller/auth/certificate.dart

@@ -0,0 +1,40 @@
+import 'dart:convert';
+import 'dart:io';
+import 'dart:typed_data';
+import 'package:crypto/crypto.dart';
+
+Future<bool> verifyCertificateManually(
+    String host, int port, String expectedPin) async {
+  try {
+    final socket = await SecureSocket.connect(host, port,
+        timeout: const Duration(seconds: 5));
+
+    final certificate = socket.peerCertificate;
+    if (certificate == null) {
+      print("❌ لا يوجد شهادة.");
+      return false;
+    }
+
+    final der = certificate.der;
+    final actualPin = base64.encode(sha256.convert(der).bytes);
+
+    print("📛 HOST: $host");
+    print("📜 Subject: ${certificate.subject}");
+    print("📜 Issuer: ${certificate.issuer}");
+    print("📅 Valid From: ${certificate.startValidity}");
+    print("📅 Valid To: ${certificate.endValidity}");
+    print(
+        "🔐 Server Pin: $actualPin → ${actualPin == expectedPin ? '✅ MATCH' : '❌ MISMATCH'}");
+
+    socket.destroy();
+    return actualPin == expectedPin;
+  } catch (e) {
+    print("❌ خطأ أثناء الاتصال أو الفحص: $e");
+    return false;
+  }
+}
+
+/// تحويل المفتاح العام إلى بصمة SHA-256
+List<int> sha256Convert(Uint8List der) {
+  return sha256.convert(der).bytes;
+}

lib/controller/auth/otp_controller.dart

@@ -25,7 +25,7 @@ class PhoneAuthHelper {
         link: _sendOtpUrl,
         payload: {'receiver': phoneNumber},
       );
-      // Log.print('response: ${response}');
+      Log.print('response: ${response}');
       if (response != 'failure') {
         final data = (response);
         // if (data['status'] == 'success') {

lib/controller/firebase/firbase_messge.dart

@@ -216,7 +216,7 @@ class FirebaseMessagesController extends GetxController {
             'Passenger come to you'.tr, 'Hi ,I will go now'.tr, 'ding');
       }
       update();
-    } else if (message.notification!.title! == 'Hi ,I Arrive your site') {
+    } else if (message.notification!.title! == 'Hi ,I Arrive your site'.tr) {
       if (Platform.isAndroid) {
         notificationController.showNotification(
             'Hi ,I Arrive your site'.tr, ''.tr, 'ding');

lib/controller/home/device_tier.dart

@@ -0,0 +1,86 @@
+import 'dart:io';
+import 'package:device_info_plus/device_info_plus.dart';
+
+import '../../main.dart';
+
+// مفاتيح التخزين (بسيطة)
+const _kDeviceTierKey = 'deviceTier'; // 'low' | 'mid' | 'high'
+const _kDeviceTierCheckedAtKey = 'deviceTierTime'; // millisSinceEpoch
+
+Future<String> detectAndCacheDeviceTier({bool force = false}) async {
+  // لا تعيد الفحص إذا عملناه خلال آخر 24 ساعة
+  if (!force) {
+    final last = box.read(_kDeviceTierCheckedAtKey);
+    if (last is int) {
+      final dt = DateTime.fromMillisecondsSinceEpoch(last);
+      if (DateTime.now().difference(dt) < const Duration(hours: 24)) {
+        final cached = box.read(_kDeviceTierKey);
+        if (cached is String && cached.isNotEmpty)
+          return cached; // low/mid/high
+      }
+    }
+  }
+
+  final info = DeviceInfoPlugin();
+  int score = 0;
+
+  if (Platform.isAndroid) {
+    final a = await info.androidInfo;
+    final int sdk = a.version.sdkInt ?? 0;
+    final int cores = Platform.numberOfProcessors;
+    final int abisCount = a.supportedAbis.length;
+    final bool isEmu = !(a.isPhysicalDevice ?? true);
+
+    // SDK (أقدم = أضعف)
+    if (sdk <= 26)
+      score += 3; // 8.0 وأقدم
+    else if (sdk <= 29)
+      score += 2; // 9-10
+    else if (sdk <= 30) score += 1; // 11
+
+    // الأنوية
+    if (cores <= 4)
+      score += 3;
+    else if (cores <= 6)
+      score += 2;
+    else if (cores <= 8) score += 1;
+
+    // ABI count (القليل غالباً أضعف)
+    if (abisCount <= 1)
+      score += 2;
+    else if (abisCount == 2) score += 1;
+
+    // محاكي
+    if (isEmu) score += 2;
+  } else {
+    // iOS/منصات أخرى: تقدير سريع بالأنوية فقط
+    final int cores = Platform.numberOfProcessors;
+    if (cores <= 4)
+      score += 3;
+    else if (cores <= 6)
+      score += 2;
+    else if (cores <= 8) score += 1;
+  }
+
+  // تحويل السكور إلى تصنيف
+  final String tier = (score >= 6)
+      ? 'low'
+      : (score >= 3)
+          ? 'mid'
+          : 'high';
+
+  box.write(_kDeviceTierKey, tier);
+  box.write(_kDeviceTierCheckedAtKey, DateTime.now().millisecondsSinceEpoch);
+  return tier;
+}
+
+// للقراءة السريعة وقت ما تحتاج:
+String getCachedDeviceTier() {
+  final t = box.read(_kDeviceTierKey);
+  if (t is String && t.isNotEmpty) return t;
+  return 'mid';
+}
+
+bool isLowEnd() => getCachedDeviceTier() == 'low';
+bool isMidEnd() => getCachedDeviceTier() == 'mid';
+bool isHighEnd() => getCachedDeviceTier() == 'high';

lib/controller/home/profile/invit_controller.dart

@@ -4,8 +4,6 @@ import 'package:Intaleq/constant/box_name.dart';
 import 'package:Intaleq/constant/colors.dart';
 import 'package:Intaleq/constant/links.dart';
 import 'package:Intaleq/controller/functions/crud.dart';
-import 'package:Intaleq/controller/functions/encrypt_decrypt.dart';
-import 'package:Intaleq/controller/payment/payment_controller.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_contacts/flutter_contacts.dart';
 import 'package:get/get.dart';
@@ -17,6 +15,7 @@ import '../../../views/widgets/error_snakbar.dart';
 import '../../../views/widgets/mydialoug.dart';
 import '../../functions/launch.dart';
 import '../../notification/notification_captain_controller.dart';
+import '../../payment/payment_controller.dart';
 
 class InviteController extends GetxController {
   final TextEditingController invitePhoneController = TextEditingController();
@@ -27,21 +26,31 @@ class InviteController extends GetxController {
 
   int selectedTab = 0;
   PassengerStats passengerStats = PassengerStats();
+
+  List<Contact> contacts = <Contact>[];
+  RxList<Map<String, dynamic>> contactMaps = <Map<String, dynamic>>[].obs;
+
+  @override
+  void onInit() {
+    super.onInit();
+    // It's good practice to fetch initial data in onInit or onReady
+    // fetchDriverStats();
+    // fetchDriverStatsPassengers();
+  }
+
   void updateSelectedTab(int index) {
     selectedTab = index;
     update();
   }
 
-  Future<void> shareCouponCode() async {
-    // TODO: Implement sharing functionality
-    // You can use share_plus package to share the coupon code
-  }
+  // --- Sharing Methods ---
+
   Future<void> shareDriverCode() async {
     if (driverCouponCode != null) {
       final String shareText = '''
-Join Intaleq as a driver using my referral code!
-Use code: $driverCouponCode
-Download the Intaleq Driver app now and earn rewards!
+${'Join Intaleq as a driver using my referral code!'.tr}
+${'Use code:'.tr} $driverCouponCode
+${'Download the Intaleq Driver app now and earn rewards!'.tr}
 ''';
       await Share.share(shareText);
     }
@@ -50,19 +59,15 @@ Download the Intaleq Driver app now and earn rewards!
   Future<void> sharePassengerCode() async {
     if (couponCode != null) {
       final String shareText = '''
-Get a discount on your first Intaleq ride!
-Use my referral code: $couponCode
-Download the Intaleq app now and enjoy your ride!
+${'Get a discount on your first Intaleq ride!'.tr}
+${'Use my referral code:'.tr} $couponCode
+${'Download the Intaleq app now and enjoy your ride!'.tr}
 ''';
       await Share.share(shareText);
     }
   }
 
-  @override
-  void onInit() {
-    super.onInit();
-    // fetchDriverStats();
-  }
+  // --- Data Fetching ---
 
   void fetchDriverStats() async {
     try {
@@ -74,7 +79,9 @@ Download the Intaleq app now and enjoy your ride!
         driverInvitationData = data['message'];
         update();
       }
-    } catch (e) {}
+    } catch (e) {
+      Log.print("Error fetching driver stats: $e");
+    }
   }
 
   void fetchDriverStatsPassengers() async {
@@ -88,216 +95,207 @@ Download the Intaleq app now and enjoy your ride!
         driverInvitationDataToPassengers = data['message'];
         update();
       }
-    } catch (e) {}
-  }
-
-  void selectPhone(String phone) {
-    if (box.read(BoxName.countryCode) == 'Egypt') {
-      invitePhoneController.text = phone;
-      update();
-      Get.back();
-    }
-  }
-
-  Future<void> saveContactsToServer() async {
-    try {
-      // TODO: Implement the actual server upload logic here
-      // Simulating a server request
-      await Future.delayed(Duration(seconds: 2));
-      Get.snackbar('Success'.tr,
-          '${selectedContacts.length} contacts saved to server'.tr);
     } catch (e) {
-      Get.snackbar('Error'.tr,
-          'An error occurred while saving contacts to server: $e'.tr);
+      Log.print("Error fetching passenger stats: $e");
     }
   }
 
-  List<Contact> contacts = <Contact>[];
-  List<Contact> selectedContacts = <Contact>[];
-  RxList<Map<String, dynamic>> contactMaps = <Map<String, dynamic>>[].obs;
+  // --- Contact Handling ---
 
+  /// **IMPROVEMENT**: This function now filters out contacts without any phone numbers.
+  /// This is the fix for the `RangeError` you were seeing, which happened when the UI
+  /// tried to access the first phone number of a contact that had none.
   Future<void> pickContacts() async {
     try {
-      // Request contacts permission
       if (await FlutterContacts.requestPermission(readonly: true)) {
-        // Fetch all contacts with full properties
-        final List<Contact> allContacts = await FlutterContacts.getContacts(
-          withProperties: true,
-          withThumbnail: false,
-          withPhoto: true,
-        );
+        final List<Contact> allContacts =
+            await FlutterContacts.getContacts(withProperties: true);
+        final int totalContactsOnDevice = allContacts.length;
 
-        // Check if contacts are available
-        if (allContacts.isNotEmpty) {
-          // Store the contacts
-          contacts = allContacts;
-          Log.print('contacts: $contacts');
+        // **FIX**: Filter contacts to only include those with at least one phone number.
+        contacts = allContacts.where((c) => c.phones.isNotEmpty).toList();
+        final int contactsWithPhones = contacts.length;
 
-          // Convert contacts to a list of maps
-          contactMaps.value = await Future.wait(contacts.map((contact) async {
-            Log.print('Contact name: ${contact.displayName}');
-
-            // Fetch phone numbers separately
-            final phones = await contact.phones;
-            Log.print('Contact phones: $phones');
-
-            // Fetch email addresses separately
-            final emails = await contact.emails;
-            Log.print('Contact emails: $emails');
-
-            // Handle empty or null values
+        if (contactsWithPhones > 0) {
+          Log.print('Found $contactsWithPhones contacts with phone numbers.');
+          contactMaps.value = contacts.map((contact) {
             return {
-              'name': contact.displayName ?? '',
-              'phones': phones
-                  .where((phone) => phone.normalizedNumber != null)
-                  .map((phone) => phone.normalizedNumber ?? 'No number')
-                  .toList(),
-              'emails': emails
-                  .where((email) => email.address != null)
-                  .map((email) => email.address ?? 'No email')
-                  .toList(),
+              'name': contact.displayName,
+              'phones': contact.phones.map((p) => p.number).toList(),
+              'emails': contact.emails.map((e) => e.address).toList(),
             };
-          }).toList());
-
+          }).toList();
           update();
+
+          // **IMPROVEMENT**: Provide feedback if some contacts were filtered out.
+          if (contactsWithPhones < totalContactsOnDevice) {
+            Get.snackbar('Contacts Loaded'.tr,
+                '${'Showing'.tr} $contactsWithPhones ${'of'.tr} $totalContactsOnDevice ${'contacts. Others were hidden because they don\'t have a phone number.'.tr}',
+                snackPosition: SnackPosition.BOTTOM);
+          }
         } else {
-          Get.snackbar('No contacts available'.tr,
-              'Please add contacts to your phone.'.tr);
+          Get.snackbar('No contacts found'.tr,
+              'No contacts with phone numbers were found on your device.'.tr);
         }
       } else {
         Get.snackbar('Permission denied'.tr,
             'Contact permission is required to pick contacts'.tr);
       }
     } catch (e) {
+      Log.print('Error picking contacts: $e');
       Get.snackbar(
           'Error'.tr, 'An error occurred while picking contacts: $e'.tr);
     }
   }
 
-  void onSelectPassengerInvitation(int index) async {
-    MyDialog().getDialog(
-      int.parse(driverInvitationDataToPassengers[index]['countOfInvitDriver']
-                  .toString()) <
-              2
-          ? '${'When'.tr} ${(driverInvitationDataToPassengers[index]['passengerName'].toString())} ${"complete, you can claim your gift".tr} '
-          : 'You deserve the gift'.tr,
-      '${(driverInvitationDataToPassengers[index]['passengerName'].toString())} ${driverInvitationDataToPassengers[index]['countOfInvitDriver'].toString()} / 2 ${'Trip'.tr}',
-      () async {
-        if (int.parse(driverInvitationDataToPassengers[index]
-                    ['countOfInvitDriver']
-                .toString()) <
-            2) {
-          Get.back();
-        } else {
-          // Claim the gift if 100 trips are completed
-          if (driverInvitationDataToPassengers[index]['isGiftToken']
-                  .toString() ==
-              '0') {
-            Get.back();
-            // Add wallet to the inviter
-            await Get.find<PaymentController>().addPassengersWallet('20');
-            // add for invitor too
-            // await Get.find<CaptainWalletController>().addDriverWalletToInvitor(
-            //     'paymentMethod',
-            //     driverInvitationData[index]['driverInviterId'],
-            //     '50');
-            // Update invitation as claimed
-            await CRUD().post(
-              link: AppLink.updatePassengerGift,
-              payload: {'id': driverInvitationDataToPassengers[index]['id']},
-            );
-            // Notify the inviter
-            NotificationCaptainController().addNotificationCaptain(
-              driverInvitationDataToPassengers[index]['passengerInviterId']
-                  .toString(),
-              "You have got a gift for invitation".tr,
-              '${"You have 20".tr} ${'LE'}',
-              false,
-            );
-          } else {
-            Get.back();
-            MyDialog().getDialog(
-              "You have got a gift".tr,
-              "Share the app with another new passenger".tr,
-              () {
-                Get.back();
-              },
-            );
-          }
-        }
-      },
-    );
+  void selectPhone(String phone) {
+    invitePhoneController.text = phone;
+    update();
+    Get.back();
   }
 
-  savePhoneToServer() async {
-    for (var i = 0; i < contactMaps.length; i++) {
-      var phones = contactMaps[i]['phones'];
-      if (phones != null && phones.isNotEmpty && phones[0].isNotEmpty) {
-        var res = await CRUD().post(link: AppLink.savePhones, payload: {
-          "name": contactMaps[i]['name'] ?? 'none',
-          "phones": phones[0] ?? 'none',
-          "phones2": phones.join(', ') ??
-              'none', // Convert List<String> to a comma-separated string
-        });
-        if (res != 'failure') {}
-      } else {}
+  /// **IMPROVEMENT**: A new robust function to format phone numbers specifically for Syria (+963).
+  /// It handles various user inputs gracefully to produce a standardized international format.
+  String _formatSyrianPhoneNumber(String phone) {
+    // 1. Remove all non-digit characters to clean the input.
+    String digitsOnly = phone.replaceAll(RegExp(r'\D'), '');
+
+    // 2. If it already starts with the country code, we assume it's correct.
+    if (digitsOnly.startsWith('963')) {
+      return '+$digitsOnly';
     }
-  }
 
-  String formatPhoneNumber(String input) {
-    // Remove any non-digit characters
-    String digitsOnly = input.replaceAll(RegExp(r'\D'), '');
-
-    // Ensure the number starts with the country code
-    if (digitsOnly.startsWith('20')) {
+    // 3. If it starts with '09' (common local format), remove the leading '0'.
+    if (digitsOnly.startsWith('09')) {
       digitsOnly = digitsOnly.substring(1);
     }
 
-    return digitsOnly;
+    // 4. Prepend the Syrian country code.
+    return '+963$digitsOnly';
   }
 
+  /// **IMPROVEMENT**: This method now uses the new phone formatting logic and
+  /// sends a much-improved, user-friendly WhatsApp message.
   void sendInviteToPassenger() async {
     if (invitePhoneController.text.isEmpty ||
-        invitePhoneController.text.length < 11) {
+        invitePhoneController.text.length < 9) {
       mySnackeBarError('Please enter a correct phone'.tr);
-
       return;
     }
 
-    // try {
-    String phoneNumber = formatPhoneNumber(invitePhoneController.text);
+    try {
+      // Use the new formatting function to ensure the number is correct.
+      String formattedPhoneNumber =
+          _formatSyrianPhoneNumber(invitePhoneController.text);
 
-    var response =
-        await CRUD().post(link: AppLink.addInvitationPassenger, payload: {
-      "driverId": box.read(BoxName.passengerID),
-      "inviterPassengerPhone": ('+2$phoneNumber')
-    });
+      var response =
+          await CRUD().post(link: AppLink.addInvitationPassenger, payload: {
+        "driverId": box.read(BoxName.passengerID),
+        "inviterPassengerPhone": formattedPhoneNumber,
+      });
 
-    if (response != 'failure') {
-      var d = response;
-      Get.snackbar('Success', 'Invite sent successfully'.tr);
+      if (response != 'failure') {
+        var d = response;
+        Get.snackbar('Success'.tr, 'Invite sent successfully'.tr,
+            backgroundColor: Colors.green, colorText: Colors.white);
 
-      String message = '${'*Intaleq APP CODE*'.tr}\n\n'
-          '${"Use this code in registration".tr}\n'
-          '${"To get a gift for both".tr}\n\n'
-          '${"The period of this code is 1 hour".tr}\n\n'
-          '${'before'.tr} *${d['message']['expirationTime'].toString()}*\n\n'
-          '_*${d['message']['inviteCode'].toString()}*_\n\n'
-          '${"Install our app:".tr}\n'
-          '*Android:* https://play.google.com/store/apps/details?id=com.mobileapp.store.ride\n\n\n'
-          '*iOS:* https://apps.apple.com/us/app/sefer/id6458734951';
+        String expirationTime = d['message']['expirationTime'].toString();
+        String inviteCode = d['message']['inviteCode'].toString();
 
-      launchCommunication('whatsapp', '+2$phoneNumber', message);
+        // New and improved WhatsApp message for better user engagement.
+        String message =
+            "👋 ${'Hello! I\'m inviting you to try Intaleq.'.tr}\n\n"
+            "🎁 ${'Use my invitation code to get a special gift on your first ride!'.tr}\n\n"
+            "${'Your personal invitation code is:'.tr}\n"
+            "*$inviteCode*\n\n"
+            "⏳ ${'Be sure to use it quickly! This code expires at'.tr} *$expirationTime*.\n\n"
+            "📲 ${'Download the app now:'.tr}\n"
+            "• *Android:* https://play.google.com/store/apps/details?id=com.Intaleq.intaleq\n"
+            "• *iOS:* https://apps.apple.com/st/app/intaleq-rider/id6748075179\n\n"
+            "${'See you on the road!'.tr} 🚗";
 
-      invitePhoneController.clear();
-    } else {
-      Get.snackbar('Error'.tr, "Invite code already used".tr,
-          backgroundColor: AppColor.redColor,
-          duration: const Duration(seconds: 4));
+        launchCommunication('whatsapp', formattedPhoneNumber, message);
+        invitePhoneController.clear();
+        update();
+      } else {
+        Get.snackbar(
+            'Error'.tr, "This phone number has already been invited.".tr,
+            backgroundColor: AppColor.redColor,
+            duration: const Duration(seconds: 4));
+      }
+    } catch (e) {
+      Log.print("Error sending invite: $e");
+      Get.snackbar(
+          'Error'.tr, 'An unexpected error occurred. Please try again.'.tr,
+          backgroundColor: AppColor.redColor);
+    }
+  }
+
+  // This function is dependent on the `pickContacts` method filtering out contacts without phones.
+  savePhoneToServer() async {
+    for (var contactMap in contactMaps) {
+      // The `pickContacts` function ensures the 'phones' list is not empty here.
+      var phones = contactMap['phones'] as List<String>;
+      var res = await CRUD().post(link: AppLink.savePhones, payload: {
+        "name": contactMap['name'] ?? 'No Name',
+        "phones": phones.first, // Safely access the first phone number
+        "phones2": phones.join(', '),
+      });
+      if (res == 'failure') {
+        Log.print('Failed to save contact: ${contactMap['name']}');
+      }
+    }
+  }
+
+  void onSelectPassengerInvitation(int index) async {
+    try {
+      final invitation = driverInvitationDataToPassengers[index];
+      final tripCount =
+          int.tryParse(invitation['countOfInvitDriver'].toString()) ?? 0;
+      final passengerName = invitation['passengerName'].toString();
+      final isGiftTaken = invitation['isGiftToken'].toString() == '1';
+
+      if (tripCount >= 2) {
+        // Gift can be claimed
+        if (!isGiftTaken) {
+          MyDialog().getDialog(
+            'You deserve the gift'.tr,
+            '${'Claim your 20 LE gift for inviting'.tr} $passengerName!',
+            () async {
+              Get.back(); // Close dialog first
+              await Get.find<PaymentController>().addPassengersWallet('20');
+              await CRUD().post(
+                link: AppLink.updatePassengerGift,
+                payload: {'id': invitation['id']},
+              );
+              NotificationCaptainController().addNotificationCaptain(
+                invitation['passengerInviterId'].toString(),
+                "You have got a gift for invitation".tr,
+                '${"You have earned 20".tr} ${'LE'}',
+                false,
+              );
+              fetchDriverStatsPassengers(); // Refresh list
+            },
+          );
+        } else {
+          MyDialog().getDialog(
+            "Gift Already Claimed".tr,
+            "You have already received your gift for inviting $passengerName."
+                .tr,
+            () => Get.back(),
+          );
+        }
+      } else {
+        // Gift not yet earned
+        MyDialog().getDialog(
+          '${'Keep it up!'.tr}',
+          '$passengerName ${'has completed'.tr} $tripCount / 2 ${'trips'.tr}. ${"You can claim your gift once they complete 2 trips.".tr}',
+          () => Get.back(),
+        );
+      }
+    } catch (e) {
+      Log.print("Error in onSelectPassengerInvitation: $e");
     }
-    // } catch (e) {
-    //   Get.snackbar('Error', 'An error occurred'.tr);
-    // }
   }
 }