From e20b207dfc8cec69ab93bc3ccea11405b6d3c1db Mon Sep 17 00:00:00 2001 From: Mattermost Build Date: Mon, 1 Sep 2025 11:34:22 +0300 Subject: [PATCH] update react-native-network-client (#9094) (#9095) --- ios/Podfile.lock | 4 ++-- package-lock.json | 10 +++++----- package.json | 2 +- ...ttermost+react-native-network-client+1.8.3.patch | 13 ------------- 4 files changed, 8 insertions(+), 21 deletions(-) delete mode 100644 patches/@mattermost+react-native-network-client+1.8.3.patch diff --git a/ios/Podfile.lock b/ios/Podfile.lock index e54c13538..357945ed4 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1498,7 +1498,7 @@ PODS: - Yoga - react-native-netinfo (11.4.1): - React-Core - - react-native-network-client (1.8.3): + - react-native-network-client (1.8.4): - Alamofire (~> 5.10.2) - DoubleConversion - glog @@ -2663,7 +2663,7 @@ SPEC CHECKSUMS: react-native-emm: 983a347e31aef8a93cbc51b6cea08708dacada84 react-native-image-picker: 32515318a4ecfbc864f5f94a1c67df1ce4b8d854 react-native-netinfo: cec9c4e86083cb5b6aba0e0711f563e2fbbff187 - react-native-network-client: fef3bd3f68ce3416057e53959a4e5b50284e45c7 + react-native-network-client: 0318a28947973601ce5783c78f997f0560ee6140 react-native-notifications: 3bafa1237ae8a47569a84801f17d80242fe9f6a5 react-native-paste-input: e151e40812741262c997fcb859ee806cbfabf617 react-native-performance: 125a96c145e29918b55b45ce25cbba54f1e24dcd diff --git a/package-lock.json b/package-lock.json index 4903efc69..0021ec306 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6,7 +6,7 @@ "packages": { "": { "name": "mattermost-mobile", - "version": "2.31.0", + "version": "2.32.0", "hasInstallScript": true, "license": "Apache 2.0", "dependencies": { @@ -22,7 +22,7 @@ "@mattermost/compass-icons": "0.1.48", "@mattermost/hardware-keyboard": "file:./libraries/@mattermost/hardware-keyboard", "@mattermost/react-native-emm": "1.6.2", - "@mattermost/react-native-network-client": "1.8.3", + "@mattermost/react-native-network-client": "1.8.4", "@mattermost/react-native-paste-input": "0.8.1", "@mattermost/react-native-turbo-log": "0.6.0", "@mattermost/rnshare": "file:./libraries/@mattermost/rnshare", @@ -4892,9 +4892,9 @@ } }, "node_modules/@mattermost/react-native-network-client": { - "version": "1.8.3", - "resolved": "https://registry.npmjs.org/@mattermost/react-native-network-client/-/react-native-network-client-1.8.3.tgz", - "integrity": "sha512-A2aKAIAGANdS0YUnF/4ZzZ1bzGxuG0XwKtUKbpkaW8qDBGeJdFjMF7yv5hcII8NU89ATxWZuAozKDFqKX7flEw==", + "version": "1.8.4", + "resolved": "https://registry.npmjs.org/@mattermost/react-native-network-client/-/react-native-network-client-1.8.4.tgz", + "integrity": "sha512-RvQ+nHhL+Uw+RWoWydIbHMRwnXfIVFOgy8CbvuhqcmJoUkeGJtE8LJptgpnn/9jL3E1biPYmYnIfiLyIypscXg==", "license": "MIT", "dependencies": { "validator": "13.12.0", diff --git a/package.json b/package.json index 8d0ea28f0..a3f329e5b 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "@mattermost/compass-icons": "0.1.48", "@mattermost/hardware-keyboard": "file:./libraries/@mattermost/hardware-keyboard", "@mattermost/react-native-emm": "1.6.2", - "@mattermost/react-native-network-client": "1.8.3", + "@mattermost/react-native-network-client": "1.8.4", "@mattermost/react-native-paste-input": "0.8.1", "@mattermost/react-native-turbo-log": "0.6.0", "@mattermost/rnshare": "file:./libraries/@mattermost/rnshare", diff --git a/patches/@mattermost+react-native-network-client+1.8.3.patch b/patches/@mattermost+react-native-network-client+1.8.3.patch deleted file mode 100644 index c79deaac2..000000000 --- a/patches/@mattermost+react-native-network-client+1.8.3.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/node_modules/@mattermost/react-native-network-client/android/src/main/java/com/mattermost/networkclient/WebSocketClientModuleImpl.kt b/node_modules/@mattermost/react-native-network-client/android/src/main/java/com/mattermost/networkclient/WebSocketClientModuleImpl.kt -index 42f620b..d03cf08 100644 ---- a/node_modules/@mattermost/react-native-network-client/android/src/main/java/com/mattermost/networkclient/WebSocketClientModuleImpl.kt -+++ b/node_modules/@mattermost/react-native-network-client/android/src/main/java/com/mattermost/networkclient/WebSocketClientModuleImpl.kt -@@ -113,7 +113,7 @@ class WebSocketClientModuleImpl(reactApplicationContext: ReactApplicationContext - } - - try { -- clients[wsUri]!!.webSocket!!.close(1000, "manual") -+ clients[wsUri]!!.webSocket!!.cancel() - } catch (error: Exception) { - promise.reject(error) - }