From f37932a037e319f3f9194fc2274fc87b69e3192c Mon Sep 17 00:00:00 2001 From: rca Date: Wed, 29 Jan 2025 16:06:38 +0900 Subject: [PATCH] improve permission check --- .../java/com/example/childguard/MainActivity.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/example/childguard/MainActivity.java b/app/src/main/java/com/example/childguard/MainActivity.java index 1a5ffd6..57e8466 100644 --- a/app/src/main/java/com/example/childguard/MainActivity.java +++ b/app/src/main/java/com/example/childguard/MainActivity.java @@ -124,9 +124,8 @@ public class MainActivity extends AppCompatActivity { db = FirebaseFirestore.getInstance();//Firebaseとの紐づけ - // Check before registering receiver - if (ActivityCompat.checkSelfPermission(this, Manifest.permission.BLUETOOTH_CONNECT) - != PackageManager.PERMISSION_GRANTED) { + String btPermission = getBluetoothConnectPermission(); + if (ActivityCompat.checkSelfPermission(this, btPermission) != PackageManager.PERMISSION_GRANTED) { Log.d("BT", "No permission to connect bluetooth devices"); return; } else { @@ -145,6 +144,13 @@ public class MainActivity extends AppCompatActivity { firebaseLink(); } + // 権限チェック用ヘルパーメソッドを追加 + private String getBluetoothConnectPermission() { + return (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) ? + Manifest.permission.BLUETOOTH_CONNECT : + Manifest.permission.BLUETOOTH; + } + /** * 乗車状態の変更 */