Skip to content

Commit b00331c

Browse files
Merge branch 'develop' into fix.duplicated-message-collapsible-attachment
2 parents 30b49a3 + 2038d6d commit b00331c

File tree

3 files changed

+17
-3
lines changed

3 files changed

+17
-3
lines changed

.github/workflows/prettier.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,5 +46,5 @@ jobs:
4646
git config user.name "${{ github.actor }}"
4747
git config user.email "${{ github.actor }}@users.noreply.github.com"
4848
git add .
49-
git commit -m "chore: format code and fix lint issues [skip ci]"
49+
git commit -m "chore: format code and fix lint issues"
5050
git push origin ${{ github.ref_name }}

android/app/src/main/java/chat/rocket/reactnative/notification/NotificationIntentHandler.kt

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,20 @@ class NotificationIntentHandler {
9393
}
9494

9595
try {
96+
val notId = extras.getString("notId")
97+
98+
// Clear the notification messages from the static map to prevent stacking
99+
if (!notId.isNullOrEmpty()) {
100+
try {
101+
val notIdInt = notId.toIntOrNull()
102+
if (notIdInt != null) {
103+
CustomPushNotification.clearMessages(notIdInt)
104+
}
105+
} catch (e: Exception) {
106+
Log.e(TAG, "Error clearing notification messages for ID $notId: ${e.message}", e)
107+
}
108+
}
109+
96110
// Extract all notification data from Intent extras
97111
// Only include serializable types to avoid JSON serialization errors
98112
val notificationData = mutableMapOf<String, Any?>()

ios/Podfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ PODS:
232232
- libwebp/sharpyuv (1.5.0)
233233
- libwebp/webp (1.5.0):
234234
- libwebp/sharpyuv
235-
- MobileCrypto (0.2.0):
235+
- MobileCrypto (0.2.1):
236236
- DoubleConversion
237237
- glog
238238
- hermes-engine
@@ -3082,7 +3082,7 @@ SPEC CHECKSUMS:
30823082
libavif: 84bbb62fb232c3018d6f1bab79beea87e35de7b7
30833083
libdav1d: 23581a4d8ec811ff171ed5e2e05cd27bad64c39f
30843084
libwebp: 02b23773aedb6ff1fd38cec7a77b81414c6842a8
3085-
MobileCrypto: 60a1e43e26a9d6851ae2aa7294b8041c9e9220b7
3085+
MobileCrypto: a424494b2f45bec9dbe60e3f6d16a40aedefe7b7
30863086
nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
30873087
PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
30883088
PromisesSwift: 9d77319bbe72ebf6d872900551f7eeba9bce2851

0 commit comments

Comments
 (0)