RobbyV2/FlyingCarpet
1
0
Fork 0
mirror of https://github.com/spieglt/FlyingCarpet.git synced 2025-09-04 16:24:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

version 9.0.6

Browse Source
This commit is contained in:
Theron
2025-09-03 20:17:58 -05:00
parent e9700f2715
commit df2d26fde7
3 changed files with 30 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Android/FlyingCarpet/app/build.gradle
View File

@@ -18,8 +18,8 @@ android {
applicationId "dev.spiegl.flyingcarpet"
minSdk 29
targetSdk 35
versionCode 18
versionName "9.0.5"
versionCode 19
versionName "9.0.6"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}

2
Android/FlyingCarpet/app/src/main/java/dev/spiegl/flyingcarpet/Alert.kt
View File

@@ -33,7 +33,7 @@ class About : DialogFragment() {
const val AboutMessage = """
https://flyingcarpet.spiegl.dev
Version 9.0.5
Version 9.0.6
theron@spiegl.dev
Copyright 2025, Theron Spiegl, all rights reserved.

36
Android/FlyingCarpet/app/src/main/java/dev/spiegl/flyingcarpet/Bluetooth.kt
View File

@@ -89,7 +89,9 @@ class Bluetooth(val application: Application, private val delegate: BluetoothDel
// peripheral
fun initializePeripheral(application: Context): Boolean {
if (ActivityCompat.checkSelfPermission(application, Manifest.permission.BLUETOOTH_CONNECT) != PackageManager.PERMISSION_GRANTED) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S
&& ActivityCompat.checkSelfPermission(application, Manifest.permission.BLUETOOTH_CONNECT) != PackageManager.PERMISSION_GRANTED)
{
return false
}
if (bluetoothManager.adapter == null) {
@@ -137,7 +139,9 @@ class Bluetooth(val application: Application, private val delegate: BluetoothDel
characteristic: BluetoothGattCharacteristic?
) {
super.onCharacteristicReadRequest(device, requestId, offset, characteristic)
if (ActivityCompat.checkSelfPermission(application, Manifest.permission.BLUETOOTH_CONNECT) != PackageManager.PERMISSION_GRANTED) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S
&& ActivityCompat.checkSelfPermission(application, Manifest.permission.BLUETOOTH_CONNECT) != PackageManager.PERMISSION_GRANTED)
{
return
}
if (characteristic == null) {
@@ -197,7 +201,9 @@ class Bluetooth(val application: Application, private val delegate: BluetoothDel
)
Log.i("Bluetooth", "Central peer wrote something: \"${value?.toString(Charsets.UTF_8)}\"")
if (ActivityCompat.checkSelfPermission(application, Manifest.permission.BLUETOOTH_CONNECT) != PackageManager.PERMISSION_GRANTED) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S
&& ActivityCompat.checkSelfPermission(application, Manifest.permission.BLUETOOTH_CONNECT) != PackageManager.PERMISSION_GRANTED)
{
return
}
if (characteristic == null) {
@@ -246,7 +252,9 @@ class Bluetooth(val application: Application, private val delegate: BluetoothDel
}
fun advertise() {
if (ActivityCompat.checkSelfPermission(application, Manifest.permission.BLUETOOTH_ADVERTISE) != PackageManager.PERMISSION_GRANTED) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S
&& ActivityCompat.checkSelfPermission(application, Manifest.permission.BLUETOOTH_ADVERTISE) != PackageManager.PERMISSION_GRANTED)
{
return
}
// BluetoothLeAdvertiser
@@ -438,7 +446,9 @@ class Bluetooth(val application: Application, private val delegate: BluetoothDel
}
override fun onServicesDiscovered(gatt: BluetoothGatt?, status: Int) {
if (ActivityCompat.checkSelfPermission(application, Manifest.permission.BLUETOOTH_CONNECT) != PackageManager.PERMISSION_GRANTED) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S
&& ActivityCompat.checkSelfPermission(application, Manifest.permission.BLUETOOTH_CONNECT) != PackageManager.PERMISSION_GRANTED)
{
return
}
super.onServicesDiscovered(gatt, status)
@@ -464,7 +474,9 @@ class Bluetooth(val application: Application, private val delegate: BluetoothDel
override fun onServiceChanged(gatt: BluetoothGatt) {
super.onServiceChanged(gatt)
if (ActivityCompat.checkSelfPermission(application, Manifest.permission.BLUETOOTH_CONNECT) != PackageManager.PERMISSION_GRANTED) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S
&& ActivityCompat.checkSelfPermission(application, Manifest.permission.BLUETOOTH_CONNECT) != PackageManager.PERMISSION_GRANTED)
{
return
}
outputText("Services changed")
@@ -478,7 +490,9 @@ class Bluetooth(val application: Application, private val delegate: BluetoothDel
newState: Int
) {
super.onConnectionStateChange(gatt, status, newState)
if (ActivityCompat.checkSelfPermission(application, Manifest.permission.BLUETOOTH_CONNECT) != PackageManager.PERMISSION_GRANTED) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S
&& ActivityCompat.checkSelfPermission(application, Manifest.permission.BLUETOOTH_CONNECT) != PackageManager.PERMISSION_GRANTED)
{
return
}
if (newState == BluetoothProfile.STATE_CONNECTED) {
@@ -529,7 +543,9 @@ class Bluetooth(val application: Application, private val delegate: BluetoothDel
// use to read peripheral's characteristic
fun read(characteristicUuid: UUID) {
// outputText("Reading $characteristicUuid")
if (ActivityCompat.checkSelfPermission(application, Manifest.permission.BLUETOOTH_CONNECT) != PackageManager.PERMISSION_GRANTED) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S
&& ActivityCompat.checkSelfPermission(application, Manifest.permission.BLUETOOTH_CONNECT) != PackageManager.PERMISSION_GRANTED)
{
outputText("No permission")
return
}
@@ -545,7 +561,9 @@ class Bluetooth(val application: Application, private val delegate: BluetoothDel
// outputText("Writing to $characteristicUuid")
// val writeType = if (waitForResponse) BluetoothGattCharacteristic.WRITE_TYPE_DEFAULT else BluetoothGattCharacteristic.WRITE_TYPE_NO_RESPONSE
val writeType = BluetoothGattCharacteristic.WRITE_TYPE_DEFAULT
if (ActivityCompat.checkSelfPermission(application, Manifest.permission.BLUETOOTH_CONNECT) != PackageManager.PERMISSION_GRANTED) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S
&& ActivityCompat.checkSelfPermission(application, Manifest.permission.BLUETOOTH_CONNECT) != PackageManager.PERMISSION_GRANTED)
{
return
}
val characteristic = when (characteristicUuid) {