wifidirectplugin 1.3.4 → 1.3.6

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

@@ -1,5 +1,6 @@
 package com.ht.plugins.wifidirect;
 
+import android.Manifest;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -8,16 +9,24 @@ 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 com.getcapacitor.annotation.Permission;
+import com.getcapacitor.annotation.PermissionCallback;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -25,7 +34,12 @@ import org.json.JSONObject;
 
 import java.util.*;
 
-@CapacitorPlugin(name = "WifiDirect")
+@CapacitorPlugin(
+    name = "WifiDirect",
+    permissions = {
+        @Permission(alias = "bluetooth", strings = { Manifest.permission.BLUETOOTH_CONNECT })
+    }
+)
 public class WifiDirectPlugin extends Plugin {
     private WifiP2pManager manager;
     private WifiP2pManager.Channel channel;
@@ -47,6 +61,10 @@ public class WifiDirectPlugin extends Plugin {
     private ConnectivityManager.NetworkCallback p2pNetworkCallback = null;
     private Network boundP2pNetwork = null;
 
+    private void showToast(String message) {
+        Toast.makeText(this, message, Toast.LENGTH_SHORT).show();
+    }
+
     private final BroadcastReceiver wifiP2pReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
@@ -531,5 +549,74 @@ 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()) {
+            showToast("Turn On the Wifi.");
+            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()) {
+            // Android 12+(API 31)에서는 ACTION_REQUEST_ENABLE 인텐트를 띄우려면
+            // BLUETOOTH_CONNECT 런타임 권한이 필요하다. 미승인 상태로 띄우면 SecurityException.
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S
+                    && getPermissionState("bluetooth") != PermissionState.GRANTED) {
+                requestPermissionForAlias("bluetooth", call, "bluetoothPermCallback");
+                return;
+            }
+            showToast("Turn On the Bluetooth.");
+            Intent btIntent = new Intent(BluetoothAdapter.ACTION_REQUEST_ENABLE);
+            startActivityForResult(call, btIntent, "bluetoothEnableResult");
+            return;
+        }
+        resolveStatus(call);
+    }
 
+    @PermissionCallback
+    private void bluetoothPermCallback(PluginCall call) {
+        if (getPermissionState("bluetooth") == PermissionState.GRANTED) {
+            // 권한 승인됨 → 다시 시도하면 이번엔 enable 인텐트를 띄울 수 있다.
+            ensureBluetoothStep(call);
+        } else {
+            // 권한 거부 시 크래시 대신 현재 상태만 반환한다.
+            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.4",
+  "version": "1.3.6",
   "description": "HT-Installer Wifi Direct Plugin",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",