From e05d55bcec7a5593f00d2fe7eff6d64aa302920e Mon Sep 17 00:00:00 2001
From: ksenia312 <nikitina3619@gmail.com>
Date: Thu, 8 Feb 2024 14:52:50 +0100
Subject: [PATCH] fix(android): release mode bugs: unavailable server and
 socket repeating

---
 android/src/main/AndroidManifest.xml          |  2 +
 .../socket_service/nearby_socket_service.dart | 40 ++++++++++---------
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
index ad81bb5..234bfaf 100644
--- a/android/src/main/AndroidManifest.xml
+++ b/android/src/main/AndroidManifest.xml
@@ -12,6 +12,8 @@
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <!-- to save the received files -->
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <!-- to use sockets for data transfer -->
+    <uses-permission android:name="android.permission.INTERNET" />
 
     <uses-feature
         android:name="android.hardware.wifi.direct"
diff --git a/lib/src/platforms/android/socket_service/nearby_socket_service.dart b/lib/src/platforms/android/socket_service/nearby_socket_service.dart
index 8a79cb2..f37a1f4 100644
--- a/lib/src/platforms/android/socket_service/nearby_socket_service.dart
+++ b/lib/src/platforms/android/socket_service/nearby_socket_service.dart
@@ -134,28 +134,30 @@ class NearbySocketService {
     required NearbyServiceMessagesListener socketListener,
     required NearbyConnectionAndroidInfo info,
   }) async {
-    final response = await _network.pingServer(
-      address: info.ownerIpAddress,
-      port: _androidData.port,
-    );
-
-    if (await _pingManager.checkPong(response)) {
-      _socket = await _network.connectToSocket(
-        ownerIpAddress: info.ownerIpAddress,
+    if (state.value.isLoading) {
+      final response = await _network.pingServer(
+        address: info.ownerIpAddress,
         port: _androidData.port,
-        socketType: NearbySocketType.message,
       );
-      _createSocketSubscription(socketListener);
-    } else {
-      Logger.debug(
-        'Retry to connect to the server in ${_androidData.clientReconnectInterval.inSeconds}s',
-      );
-      Future.delayed(_androidData.clientReconnectInterval, () {
-        _tryConnectClient(
-          socketListener: socketListener,
-          info: info,
+
+      if (await _pingManager.checkPong(response)) {
+        _socket = await _network.connectToSocket(
+          ownerIpAddress: info.ownerIpAddress,
+          port: _androidData.port,
+          socketType: NearbySocketType.message,
         );
-      });
+        _createSocketSubscription(socketListener);
+      } else {
+        Logger.debug(
+          'Retry to connect to the server in ${_androidData.clientReconnectInterval.inSeconds}s',
+        );
+        Future.delayed(_androidData.clientReconnectInterval, () {
+          _tryConnectClient(
+            socketListener: socketListener,
+            info: info,
+          );
+        });
+      }
     }
   }