Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-18 13:49:53 +01:00
Code Issues Projects Releases Wiki Activity

Don't try to get Bluetooth address from settings.

Browse Source
This commit is contained in:
akwizgran
2023-06-30 18:14:12 +01:00
parent 74f8e84a9b
commit 882f536b8d
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
bramble-android/src/main/java/org/briarproject/bramble/util/AndroidUtils.java
View File

@@ -63,10 +63,12 @@ public class AndroidUtils {
return new Pair<>(address, "adapter"); return new Pair<>(address, "adapter");
} }
// Return the address from settings if it's valid and not fake // Return the address from settings if it's valid and not fake
address = Settings.Secure.getString(ctx.getContentResolver(), if (SDK_INT < 33) {
"bluetooth_address"); address = Settings.Secure.getString(ctx.getContentResolver(),
if (isValidBluetoothAddress(address)) { "bluetooth_address");
return new Pair<>(address, "settings"); if (isValidBluetoothAddress(address)) {
return new Pair<>(address, "settings");
}
} }
// Try to get the address via reflection // Try to get the address via reflection
address = getBluetoothAddressByReflection(adapter); address = getBluetoothAddressByReflection(adapter);