Skip to content

Release 0.31.1-beta #218

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

Merged
Semper-Viventem merged 3 commits into from
Sep 28, 2025
Merged

Release 0.31.1-beta #218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1825612
Fix some common crashes
Semper-Viventem Sep 28, 2025
744b717
Fix some common crashes
Semper-Viventem Sep 28, 2025
e676700
Merge pull request #217 from Semper-Viventem/fix-crashes
Semper-Viventem Sep 28, 2025
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
4 changes: 2 additions & 2 deletions app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ android {
minSdk = 29
targetSdk = 36

versionCode = 1708536377
versionName = "0.31.0-beta"
versionCode = 1708536378
versionName = "0.31.1-beta"

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/f/cking/software/data/DataModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class DataModule(
single { DevicesRepository(get()) }
single { PermissionHelper(get(), get(), get()) }
single { ActivityProvider() }
single { IntentHelper(get(), get()) }
single { IntentHelper(get(), get(), get()) }
single { RadarProfilesRepository(get()) }
single { LocationProvider(get(), get(), get(), get()) }
single { LocationRepository(get()) }
Expand Down
25 changes: 22 additions & 3 deletions app/src/main/java/f/cking/software/data/helpers/BleScannerHelper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,14 @@ class BleScannerHelper(
private val callback = object : ScanCallback() {

@SuppressLint("MissingPermission")
override fun onScanResult(callbackType: Int, result: ScanResult) {
override fun onScanResult(callbackType: Int, result: ScanResult?) {
super.onScanResult(callbackType, result)

if (result == null || result.device == null) {
Timber.e(IllegalArgumentException("Scan result is null"))
return
}

result.scanRecord?.serviceUuids?.map { bleFiltersProvider.previouslyNoticedServicesUUIDs.add(it.uuid.toString()) }
val addressType: Int? = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM) {
result.device.addressType
Expand All @@ -75,7 +81,7 @@ class BleScannerHelper(
scanRecordRaw = result.scanRecord?.bytes,
rssi = result.rssi,
addressType = addressType,
deviceClass = result.device.bluetoothClass.deviceClass,
deviceClass = result.device?.bluetoothClass?.deviceClass,
isPaired = isPaired,
serviceUuids = result.scanRecord?.serviceUuids?.map { it.uuid.toString() }.orEmpty(),
isConnectable = result.isConnectable,
Expand Down Expand Up @@ -143,19 +149,23 @@ class BleScannerHelper(
Timber.tag(TAG_CONNECT).d("Connecting to device $address")
trySend(DeviceConnectResult.Connecting)
}

BluetoothProfile.STATE_CONNECTED -> {
Timber.tag(TAG_CONNECT).d("Connected to device $address")
trySend(DeviceConnectResult.Connected(gatt))
}

BluetoothProfile.STATE_DISCONNECTING -> {
Timber.tag(TAG_CONNECT).d("Disconnecting from device $address")
trySend(DeviceConnectResult.Disconnecting)
}

BluetoothProfile.STATE_DISCONNECTED -> {
Timber.tag(TAG_CONNECT).d("Disconnected from device $address")
handleDisconnect(status, gatt)
close(gatt)
}

else -> {
Timber.tag(TAG_CONNECT).e("Error while connecting to device $address. Error code: $status")
trySend(DeviceConnectResult.DisconnectedWithError.UnspecifiedConnectionError(gatt, status))
Expand All @@ -168,26 +178,32 @@ class BleScannerHelper(
BluetoothGatt.GATT_SUCCESS -> {
trySend(DeviceConnectResult.Disconnected)
}

CONNECTION_FAILED_TO_ESTABLISH -> {
Timber.tag(TAG_CONNECT).e("Error while connecting to device $address. Error code: $status")
trySend(DeviceConnectResult.DisconnectedWithError.ConnectionFailedToEstablish(gatt, status))
}

CONNECTION_FAILED_BEFORE_INITIALIZING -> {
Timber.tag(TAG_CONNECT).e("Error while connecting to device $address. Error code: $status")
trySend(DeviceConnectResult.DisconnectedWithError.ConnectionFailedBeforeInitializing(gatt, status))
}

CONNECTION_TERMINATED -> {
Timber.tag(TAG_CONNECT).e("Error while connecting to device $address. Error code: $status")
trySend(DeviceConnectResult.DisconnectedWithError.ConnectionTerminated(gatt, status))
}

BluetoothGatt.GATT_CONNECTION_TIMEOUT -> {
Timber.tag(TAG_CONNECT).e("Error while connecting to device $address. Error code: $status")
trySend(DeviceConnectResult.DisconnectedWithError.ConnectionTimeout(gatt, status))
}

BluetoothGatt.GATT_FAILURE -> {
Timber.tag(TAG_CONNECT).e("Error while connecting to device $address. Error code: $status")
trySend(DeviceConnectResult.DisconnectedWithError.ConnectionFailedTooManyClients(gatt, status))
}

else -> {
Timber.tag(TAG_CONNECT).e("Error while connecting to device $address. Error code: $status")
trySend(DeviceConnectResult.DisconnectedWithError.UnspecifiedConnectionError(gatt, status))
Expand Down Expand Up @@ -259,6 +275,7 @@ class BleScannerHelper(
Timber.tag(tag).i("Try disconnect from ${gatt.device.address}")
gatt.disconnect()
}

BluetoothProfile.STATE_DISCONNECTED -> {
Timber.tag(tag).i("Disconnected. Closing connection ${gatt.device.address}")
gatt.close()
Expand Down Expand Up @@ -309,7 +326,9 @@ class BleScannerHelper(

sealed interface DeviceConnectResult {
data class AvailableServices(val gatt: BluetoothGatt, val services: List<BluetoothGattService>) : DeviceConnectResult
data class CharacteristicRead(val gatt: BluetoothGatt, val characteristic: BluetoothGattCharacteristic, val valueEncoded64: String) : DeviceConnectResult
data class CharacteristicRead(val gatt: BluetoothGatt, val characteristic: BluetoothGattCharacteristic, val valueEncoded64: String) :
DeviceConnectResult

data class FailedReadCharacteristic(val gatt: BluetoothGatt, val characteristic: BluetoothGattCharacteristic) : DeviceConnectResult
data class DescriptorRead(val gatt: BluetoothGatt, val descriptor: BluetoothGattDescriptor, val valueEncoded64: String) : DeviceConnectResult
data object Connecting : DeviceConnectResult
Expand Down
9 changes: 4 additions & 5 deletions app/src/main/java/f/cking/software/data/helpers/IntentHelper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,11 @@ package f.cking.software.data.helpers
import android.annotation.SuppressLint
import android.app.Activity
import android.bluetooth.BluetoothAdapter
import android.content.Context
import android.content.Intent
import android.net.Uri
import android.provider.Settings
import f.cking.software.data.helpers.IntentHelper.ScreenNavigation.BACKGROUND_LOCATION_DESCRIPTION
import f.cking.software.data.helpers.IntentHelper.ScreenNavigation.Companion.toNavigationCommand
import f.cking.software.data.helpers.IntentHelper.ScreenNavigation.MAIN
import f.cking.software.data.helpers.IntentHelper.ScreenNavigation.entries
import f.cking.software.openUrl
import f.cking.software.ui.MainActivity
import f.cking.software.ui.ScreenNavigationCommands
Expand All @@ -19,6 +17,7 @@ import f.cking.software.utils.navigation.Router
class IntentHelper(
private val activityProvider: ActivityProvider,
private val router: Router,
private val context: Context,
) {

/**
Expand Down Expand Up @@ -53,7 +52,7 @@ class IntentHelper(

fun openAppSettings() {
val intent = Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
val uri = Uri.fromParts("package", activityProvider.requireActivity().getPackageName(), null)
val uri = Uri.fromParts("package", context.packageName, null)
intent.data = uri
activityProvider.requireActivity().startActivity(intent)
}
Expand All @@ -75,7 +74,7 @@ class IntentHelper(
}

fun openScreenIntent(screenName: ScreenNavigation): Intent {
val intent = Intent(activityProvider.requireActivity(), MainActivity::class.java)
val intent = Intent(context, MainActivity::class.java)
intent.setAction(ACTION_OPEN_SCREEN)
intent.putExtra(SCREEN_NAME, screenName.name)
return intent
Expand Down
26 changes: 17 additions & 9 deletions app/src/main/java/f/cking/software/service/BgScanService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import android.content.pm.ServiceInfo
import android.os.Handler
import android.os.IBinder
import android.os.Looper
import android.widget.Toast
import f.cking.software.R
import f.cking.software.data.helpers.BleScannerHelper
import f.cking.software.data.helpers.LocationProvider
import f.cking.software.data.helpers.NotificationsHelper
Expand Down Expand Up @@ -95,14 +97,20 @@ class BgScanService : Service() {
scan()
} else {
Timber.d("Background service launched")
startForeground(
NotificationsHelper.FOREGROUND_NOTIFICATION_ID,
notificationsHelper.buildForegroundNotification(
NotificationsHelper.ServiceNotificationContent.NoDataYet,
createCloseServiceIntent(this)
),
ServiceInfo.FOREGROUND_SERVICE_TYPE_CONNECTED_DEVICE or ServiceInfo.FOREGROUND_SERVICE_TYPE_LOCATION,
)
try {
startForeground(
NotificationsHelper.FOREGROUND_NOTIFICATION_ID,
notificationsHelper.buildForegroundNotification(
NotificationsHelper.ServiceNotificationContent.NoDataYet,
createCloseServiceIntent(this)
),
ServiceInfo.FOREGROUND_SERVICE_TYPE_CONNECTED_DEVICE or ServiceInfo.FOREGROUND_SERVICE_TYPE_LOCATION,
)
} catch (e: Exception) {
reportError(e)
Toast.makeText(this, R.string.unable_to_run_service_erro_toast, Toast.LENGTH_LONG).show()
stopSelf()
}

permissionHelper.checkOrRequestPermission(
onRequestPermissions = { _, _, _ ->
Expand Down Expand Up @@ -156,7 +164,7 @@ class BgScanService : Service() {

private fun handleScanResult(batch: List<BleScanDevice>) {
scope.launch {
val notificationContent: NotificationsHelper.ServiceNotificationContent = if (batch.isNotEmpty()){
val notificationContent: NotificationsHelper.ServiceNotificationContent = if (batch.isNotEmpty()) {
handleNonEmptyBatch(batch)
} else {
handleEmptyBatch()
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,7 @@
<string name="refresh">refresh</string>

<!-- Notifications -->
<string name="unable_to_run_service_erro_toast">Unable to launch scanning service.</string>
<string name="ble_scanner_is_started_but_no_data">BLE scanner is started but there is no data yet</string>
<string name="known_devices_around">%s known devices around</string>
<string name="total_devices_around">%s total devices around</string>
Expand Down