ChildGuard/child_guard
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improve permission check

Browse Source
This commit is contained in:
rca 2025-01-29 16:06:38 +09:00
parent 1ea6785f83
commit f37932a037
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/com/example/childguard/MainActivity.java
View File

@ -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;
}
/**
* 乗車状態の変更
*/