Skip to content

updated permissions for versions >= Tiramisu when discovering devices #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chaneylc merged 2 commits into from
Feb 26, 2025
Merged

updated permissions for versions >= Tiramisu when discovering devices #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e38a03
updated permissions for versions >= Tiramisu when discovering devices
chaneylc Feb 26, 2025
8c8b2c8
updated version
chaneylc Feb 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ ext.versions = [
minSdk: 16,
compileSdk: 33,
buildTools: "29.0.3",
publishVersion: "0.9.52",
publishVersion: "0.9.53",
publishVersionCode: 1
]

Expand Down
2 changes: 2 additions & 0 deletions phenolib/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>

<uses-permission android:name="android.permission.NEARBY_WIFI_DEVICES" />

<uses-feature android:name="android.hardware.usb.host" android:required="false"/>

</manifest>
13 changes: 11 additions & 2 deletions phenolib/src/main/java/org/phenoapps/security/SecureBluetoothActivityImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,17 @@ class SecureBluetoothActivityImpl(private val act: FragmentActivity): SecureBlue
*/
override fun discoverWith(function: (adapter: BluetoothAdapter) -> Unit) = withAdapter { adapter ->

//discovering new devices on API >= 12 requires SCAN permissions runtime check
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
// discovering new devices on API >= 13 requires SCAN and NEARBY_WIFI permissions runtime check
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {

withPermission(arrayOf(
Manifest.permission.BLUETOOTH_SCAN,
Manifest.permission.NEARBY_WIFI_DEVICES)) {

function(adapter)
}

} else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {//on API >= 12 requires SCAN

withPermission(arrayOf(
Manifest.permission.BLUETOOTH_SCAN)) {
Expand Down
13 changes: 11 additions & 2 deletions phenolib/src/main/java/org/phenoapps/security/SecureBluetoothImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,17 @@ class SecureBluetoothImpl(private val fragment: Fragment): SecureBluetooth, Secu
*/
override fun discoverWith(function: (adapter: BluetoothAdapter) -> Unit) = withAdapter { adapter ->

//discovering new devices on API >= 12 requires SCAN permissions runtime check
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
// discovering new devices on API >= 13 requires SCAN and NEARBY_WIFI permissions runtime check
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {

withPermission(arrayOf(
Manifest.permission.BLUETOOTH_SCAN,
Manifest.permission.NEARBY_WIFI_DEVICES)) {

function(adapter)
}

} else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {//on API >= 12 requires SCAN

withPermission(arrayOf(
Manifest.permission.BLUETOOTH_SCAN)) {
Expand Down
Loading