Version bump

(Or rather that scanner is restarted when permissions change).
+ some refactoring to improve readability

app-common/src/main/java/eu/darken/capod/common/upgrade/UpgradeRepo.kt

@@ -9,6 +9,8 @@ interface UpgradeRepo {
 
     fun launchBillingFlow(activity: Activity)
 
+    fun getSponsorUrl(): String? = null
+
     interface Info {
         val type: Type
 

app-common/src/main/java/eu/darken/capod/monitor/core/PodMonitor.kt

@@ -4,7 +4,6 @@ import android.bluetooth.le.ScanFilter
 import eu.darken.capod.common.bluetooth.BleScanResult
 import eu.darken.capod.common.bluetooth.BleScanner
 import eu.darken.capod.common.bluetooth.BluetoothManager2
-import eu.darken.capod.common.bluetooth.ScannerMode
 import eu.darken.capod.common.coroutine.AppScope
 import eu.darken.capod.common.debug.autoreport.DebugSettings
 import eu.darken.capod.common.debug.logging.Logging.Priority.VERBOSE
@@ -14,6 +13,7 @@ import eu.darken.capod.common.debug.logging.log
 import eu.darken.capod.common.debug.logging.logTag
 import eu.darken.capod.common.flow.replayingShare
 import eu.darken.capod.main.core.GeneralSettings
+import eu.darken.capod.main.core.PermissionTool
 import eu.darken.capod.pods.core.PodDevice
 import eu.darken.capod.pods.core.PodFactory
 import eu.darken.capod.pods.core.apple.protocol.ProximityPairing
@@ -36,14 +36,103 @@ class PodMonitor @Inject constructor(
     private val bluetoothManager: BluetoothManager2,
     private val debugSettings: DebugSettings,
     private val podDeviceCache: PodDeviceCache,
+    private val permissionTool: PermissionTool,
 ) {
 
     private val deviceCache = mutableMapOf<PodDevice.Id, PodDevice>()
     private val cacheLock = Mutex()
 
-    private suspend fun List<BleScanResult>.preFilterAndMap(
+    val devices: Flow<List<PodDevice>> = combine(
-        scannerMode: ScannerMode
+        permissionTool.missingPermissions,
-    ): List<PodFactory.Result> = this
+        bluetoothManager.isBluetoothEnabled
+    ) { missingPermissions, isBluetoothEnabled ->
+        log(TAG) { "devices: missingPermissions=$missingPermissions, isBluetoothEnabled=$isBluetoothEnabled" }
+        // We just want to retrigger if permissions change.
+        isBluetoothEnabled
+    }
+        .flatMapLatest { isReady ->
+            if (!isReady) {
+                log(TAG, WARN) { "Bluetooth is not ready" }
+                flowOf(null)
+            } else {
+                createBleScanner()
+            }
+        }
+        .map { newPods ->
+            val pods = processWithCache(newPods)
+
+            val presorted = sortPodsToInterest(pods.values)
+            val main = determineMainDevice(presorted)
+            newPods?.firstOrNull { it.device.identifier == main?.identifier }?.let {
+                podDeviceCache.saveMainDevice(it.scanResult)
+            }
+
+            presorted.sortedByDescending { it == main }
+        }
+        .retryWhen { cause, attempt ->
+            log(TAG, WARN) { "PodMonitor failed (attempt=$attempt), will retry: ${cause.asLog()}" }
+            delay(3000)
+            true
+        }
+        .onStart { emit(emptyList()) }
+        .replayingShare(appScope)
+
+    val mainDevice: Flow<PodDevice?> = devices
+        .map { determineMainDevice(it) }
+        .replayingShare(appScope)
+
+    private fun createBleScanner() = combine(
+        generalSettings.scannerMode.flow,
+        generalSettings.compatibilityMode.flow,
+        debugSettings.showUnfiltered.flow
+    ) { scannerMode, compatMode, unfiltered ->
+        Triple(scannerMode, compatMode, unfiltered)
+    }
+        .flatMapLatest { (mode, compat, unfiltered) ->
+            val filters = when {
+                unfiltered -> {
+                    log(TAG, WARN) { "Using unfiltered scan mode" }
+                    setOf(getUnfilteredFilter())
+                }
+                else -> ProximityPairing.getBleScanFilter()
+            }
+
+            bleScanner.scan(
+                filters = filters,
+                scannerMode = mode,
+                compatMode = compat,
+            ).map { preFilterAndMap(it) }
+        }
+
+    private suspend fun processWithCache(
+        newPods: List<PodFactory.Result>?
+    ): Map<PodDevice.Id, PodDevice> = cacheLock.withLock {
+        if (newPods == null) {
+            log(TAG) { "Null result, Bluetooth is disabled." }
+            deviceCache.clear()
+            return emptyMap()
+        }
+
+        val now = Instant.now()
+        deviceCache.toList().forEach { (key, value) ->
+            if (Duration.between(value.seenLastAt, now) > Duration.ofSeconds(20)) {
+                log(TAG, VERBOSE) { "Removing stale device from cache: $value" }
+                deviceCache.remove(key)
+            }
+        }
+
+        val pods = mutableMapOf<PodDevice.Id, PodDevice>()
+
+        pods.putAll(deviceCache)
+
+        newPods.map { it.device }.forEach {
+            deviceCache[it.identifier] = it
+            pods[it.identifier] = it
+        }
+        return pods
+    }
+
+    private suspend fun preFilterAndMap(rawResults: List<BleScanResult>): List<PodFactory.Result> = rawResults
         .groupBy { it.address }
         .values
         .map { sameAdrDevs ->
@@ -56,115 +145,36 @@ class PodMonitor @Inject constructor(
         }
         .mapNotNull { podFactory.createPod(it) }
 
-    val devices: Flow<List<PodDevice>> = bluetoothManager.isBluetoothEnabled
+    private fun sortPodsToInterest(pods: Collection<PodDevice>): List<PodDevice> {
-        .flatMapLatest { isBluetoothEnabled ->
-            if (isBluetoothEnabled) {
-                log(TAG) { "Bluetooth is enabled" }
-                combine(
-                    generalSettings.scannerMode.flow,
-                    generalSettings.compatibilityMode.flow,
-                    debugSettings.showUnfiltered.flow
-                ) { scannerMode, compatMode, unfiltered ->
-                    Triple(scannerMode, compatMode, unfiltered)
-                }.flatMapLatest { (mode, compat, unfiltered) ->
-                    log(TAG, VERBOSE) { "Starting BLEScanner mode=$mode, compat=$compat, unfiltered=$unfiltered" }
-                    val filters = if (unfiltered) {
-                        setOf(getUnfilteredFilter())
-                    } else {
-                        ProximityPairing.getBleScanFilter()
-                    }
-                    bleScanner.scan(
-                        filters = filters,
-                        scannerMode = mode,
-                        compatMode = compat,
-                    ).map { it.preFilterAndMap(mode) }
-                }
-            } else {
-                log(TAG, WARN) { "Bluetooth is currently disabled" }
-                flowOf(null)
-            }
-        }
-        .map { newPods ->
-            val pods = mutableMapOf<PodDevice.Id, PodDevice>()
-
-            cacheLock.withLock {
-                if (newPods == null) {
-                    log(TAG) { "Null result, Bluetooth is disabled." }
-                    deviceCache.clear()
-                    return@map emptyList()
-                }
-
-                val now = Instant.now()
-                deviceCache.toList().forEach { (key, value) ->
-                    if (Duration.between(value.seenLastAt, now) > Duration.ofSeconds(20)) {
-                        log(TAG, VERBOSE) { "Removing stale device from cache: $value" }
-                        deviceCache.remove(key)
-                    }
-                }
-
-                pods.putAll(deviceCache)
-
-                newPods.map { it.device }.forEach {
-                    deviceCache[it.identifier] = it
-                    pods[it.identifier] = it
-                }
-            }
-
-            val presorted = pods.values.sortPodsToInterest()
-            val main = presorted.determineMainDevice()
-            newPods?.firstOrNull { it.device.identifier == main?.identifier }?.let {
-                podDeviceCache.saveMainDevice(it.scanResult)
-            }
-
-            presorted.sortedByDescending { it == main }
-        }
-        .onStart { emit(emptyList()) }
-        .retryWhen { cause, attempt ->
-            log(TAG, WARN) { "PodMonitor failed (attempt=$attempt), will retry: ${cause.asLog()}" }
-            delay(3000)
-            true
-        }
-        .replayingShare(appScope)
-
-    val mainDevice: Flow<PodDevice?>
-        get() = devices
-            .map { it.determineMainDevice() }
-            .replayingShare(appScope)
-
-    private fun Collection<PodDevice>.sortPodsToInterest(): List<PodDevice> = this.let { devices ->
         val now = Instant.now()
 
-        return@let devices.sortedWith(
+        return pods.sortedWith(
             compareByDescending<PodDevice> { true }
                 .thenBy {
                     val age = Duration.between(it.seenLastAt, now).seconds
-                    if (age < 5) 0L else (age / 3L).toLong()
+                    if (age < 5) 0L else (age / 3L)
                 }
                 .thenByDescending { it.signalQuality }
                 .thenByDescending { (it.seenCounter / 10) }
-
         )
     }
 
-    private fun List<PodDevice>.determineMainDevice(): PodDevice? = this
+    private fun determineMainDevice(pods: List<PodDevice>): PodDevice? {
-        .sortPodsToInterest()
+        val mainDeviceModel = generalSettings.mainDeviceModel.value
-        .let { devices ->
-            val mainDeviceModel = generalSettings.mainDeviceModel.value
 
-            val presorted = devices.sortedByDescending {
+        val presorted = sortPodsToInterest(pods).sortedByDescending {
-                it.model == mainDeviceModel && it.model != PodDevice.Model.UNKNOWN
+            it.model == mainDeviceModel && it.model != PodDevice.Model.UNKNOWN
-            }
-
-            return@let presorted.firstOrNull()?.let { candidate ->
-                when {
-                    candidate.model == PodDevice.Model.UNKNOWN -> null
-                    mainDeviceModel != PodDevice.Model.UNKNOWN && candidate.model != mainDeviceModel -> null
-                    candidate.signalQuality <= generalSettings.minimumSignalQuality.value -> null
-                    else -> candidate
-                }
-            }
         }
 
+        return presorted.firstOrNull()?.let { candidate ->
+            when {
+                candidate.model == PodDevice.Model.UNKNOWN -> null
+                mainDeviceModel != PodDevice.Model.UNKNOWN && candidate.model != mainDeviceModel -> null
+                candidate.signalQuality <= generalSettings.minimumSignalQuality.value -> null
+                else -> candidate
+            }
+        }
+    }
 
     private fun getUnfilteredFilter(): ScanFilter {
         return ScanFilter.Builder().build()

app-wear/build.gradle.kts

@@ -17,7 +17,7 @@ android {
         minSdk = ProjectConfig.minSdk
         targetSdk = ProjectConfig.targetSdk
 
-        versionCode = ProjectConfig.Version.code
+        versionCode = ProjectConfig.Version.code + 1 // Wear app
         versionName = ProjectConfig.Version.name
 
         testInstrumentationRunner = "eu.darken.capod.HiltTestRunner"

app/build.gradle.kts

@@ -18,7 +18,7 @@ android {
         minSdk = ProjectConfig.minSdk
         targetSdk = ProjectConfig.targetSdk
 
-        versionCode = ProjectConfig.Version.code
+        versionCode = ProjectConfig.Version.code + 0 // Base app
         versionName = ProjectConfig.Version.name
 
         testInstrumentationRunner = "eu.darken.capod.HiltTestRunner"

app/src/foss/java/eu/darken/capod/common/upgrade/core/UpgradeControlFoss.kt

@@ -40,7 +40,7 @@ class UpgradeControlFoss @Inject constructor(
                     upgradedAt = Instant.now(),
                     reason = FossUpgrade.Reason.DONATED
                 )
-                webpageTool.open("https://github.com/d4rken-org/capod#support-the-project")
+                webpageTool.open("https://github.com/sponsors/d4rken")
                 Toast.makeText(activity, R.string.general_thank_you_label, Toast.LENGTH_SHORT).show()
             }
             setNegativeButton(R.string.foss_upgrade_alreadydonated_label) { _, _ ->
@@ -68,4 +68,6 @@ class UpgradeControlFoss @Inject constructor(
         override val type: UpgradeRepo.Type = UpgradeRepo.Type.FOSS
     }
 
+    override fun getSponsorUrl(): String? = "https://github.com/sponsors/d4rken"
+
 }

app/src/main/java/eu/darken/capod/main/ui/settings/SettingsIndexFragment.kt

@@ -10,6 +10,7 @@ import eu.darken.capod.common.PrivacyPolicy
 import eu.darken.capod.common.WebpageTool
 import eu.darken.capod.common.preferences.Settings
 import eu.darken.capod.common.uix.PreferenceFragment2
+import eu.darken.capod.common.upgrade.UpgradeRepo
 import eu.darken.capod.main.core.GeneralSettings
 import javax.inject.Inject
 
@@ -22,6 +23,7 @@ class SettingsIndexFragment : PreferenceFragment2() {
     override val preferenceFile: Int = R.xml.preferences_index
 
     @Inject lateinit var webpageTool: WebpageTool
+    @Inject lateinit var upgradeRepo: UpgradeRepo
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         setupMenu(R.menu.menu_settings_index) { item ->
@@ -30,7 +32,13 @@ class SettingsIndexFragment : PreferenceFragment2() {
                     webpageTool.open("https://twitter.com/d4rken")
                 }
             }
+            when (item.itemId) {
+                R.id.menu_item_sponsor -> {
+                    upgradeRepo.getSponsorUrl()?.let { webpageTool.open(it) }
+                }
+            }
         }
+        toolbar.menu?.findItem(R.id.menu_item_sponsor)?.isVisible = !upgradeRepo.getSponsorUrl().isNullOrEmpty()
         super.onViewCreated(view, savedInstanceState)
     }
 

app/src/main/java/eu/darken/capod/reaction/ui/ReactionSettingsFragment.kt

@@ -93,7 +93,7 @@ class ReactionSettingsFragment : PreferenceFragment2() {
             autoConnectConditionPref.isEnabled = it
         }
 
-        vm.isPro.observe2 { isPro = true }
+        vm.isPro.observe2 { isPro = it }
 
         super.onViewCreated(view, savedInstanceState)
     }

app/src/main/res/menu/menu_settings_index.xml

@@ -2,11 +2,19 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     tools:context="eu.darken.androidstarter.main.ui.MainActivity">
+    <item
+        android:id="@+id/menu_item_sponsor"
+        android:icon="@drawable/ic_heart"
+        android:orderInCategory="100"
+        android:title="Sponsor development"
+        android:tooltipText="Sponsor development"
+        android:visible="false"
+        app:showAsAction="always" />
     <item
         android:id="@+id/menu_item_twitter"
         android:icon="@drawable/ic_twitter"
         android:orderInCategory="100"
-        android:tooltipText="Twitter"
         android:title="Twitter"
+        android:tooltipText="Twitter"
         app:showAsAction="always" />
 </menu>

buildSrc/src/main/java/ProjectConfig.kt

@@ -15,12 +15,12 @@ object ProjectConfig {
 
     object Version {
         const val major = 2
-        const val minor = 0
+        const val minor = 1
         const val patch = 0
-        const val build = 1
+        const val build = 0
 
         const val name = "${major}.${minor}.${patch}-rc${build}"
-        const val code = major * 1000000 + minor * 10000 + patch * 100 + build
+        const val code = major * 10000000 + minor * 100000 + patch * 1000 + build * 10
     }
 }