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

権限チェック, 権限処理の修正 #38

Merged
asura146 merged 10 commits from rca/workaround into main 2025-01-29 07:33:06 +00:00
Conversation 0 Commits 10 Files Changed 4 +9 -3
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f37932a037 - Show all commits

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との紐づけ db = FirebaseFirestore.getInstance();//Firebaseとの紐づけ
// Check before registering receiver String btPermission = getBluetoothConnectPermission();
if (ActivityCompat.checkSelfPermission(this, Manifest.permission.BLUETOOTH_CONNECT) if (ActivityCompat.checkSelfPermission(this, btPermission) != PackageManager.PERMISSION_GRANTED) {
!= PackageManager.PERMISSION_GRANTED) {
Log.d("BT", "No permission to connect bluetooth devices"); Log.d("BT", "No permission to connect bluetooth devices");
return; return;
} else { } else {
@ -145,6 +144,13 @@ public class MainActivity extends AppCompatActivity {
firebaseLink(); firebaseLink();
} }
// 権限チェック用ヘルパーメソッドを追加
private String getBluetoothConnectPermission() {
return (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) ?
Manifest.permission.BLUETOOTH_CONNECT :
Manifest.permission.BLUETOOTH;
}
/** /**
* 乗車状態の変更 * 乗車状態の変更
*/ */