wifidirectplugin 1.3.3 → 1.3.5

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

@@ -8,15 +8,21 @@ import android.net.ConnectivityManager;
 import android.net.Network;
 import android.net.NetworkCapabilities;
 import android.net.NetworkRequest;
+import android.bluetooth.BluetoothAdapter;
+import android.net.wifi.WifiManager;
 import android.net.wifi.WpsInfo;
 import android.net.wifi.p2p.*;
 import android.net.NetworkInfo;
 import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
+import android.provider.Settings;
 import android.util.Log;
 
+import androidx.activity.result.ActivityResult;
+
 import com.getcapacitor.*;
+import com.getcapacitor.annotation.ActivityCallback;
 import com.getcapacitor.annotation.CapacitorPlugin;
 
 import org.json.JSONArray;
@@ -46,9 +52,6 @@ public class WifiDirectPlugin extends Plugin {
     private ConnectivityManager connectivityManager;
     private ConnectivityManager.NetworkCallback p2pNetworkCallback = null;
     private Network boundP2pNetwork = null;
-    // NetworkCapabilities.TRANSPORT_WIFI_P2P는 API 31에서 public으로 추가됐다.
-    // 그 이전 SDK로 컴파일해도 동작하도록 안정적인 정수 값 5를 직접 사용한다.
-    private static final int TRANSPORT_WIFI_P2P = 5;
 
     private final BroadcastReceiver wifiP2pReceiver = new BroadcastReceiver() {
         @Override
@@ -335,7 +338,7 @@ public class WifiDirectPlugin extends Plugin {
         if (p2pNetworkCallback != null) return;
 
         NetworkRequest req = new NetworkRequest.Builder()
-            .addTransportType(TRANSPORT_WIFI_P2P)
+            .addTransportType(NetworkCapabilities.TRANSPORT_WIFI_AWARE)
             // P2P는 인터넷 capability가 없으므로 매칭을 위해 제거
             .removeCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
             .build();
@@ -426,7 +429,7 @@ public class WifiDirectPlugin extends Plugin {
         Network[] networks = connectivityManager.getAllNetworks();
         for (Network n : networks) {
             NetworkCapabilities caps = connectivityManager.getNetworkCapabilities(n);
-            if (caps != null && caps.hasTransport(TRANSPORT_WIFI_P2P)) {
+            if (caps != null && caps.hasTransport(NetworkCapabilities.TRANSPORT_WIFI_AWARE)) {
                 try {
                     connectivityManager.bindProcessToNetwork(n);
                     boundP2pNetwork = n;
@@ -534,5 +537,54 @@ public class WifiDirectPlugin extends Plugin {
         });
     }
 
+    // ── Wi-Fi / Bluetooth 활성화 보장 ────────────────────────────────────────
+    // 페이지 진입 시 사용자 기기의 Wi-Fi / Bluetooth 가 꺼져있으면
+    // 1) Wi-Fi 패널 → 2) Bluetooth enable intent 를 순서대로 띄우고,
+    // 최종 상태(둘 다의 enable 여부)를 한 번에 resolve 한다.
+    // Android 10+ 에서는 앱이 직접 Wi-Fi 를 켤 수 없어 시스템 패널을 통한 사용자 동의 필요.
+    @PluginMethod
+    public void ensureWifiAndBluetooth(PluginCall call) {
+        WifiManager wifiManager = (WifiManager) context
+            .getApplicationContext()
+            .getSystemService(Context.WIFI_SERVICE);
+        if (wifiManager != null && !wifiManager.isWifiEnabled()) {
+            Intent panelIntent = new Intent(Settings.Panel.ACTION_WIFI);
+            startActivityForResult(call, panelIntent, "wifiPanelResult");
+            return;
+        }
+        ensureBluetoothStep(call);
+    }
+
+    @ActivityCallback
+    private void wifiPanelResult(PluginCall call, ActivityResult result) {
+        if (call == null) return;
+        ensureBluetoothStep(call);
+    }
+
+    private void ensureBluetoothStep(PluginCall call) {
+        BluetoothAdapter btAdapter = BluetoothAdapter.getDefaultAdapter();
+        if (btAdapter != null && !btAdapter.isEnabled()) {
+            Intent btIntent = new Intent(BluetoothAdapter.ACTION_REQUEST_ENABLE);
+            startActivityForResult(call, btIntent, "bluetoothEnableResult");
+            return;
+        }
+        resolveStatus(call);
+    }
 
+    @ActivityCallback
+    private void bluetoothEnableResult(PluginCall call, ActivityResult result) {
+        if (call == null) return;
+        resolveStatus(call);
+    }
+
+    private void resolveStatus(PluginCall call) {
+        WifiManager wifiManager = (WifiManager) context
+            .getApplicationContext()
+            .getSystemService(Context.WIFI_SERVICE);
+        BluetoothAdapter btAdapter = BluetoothAdapter.getDefaultAdapter();
+        JSObject ret = new JSObject();
+        ret.put("wifiEnabled", wifiManager != null && wifiManager.isWifiEnabled());
+        ret.put("bluetoothEnabled", btAdapter != null && btAdapter.isEnabled());
+        call.resolve(ret);
+    }
 }

package/package.json

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