Skip to content
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

implement some deprecated logic for SDK < 33 #627

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

implement some deprecated logic for SDK < 33 #627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 demos/kotlin/tutorial/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ android {

defaultConfig {
applicationId "com.example.open_gopro_tutorial"
minSdk 33
minSdk 31
targetSdk 33
versionCode 1
versionName "1.0"
Expand Down
62 changes: 54 additions & 8 deletions demos/kotlin/tutorial/app/src/main/java/com/example/open_gopro_tutorial/network/Ble.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,13 @@
package com.example.open_gopro_tutorial.network

import android.Manifest
import android.annotation.SuppressLint
import android.bluetooth.*
import android.bluetooth.le.*
import android.content.Context
import android.content.Intent
import android.content.Intent.FLAG_ACTIVITY_NEW_TASK
import android.os.Build
import androidx.annotation.RequiresPermission
import com.example.open_gopro_tutorial.*
import com.example.open_gopro_tutorial.util.*
Expand Down Expand Up @@ -170,6 +172,33 @@ class Bluetooth private constructor(private val context: Context) {
gatt: BluetoothGatt, characteristic: UUID
): BluetoothGattCharacteristic? = gatt.findCharacteristic(characteristic)

@SuppressLint("NewApi")
@RequiresPermission(value = "android.permission.BLUETOOTH_CONNECT")
fun writeCharacteristic(gatt: BluetoothGatt, char: BluetoothGattCharacteristic, payload: ByteArray, writeType: Int): Boolean {
return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
gatt.writeCharacteristic(char, payload, writeType) == BluetoothStatusCodes.SUCCESS
} else {
@Suppress("DEPRECATION")
char.value = payload
char.writeType = writeType
@Suppress("DEPRECATION")
gatt.writeCharacteristic(char)
}
}

@SuppressLint("NewApi")
@RequiresPermission(value = "android.permission.BLUETOOTH_CONNECT")
fun writeDescriptor(gatt: BluetoothGatt, descriptor: BluetoothGattDescriptor, payload: ByteArray): Boolean {
return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
gatt.writeDescriptor(descriptor, payload) == BluetoothStatusCodes.SUCCESS
} else {
@Suppress("DEPRECATION")
descriptor.value = payload
@Suppress("DEPRECATION")
gatt.writeDescriptor(descriptor)
}
}

/**
* Callbacks
*/
Expand Down Expand Up @@ -228,6 +257,18 @@ class Bluetooth private constructor(private val context: Context) {
}
}

@Deprecated("Deprecated for Android 13+",
ReplaceWith("onCharacteristicRead(gatt, characteristic, characteristic.value, status)")
)
@Suppress("DEPRECATION")
override fun onCharacteristicRead(
gatt: BluetoothGatt,
characteristic: BluetoothGattCharacteristic,
status: Int,
) {
onCharacteristicRead(gatt, characteristic, characteristic.value, status)
}

override fun onCharacteristicRead(
gatt: BluetoothGatt,
characteristic: BluetoothGattCharacteristic,
Expand Down Expand Up @@ -273,6 +314,17 @@ class Bluetooth private constructor(private val context: Context) {
}
}

@Deprecated("Deprecated for Android 13+",
ReplaceWith("onCharacteristicChanged(gatt, characteristic, characteristic.value)")
)
@Suppress("DEPRECATION")
override fun onCharacteristicChanged(
gatt: BluetoothGatt,
characteristic: BluetoothGattCharacteristic,
) {
onCharacteristicChanged(gatt, characteristic, characteristic.value)
}

override fun onCharacteristicChanged(
gatt: BluetoothGatt, characteristic: BluetoothGattCharacteristic, value: ByteArray
) {
Expand Down Expand Up @@ -417,10 +469,7 @@ class Bluetooth private constructor(private val context: Context) {
}
char.getDescriptor(CoreUUID.CCC_DESCRIPTOR.uuid)?.let { descriptor ->
return BleJob.EnableNotification.suspendWithTimeout(10000) {
if (gatt.writeDescriptor(
descriptor, payload
) != BluetoothStatusCodes.SUCCESS
) {
if (!writeDescriptor(gatt, descriptor, payload)) {
BleJob.EnableNotification.resumeWithError("writeDescriptor failed for ${descriptor.uuid}")
}
}
Expand Down Expand Up @@ -463,10 +512,7 @@ class Bluetooth private constructor(private val context: Context) {
}
return BleJob.Write.suspendWithTimeout(5000) {
Timber.d("Writing characteristic $characteristic ==> ${payload.toHexString()}")
if (gatt.writeCharacteristic(
char, payload.toByteArray(), writeType
) != BluetoothStatusCodes.SUCCESS
) {
if (!writeCharacteristic(gatt, char, payload.toByteArray(), writeType)) {
BleJob.Write.resumeWithError("Write of $characteristic failed")
}
}
Expand Down