wifidirectplugin 1.3.5 → 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;
@@ -24,6 +25,8 @@ 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;
@@ -31,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;
@@ -53,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) {
@@ -548,6 +560,7 @@ public class WifiDirectPlugin extends Plugin {
             .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;
@@ -564,6 +577,14 @@ public class WifiDirectPlugin extends Plugin {
     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;
@@ -571,6 +592,17 @@ public class WifiDirectPlugin extends Plugin {
         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;

package/package.json

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