[messages] allow to mutate message status PendingIntents

Author: capcom6

app/src/main/java/me/capcom/smsgateway/modules/messages/MessagesService.kt

@@ -132,7 +132,8 @@ class MessagesService(
             "Status intent received with action ${intent.action} and result code $resultCode",
             mapOf(
                 "data" to intent.dataString,
-                "extras" to intent.extras?.toString(),
+                "extras" to intent.extras?.keySet()
+                    ?.associate { key -> key to intent.extras?.get(key)?.toString() },
             )
         )
 
@@ -294,31 +295,31 @@ class MessagesService(
 
         request.recipients
             .filter { it.state == ProcessingState.Pending }
-            .forEach { rcp ->
+            .forEachIndexed { i, rcp ->
                 val sourcePhoneNumber = rcp.phoneNumber
                 val sentIntent = PendingIntent.getBroadcast(
                     context,
-                    0,
+                    id.hashCode() + i,
                     Intent(
                         EventsReceiver.ACTION_SENT,
                         Uri.parse("$id|$sourcePhoneNumber"),
                         context,
                         EventsReceiver::class.java
                     ),
-                    PendingIntent.FLAG_IMMUTABLE
+                    PendingIntent.FLAG_MUTABLE
                 )
                 val deliveredIntent = when (message.withDeliveryReport) {
                     false -> null
                     true -> PendingIntent.getBroadcast(
                         context,
-                        0,
+                        id.hashCode() + i,
                         Intent(
                             EventsReceiver.ACTION_DELIVERED,
                             Uri.parse("$id|$sourcePhoneNumber"),
                             context,
                             EventsReceiver::class.java
                         ),
-                        PendingIntent.FLAG_IMMUTABLE
+                        PendingIntent.FLAG_MUTABLE
                     )
                 }