Android before 12: fix Bluetooth connect permissions

master 1.6.3b
Georg Lukas 2024-01-07 15:16:36 +01:00
rodzic 4e2788e6b3
commit 73af9d1c5d
1 zmienionych plików z 8 dodań i 1 usunięć

Wyświetl plik

@ -1,6 +1,7 @@
package org.aprsdroid.app
import android.Manifest
import android.os.Build
import _root_.net.ab0oo.aprs.parser.APRSPacket
import _root_.java.io.{InputStream, OutputStream}
@ -32,6 +33,12 @@ object AprsBackend {
val need_passcode : Int
) {}
val BLUETOOTH_PERMISSION = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
Manifest.permission.BLUETOOTH_CONNECT
} else {
Manifest.permission.BLUETOOTH_ADMIN
}
// map from old "backend" to new proto-link-aprsis (defaults are bluetooth and tcp)
val backend_upgrade = Map(
"tcp" -> "aprsis-tcpip-tcp",
@ -73,7 +80,7 @@ object AprsBackend {
"bluetooth" -> new BackendInfo(
(s, p) => new BluetoothTnc(s, p),
R.xml.backend_bluetooth,
Set(Manifest.permission.BLUETOOTH_ADMIN, Manifest.permission.BLUETOOTH_CONNECT),
Set(BLUETOOTH_PERMISSION),
CAN_DUPLEX,
PASSCODE_NONE),
"tcpip" -> new BackendInfo(