Update: 2026-05-14 20:47:41

app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt

@@ -1,4 +1,4 @@
-#Thu May 14 20:19:47 EET 2026
+#Thu May 14 20:41:24 EET 2026
 base.0=/Users/hamzaaleghwairyeen/development/App/jordan_bot/app/build/intermediates/dex/debug/mergeExtDexDebug/classes.dex
 base.1=/Users/hamzaaleghwairyeen/development/App/jordan_bot/app/build/intermediates/dex/debug/mergeProjectDexDebug/0/classes.dex
 base.2=/Users/hamzaaleghwairyeen/development/App/jordan_bot/app/build/intermediates/dex/debug/mergeProjectDexDebug/12/classes.dex

app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/counters.tab

@@ -1,2 +1,2 @@
-29
+30
 0

app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.values.s

@@ -1 +1 @@
-Α·
Ο‡
ύΊ
ΛΊ
<EFBFBD><EFBFBD>

+Α·
Ο‡
ύΊ
ΛΊ
<EFBFBD><EFBFBD>
ΰ¶

app/src/main/java/com/jordanbot/autoride/api/BackendApi.kt

@@ -12,6 +12,8 @@ data class RideLogRequest(
     val pickupDistance: String,
     val dropoffDistance: String,
     val timeToPickup: String,
+    val pickupAddress: String,
+    val dropoffAddress: String,
     val isAccepted: Boolean,
     val rawText: String,
     val fingerprint: String,

app/src/main/java/com/jordanbot/autoride/model/RideRequest.kt

@@ -5,6 +5,8 @@ data class RideRequest(
     val priceJod: Double?,
     val minutesAway: Int?,
     val distanceKm: Double?,
+    val pickupAddress: String? = null,
+    val dropoffAddress: String? = null,
     val title: String,
     val text: String
 )

app/src/main/java/com/jordanbot/autoride/parser/UberParser.kt

@@ -12,11 +12,17 @@ class UberParser : NotificationParser {
         var price: Double? = null
         var minutes: Int? = null
         var distance: Double? = null
+        var pickupAddress: String? = null
+        var dropoffAddress: String? = null
 
         val priceRegex = """(\d+\.?\d*)\s*(JOD|د\.أ)""".toRegex()
         val minutesRegex = """(\d+)\s*(min|دقيقة)""".toRegex()
         val distanceRegex = """(\d+\.?\d*)\s*(km|كم)""".toRegex()
         
+        // Patterns for addresses (e.g. "Pick up: Amman", "Drop-off: Irbid")
+        val pickupAddrRegex = """(?:Pick up|من|صعود):\s*([^•\d,]+)""".toRegex(RegexOption.IGNORE_CASE)
+        val dropoffAddrRegex = """(?:Drop-off|إلى|نزول):\s*([^•\d,]+)""".toRegex(RegexOption.IGNORE_CASE)
+
         val fullText = "$title $text"
 
         priceRegex.find(fullText)?.let {
@@ -31,11 +37,21 @@ class UberParser : NotificationParser {
             distance = it.groupValues[1].toDoubleOrNull()
         }
 
+        pickupAddrRegex.find(fullText)?.let {
+            pickupAddress = it.groupValues[1].trim()
+        }
+
+        dropoffAddrRegex.find(fullText)?.let {
+            dropoffAddress = it.groupValues[1].trim()
+        }
+
         return RideRequest(
             appPackage = packageName,
             priceJod = price,
             minutesAway = minutes,
             distanceKm = distance,
+            pickupAddress = pickupAddress,
+            dropoffAddress = dropoffAddress,
             title = title,
             text = text
         )

app/src/main/java/com/jordanbot/autoride/service/RideNotificationListener.kt

@@ -50,6 +50,12 @@ class RideNotificationListener : NotificationListenerService() {
         var packageName = sbn.packageName
         Log.d("JordanBot", "Received notification from: $packageName")
 
+        // TEMPORARY: Allow Shell notifications for testing
+        if (packageName == "com.android.shell") {
+            Log.d("JordanBot", "Testing mode: Treating Shell notification as Uber")
+            packageName = "com.ubercab.driver"
+        }
+        
         val parser = parsers.find { it.packageName == packageName }
         if (parser == null) {
             Log.d("JordanBot", "No parser found for package: $packageName")
@@ -109,6 +115,8 @@ class RideNotificationListener : NotificationListenerService() {
                 pickupDistance = ride.distanceKm?.toString() ?: "Unknown",
                 dropoffDistance = "Unknown",
                 timeToPickup = ride.minutesAway?.toString() ?: "Unknown",
+                pickupAddress = ride.pickupAddress ?: "Unknown",
+                dropoffAddress = ride.dropoffAddress ?: "Unknown",
                 isAccepted = isAccepted,
                 rawText = rawText,
                 fingerprint = DeviceUtils.getDeviceFingerprint(this@RideNotificationListener),

backend/api/rides.php

@@ -46,6 +46,8 @@ $price = $input['price'] ?? 0.0;
 $pickupDistance = $input['pickupDistance'] ?? 'Unknown';
 $dropoffDistance = $input['dropoffDistance'] ?? 'Unknown';
 $timeToPickup = $input['timeToPickup'] ?? 'Unknown';
+$pickupAddress = $input['pickupAddress'] ?? 'Unknown';
+$dropoffAddress = $input['dropoffAddress'] ?? 'Unknown';
 $isAccepted = isset($input['isAccepted']) ? (int)$input['isAccepted'] : 0;
 $rawText = $input['rawText'] ?? '';
 $fingerprint = $input['fingerprint'] ?? 'UNKNOWN_DEVICE';
@@ -53,8 +55,8 @@ $latitude = $input['latitude'] ?? null;
 $longitude = $input['longitude'] ?? null;
 
 try {
-    $sql = "INSERT INTO rides (fingerprint, platform, price, pickup_distance, dropoff_distance, time_to_pickup, is_accepted, raw_text, latitude, longitude, created_at) 
-            VALUES (:fingerprint, :platform, :price, :pickup_distance, :dropoff_distance, :time_to_pickup, :is_accepted, :raw_text, :latitude, :longitude, NOW())";
+    $sql = "INSERT INTO rides (fingerprint, platform, price, pickup_distance, dropoff_distance, time_to_pickup, pickup_address, dropoff_address, is_accepted, raw_text, latitude, longitude, created_at) 
+            VALUES (:fingerprint, :platform, :price, :pickup_distance, :dropoff_distance, :time_to_pickup, :pickup_address, :dropoff_address, :is_accepted, :raw_text, :latitude, :longitude, NOW())";
     
     $stmt = $pdo->prepare($sql);
     $stmt->execute([
@@ -64,6 +66,8 @@ try {
         ':pickup_distance' => $pickupDistance,
         ':dropoff_distance' => $dropoffDistance,
         ':time_to_pickup' => $timeToPickup,
+        ':pickup_address' => $pickupAddress,
+        ':dropoff_address' => $dropoffAddress,
         ':is_accepted' => $isAccepted,
         ':raw_text' => $rawText,
         ':latitude' => $latitude,

backend/schema.sql

@@ -12,6 +12,8 @@ CREATE TABLE IF NOT EXISTS rides (
     pickup_distance VARCHAR(50),
     dropoff_distance VARCHAR(50),
     time_to_pickup VARCHAR(50),
+    pickup_address VARCHAR(255),
+    dropoff_address VARCHAR(255),
     is_accepted TINYINT(1) DEFAULT 0,
     raw_text TEXT,
     latitude DOUBLE DEFAULT NULL,

test_notifications.sh

@@ -5,7 +5,7 @@ adb devices
 
 echo "إرسال إشعار أوبر تجريبي..."
 # Uber mock notification
-adb shell cmd notification post -t "Uber" -S "bigtext" "1.50 JOD" "Pick up: 2 min, 0.5 km. Drop-off: 10 min. 1.50 JOD. Cash" com.ubercab.driver
+adb shell cmd notification post -t "Uber" -S "bigtext" "1.50 JOD" "Pick up: Abdoun, 2 min, 0.5 km. Drop-off: 7th Circle. 1.50 JOD. Cash" com.ubercab.driver
 
 sleep 2