wifidirectplugin 1.2.5 → 1.2.7

package/android/src/main/java/com/ht/plugins/wifidirect/WifiDirectPlugin.java

@@ -26,8 +26,7 @@ public class WifiDirectPlugin extends Plugin {
     private Context context;
     private List<WifiP2pDevice> peerWifiDirDevices = new ArrayList<>();
     private static final String TAG = "WifiDirectPlugin";
-    private static final int MAX_DISCOVER_RETRIES = 3;
-    private int discoverRetryCount = 0;
+
     private final BroadcastReceiver wifiP2pReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
@@ -76,7 +75,6 @@ public class WifiDirectPlugin extends Plugin {
     }
     @PluginMethod
     public void scanWifiPeers(PluginCall call) {
-        discoverRetryCount = 0;
         String targetDeviceName = call.getString("deviceName"); // 앱에서 입력 받은 장치 이름
         Log.d(TAG, "DeviceName: " + targetDeviceName);
         if(manager == null || channel == null) {
@@ -119,13 +117,8 @@ public class WifiDirectPlugin extends Plugin {
 
             @Override
             public void onFailure(int reason) {
-                if (++discoverRetryCount < MAX_DISCOVER_RETRIES) {
-                    discoverRetryCount = 0;
-                    Log.e(TAG, "scanWifi onFailure: " + reason);
-                    new android.os.Handler(Looper.getMainLooper()).postDelayed(() -> discoverPeers(call), 2000);
-                } else {
-                    call.reject("Peer discovery failed after retries: " + reason);
-                }
+                Log.e(TAG, "scanWifi onFailure: " + reason);
+                call.reject("Peer discovery failed: " + reason);
             }
         });
     }
@@ -147,6 +140,32 @@ public class WifiDirectPlugin extends Plugin {
             call.reject("Device address is required");
             return;
         }
+
+        manager.requestConnectionInfo(channel, info -> {
+            if(info != null && info.groupFormed) {
+                // 기존 그룹 해제
+                Log.d(TAG, "Existing Wi-Fi Direct group found. Removing group.");
+                manager.removeGroup(channel, new WifiP2pManager.ActionListener() {
+                    @Override
+                    public void onSuccess() {
+                        Log.d(TAG, "removeGroup success, proceed to connect.");
+                        // 그룹 해제 성공 시 연결 계속 진행
+                        initiateConnect(deviceAddress, pin, call);
+                    }
+                    @Override
+                    public void onFailure(int reason) {
+                        Log.w(TAG, "removeGroup failed: " + reason + ". Proceed anyway.");
+                        // 그룹 해제 실패 시에도 연결 시도(혹은 call.reject로 실패 처리 가능)
+                        initiateConnect(deviceAddress, pin, call);
+                    }
+                });
+            } else {
+                Log.d(TAG, "No existing group, proceed to connect directly.");
+                initiateConnect(deviceAddress, pin, call);
+            }
+        });
+    }
+    private void initiateConnect(String deviceAddress, String pin, PluginCall call) {
         WifiP2pConfig config = new WifiP2pConfig();
         config.deviceAddress = deviceAddress;
 
@@ -180,7 +199,6 @@ public class WifiDirectPlugin extends Plugin {
             call.reject("Connection exception: " + e.getMessage());
 //            unload();
         }
-
     }
 
     @PluginMethod

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wifidirectplugin",
-  "version": "1.2.5",
+  "version": "1.2.7",
   "description": "HT-Installer Wifi Direct Plugin",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",