Skip to content

Commit

Permalink
Fix setting service by characteristic property
Browse files Browse the repository at this point in the history
  • Loading branch information
@AbandonedCart
AbandonedCart committed Sep 21, 2023
1 parent 2608914 commit d12cc25
Show file tree
Hide file tree
Showing 4 changed files with 52 additions and 53 deletions.
3 changes: 1 addition & 2 deletions app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@
tools:ignore="ScopedStorage" />
<uses-permission android:name="${installPermission}" />
<uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES" />
<!-- uses-permission android:name="android.permission.BLUETOOTH" android:maxSdkVersion="30" / -->
<uses-permission android:name="android.permission.BLUETOOTH" tools:remove="android:maxSdkVersion" />
<uses-permission android:name="android.permission.BLUETOOTH" android:maxSdkVersion="30" />
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" android:maxSdkVersion="30" />
<uses-permission android:name="android.permission.BLUETOOTH_SCAN"
android:usesPermissionFlags="neverForLocation" tools:targetApi="S" />
Expand Down
16 changes: 16 additions & 0 deletions app/src/main/java/com/hiddenramblings/tagmo/bluetooth/GattArray.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,26 @@
*/
package com.hiddenramblings.tagmo.bluetooth

import android.bluetooth.BluetoothGatt
import android.bluetooth.BluetoothGattCharacteristic
import android.os.Build
import androidx.annotation.RequiresApi
import com.hiddenramblings.tagmo.nfctech.Foomiibo
import com.hiddenramblings.tagmo.nfctech.NfcByte


object GattArray {
@RequiresApi(Build.VERSION_CODES.JELLY_BEAN_MR2)
fun BluetoothGattCharacteristic.hasProperty(property: Int): Boolean {
return this.properties and property != 0
}

@RequiresApi(Build.VERSION_CODES.JELLY_BEAN_MR2)
fun BluetoothGatt.getCharacteristicByProperty(property: Int): BluetoothGattCharacteristic? {
return services.find { service ->
service.characteristics.any { it.hasProperty(property) }
}?.characteristics?.find { it.hasProperty(property) }
}

fun generateBlank(): ByteArray {
val blankData = ByteArray(NfcByte.TAG_FILE_SIZE)
Expand Down
84 changes: 34 additions & 50 deletions app/src/main/java/com/hiddenramblings/tagmo/bluetooth/GattService.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,12 @@ import android.util.Base64
import androidx.annotation.RequiresApi
import com.hiddenramblings.tagmo.R
import com.hiddenramblings.tagmo.amiibo.Amiibo
import com.hiddenramblings.tagmo.bluetooth.GattArray.getCharacteristicByProperty
import com.hiddenramblings.tagmo.bluetooth.GattArray.hasProperty
import com.hiddenramblings.tagmo.bluetooth.GattArray.toDataBytes
import com.hiddenramblings.tagmo.bluetooth.GattArray.toFileBytes
import com.hiddenramblings.tagmo.bluetooth.GattArray.toPortions
import com.hiddenramblings.tagmo.bluetooth.GattArray.toUnicode
import com.hiddenramblings.tagmo.bluetooth.Nordic.isUUID
import com.hiddenramblings.tagmo.bluetooth.Nordic.logTag
import com.hiddenramblings.tagmo.eightbit.io.Debug
import com.hiddenramblings.tagmo.eightbit.os.Version
Expand Down Expand Up @@ -154,8 +155,8 @@ class GattService : Service() {

private fun getCharacteristicValue(characteristic: BluetoothGattCharacteristic, data: ByteArray?) {
if (data?.isNotEmpty() == true) {
Debug.info(this.javaClass, "${characteristic.uuid.logTag} ${data.toHex()}")
if (characteristic.uuid.isUUID(mCharacteristicRX?.uuid)) {
Debug.info(Companion::class.java, "${characteristic.uuid.logTag} ${data.toHex()}")
if (characteristic.hasProperty(BluetoothGattCharacteristic.PROPERTY_NOTIFY)) {
val hexData = data.toHex()
when (serviceType) {
Nordic.DEVICE.PIXL -> {
Expand Down Expand Up @@ -261,8 +262,8 @@ class GattService : Service() {

private fun getCharacteristicValue(characteristic: BluetoothGattCharacteristic, output: String?) {
if (!output.isNullOrEmpty()) {
Debug.info(this.javaClass, "${characteristic.uuid.logTag} $output")
if (characteristic.uuid.isUUID(mCharacteristicRX?.uuid)) {
Debug.info(Companion::class.java, "${characteristic.uuid.logTag} $output")
if (characteristic.hasProperty(BluetoothGattCharacteristic.PROPERTY_NOTIFY)) {
if (output.contains(">tag.")) {
response = StringBuilder()
response.append(output.split(">".toRegex()).toTypedArray()[1])
Expand Down Expand Up @@ -379,7 +380,7 @@ class GattService : Service() {
if (dataString.startsWith("tag.download")
&& dataString.endsWith("=")
) continue
Debug.info(this.javaClass, dataString)
Debug.info(Companion::class.java, dataString)
try {
it.onFilesDownload(dataString.substring(
1, dataString.lastIndexOf(")")
Expand Down Expand Up @@ -451,33 +452,32 @@ class GattService : Service() {
}

override fun onServicesDiscovered(gatt: BluetoothGatt, status: Int) {
Debug.info(this.javaClass, "${serviceType.logTag} onServicesDiscovered $status")
Debug.info(Companion::class.java, "${serviceType.logTag} onServicesDiscovered $status")
if (status == BluetoothGatt.GATT_SUCCESS) {
if (Version.isLollipop) {
gatt.requestMtu(247) // Nordic
}
when (serviceType) {
Nordic.DEVICE.BLUUP, Nordic.DEVICE.FLASK, Nordic.DEVICE.SLIDE -> {
listener?.onBluupServicesDiscovered()
}
Nordic.DEVICE.PIXL, Nordic.DEVICE.LOOP, Nordic.DEVICE.LINK -> {
listener?.onPixlServicesDiscovered()
}
Nordic.DEVICE.PUCK -> {
listener?.onPuckServicesDiscovered()
}
else -> { }
}
}
}

override fun onMtuChanged(gatt: BluetoothGatt, mtu: Int, status: Int) {
Debug.info(this.javaClass, "${serviceType.logTag} onMtuChange $mtu $status")
Debug.info(Companion::class.java, "${serviceType.logTag} onMtuChange $mtu $status")
if (status == BluetoothGatt.GATT_SUCCESS)
maxTransmissionUnit = mtu - 3
when (serviceType) {
Nordic.DEVICE.BLUUP, Nordic.DEVICE.FLASK, Nordic.DEVICE.SLIDE -> {
listener?.onBluupServicesDiscovered()
}
Nordic.DEVICE.PIXL, Nordic.DEVICE.LOOP, Nordic.DEVICE.LINK -> {
listener?.onPixlServicesDiscovered()
}
Nordic.DEVICE.PUCK -> {
listener?.onPuckServicesDiscovered()
}
else -> { }
}
}

@RequiresApi(Build.VERSION_CODES.TIRAMISU)
override fun onCharacteristicRead(
gatt: BluetoothGatt, characteristic: BluetoothGattCharacteristic, value: ByteArray, status: Int
) {
Expand All @@ -496,10 +496,9 @@ class GattService : Service() {
override fun onCharacteristicWrite(
gatt: BluetoothGatt, characteristic: BluetoothGattCharacteristic, status: Int
) {
Debug.info(this.javaClass, "${characteristic.uuid.logTag} onCharacteristicWrite $status")
Debug.info(Companion::class.java, "${characteristic.uuid.logTag} onCharacteristicWrite $status")
}

@RequiresApi(Build.VERSION_CODES.TIRAMISU)

override fun onCharacteristicChanged(
gatt: BluetoothGatt, characteristic: BluetoothGattCharacteristic, value: ByteArray
) {
Expand Down Expand Up @@ -562,16 +561,11 @@ class GattService : Service() {
* callback.
*/
fun connect(address: String?): Boolean {
mBluetoothAdapter = if (Version.isJellyBeanMR2) {
with (getSystemService(Context.BLUETOOTH_SERVICE) as BluetoothManager) { adapter }
} else {
@Suppress("deprecation") BluetoothAdapter.getDefaultAdapter()
}
mBluetoothAdapter = with (getSystemService(Context.BLUETOOTH_SERVICE) as BluetoothManager) { adapter }
if (emptyAdapater || address == null) return false

// Previously connected device. Try to reconnect.
if (Version.isJellyBeanMR2 && address == mBluetoothDeviceAddress)
mBluetoothGatt?.let { return it.connect() }
if (address == mBluetoothDeviceAddress) mBluetoothGatt?.let { return it.connect() }
val device = mBluetoothAdapter?.getRemoteDevice(address) ?: return false
// We want to directly connect to the device, so we are setting the autoConnect
// parameter to false.
Expand Down Expand Up @@ -605,7 +599,7 @@ class GattService : Service() {
characteristic?.let {
mBluetoothGatt?.setCharacteristicNotification(it, enabled)
try {
val descriptor = characteristic.getDescriptor(
val descriptor = it.getDescriptor(
UUID.fromString("00002902-0000-1000-8000-00805f9b34fb")
)
val value = BluetoothGattDescriptor.ENABLE_NOTIFICATION_VALUE
Expand Down Expand Up @@ -644,13 +638,8 @@ class GattService : Service() {
throw IllegalAccessException(getString(R.string.fail_bluetooth_adapter))
mBluetoothGatt?.let { gatt ->
mCharacteristicRX = gatt.getService(GattNUS).getCharacteristic(GattRX)
?: gatt.services.find { service ->
service.characteristics.any {
it.properties == BluetoothGattCharacteristic.PROPERTY_NOTIFY
}
}?.characteristics?.find {
it.properties == BluetoothGattCharacteristic.PROPERTY_NOTIFY
} ?: throw UnsupportedOperationException(getString(R.string.characteristic_null))
?: gatt.getCharacteristicByProperty(BluetoothGattCharacteristic.PROPERTY_NOTIFY)
?: throw UnsupportedOperationException(getString(R.string.characteristic_null))
} ?: throw IllegalAccessException(getString(R.string.fail_bluetooth_adapter))
setCharacteristicNotification(mCharacteristicRX, true)
}
Expand All @@ -661,13 +650,8 @@ class GattService : Service() {
throw IllegalAccessException(getString(R.string.fail_bluetooth_adapter))
mBluetoothGatt?.let { gatt ->
mCharacteristicTX = gatt.getService(GattNUS).getCharacteristic(GattTX)
?: gatt.services.find { service ->
service.characteristics.any {
it.properties == BluetoothGattCharacteristic.PROPERTY_WRITE_NO_RESPONSE
}
}?.characteristics?.find {
it.properties == BluetoothGattCharacteristic.PROPERTY_WRITE_NO_RESPONSE
} ?: throw UnsupportedOperationException(getString(R.string.characteristic_null))
?: gatt.getCharacteristicByProperty(BluetoothGattCharacteristic.PROPERTY_WRITE_NO_RESPONSE)
?: throw UnsupportedOperationException(getString(R.string.characteristic_null))
} ?: throw IllegalAccessException(getString(R.string.fail_bluetooth_adapter))
setCharacteristicNotification(mCharacteristicTX, true)

Expand Down Expand Up @@ -716,6 +700,10 @@ class GattService : Service() {
}, commandQueue * chunkTimeout)
}

private fun delayedWriteCharacteristic(value: String) {
delayedWriteCharacteristic(value.encodeToByteArray())
}

private fun queueByteCharacteristic(value: ByteArray) {
if (null == mCharacteristicTX) {
try {
Expand All @@ -731,10 +719,6 @@ class GattService : Service() {
}
}

private fun delayedWriteCharacteristic(value: String) {
delayedWriteCharacteristic(value.encodeToByteArray())
}

private fun queueTagCharacteristic(value: String) {
if (null == mCharacteristicTX) {
try {
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/hiddenramblings/tagmo/fragment/GattSlotFragment.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -687,9 +687,9 @@ open class GattSlotFragment : Fragment(), GattSlotAdapter.OnAmiiboClickListener,
deviceDialog.dismiss()
deviceProfile = device.name
deviceAddress = device.address
dismissGattDiscovery()
showConnectionNotice()
startGattService()
dismissGattDiscovery()
}
return item
}
Expand Down

0 comments on commit d12cc25

Please sign in to comment.