Merge pull request #6822 from bithyve/fixes/fix-6819

updated react-native-tcp-socket, fix for issue #6819
bithyve · Sep 28, 2023 · 890eab7 · 890eab7
2 parents 2d266c4 + 4e48bbb
commit 890eab7
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 6 deletions.
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -993,8 +993,8 @@ SPEC CHECKSUMS:
   FlipperKit: cbdee19bdd4e7f05472a66ce290f1b729ba3cb86
   fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
   glog: 40a13f7840415b9a77023fbcae0f1e6f43192af3
-  GoogleDataTransport: f0308f5905a745f94fb91fea9c6cbaf3831cb1bd
-  GoogleUtilities: c63691989bf362ba0505507da00eeb326192e83e
+  GoogleDataTransport: 54dee9d48d14580407f8f5fbf2f496e92437a2f2
+  GoogleUtilities: 13e2c67ede716b8741c7989e26893d151b2b2084
   GTMSessionFetcher: 5595ec75acf5be50814f81e9189490412bad82ba
   hermes-engine: 8b9dc37355d2e12879267382f4256afd356349a1
   jail-monkey: a71b35d482a70ecba844a90f002994012cf12a5d

diff --git a/package.json b/package.json
@@ -42,12 +42,12 @@
   },
   "dependencies": {
     "@gorhom/bottom-sheet": "^1.4.1",
+    "@mindinventory/react-native-stagger-view": "^1.2.1",
     "@react-native-async-storage/async-storage": "^1.17.11",
     "@react-native-clipboard/clipboard": "^1.10.0",
     "@react-native-community/blur": "^4.3.2",
-    "@react-native-community/netinfo": "^9.0.0",
-    "@mindinventory/react-native-stagger-view": "^1.2.1",
     "@react-native-community/masked-view": "^0.1.10",
+    "@react-native-community/netinfo": "^9.0.0",
     "@react-native-community/push-notification-ios": "^1.8.0",
     "@react-native-firebase/app": "14.11.1",
     "@react-native-firebase/dynamic-links": "14.11.1",
@@ -144,7 +144,7 @@
     "react-native-slider": "^0.11.0",
     "react-native-snap-carousel": "^4.0.0-beta.5",
     "react-native-svg": "^13.9.0",
-    "react-native-tcp-socket": "^5.6.2",
+    "react-native-tcp-socket": "5.6.2",
     "react-native-vector-icons": "^7.0.0",
     "react-native-video": "5.2.1",
     "react-native-view-shot": "^3.1.2",

diff --git a/patches/react-native-tcp-socket+5.6.2.patch b/patches/react-native-tcp-socket+5.6.2.patch
@@ -0,0 +1,12 @@
+diff --git a/node_modules/react-native-tcp-socket/android/src/main/java/com/asterinet/react/tcpsocket/TcpSocketModule.java b/node_modules/react-native-tcp-socket/android/src/main/java/com/asterinet/react/tcpsocket/TcpSocketModule.java
+index 297da65..f06e225 100644
+--- a/node_modules/react-native-tcp-socket/android/src/main/java/com/asterinet/react/tcpsocket/TcpSocketModule.java
++++ b/node_modules/react-native-tcp-socket/android/src/main/java/com/asterinet/react/tcpsocket/TcpSocketModule.java
+@@ -105,7 +105,6 @@ public class TcpSocketModule extends ReactContextBaseJavaModule {
+             public void run() {
+                 TcpSocketClient socketClient = getTcpClient(cId);
+                 socketClient.destroy();
+-                socketMap.remove(cId);
+             }
+         });
+     }
diff --git a/yarn.lock b/yarn.lock
@@ -10312,7 +10312,7 @@ react-native-svg@^13.9.0:
     css-select "^5.1.0"
     css-tree "^1.1.3"
 
-react-native-tcp-socket@^5.6.2:
+react-native-tcp-socket@5.6.2:
   version "5.6.2"
   resolved "https://registry.yarnpkg.com/react-native-tcp-socket/-/react-native-tcp-socket-5.6.2.tgz#8f09c13f73f6592a34cee5f441acc7a0aefbdf0a"
   integrity sha512-doijFOAJd9p8KmduhfbZaPfqRVd3CZuTLAimJx0yxIqFWy/EDPGHeFVrOEOqRZ3lWBVDcssiCIQJhV0baKu5Pg==