Release: 2.11.1-rc0

Update translations (#166 )
Update README.md
2026-09-14 18:26:11 -04:00 · 2023-09-23 21:44:04 +02:00 · 2023-09-23 21:43:24 +02:00 · 2023-09-23 21:38:44 +02:00 · 2023-09-23 21:35:30 +02:00 · 2023-09-11 23:35:20 +02:00
355 changed files with 5683 additions and 1943 deletions
@@ -7,28 +7,47 @@ on:
    branches: [ main ]

 jobs:
-  build-and-test:
-    name: Build and test
+  build-modules:
+    name: Build apps
+    strategy:
+      fail-fast: false
+      matrix:
+        flavor: [ Foss,Gplay ]
+        variant: [ Debug ]
+        module: [ app,app-wear ]
    runs-on: ubuntu-latest
-
    steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 11
-        uses: actions/setup-java@v2
+      - uses: actions/checkout@v3
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
        with:
-          java-version: '11'
+          java-version: '17'
          distribution: 'adopt'
          cache: gradle
-
      - name: Grant execute permission for gradlew
        run: chmod +x gradlew

-      - name: Build FOSS variant
-        run: ./gradlew assembleFossDebug
-      - name: Test FOSS variant
-        run: ./gradlew testFossDebugUnitTest
+      - name: Build module
+        run: ./gradlew ${{ matrix.module }}:assemble${{ matrix.flavor }}${{ matrix.variant }}

-      - name: Build Google Play variant
-        run: ./gradlew assembleGplayDebug
-      - name: Test Google Play variant
-        run: ./gradlew testGplayDebugUnitTest
+  test-modules:
+    name: Unit tests
+    strategy:
+      fail-fast: false
+      matrix:
+        variant: [ Release ]
+        flavor: [ testFoss,testGplay ]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'adopt'
+          cache: gradle
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+
+      - name: Test modules
+        run: ./gradlew ${{ matrix.flavor }}${{ matrix.variant }}UnitTest
@@ -38,7 +38,7 @@ jobs:
        uses: actions/setup-java@v3
        with:
          distribution: 'adopt'
-          java-version: 11
+          java-version: 17

      - name: Assemble beta APK
        if: contains(steps.tagger.outputs.tag, '-beta')
@@ -48,7 +48,6 @@ jobs:
          STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }}
          KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
          KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
-          BUGSNAG_API_KEY: ${{ secrets.BUGSNAG_API_KEY }}

      - name: Assemble production APK
        if: "!contains(steps.tagger.outputs.tag, '-beta')"
@@ -58,7 +57,6 @@ jobs:
          STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }}
          KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
          KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
-          BUGSNAG_API_KEY: ${{ secrets.BUGSNAG_API_KEY }}

      - name: Create pre-release
        if: contains(steps.tagger.outputs.tag, '-beta')
@@ -130,7 +128,7 @@ jobs:
        uses: actions/setup-java@v3
        with:
          distribution: 'adopt'
-          java-version: 11
+          java-version: 17

      - name: Set up ruby env
        uses: ruby/setup-ruby@v1
@@ -138,6 +136,14 @@ jobs:
          ruby-version: 2.7.6
          bundler-cache: true

+      #      - name: Assemble WearOS beta and upload to Google Play
+      #        if: contains(steps.tagger.outputs.tag, '-beta')
+      #        run: bundle exec fastlane beta_wearos
+      #        env:
+      #          STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }}
+      #          KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
+      #          KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
+
      - name: Assemble beta and upload to Google Play
        if: contains(steps.tagger.outputs.tag, '-beta')
        run: bundle exec fastlane beta
@@ -145,7 +151,14 @@ jobs:
          STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }}
          KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
          KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
-          BUGSNAG_API_KEY: ${{ secrets.BUGSNAG_API_KEY }}
+
+      #      - name: Assemble WearOS production and upload to Google Play
+      #        if: "!contains(steps.tagger.outputs.tag, '-beta')"
+      #        run: bundle exec fastlane production_wearos
+      #        env:
+      #          STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }}
+      #          KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
+      #          KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}

      - name: Assemble production and upload to Google Play
        if: "!contains(steps.tagger.outputs.tag, '-beta')"
@@ -153,5 +166,4 @@ jobs:
        env:
          STORE_PASSWORD: ${{ secrets.STORE_PASSWORD }}
          KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
-          KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
-          BUGSNAG_API_KEY: ${{ secrets.BUGSNAG_API_KEY }}
+          KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
@@ -12,3 +12,4 @@
 *.jks
 .local/*
 /fastlane/report.xml
+/fastlane/Appfile
@@ -1,27 +1,27 @@
 GEM
  remote: https://rubygems.org/
  specs:
-    CFPropertyList (3.0.5)
+    CFPropertyList (3.0.6)
      rexml
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.4)
+      public_suffix (>= 2.0.2, < 6.0)
    artifactory (3.0.15)
    atomos (0.1.3)
    aws-eventstream (1.2.0)
-    aws-partitions (1.610.0)
-    aws-sdk-core (3.131.3)
+    aws-partitions (1.784.0)
+    aws-sdk-core (3.177.0)
      aws-eventstream (~> 1, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.525.0)
-      aws-sigv4 (~> 1.1)
+      aws-partitions (~> 1, >= 1.651.0)
+      aws-sigv4 (~> 1.5)
      jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.58.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-kms (1.70.0)
+      aws-sdk-core (~> 3, >= 3.177.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.114.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-s3 (1.128.0)
+      aws-sdk-core (~> 3, >= 3.177.0)
      aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.4)
-    aws-sigv4 (1.5.1)
+      aws-sigv4 (~> 1.6)
+    aws-sigv4 (1.6.0)
      aws-eventstream (~> 1, >= 1.0.2)
    babosa (1.0.4)
    claide (1.1.0)
@@ -30,14 +30,14 @@ GEM
    commander (4.6.0)
      highline (~> 2.0.0)
    declarative (0.0.20)
-    digest-crc (0.6.4)
+    digest-crc (0.6.5)
      rake (>= 12.0.0, < 14.0.0)
    domain_name (0.5.20190701)
      unf (>= 0.0.5, < 1.0.0)
-    dotenv (2.7.6)
+    dotenv (2.8.1)
    emoji_regex (3.2.3)
-    excon (0.92.4)
-    faraday (1.10.0)
+    excon (0.100.0)
+    faraday (1.10.3)
      faraday-em_http (~> 1.0)
      faraday-em_synchrony (~> 1.0)
      faraday-excon (~> 1.1)
@@ -65,8 +65,8 @@ GEM
    faraday-retry (1.0.3)
    faraday_middleware (1.2.0)
      faraday (~> 1.0)
-    fastimage (2.2.6)
-    fastlane (2.208.0)
+    fastimage (2.2.7)
+    fastlane (2.213.0)
      CFPropertyList (>= 2.3, < 4.0.0)
      addressable (>= 2.8, < 3.0.0)
      artifactory (~> 3.0)
@@ -90,7 +90,7 @@ GEM
      json (< 3.0.0)
      jwt (>= 2.1.0, < 3)
      mini_magick (>= 4.9.4, < 5.0.0)
-      multipart-post (~> 2.0.0)
+      multipart-post (>= 2.0.0, < 3.0.0)
      naturally (~> 2.2)
      optparse (~> 0.1.1)
      plist (>= 3.1.0, < 4.0.0)
@@ -106,9 +106,9 @@ GEM
      xcpretty (~> 0.3.0)
      xcpretty-travis-formatter (>= 0.0.3)
    gh_inspector (1.1.3)
-    google-apis-androidpublisher_v3 (0.25.0)
-      google-apis-core (>= 0.7, < 2.a)
-    google-apis-core (0.7.0)
+    google-apis-androidpublisher_v3 (0.45.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-core (0.11.0)
      addressable (~> 2.5, >= 2.5.1)
      googleauth (>= 0.16.2, < 2.a)
      httpclient (>= 2.8.1, < 3.a)
@@ -117,27 +117,27 @@ GEM
      retriable (>= 2.0, < 4.a)
      rexml
      webrick
-    google-apis-iamcredentials_v1 (0.13.0)
-      google-apis-core (>= 0.7, < 2.a)
-    google-apis-playcustomapp_v1 (0.10.0)
-      google-apis-core (>= 0.7, < 2.a)
-    google-apis-storage_v1 (0.18.0)
-      google-apis-core (>= 0.7, < 2.a)
+    google-apis-iamcredentials_v1 (0.17.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-playcustomapp_v1 (0.13.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-storage_v1 (0.19.0)
+      google-apis-core (>= 0.9.0, < 2.a)
    google-cloud-core (1.6.0)
      google-cloud-env (~> 1.0)
      google-cloud-errors (~> 1.0)
    google-cloud-env (1.6.0)
      faraday (>= 0.17.3, < 3.0)
-    google-cloud-errors (1.2.0)
-    google-cloud-storage (1.37.0)
+    google-cloud-errors (1.3.1)
+    google-cloud-storage (1.44.0)
      addressable (~> 2.8)
      digest-crc (~> 0.4)
      google-apis-iamcredentials_v1 (~> 0.1)
-      google-apis-storage_v1 (~> 0.1)
+      google-apis-storage_v1 (~> 0.19.0)
      google-cloud-core (~> 1.6)
      googleauth (>= 0.16.2, < 2.a)
      mini_mime (~> 1.0)
-    googleauth (1.2.0)
+    googleauth (1.6.0)
      faraday (>= 0.17.3, < 3.a)
      jwt (>= 1.4, < 3.0)
      memoist (~> 0.16)
@@ -148,20 +148,20 @@ GEM
    http-cookie (1.0.5)
      domain_name (~> 0.5)
    httpclient (2.8.3)
-    jmespath (1.6.1)
-    json (2.6.2)
-    jwt (2.4.1)
+    jmespath (1.6.2)
+    json (2.6.3)
+    jwt (2.7.1)
    memoist (0.16.2)
-    mini_magick (4.11.0)
+    mini_magick (4.12.0)
    mini_mime (1.1.2)
    multi_json (1.15.0)
-    multipart-post (2.0.0)
+    multipart-post (2.3.0)
    nanaimo (0.3.0)
    naturally (2.2.1)
    optparse (0.1.1)
    os (1.1.4)
-    plist (3.6.0)
-    public_suffix (4.0.7)
+    plist (3.7.0)
+    public_suffix (5.0.1)
    rake (13.0.6)
    representable (3.2.0)
      declarative (< 0.1.0)
@@ -178,7 +178,7 @@ GEM
      faraday (>= 0.17.5, < 3.a)
      jwt (>= 1.5, < 3.0)
      multi_json (~> 1.10)
-    simctl (1.6.8)
+    simctl (1.6.10)
      CFPropertyList
      naturally
    terminal-notifier (2.0.0)
@@ -194,7 +194,7 @@ GEM
      unf_ext
    unf_ext (0.0.8.2)
    unicode-display_width (1.8.0)
-    webrick (1.7.0)
+    webrick (1.8.1)
    word_wrap (1.0.0)
    xcodeproj (1.22.0)
      CFPropertyList (>= 2.3.3, < 4.0)
@@ -20,23 +20,43 @@ On Android 12+ the newer and more fine grained `BLUETOOTH_SCAN` permission is us

 Bluetooth Low Energy is a technology that devices like AirPods use to communicate their status to nearby devices.
 CAPod requests location permissions because these permissions are required to work with Bluetooth Low Energy data.
-This is a privacy measure on Android's side because you could determine someones location by scanning for Bluetooth devices:
-If you know the physical location of a Bluetooth device (e.g. AirTags) you could use Bluetooth data to calculate your position.
+This is a privacy measure on Android's side because you could determine someones location by scanning for Bluetooth
+devices:
+If you know the physical location of a Bluetooth device (e.g. AirTags) you could use Bluetooth data to calculate your
+position.

 ### Location access in the background

-CAPod uses the "location access in the background" permission (`ACCESS_BACKGROUND_LOCATION`) on Android 11 and older to receive Bluetooth Low Energy data while the app is in the background. This permission enables the "Show popup" and "Autoconnect" features and allows CAPod to react to nearby devices whil the app is closed.
+CAPod uses the "location access in the background" permission (`ACCESS_BACKGROUND_LOCATION`) on Android 11 and older to
+receive Bluetooth Low Energy data while the app is in the background. This permission enables the "Show popup" and "
+Autoconnect" features and allows CAPod to react to nearby devices whil the app is closed.

-## Automatic crash reports
+## Automatic error reports

-Anonymous device information may be collected in the event of an app crash or error.
+*This was removed in v2.11.0+*

-To do this the app uses the service "Bugsnag":
+If an error occurs, an automated report may be sent to help me fix the issue.
+
+This is optional and you can opt out of this in the settings.
+
+Error reports are collected using "Bugsnag":
 https://www.bugsnag.com/

 Bugsnag's privacy policy can be found here:
 https://docs.bugsnag.com/legal/privacy-policy/

-Crash reports may contain device and app related information, e.g. your phone model, Android version and app version.
+Error reports contain device and app information related to the error that occured.
+Additional information about the error context may also be included, e.g. what this app did shortly before the error.

-You can disable automatic reports in the app's settings.
+Additional details about the type of data that is collected by the error tracking SDK can be found here:
+https://docs.bugsnag.com/platforms/android/playstore-privacy/
+
+Error reports are pseudonymous. Unless you tell me your install-ID, I don't know that an error report came from you.
+
+Error reports are automatically deleted after 90 days.
+
+## Debug logs
+
+The app has a debug log feature that can be used to assist troubleshooting efforts. This feature creates a log file that contains verbose output of what the app is doing.
+
+It is manually triggered by the user through an option in the app settings. The recorded log file can be shared through compatible apps (e.g. your email app) using the system's share dialog. As this log file may contain sensitive information (e.g. details about files or installed applications) it should only be shared with trusted parties.
@@ -16,6 +16,7 @@ A companion app that adds support for AirPod specific features to Android:
 * Automatically connect phone & AirPods.
 * Show popup when case is opened.
 * Support for Wear OS
+* Widgets

 CAPod is ad-free. Some additional features require an in-app purchase.

@@ -26,6 +27,7 @@ Currently supported models:
 * AirPods 3. Generation
 * AirPods Pro 1. Generation
 * AirPods Pro 2. Generation
+* AirPods Pro 2. Generation (USB-C)
 * AirPods Max
 * Power Beats Pro
 * Power Beats 3
@@ -33,12 +35,23 @@ Currently supported models:
 * Beats Studio 3
 * Beats X
 * Beats Flex
+* Beats Fit Pro
+* Fake AirPods 1. Generation 🎭
+* Fake AirPods 2. Generation 🎭
+* Fake AirPods 3. Generation 🎭
+* Fake AirPods Pro1 🎭
+* Fake AirPods Pro2 🎭

 ## Download

-* [Google Play](https://play.google.com/store/apps/details?id=eu.darken.capod)
-* [GitHub](https://github.com/d4rken-org/capod/releases/latest)
-* [IzzyOnDroid](https://apt.izzysoft.de/fdroid/index/apk/eu.darken.capod)
+| Source                                                                       | Status                                                                                                                                                                                                                                                         |
+|------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| [Google Play](https://play.google.com/store/apps/details?id=eu.darken.capod) | [![](https://img.shields.io/endpoint?color=green&logo=google-play&logoColor=green&url=https%3A%2F%2Fplay.cuzi.workers.dev%2Fplay%3Fi%3Deu.darken.capod%26l%3DGoogle%2520Play%26m%3D%24version)](https://play.google.com/store/apps/details?id=eu.darken.capod) |
+| [Google Play Beta](https://play.google.com/apps/testing/eu.darken.capod)     | [![](https://img.shields.io/badge/Google%20Play-Beta-yellowgreen?style=flat&logo=google-play)](https://play.google.com/apps/testing/eu.darken.capod)                                                                                                           |                                                                                                                  |
+| [Github Releases](https://github.com/d4rken-org/capod/releases)              | [![GitHub release (latest SemVer including pre-releases)](https://img.shields.io/github/v/release/d4rken-org/capod?include_prereleases&label=GitHub)](https://github.com/d4rken-org/capod/releases/latest)                                                     |
+| [F-Droid](https://f-droid.org/en/packages/eu.darken.capod/)                  | [![](https://img.shields.io/f-droid/v/eu.darken.capod)](https://f-droid.org/en/packages/eu.darken.capod/)                                                                                                                                                      |
+| [F-Droid (IzzyOnDroid)](https://apt.izzysoft.de/packages/eu.darken.capod/)   | [![](https://img.shields.io/endpoint?url=https://apt.izzysoft.de/fdroid/api/v1/shield/eu.darken.capod)](https://apt.izzysoft.de/packages/eu.darken.capod/)                                                                                                     |
+

 ## Support the project

@@ -1 +1 @@
-2.3.0-rc0 20300000
+2.11.1-rc0 21101000
@@ -8,6 +8,7 @@ apply(plugin = "dagger.hilt.android.plugin")

 android {
    compileSdk = ProjectConfig.compileSdk
+    namespace = "${ProjectConfig.packageName}.common"

    defaultConfig {
        minSdk = ProjectConfig.minSdk
@@ -29,12 +30,12 @@ android {

    compileOptions {
        isCoreLibraryDesugaringEnabled = true
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
    }

    kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "17"
        freeCompilerArgs = freeCompilerArgs + listOf(
            "-opt-in=kotlin.ExperimentalStdlibApi",
            "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
@@ -95,6 +96,4 @@ dependencies {

    addTesting()

-    implementation("com.bugsnag:bugsnag-android:5.9.2")
-
 }
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest>
+
+</manifest>
@@ -0,0 +1,17 @@
+package eu.darken.capod.debug.autoreport
+
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import eu.darken.capod.common.debug.autoreport.AutomaticBugReporter
+import eu.darken.capod.debug.autoreport.FossAutoReporting
+import javax.inject.Singleton
+
+@InstallIn(SingletonComponent::class)
+@Module
+abstract class AutoReportingModule {
+    @Binds
+    @Singleton
+    abstract fun autoreporting(foss: FossAutoReporting): AutomaticBugReporter
+}
@@ -0,0 +1,17 @@
+package eu.darken.capod.debug.autoreport
+
+import android.app.Application
+import eu.darken.capod.common.debug.autoreport.AutomaticBugReporter
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class FossAutoReporting @Inject constructor() : AutomaticBugReporter {
+    override fun setup(application: Application) {
+        // NOOP
+    }
+
+    override fun notify(throwable: Throwable) {
+        throw IllegalStateException("Who initliazed this? Without setup no calls to here!")
+    }
+}
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest>
+
+    <application>
+
+    </application>
+
+</manifest>
@@ -0,0 +1,16 @@
+package eu.darken.capod.debug.autoreport
+
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import eu.darken.capod.common.debug.autoreport.AutomaticBugReporter
+import javax.inject.Singleton
+
+@InstallIn(SingletonComponent::class)
+@Module
+abstract class AutoReportingModule {
+    @Binds
+    @Singleton
+    abstract fun autoreporting(foss: GplayAutoReporting): AutomaticBugReporter
+}
@@ -0,0 +1,42 @@
+package eu.darken.capod.debug.autoreport
+
+import android.app.Application
+import android.content.Context
+import dagger.hilt.android.qualifiers.ApplicationContext
+import eu.darken.capod.common.InstallId
+import eu.darken.capod.common.debug.Bugs
+import eu.darken.capod.common.debug.DebugSettings
+import eu.darken.capod.common.debug.autoreport.AutomaticBugReporter
+import eu.darken.capod.common.debug.logging.Logging.Priority.WARN
+import eu.darken.capod.common.debug.logging.log
+import eu.darken.capod.common.debug.logging.logTag
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class GplayAutoReporting @Inject constructor(
+    @ApplicationContext private val context: Context,
+    private val debugSettings: DebugSettings,
+    private val installId: InstallId,
+) : AutomaticBugReporter {
+
+    override fun setup(application: Application) {
+        val isEnabled = debugSettings.isAutoReportingEnabled.value
+        log(TAG) { "setup(): isEnabled=$isEnabled" }
+
+        if (!isEnabled) return
+
+        // Currently no 3rd party bug tracking
+
+        Bugs.reporter = this
+    }
+
+    override fun notify(throwable: Throwable) {
+        log(TAG, WARN) { "notify($throwable)" }
+    }
+
+    companion object {
+        private val TAG = logTag("Debug", "AutoReport")
+    }
+
+}
@@ -1,4 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="eu.darken.capod.common">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="eu.darken.capod.common">

+    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
+
+    <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.ACCESS_COARSE_LOCATION"
+        android:maxSdkVersion="30" />
+    <uses-permission
+        android:name="android.permission.ACCESS_FINE_LOCATION"
+        android:maxSdkVersion="30" />
+
+    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
+    <uses-permission
+        android:name="android.permission.BLUETOOTH_SCAN"
+        android:usesPermissionFlags="neverForLocation" />
+
+    <application>
+        <receiver
+            android:name=".bluetooth.BleScanResultReceiver"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="eu.darken.capod.bluetooth.DELIVER_SCAN_RESULTS" />
+            </intent-filter>
+        </receiver>
+    </application>
 </manifest>
@@ -0,0 +1,10 @@
+import android.content.BroadcastReceiver
+import eu.darken.capod.common.debug.logging.log
+
+fun BroadcastReceiver.PendingResult.finish2(): Boolean = try {
+    finish()
+    true
+} catch (e: IllegalStateException) {
+    log { "BroadcastReceiver.PendingResult.finish() failed: $e" }
+    false
+}
@@ -0,0 +1,33 @@
+package eu.darken.capod.common.bluetooth
+
+import android.bluetooth.le.ScanResult
+import eu.darken.capod.common.debug.logging.Logging.Priority.VERBOSE
+import eu.darken.capod.common.debug.logging.Logging.Priority.WARN
+import eu.darken.capod.common.debug.logging.log
+import eu.darken.capod.common.debug.logging.logTag
+import kotlinx.coroutines.channels.BufferOverflow
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableSharedFlow
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class BleScanResultForwarder @Inject constructor() {
+
+    private val forwarder = MutableSharedFlow<Collection<ScanResult>>(
+        replay = 0,
+        extraBufferCapacity = 128,
+        onBufferOverflow = BufferOverflow.DROP_OLDEST
+    )
+    val results: Flow<Collection<ScanResult>> = forwarder
+
+    fun forward(scanResults: Collection<ScanResult>) {
+        log(TAG, VERBOSE) { "forward($scanResults)" }
+        val success = forwarder.tryEmit(scanResults)
+        if (!success) log(TAG, WARN) { "Failed to forward (overflow?) $scanResults" }
+    }
+
+    companion object {
+        private val TAG = logTag("Bluetooth", "BleScanner", "Forwarder")
+    }
+}
@@ -0,0 +1,64 @@
+package eu.darken.capod.common.bluetooth
+
+import android.bluetooth.le.BluetoothLeScanner
+import android.bluetooth.le.ScanResult
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import dagger.hilt.android.AndroidEntryPoint
+import eu.darken.capod.common.coroutine.AppScope
+import eu.darken.capod.common.debug.logging.Logging.Priority.VERBOSE
+import eu.darken.capod.common.debug.logging.Logging.Priority.WARN
+import eu.darken.capod.common.debug.logging.log
+import eu.darken.capod.common.debug.logging.logTag
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class BleScanResultReceiver : BroadcastReceiver() {
+
+    @Inject @AppScope lateinit var appScope: CoroutineScope
+    @Inject lateinit var scanResultForwarder: BleScanResultForwarder
+
+    override fun onReceive(context: Context, intent: Intent) {
+        log(TAG, VERBOSE) { "onReceive($context, $intent)" }
+        if (intent.action != ACTION) {
+            log(TAG, WARN) { "Unknown action: ${intent.action}" }
+            return
+        }
+        if (intent.extras == null) {
+            log(TAG) { "Extras are null!" }
+            return
+        }
+
+        val errorCode = intent.getIntExtra(BluetoothLeScanner.EXTRA_ERROR_CODE, 0)
+        log(TAG, VERBOSE) { "errorCode=$errorCode" }
+        if (errorCode != 0) {
+            log(TAG, WARN) { "ScanCallback error code: $errorCode" }
+            return
+        }
+
+        val callbackType = intent.getIntExtra(BluetoothLeScanner.EXTRA_CALLBACK_TYPE, -1)
+        log(TAG, VERBOSE) { "callbackType=$callbackType" }
+
+        val scanResults = intent.getParcelableArrayListExtra<ScanResult>(BluetoothLeScanner.EXTRA_LIST_SCAN_RESULT)
+        log(TAG, VERBOSE) { "scanResults=$scanResults" }
+
+        if (scanResults == null) {
+            log(TAG) { "Scan results were empty!" }
+            return
+        }
+
+        val pending = goAsync()
+        appScope.launch {
+            scanResultForwarder.forward(scanResults)
+            pending.finish()
+        }
+    }
+
+    companion object {
+        private val TAG = logTag("Bluetooth", "BleScanner", "Forwarder", "Receiver")
+        const val ACTION = "eu.darken.capod.bluetooth.DELIVER_SCAN_RESULTS"
+    }
+}
@@ -1,20 +1,21 @@
 package eu.darken.capod.common.bluetooth

 import android.annotation.SuppressLint
+import android.app.PendingIntent
 import android.bluetooth.le.ScanCallback
 import android.bluetooth.le.ScanFilter
 import android.bluetooth.le.ScanResult
 import android.bluetooth.le.ScanSettings
 import android.content.Context
+import android.content.Intent
 import dagger.hilt.android.qualifiers.ApplicationContext
 import eu.darken.capod.common.debug.logging.Logging.Priority.*
 import eu.darken.capod.common.debug.logging.log
 import eu.darken.capod.common.debug.logging.logTag
+import eu.darken.capod.common.notifications.PendingIntentCompat
 import kotlinx.coroutines.channels.awaitClose
 import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.callbackFlow
-import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
 import javax.inject.Inject
@@ -25,28 +26,48 @@ class BleScanner @Inject constructor(
    @ApplicationContext private val context: Context,
    private val bluetoothManager: BluetoothManager2,
    private val fakeBleData: FakeBleData,
+    private val scanResultForwarder: BleScanResultForwarder,
 ) {

    @SuppressLint("MissingPermission") fun scan(
        filters: Set<ScanFilter>,
-        scannerMode: ScannerMode,
-        compatMode: Boolean,
-    ): Flow<List<BleScanResult>> = callbackFlow {
-        log(TAG, VERBOSE) { "scan(filters=$filters, scannerMode=$scannerMode, compatMode=$compatMode)" }
-        if (compatMode) log(TAG, WARN) { "Using compatibilityMode!" }
+        scannerMode: ScannerMode = ScannerMode.BALANCED,
+        disableOffloadFiltering: Boolean = false,
+        disableOffloadBatching: Boolean = false,
+        disableDirectScanCallback: Boolean = false,
+    ): Flow<Collection<BleScanResult>> = callbackFlow {
+        log(TAG) { "scan(filters=$filters, scannerMode=$scannerMode)" }

        val adapter = bluetoothManager.adapter ?: throw IllegalStateException("Bluetooth adapter unavailable")

-        val supportsOffloadFiltering = adapter.isOffloadedFilteringSupported.also {
+        val useOffloadedFiltering = adapter.isOffloadedFilteringSupported.also {
            log(TAG, if (it) DEBUG else WARN) { "isOffloadedFilteringSupported=$it" }
-        } && !compatMode
+        } && !disableOffloadFiltering
+        if (disableOffloadFiltering) log(TAG, WARN) { "Offloaded filtering is disabled!" }

-        val supportsOffloadBatching = adapter.isOffloadedScanBatchingSupported.also {
+        val useOffloadedBatching = adapter.isOffloadedScanBatchingSupported.also {
            log(TAG, if (it) DEBUG else WARN) { "isOffloadedScanBatchingSupported=$it" }
-        } && !compatMode
+        } && !disableOffloadBatching
+        if (disableOffloadBatching) log(TAG, WARN) { "Offloaded scan-batching is disabled!" }
+
+        if (disableDirectScanCallback) log(TAG, WARN) { "Direct scan callback is disabled!" }

        val scanner = bluetoothManager.scanner ?: throw IllegalStateException("BLE scanner unavailable")

+        val filterResults: (Collection<ScanResult>) -> Collection<BleScanResult> = { results ->
+            results
+                .filter { result ->
+                    val passed = when {
+                        useOffloadedFiltering -> true
+                        filters.isEmpty() -> true
+                        else -> filters.any { it.matches(result) }
+                    }
+                    if (!passed) log(TAG, VERBOSE) { "Manually filtered $result" }
+                    passed
+                }
+                .map { BleScanResult.fromScanResult(it) }
+        }
+
        val callback = object : ScanCallback() {
            var lastScanAt = System.currentTimeMillis()
            override fun onScanResult(callbackType: Int, result: ScanResult) {
@@ -55,17 +76,8 @@ class BleScanner @Inject constructor(
                    lastScanAt = System.currentTimeMillis()
                    "onScanResult(delay=${delay}ms, callbackType=$callbackType, result=$result)"
                }
-                val toSend = if (
-                    supportsOffloadFiltering
-                    || filters.isEmpty()
-                    || filters.any { it.matchesSafe(result) }
-                ) {
-                    listOf(BleScanResult.fromScanResult(result))
-                } else {
-                    log(TAG, VERBOSE) { "Manual filtering: No match for $result" }
-                    emptyList()
-                }
-                trySend(toSend)
+
+                trySend(filterResults(setOf(result)))
            }

            override fun onBatchScanResults(results: MutableList<ScanResult>) {
@@ -75,18 +87,7 @@ class BleScanner @Inject constructor(
                    "onBatchScanResults(delay=${delay}ms, results=$results)"
                }

-                val toSend = results
-                    .filter { result ->
-                        val passed = when {
-                            supportsOffloadFiltering -> true
-                            filters.isEmpty() -> true
-                            else -> filters.any { it.matches(result) }
-                        }
-                        if (!passed) log(TAG, VERBOSE) { "Manually filtered $result" }
-                        passed
-                    }
-                    .map { BleScanResult.fromScanResult(it) }
-                trySend(toSend)
+                trySend(filterResults(results))
            }

            override fun onScanFailed(errorCode: Int) {
@@ -94,58 +95,113 @@ class BleScanner @Inject constructor(
            }
        }

-
-        val settings = ScanSettings.Builder().apply {
-            setScanMode(
-                when (scannerMode) {
-                    ScannerMode.LOW_POWER -> ScanSettings.SCAN_MODE_LOW_POWER
-                    ScannerMode.BALANCED -> ScanSettings.SCAN_MODE_BALANCED
-                    ScannerMode.LOW_LATENCY -> ScanSettings.SCAN_MODE_LOW_LATENCY
-                }
-            )
-            if (supportsOffloadBatching) {
-                setReportDelay(
-                    when (scannerMode) {
-                        ScannerMode.LOW_POWER -> 2000L
-                        ScannerMode.BALANCED -> 1000L
-                        ScannerMode.LOW_LATENCY -> 500L
-                    }
-                )
-            }
-        }.build()
-
-        log(TAG, VERBOSE) { "Settings created for offloaded filtering: $settings" }
-
-        val flushJob = launch {
-            log(TAG) { "Flush job launched" }
-            while (isActive) {
-                // Can undercut the minimum setReportDelay(), e.g. 5000ms on a Pixel5@12
-                log(TAG, VERBOSE) { "Flushing scan results." }
-                adapter.bluetoothLeScanner.flushPendingScanResults(callback)
-                when (scannerMode) {
-                    ScannerMode.LOW_POWER -> break
-                    ScannerMode.BALANCED -> delay(1000)
-                    ScannerMode.LOW_LATENCY -> delay(500)
-                }
-            }
+        val forwarderConsumer = if (disableDirectScanCallback) {
+            scanResultForwarder.results
+                .onEach { results -> trySend(filterResults(results)) }
+                .launchIn(this)
+        } else {
+            null
        }

-        scanner.startScan(
-            if (supportsOffloadFiltering) filters.toList() else listOf(ScanFilter.Builder().build()),
-            settings,
-            callback
-        )
-        log(TAG) { "BleScanner started (filters=$filters, settings=$settings)" }
+        val flushJob = if (!disableDirectScanCallback) {
+            launch {
+                log(TAG) { "Flush job launched" }
+                while (isActive) {
+                    log(TAG, VERBOSE) { "Flushing scan results." }
+                    // Can undercut the minimum setReportDelay(), e.g. 5000ms on a Pixel5@12
+                    adapter.bluetoothLeScanner.flushPendingScanResults(callback)
+                    when (scannerMode) {
+                        ScannerMode.LOW_POWER -> break
+                        ScannerMode.BALANCED -> delay(2000)
+                        ScannerMode.LOW_LATENCY -> delay(500)
+                    }
+                }
+            }
+        } else {
+            null
+        }
+
+        val filterList = when {
+            useOffloadedFiltering -> filters.toList()
+            else -> emptyList()
+        }
+
+        val scanSettings = ScanSettings.Builder().apply {
+            setCallbackType(ScanSettings.CALLBACK_TYPE_ALL_MATCHES)
+            when (scannerMode) {
+                ScannerMode.LOW_POWER -> {
+                    setScanMode(ScanSettings.SCAN_MODE_LOW_POWER)
+                    setMatchMode(ScanSettings.MATCH_MODE_STICKY)
+                    setNumOfMatches(ScanSettings.MATCH_NUM_FEW_ADVERTISEMENT)
+                }
+                ScannerMode.BALANCED -> {
+                    setScanMode(ScanSettings.SCAN_MODE_BALANCED)
+                    setMatchMode(ScanSettings.MATCH_MODE_STICKY)
+                    setNumOfMatches(ScanSettings.MATCH_NUM_FEW_ADVERTISEMENT)
+                }
+                ScannerMode.LOW_LATENCY -> {
+                    setScanMode(ScanSettings.SCAN_MODE_LOW_LATENCY)
+                    setMatchMode(ScanSettings.MATCH_MODE_AGGRESSIVE)
+                    setNumOfMatches(ScanSettings.MATCH_NUM_MAX_ADVERTISEMENT)
+                }
+            }
+
+            val delay = if (useOffloadedBatching) {
+                when (scannerMode) {
+                    ScannerMode.LOW_POWER -> 2000L
+                    ScannerMode.BALANCED -> 1000L
+                    ScannerMode.LOW_LATENCY -> 500L
+                }
+            } else {
+                0L // Anything > 0 enables batching
+            }
+            setReportDelay(delay)
+        }.build()
+
+        if (disableDirectScanCallback) {
+            val callbackIntent = createStartIntent()
+            log(TAG) { "Intent callback: startScan(filters=$filters, settings=$scanSettings, callbackIntent=$callbackIntent)" }
+            scanner.startScan(filterList, scanSettings, callbackIntent)
+        } else {
+            log(TAG) { "Direct callback: startScan(filters=$filters, settings=$scanSettings, callback=$callback)" }
+            scanner.startScan(filterList, scanSettings, callback)
+        }

        awaitClose {
-            flushJob.cancel()
-            scanner.stopScan(callback)
+            forwarderConsumer?.cancel()
+            flushJob?.cancel()
+            if (disableDirectScanCallback) {
+                scanner.stopScan(createStopIntent())
+            } else {
+                scanner.stopScan(callback)
+            }
            log(TAG) { "BleScanner stopped" }
        }
    }
        .map { fakeBleData.maybeAddfakeData(it) }

+    private val receiverIntent by lazy {
+        Intent(context, BleScanResultReceiver::class.java).apply {
+            action = BleScanResultReceiver.ACTION
+        }
+    }
+
+    private fun createStartIntent(): PendingIntent = PendingIntent.getBroadcast(
+        context,
+        CALLBACK_INTENT_REQUESTCODE,
+        receiverIntent,
+        PendingIntent.FLAG_UPDATE_CURRENT or PendingIntentCompat.FLAG_MUTABLE
+    )
+
+    private fun createStopIntent(): PendingIntent = PendingIntent.getBroadcast(
+        context,
+        270,
+        receiverIntent,
+        PendingIntentCompat.FLAG_IMMUTABLE
+    )
+
    companion object {
+        private const val CALLBACK_INTENT_REQUESTCODE = 270
        private val TAG = logTag("Bluetooth", "BleScanner")
    }
 }
@@ -0,0 +1,15 @@
+package eu.darken.capod.common.bluetooth
+
+import android.bluetooth.BluetoothDevice
+import java.time.Instant
+
+data class BluetoothDevice2(
+    internal val internal: BluetoothDevice,
+    val seenFirstAt: Instant,
+) {
+    val address: String
+        get() = internal.address
+
+    val name: String?
+        get() = internal.name
+}
@@ -1,6 +1,10 @@
 package eu.darken.capod.common.bluetooth

-import android.bluetooth.*
+import android.bluetooth.BluetoothAdapter
+import android.bluetooth.BluetoothDevice
+import android.bluetooth.BluetoothHeadset
+import android.bluetooth.BluetoothManager
+import android.bluetooth.BluetoothProfile
 import android.bluetooth.le.BluetoothLeScanner
 import android.content.BroadcastReceiver
 import android.content.Context
@@ -12,14 +16,24 @@ import android.os.ParcelUuid
 import dagger.hilt.android.qualifiers.ApplicationContext
 import eu.darken.capod.common.coroutine.DispatcherProvider
 import eu.darken.capod.common.debug.Bugs
-import eu.darken.capod.common.debug.logging.Logging.Priority.*
+import eu.darken.capod.common.debug.logging.Logging.Priority.ERROR
+import eu.darken.capod.common.debug.logging.Logging.Priority.VERBOSE
+import eu.darken.capod.common.debug.logging.Logging.Priority.WARN
 import eu.darken.capod.common.debug.logging.log
 import eu.darken.capod.common.debug.logging.logTag
 import eu.darken.capod.pods.core.apple.protocol.ContinuityProtocol
 import kotlinx.coroutines.channels.awaitClose
-import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.callbackFlow
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.flatMapLatest
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
 import java.io.IOException
+import java.time.Instant
 import javax.inject.Inject
 import javax.inject.Singleton

@@ -74,7 +88,7 @@ class BluetoothManager2 @Inject constructor(
            }

            override fun onServiceDisconnected(profile: Int) {
-                log(TAG, WARN) { "onServiceDisconnected(profile=$profile" }
+                log(TAG, WARN) { "onServiceDisconnected(profile=$profile)" }
                close(IOException("BluetoothProfile service disconnected (profile=$profile)"))
            }

@@ -128,6 +142,7 @@ class BluetoothManager2 @Inject constructor(
                                log(TAG) { "Adding $device to current devices $currentDevices" }
                                trySend(currentDevices.plus(device))
                            }
+
                            BluetoothDevice.ACTION_ACL_DISCONNECTED -> {
                                log(TAG) { "Removing $device from current devices $currentDevices" }
                                trySend(currentDevices.minus(device))
@@ -145,23 +160,54 @@ class BluetoothManager2 @Inject constructor(
        }
    }

+    private val seenDevicesLock = Mutex()
+    private val seenDevicesCache = mutableMapOf<String, Instant>()
+
    fun connectedDevices(
        featureFilter: Set<ParcelUuid> = ContinuityProtocol.BLE_FEATURE_UUIDS
-    ): Flow<List<BluetoothDevice>> = isBluetoothEnabled
+    ): Flow<List<BluetoothDevice2>> = isBluetoothEnabled
        .flatMapLatest { monitorDevicesForProfile(BluetoothProfile.HEADSET) }
        .map { devices ->
-            devices.filter { device ->
-                featureFilter.any { feature ->
-                    device.hasFeature(feature)
-                }
+            val currentAddresses = devices.map { it.address }
+
+            seenDevicesLock.withLock {
+                val cleanedCache = seenDevicesCache.filterKeys { currentAddresses.contains(it) }
+                seenDevicesCache.clear()
+                seenDevicesCache.putAll(cleanedCache)
            }
+
+            devices
+                .filter { device -> featureFilter.any { feature -> device.hasFeature(feature) } }
+                .map { device ->
+                    BluetoothDevice2(
+                        internal = device,
+                        seenFirstAt = seenDevicesLock.withLock {
+                            seenDevicesCache[device.address] ?: Instant.now().also {
+                                seenDevicesCache[device.address] = it
+                            }
+                        }
+                    )
+                }
        }

-    fun bondedDevices(): Flow<Set<BluetoothDevice>> = flow {
-        emit(adapter?.bondedDevices ?: throw IllegalStateException("Bluetooth adapter unavailable"))
+    fun bondedDevices(): Flow<Set<BluetoothDevice2>> = flow {
+        val rawDevices = adapter?.bondedDevices ?: throw IllegalStateException("Bluetooth adapter unavailable")
+        val wrappedDevices = rawDevices.map { device ->
+
+            BluetoothDevice2(
+                internal = device,
+                seenFirstAt = seenDevicesLock.withLock {
+                    seenDevicesCache[device.address] ?: Instant.now().also {
+                        seenDevicesCache[device.address] = it
+                    }
+                }
+            )
+
+        }.toSet()
+        emit(wrappedDevices)
    }

-    suspend fun nudgeConnection(device: BluetoothDevice): Boolean = getBluetoothProfile().map { bluetoothProfile ->
+    suspend fun nudgeConnection(device: BluetoothDevice2): Boolean = getBluetoothProfile().map { bluetoothProfile ->
        try {
            log(TAG) { "Nudging Android connection to $device" }

@@ -169,7 +215,7 @@ class BluetoothManager2 @Inject constructor(
                "connect", BluetoothDevice::class.java
            ).apply { isAccessible = true }

-            connectMethod.invoke(bluetoothProfile.proxy, device)
+            connectMethod.invoke(bluetoothProfile.proxy, device.internal)

            log(TAG) { "Nudged connection to $device" }
            true
@@ -2,7 +2,7 @@ package eu.darken.capod.common.bluetooth

 import dagger.Reusable
 import eu.darken.capod.common.SystemClockWrap
-import eu.darken.capod.common.debug.autoreport.DebugSettings
+import eu.darken.capod.common.debug.DebugSettings
 import java.time.Instant
 import javax.inject.Inject
 import kotlin.random.Random
@@ -12,7 +12,7 @@ class FakeBleData @Inject constructor(
    private val debugSettings: DebugSettings,
 ) {

-    fun maybeAddfakeData(originals: List<BleScanResult>): List<BleScanResult> {
+    fun maybeAddfakeData(originals: Collection<BleScanResult>): Collection<BleScanResult> {
        if (!debugSettings.showFakeData.value) return originals
        return originals + getFakeData()
    }
@@ -27,9 +27,7 @@ class FakeBleData @Inject constructor(
            generatedAtNanos = SystemClockWrap.elapsedRealtimeNanos + 100,
            manufacturerSpecificData = mapOf(76 to "07 19 01 02 20 75 AA B6 31 00 05 9C 5A A4 5D C0 2C A0 B4 6F B9 ED 8E CE 03 97 CA".hexToByteArray())
        ).run {
-            if (Random.nextBoolean()) {
-                fakeDevices.add(this)
-            }
+            fakeDevices.add(this)
        }

        // AirPods Gen2
@@ -40,9 +38,7 @@ class FakeBleData @Inject constructor(
            generatedAtNanos = SystemClockWrap.elapsedRealtimeNanos + 100,
            manufacturerSpecificData = mapOf(76 to "07 19 01 0F 20 75 AA B6 31 00 05 9C 5A A4 5D C0 2C A0 B4 6F B9 ED 8E CE 03 97 CA".hexToByteArray())
        ).run {
-            if (Random.nextBoolean()) {
-                fakeDevices.add(this)
-            }
+            fakeDevices.add(this)
        }

        // AirPods Gen3
@@ -53,9 +49,7 @@ class FakeBleData @Inject constructor(
            generatedAtNanos = SystemClockWrap.elapsedRealtimeNanos + 200,
            manufacturerSpecificData = mapOf(76 to "07 19 01 13 20 55 AF 56 31 00 06 6F E4 DF 10 AF 10 60 81 03 3B 76 D9 C7 11 22 88".hexToByteArray())
        ).run {
-            if (Random.nextBoolean()) {
-                fakeDevices.add(this)
-            }
+            fakeDevices.add(this)
        }
        // AirPods Max
        BleScanResult(
@@ -65,9 +59,7 @@ class FakeBleData @Inject constructor(
            generatedAtNanos = SystemClockWrap.elapsedRealtimeNanos + 300,
            manufacturerSpecificData = mapOf(76 to "07 19 01 0A 20 02 05 80 04 0F 44 A7 60 9B F8 3C FD B1 D8 1C 61 EA 82 60 A3 2C 4E".hexToByteArray())
        ).run {
-            if (Random.nextBoolean()) {
-                fakeDevices.add(this)
-            }
+            fakeDevices.add(this)
        }
        // BeatsFlex
        BleScanResult(
@@ -77,9 +69,7 @@ class FakeBleData @Inject constructor(
            generatedAtNanos = SystemClockWrap.elapsedRealtimeNanos + 400,
            manufacturerSpecificData = mapOf(76 to "07 19 01 10 20 0A F4 8F 00 01 00 C4 71 9F 9C EF A2 E3 BA 66 FE 1D 45 9F C9 2F A0".hexToByteArray())
        ).run {
-            if (Random.nextBoolean()) {
-                fakeDevices.add(this)
-            }
+            fakeDevices.add(this)
        }

        // Tws i99999
@@ -90,9 +80,7 @@ class FakeBleData @Inject constructor(
            generatedAtNanos = SystemClockWrap.elapsedRealtimeNanos + 400,
            manufacturerSpecificData = mapOf(76 to "07 13 01 02 20 71 AA 37 32 00 10 00 64 64 FF 00 00 00 00 00 00".hexToByteArray())
        ).run {
-            if (Random.nextBoolean()) {
-                fakeDevices.add(this)
-            }
+            fakeDevices.add(this)
        }

        // Unknown Device
@@ -103,9 +91,7 @@ class FakeBleData @Inject constructor(
            generatedAtNanos = SystemClockWrap.elapsedRealtimeNanos + 500,
            manufacturerSpecificData = mapOf(76 to "07 19 01 FF 20 0A F4 8F 00 01 00 C4 71 9F 9C EF A2 E3 BA 66 FE 1D 45 9F C9 2F A0".hexToByteArray())
        ).run {
-            if (Random.nextBoolean()) {
-                fakeDevices.add(this)
-            }
+            fakeDevices.add(this)
        }

        return fakeDevices
@@ -0,0 +1,10 @@
+package eu.darken.capod.common.collections
+
+
+fun Collection<Int>.median(): Int = this.sorted().let {
+    if (it.size % 2 == 0) {
+        (it[it.size / 2] + it[(it.size - 1) / 2]) / 2
+    } else {
+        it[it.size / 2]
+    }
+}
@@ -1,13 +1,13 @@
 package eu.darken.capod.common.debug

-import com.bugsnag.android.Bugsnag
+import eu.darken.capod.common.debug.autoreport.AutomaticBugReporter
 import eu.darken.capod.common.debug.logging.Logging.Priority.*
 import eu.darken.capod.common.debug.logging.asLog
 import eu.darken.capod.common.debug.logging.log
 import eu.darken.capod.common.debug.logging.logTag

 object Bugs {
-    var ready = false
+    var reporter: AutomaticBugReporter? = null
    fun report(
        tag: String,
        message: String,
@@ -16,11 +16,9 @@ object Bugs {
        log(TAG, VERBOSE) { "Reporting $exception" }
        log(tag, ERROR) { "$message\n${exception.asLog()}" }

-        if (!ready) {
+        reporter?.notify(exception) ?: run {
            log(TAG, WARN) { "Bug tracking not initialized yet." }
-            return
        }
-        Bugsnag.notify(exception)
    }

    private val TAG = logTag("Bugs")
@@ -1,4 +1,4 @@
-package eu.darken.capod.common.debug.autoreport
+package eu.darken.capod.common.debug

 import android.content.Context
 import android.content.SharedPreferences
@@ -1,60 +0,0 @@
-package eu.darken.capod.common.debug.autoreport
-
-import android.content.Context
-import com.bugsnag.android.Bugsnag
-import com.bugsnag.android.Configuration
-import dagger.hilt.android.qualifiers.ApplicationContext
-import eu.darken.capod.common.BuildConfigWrap
-import eu.darken.capod.common.InstallId
-import eu.darken.capod.common.debug.Bugs
-import eu.darken.capod.common.debug.autoreport.bugsnag.BugsnagErrorHandler
-import eu.darken.capod.common.debug.autoreport.bugsnag.BugsnagLogger
-import eu.darken.capod.common.debug.autoreport.bugsnag.NOPBugsnagErrorHandler
-import eu.darken.capod.common.debug.logging.Logging
-import eu.darken.capod.common.debug.logging.log
-import eu.darken.capod.common.debug.logging.logTag
-import javax.inject.Inject
-import javax.inject.Provider
-import javax.inject.Singleton
-
-@Singleton
-class AutoReporting @Inject constructor(
-    @ApplicationContext private val context: Context,
-    private val debugSettings: DebugSettings,
-    private val installId: InstallId,
-    private val bugsnagLogger: Provider<BugsnagLogger>,
-    private val bugsnagErrorHandler: Provider<BugsnagErrorHandler>,
-    private val nopBugsnagErrorHandler: Provider<NOPBugsnagErrorHandler>,
-) {
-
-    fun setup() {
-        val isEnabled = debugSettings.isAutoReportingEnabled.value
-        log(TAG) { "setup(): isEnabled=$isEnabled" }
-
-        try {
-            val bugsnagConfig = Configuration.load(context).apply {
-                if (debugSettings.isAutoReportingEnabled.value) {
-                    Logging.install(bugsnagLogger.get())
-                    setUser(installId.id, null, null)
-                    autoTrackSessions = true
-                    addOnError(bugsnagErrorHandler.get())
-                    addMetadata("App", "buildFlavor", BuildConfigWrap.FLAVOR)
-                    log(TAG) { "Bugsnag setup done!" }
-                } else {
-                    autoTrackSessions = false
-                    addOnError(nopBugsnagErrorHandler.get())
-                    log(TAG) { "Installing Bugsnag NOP error handler due to user opt-out!" }
-                }
-            }
-
-            Bugsnag.start(context, bugsnagConfig)
-            Bugs.ready = true
-        } catch (e: IllegalStateException) {
-            log(TAG) { "Bugsnag API Key not configured." }
-        }
-    }
-
-    companion object {
-        private val TAG = logTag("Debug", "AutoReport")
-    }
-}
@@ -0,0 +1,10 @@
+package eu.darken.capod.common.debug.autoreport
+
+import android.app.Application
+
+interface AutomaticBugReporter {
+
+    fun setup(application: Application)
+
+    fun notify(throwable: Throwable)
+}
@@ -1,58 +0,0 @@
-package eu.darken.capod.common.debug.autoreport.bugsnag
-
-import android.annotation.SuppressLint
-import android.content.Context
-import android.content.pm.PackageManager
-import com.bugsnag.android.Event
-import com.bugsnag.android.OnErrorCallback
-import dagger.hilt.android.qualifiers.ApplicationContext
-import eu.darken.capod.common.BuildConfigWrap
-import eu.darken.capod.common.debug.autoreport.DebugSettings
-import eu.darken.capod.common.debug.logging.Logging.Priority.WARN
-import eu.darken.capod.common.debug.logging.asLog
-import eu.darken.capod.common.debug.logging.log
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class BugsnagErrorHandler @Inject constructor(
-    @ApplicationContext private val context: Context,
-    private val bugsnagLogger: BugsnagLogger,
-    private val debugSettings: DebugSettings,
-) : OnErrorCallback {
-
-    override fun onError(event: Event): Boolean {
-        bugsnagLogger.injectLog(event)
-
-        TAB_APP.also { tab ->
-            event.addMetadata(tab, "gitSha", BuildConfigWrap.GIT_SHA)
-            event.addMetadata(tab, "buildTime", BuildConfigWrap.BUILDTIME)
-
-            context.tryFormattedSignature()?.let { event.addMetadata(tab, "signatures", it) }
-        }
-
-        return debugSettings.isAutoReportingEnabled.value && !eu.darken.capod.common.BuildConfigWrap.DEBUG
-    }
-
-    companion object {
-        private const val TAB_APP = "app"
-
-        @Suppress("DEPRECATION")
-        @SuppressLint("PackageManagerGetSignatures")
-        fun Context.tryFormattedSignature(): String? = try {
-            packageManager.getPackageInfo(packageName, PackageManager.GET_SIGNATURES).signatures?.let { sigs ->
-                val sb = StringBuilder("[")
-                for (i in sigs.indices) {
-                    sb.append(sigs[i].hashCode())
-                    if (i + 1 != sigs.size) sb.append(", ")
-                }
-                sb.append("]")
-                sb.toString()
-            }
-        } catch (e: Exception) {
-            log(WARN) { e.asLog() }
-            null
-        }
-    }
-
-}
@@ -1,47 +0,0 @@
-package eu.darken.capod.common.debug.autoreport.bugsnag
-
-import com.bugsnag.android.Event
-import eu.darken.capod.common.debug.logging.Logging
-import eu.darken.capod.common.debug.logging.asLog
-import java.lang.String.format
-import java.util.*
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class BugsnagLogger @Inject constructor() : Logging.Logger {
-
-    // Adding one to the initial size accounts for the add before remove.
-    private val buffer: Deque<String> = ArrayDeque(BUFFER_SIZE + 1)
-
-    override fun log(priority: Logging.Priority, tag: String, message: String, metaData: Map<String, Any>?) {
-        val line = "${System.currentTimeMillis()} ${priority.toLabel()}/$tag: $message"
-        synchronized(buffer) {
-            buffer.addLast(line)
-            if (buffer.size > BUFFER_SIZE) {
-                buffer.removeFirst()
-            }
-        }
-    }
-
-    fun injectLog(event: Event) {
-        synchronized(buffer) {
-            var i = 100
-            buffer.forEach { event.addMetadata("Log", format(Locale.ROOT, "%03d", i++), it) }
-            event.addMetadata("Log", format(Locale.ROOT, "%03d", i), event.originalError?.asLog())
-        }
-    }
-
-    companion object {
-        private const val BUFFER_SIZE = 200
-
-        private fun Logging.Priority.toLabel(): String = when (this) {
-            Logging.Priority.VERBOSE -> "V"
-            Logging.Priority.DEBUG -> "D"
-            Logging.Priority.INFO -> "I"
-            Logging.Priority.WARN -> "W"
-            Logging.Priority.ERROR -> "E"
-            Logging.Priority.ASSERT -> "WTF"
-        }
-    }
-}
@@ -1,19 +0,0 @@
-package eu.darken.capod.common.debug.autoreport.bugsnag
-
-import com.bugsnag.android.Event
-import com.bugsnag.android.OnErrorCallback
-import eu.darken.capod.common.debug.logging.Logging.Priority.WARN
-import eu.darken.capod.common.debug.logging.asLog
-import eu.darken.capod.common.debug.logging.log
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class NOPBugsnagErrorHandler @Inject constructor() : OnErrorCallback {
-
-    override fun onError(event: Event): Boolean {
-        log(WARN) { "Error, but skipping bugsnag due to user opt-out: ${event.originalError?.asLog()}" }
-        return false
-    }
-
-}
@@ -9,4 +9,9 @@ object PendingIntentCompat {
    } else {
        0
    }
+    val FLAG_MUTABLE: Int = if (hasApiLevel(31)) {
+        PendingIntent.FLAG_MUTABLE
+    } else {
+        0
+    }
 }
@@ -3,6 +3,7 @@ package eu.darken.capod.common.uix
 import android.content.Intent
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.view.WindowCompat
 import androidx.lifecycle.LiveData
 import eu.darken.capod.common.debug.logging.Logging.Priority.VERBOSE
 import eu.darken.capod.common.debug.logging.log
@@ -15,6 +16,8 @@ abstract class Activity2 : AppCompatActivity() {
    override fun onCreate(savedInstanceState: Bundle?) {
        log(tag, VERBOSE) { "onCreate(savedInstanceState=$savedInstanceState)" }
        super.onCreate(savedInstanceState)
+
+        WindowCompat.setDecorFitsSystemWindows( window, false )
    }

    override fun onResume() {
@@ -7,6 +7,8 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.annotation.LayoutRes
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
 import androidx.fragment.app.Fragment
 import eu.darken.capod.common.debug.logging.Logging.Priority.VERBOSE
 import eu.darken.capod.common.debug.logging.log
@@ -40,6 +42,17 @@ abstract class Fragment2(@LayoutRes val layoutRes: Int?) : Fragment(layoutRes ?:
    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
        log(tag, VERBOSE) { "onViewCreated(view=$view, savedInstanceState=$savedInstanceState)" }
        super.onViewCreated(view, savedInstanceState)
+
+        ViewCompat.setOnApplyWindowInsetsListener(view) { v, insets ->
+            val systemWindowInsets = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+            v.setPadding(
+                v.paddingLeft,
+                systemWindowInsets.top,
+                v.paddingRight,
+                0
+            )
+            insets
+        }
    }

    override fun onActivityCreated(savedInstanceState: Bundle?) {
@@ -8,6 +8,7 @@ import eu.darken.capod.common.error.ErrorEventSource
 import eu.darken.capod.common.flow.setupCommonEventHandlers
 import eu.darken.capod.common.livedata.SingleLiveEvent
 import eu.darken.capod.common.navigation.NavEventSource
+import eu.darken.capod.common.navigation.navVia
 import kotlinx.coroutines.CoroutineExceptionHandler
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.launchIn
@@ -31,4 +32,7 @@ abstract class ViewModel3(
        .setupCommonEventHandlers(TAG) { "launchInViewModel()" }
        .launchIn(vmScope)

+    fun NavDirections.navigate() {
+        navVia(navEvents)
+    }
 }
@@ -6,7 +6,7 @@ import androidx.preference.PreferenceDataStore
 import com.squareup.moshi.Moshi
 import dagger.hilt.android.qualifiers.ApplicationContext
 import eu.darken.capod.common.bluetooth.ScannerMode
-import eu.darken.capod.common.debug.autoreport.DebugSettings
+import eu.darken.capod.common.debug.DebugSettings
 import eu.darken.capod.common.preferences.PreferenceStoreMapper
 import eu.darken.capod.common.preferences.Settings
 import eu.darken.capod.common.preferences.createFlowPreference
@@ -23,51 +23,34 @@ class GeneralSettings @Inject constructor(

    override val preferences: SharedPreferences = context.getSharedPreferences("settings_general", Context.MODE_PRIVATE)

-    val monitorMode = preferences.createFlowPreference(
-        "core.monitor.mode",
-        MonitorMode.AUTOMATIC,
-        moshi
-    )
+    val monitorMode = preferences.createFlowPreference("core.monitor.mode", MonitorMode.AUTOMATIC, moshi)
+    val scannerMode = preferences.createFlowPreference("core.scanner.mode", ScannerMode.BALANCED, moshi)

-    val scannerMode = preferences.createFlowPreference(
-        "core.scanner.mode",
-        ScannerMode.LOW_LATENCY,
-        moshi
-    )
+    val showAll = preferences.createFlowPreference("core.showall.enabled", true)

-    val compatibilityMode = preferences.createFlowPreference(
-        "core.compatibility.enabled",
+    val minimumSignalQuality = preferences.createFlowPreference("core.signal.minimum", 0.25f)
+
+    val mainDeviceAddress = preferences.createFlowPreference<String?>("core.maindevice.address", null)
+    val mainDeviceModel = preferences.createFlowPreference("core.maindevice.model", PodDevice.Model.UNKNOWN, moshi)
+
+    val isOffloadedFilteringDisabled = preferences.createFlowPreference(
+        "core.compat.offloaded.filtering.disabled",
        false
    )
+    val isOffloadedBatchingDisabled = preferences.createFlowPreference("core.compat.offloaded.batching.disabled", false)
+    val useIndirectScanResultCallback = preferences.createFlowPreference("core.compat.indirectcallback.enabled", false)

-    val showAll = preferences.createFlowPreference(
-        "core.showall.enabled",
-        false
-    )
-
-    val minimumSignalQuality = preferences.createFlowPreference(
-        "core.signal.minimum",
-        0.25f
-    )
-
-    val mainDeviceAddress = preferences.createFlowPreference<String?>(
-        "core.maindevice.address",
-        null
-    )
-
-    val mainDeviceModel = preferences.createFlowPreference<PodDevice.Model>(
-        "core.maindevice.model",
-        PodDevice.Model.UNKNOWN,
-        moshi
-    )
+    val isOnboardingDone = preferences.createFlowPreference("core.onboarding.done", false)

    override val preferenceDataStore: PreferenceDataStore = PreferenceStoreMapper(
        monitorMode,
        scannerMode,
-        compatibilityMode,
        showAll,
        minimumSignalQuality,
        mainDeviceAddress,
+        isOffloadedFilteringDisabled,
+        isOffloadedBatchingDisabled,
+        useIndirectScanResultCallback,
        debugSettings.isAutoReportingEnabled,
    )
 }
@@ -1,18 +0,0 @@
-package eu.darken.capod.monitor.core
-
-import dagger.BindsInstance
-import dagger.hilt.DefineComponent
-import dagger.hilt.components.SingletonComponent
-
-@MonitorScope
-@DefineComponent(parent = SingletonComponent::class)
-interface MonitorComponent {
-
-    @DefineComponent.Builder
-    interface Builder {
-
-        fun coroutineScope(@BindsInstance coroutineScope: MonitorCoroutineScope): Builder
-
-        fun build(): MonitorComponent
-    }
-}
@@ -1,16 +0,0 @@
-package eu.darken.capod.monitor.core
-
-import dagger.Binds
-import dagger.Module
-import dagger.hilt.InstallIn
-import kotlinx.coroutines.CoroutineScope
-
-@InstallIn(MonitorComponent::class)
-@Module()
-abstract class ProcessorModule {
-
-    @Binds
-    @MonitorScope
-    abstract fun processorScope(scope: MonitorCoroutineScope): CoroutineScope
-
-}
@@ -1,8 +0,0 @@
-package eu.darken.capod.monitor.core
-
-import javax.inject.Qualifier
-
-@Qualifier
-@MustBeDocumented
-@Retention(AnnotationRetention.RUNTIME)
-annotation class MonitorScope
@@ -4,14 +4,17 @@ 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.DebugSettings
 import eu.darken.capod.common.debug.logging.Logging.Priority.VERBOSE
 import eu.darken.capod.common.debug.logging.Logging.Priority.WARN
 import eu.darken.capod.common.debug.logging.asLog
 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.common.flow.setupCommonEventHandlers
+import eu.darken.capod.common.flow.throttleLatest
 import eu.darken.capod.main.core.GeneralSettings
 import eu.darken.capod.main.core.PermissionTool
 import eu.darken.capod.pods.core.PodDevice
@@ -79,28 +82,54 @@ class PodMonitor @Inject constructor(

    val mainDevice: Flow<PodDevice?> = devices
        .map { determineMainDevice(it) }
+        .setupCommonEventHandlers(TAG) { "mainDevice" }
        .replayingShare(appScope)

+    private data class ScannerOptions(
+        val scannerMode: ScannerMode,
+        val showUnfiltered: Boolean,
+        val offloadedFilteringDisabled: Boolean,
+        val offloadedBatchingDisabled: Boolean,
+        val disableDirectCallback: Boolean,
+    )
+
    private fun createBleScanner() = combine(
        generalSettings.scannerMode.flow,
-        generalSettings.compatibilityMode.flow,
-        debugSettings.showUnfiltered.flow
-    ) { scannerMode, compatMode, unfiltered ->
-        Triple(scannerMode, compatMode, unfiltered)
+        debugSettings.showUnfiltered.flow,
+        generalSettings.isOffloadedBatchingDisabled.flow,
+        generalSettings.isOffloadedFilteringDisabled.flow,
+        generalSettings.useIndirectScanResultCallback.flow,
+    ) {
+            scannermode,
+            showUnfiltered,
+            isOffloadedBatchingDisabled,
+            isOffloadedFilteringDisabled,
+            useIndirectScanResultCallback,
+        ->
+        ScannerOptions(
+            scannerMode = scannermode,
+            showUnfiltered = showUnfiltered,
+            offloadedFilteringDisabled = isOffloadedFilteringDisabled,
+            offloadedBatchingDisabled = isOffloadedBatchingDisabled,
+            disableDirectCallback = useIndirectScanResultCallback,
+        )
    }
-        .flatMapLatest { (mode, compat, unfiltered) ->
+        .throttleLatest(1000)
+        .flatMapLatest { options ->
            val filters = when {
-                unfiltered -> {
+                options.showUnfiltered -> {
                    log(TAG, WARN) { "Using unfiltered scan mode" }
-                    setOf(getUnfilteredFilter())
+                    setOf(ScanFilter.Builder().build())
                }
                else -> ProximityPairing.getBleScanFilter()
            }

            bleScanner.scan(
                filters = filters,
-                scannerMode = mode,
-                compatMode = compat,
+                scannerMode = options.scannerMode,
+                disableOffloadFiltering = options.offloadedFilteringDisabled,
+                disableOffloadBatching = options.offloadedBatchingDisabled,
+                disableDirectScanCallback = options.disableDirectCallback,
            ).map { preFilterAndMap(it) }
        }

@@ -132,7 +161,7 @@ class PodMonitor @Inject constructor(
        return pods
    }

-    private suspend fun preFilterAndMap(rawResults: List<BleScanResult>): List<PodFactory.Result> = rawResults
+    private suspend fun preFilterAndMap(rawResults: Collection<BleScanResult>): List<PodFactory.Result> = rawResults
        .groupBy { it.address }
        .values
        .map { sameAdrDevs ->
@@ -185,10 +214,6 @@ class PodMonitor @Inject constructor(
            .also { log(TAG) { "Cached mainDevice is $it" } }
    }

-    private fun getUnfilteredFilter(): ScanFilter {
-        return ScanFilter.Builder().build()
-    }
-
    companion object {
        private val TAG = logTag("Monitor", "PodMonitor")
    }
@@ -1,5 +1,8 @@
 package eu.darken.capod.pods.core

+import androidx.annotation.DrawableRes
+import eu.darken.capod.common.R
+
 interface DualPodDevice : PodDevice {

    enum class Pod {
@@ -10,4 +13,12 @@ interface DualPodDevice : PodDevice {
    val batteryLeftPodPercent: Float?

    val batteryRightPodPercent: Float?
+
+    @get:DrawableRes
+    val leftPodIcon: Int
+        get() = R.drawable.devic_airpods_gen1_left
+
+    @get:DrawableRes
+    val rightPodIcon: Int
+        get() = R.drawable.devic_airpods_gen1_right
 }
@@ -1,9 +1,15 @@
 package eu.darken.capod.pods.core

+import androidx.annotation.DrawableRes
+import eu.darken.capod.common.R
+
 interface HasCase {

    val batteryCasePercent: Float?

    val isCaseCharging: Boolean

+    @get:DrawableRes
+    val caseIcon: Int
+        get() = R.drawable.devic_airpods_gen1_case
 }
@@ -6,8 +6,11 @@ import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 import eu.darken.capod.common.R
 import eu.darken.capod.common.bluetooth.BleScanResult
+import eu.darken.capod.common.debug.logging.Logging.Priority.VERBOSE
+import eu.darken.capod.common.debug.logging.log
+import java.time.Duration
 import java.time.Instant
-import java.util.*
+import java.util.UUID
 import kotlin.math.abs
 import kotlin.math.max

@@ -31,14 +34,20 @@ interface PodDevice {
    val rssi: Int
        get() = scanResult.rssi

-    val confidence: Float
+    val reliability: Float

-    /**
-     * This is not correct but it works ¯\_(ツ)_/¯
-     * The range of the RSSI is device specific (ROMs).
-     */
    val signalQuality: Float
-        get() = ((100 - abs(rssi)) / 100f) * (max(BASE_CONFIDENCE, confidence))
+        get() {
+            /**
+             * This is not correct but it works ¯\_(ツ)_/¯
+             * The range of the RSSI is device specific (ROMs).
+             */
+            val sqRssi = ((100 - abs(rssi)) / 100f)
+            val sqReliability = max(BASE_CONFIDENCE, reliability)
+            val sqAge = (Duration.between(seenFirstAt, Instant.now()).toMinutes().coerceAtMost(60) / 60f) * 0.25f
+            log(VERBOSE) { "Signal Quality ($address): rssi=$sqRssi, reliability=$reliability, age=$sqAge" }
+            return (sqRssi + sqReliability + sqAge) / 2f
+        }

    val rawData: Map<Int, ByteArray>
        get() = scanResult.manufacturerSpecificData
@@ -60,31 +69,35 @@ interface PodDevice {
    @JsonClass(generateAdapter = false)
    enum class Model(
        val label: String,
-        @DrawableRes val iconRes: Int = R.drawable.ic_device_generic_earbuds,
+        @DrawableRes val iconRes: Int = R.drawable.devic_earbuds_generic_both,
    ) {
        @Json(name = "airpods.gen1") AIRPODS_GEN1(
            label = "AirPods (Gen 1)",
-            iconRes = R.drawable.ic_device_airpods_gen1,
+            iconRes = R.drawable.devic_airpods_gen1_both,
        ),
        @Json(name = "airpods.gen2") AIRPODS_GEN2(
            "AirPods (Gen 2)",
-            R.drawable.ic_device_airpods_gen2,
+            R.drawable.devic_airpods_gen2_both,
        ),
        @Json(name = "airpods.gen3") AIRPODS_GEN3(
            "AirPods (Gen 3)",
-            R.drawable.ic_device_airpods_gen2,
+            R.drawable.devic_airpods_gen2_both,
        ),
        @Json(name = "airpods.pro") AIRPODS_PRO(
            "AirPods Pro",
-            R.drawable.ic_device_airpods_gen2
+            R.drawable.devic_airpods_pro2_both
        ),
        @Json(name = "airpods.pro2") AIRPODS_PRO2(
            "AirPods Pro 2",
-            R.drawable.ic_device_airpods_gen2
+            R.drawable.devic_airpods_pro2_both
+        ),
+        @Json(name = "airpods.pro2.usbc") AIRPODS_PRO2_USBC(
+            "AirPods Pro 2 USB-C",
+            R.drawable.devic_airpods_pro2_both
        ),
        @Json(name = "airpods.max") AIRPODS_MAX(
            "AirPods Max",
-            R.drawable.ic_device_generic_headphones
+            R.drawable.devic_headphones_generic
        ),
        @Json(name = "beats.flex") BEATS_FLEX(
            "Beats Flex"
@@ -104,11 +117,28 @@ interface PodDevice {
        @Json(name = "beats.powerbeats.pro") POWERBEATS_PRO(
            "Power Beats Pro"
        ),
-        @Json(name = "fakes.tws.i99999") TWS_I99999(
-            "TWS i99999"
+        @Json(name = "beats.fit.pro") BEATS_FIT_PRO(
+            "Beats Fit Pro"
        ),
-        @Json(name = "fakes.varunr.airpodspro") VARUNR_AIRPODS_PRO(
-            "Fake AirPods Pro"
+        @Json(name = "fakes.tws.i99999") FAKE_AIRPODS_GEN1(
+            "AirPods (Gen 1)? \uD83C\uDFAD",
+            R.drawable.devic_airpods_gen1_both,
+        ),
+        @Json(name = "fakes.generic.airpods.gen2") FAKE_AIRPODS_GEN2(
+            "AirPods (Gen 2)? \uD83C\uDFAD",
+            R.drawable.devic_airpods_gen2_both,
+        ),
+        @Json(name = "fakes.generic.airpods.gen3") FAKE_AIRPODS_GEN3(
+            "AirPods (Gen 3)? \uD83C\uDFAD",
+            R.drawable.devic_airpods_gen2_both,
+        ),
+        @Json(name = "fakes.varunr.airpodspro") FAKE_AIRPODS_PRO(
+            "AirPods Pro? \uD83C\uDFAD",
+            R.drawable.devic_airpods_pro2_both,
+        ),
+        @Json(name = "fakes.generic.airpods.pro2") FAKE_AIRPODS_PRO2(
+            "AirPods Pro2? \uD83C\uDFAD",
+            R.drawable.devic_airpods_pro2_both,
        ),
        @Json(name = "unknown") UNKNOWN(
            "Unknown"
@@ -116,6 +146,6 @@ interface PodDevice {
    }

    companion object {
-        const val BASE_CONFIDENCE = 0.5f
+        const val BASE_CONFIDENCE = 0.0f
    }
 }
@@ -25,8 +25,8 @@ fun SinglePodDevice.getBatteryLevelHeadset(context: Context): String =
        ?: context.getString(R.string.general_value_not_available_label)

 fun PodDevice.getSignalQuality(context: Context): String {
-    val percentage = 100 * signalQuality
-    return "~${percentage.roundToInt()}%"
+    val multiplier = 100 * signalQuality
+    return "${multiplier.roundToInt()}"
 }

@DrawableRes
@@ -7,8 +7,7 @@ import dagger.hilt.components.SingletonComponent
 import dagger.multibindings.IntoSet
 import eu.darken.capod.pods.core.apple.airpods.*
 import eu.darken.capod.pods.core.apple.beats.*
-import eu.darken.capod.pods.core.apple.misc.Twsi99999
-import eu.darken.capod.pods.core.apple.misc.VarunrAirPodsPro
+import eu.darken.capod.pods.core.apple.misc.*

@InstallIn(SingletonComponent::class)
@Module
@@ -20,6 +19,7 @@ abstract class AppleFactoryModule {

    @Binds @IntoSet abstract fun airPodsPro(factory: AirPodsPro.Factory): ApplePodsFactory<out ApplePods>
    @Binds @IntoSet abstract fun airPodsPro2(factory: AirPodsPro2.Factory): ApplePodsFactory<out ApplePods>
+    @Binds @IntoSet abstract fun airPodsPro2Usbc(factory: AirPodsPro2Usbc.Factory): ApplePodsFactory<out ApplePods>
    @Binds @IntoSet abstract fun airPodsMax(factory: AirPodsMax.Factory): ApplePodsFactory<out ApplePods>

    @Binds @IntoSet abstract fun beatsFlex(factory: BeatsFlex.Factory): ApplePodsFactory<out ApplePods>
@@ -28,8 +28,11 @@ abstract class AppleFactoryModule {
    @Binds @IntoSet abstract fun beatsX(factory: BeatsX.Factory): ApplePodsFactory<out ApplePods>
    @Binds @IntoSet abstract fun powerBeats3(factory: PowerBeats3.Factory): ApplePodsFactory<out ApplePods>
    @Binds @IntoSet abstract fun powerBeatsPro(factory: PowerBeatsPro.Factory): ApplePodsFactory<out ApplePods>
+    @Binds @IntoSet abstract fun beatsFitPro(factory: BeatsFitPro.Factory): ApplePodsFactory<out ApplePods>

-    @Binds @IntoSet abstract fun fakesTwsi999999(factory: Twsi99999.Factory): ApplePodsFactory<out ApplePods>
-    @Binds @IntoSet
-    abstract fun fakesVarunrAirPodsPro(factory: VarunrAirPodsPro.Factory): ApplePodsFactory<out ApplePods>
+    @Binds @IntoSet abstract fun fakeAirPodsGen1(factory: FakeAirPodsGen1.Factory): ApplePodsFactory<out ApplePods>
+    @Binds @IntoSet abstract fun fakeAirPodsGen2(factory: FakeAirPodsGen2.Factory): ApplePodsFactory<out ApplePods>
+    @Binds @IntoSet abstract fun fakeAirPodsGen3(factory: FakeAirPodsGen3.Factory): ApplePodsFactory<out ApplePods>
+    @Binds @IntoSet abstract fun fakeAirPodsPro(factory: FakeAirPodsPro.Factory): ApplePodsFactory<out ApplePods>
+    @Binds @IntoSet abstract fun fakeAirPodsPro2(factory: FakeAirPodsPro2.Factory): ApplePodsFactory<out ApplePods>
 }
@@ -1,16 +1,18 @@
 package eu.darken.capod.pods.core.apple

 import eu.darken.capod.common.bluetooth.BleScanResult
+import eu.darken.capod.common.collections.median
 import eu.darken.capod.common.debug.logging.Logging.Priority.VERBOSE
+import eu.darken.capod.common.debug.logging.Logging.Priority.WARN
 import eu.darken.capod.common.debug.logging.log
 import eu.darken.capod.common.lowerNibble
 import eu.darken.capod.common.upperNibble
 import eu.darken.capod.pods.core.HasCase
 import eu.darken.capod.pods.core.PodDevice
-import eu.darken.capod.pods.core.apple.airpods.AirPodsPro
 import eu.darken.capod.pods.core.apple.protocol.ProximityPairing
 import java.time.Duration
 import java.time.Instant
+import kotlin.math.max

 abstract class ApplePodsFactory<PodType : ApplePods>(private val tag: String) {

@@ -37,7 +39,8 @@ abstract class ApplePodsFactory<PodType : ApplePods>(private val tag: String) {
        val id: PodDevice.Id,
        val seenFirstAt: Instant,
        val seenCounter: Int,
-        val history: List<ApplePods>
+        val history: List<ApplePods>,
+        val lastCaseBattery: Float?,
    ) {
        val lastMessage: ProximityPairing.Message
            get() = history.last().proximityMessage
@@ -45,47 +48,81 @@ abstract class ApplePodsFactory<PodType : ApplePods>(private val tag: String) {
        val lastAddress: String
            get() = history.last().address

-        val confidence: Float
-            get() = 0.75f + (history.size / (MAX_HISTORY * 4f))
+        val reliability: Float
+            get() {
+                if (history.size < 2) return 0f

-        fun averageRssi(latest: Int): Int =
-            history.map { it.rssi }.plus(latest).takeLast(10).median()
+                val now = Instant.now()
+
+                val pingInterval = List(history.dropLast(1).size) { index ->
+                    Duration.between(history[index].seenLastAt, history[index + 1].seenLastAt).toMillis()
+                }.map { it.toInt() }.median()
+
+                val expectedPings: Float = LOOKBACK.toMillis() / pingInterval.toFloat()
+
+                val recentPings = history.filter {
+                    Duration.between(it.seenLastAt, now).toMillis() < LOOKBACK.toMillis() + pingInterval
+                }.size
+
+                val reliability: Float = (recentPings / expectedPings)
+                // log("#####") { "interval=$pingInterval, expectedPerMinute=$expectedPings, count=$recentPings" }
+
+                return max(0.0f, reliability).coerceAtMost(1f)
+            }
+
+        fun rssiSmoothed(latest: Int): Int {
+            val now = Instant.now()
+            return history
+                .filter { Duration.between(it.seenLastAt, now) < LOOKBACK }
+                .map { it.rssi }
+                .plus(latest)
+                .median()
+        }

        fun isOlderThan(age: Duration): Boolean {
            val now = Instant.now()
            return Duration.between(history.last().seenLastAt, now) > age
        }

-        private fun List<Int>.median(): Int = this.sorted().let {
-            if (it.size % 2 == 0)
-                (it[it.size / 2] + it[(it.size - 1) / 2]) / 2
-            else
-                it[it.size / 2]
-        }
-
        override fun toString(): String = "KnownDevice(history=${history.size}, last=${history.last()})"

        companion object {
-            const val MAX_HISTORY = 10
+            // 30 seconds at fastest interval
+            const val MAX_HISTORY = 60
+            val LOOKBACK = Duration.ofSeconds(30)
        }
    }

    internal val knownDevices = mutableMapOf<PodDevice.Id, KnownDevice>()


-    fun KnownDevice.getLatestCaseBattery(): Float? = history
+    fun KnownDevice.getLatestCaseBattery(): Float? = this.lastCaseBattery
+
+    private fun Collection<ApplePods>.determineLatestCaseBattery(): Float? = this
        .filterIsInstance<HasCase>()
        .mapNotNull { it.batteryCasePercent }
        .lastOrNull()

-    fun KnownDevice.getLatestCaseLidState(basic: DualAirPods): DualAirPods.LidState? {
-        val definitive = setOf(DualAirPods.LidState.OPEN, DualAirPods.LidState.CLOSED)
-        if (definitive.contains(basic.caseLidState)) return null
+    fun KnownDevice.getLatestCaseLidState(basic: DualApplePods): DualApplePods.LidState? {
+        val definitive = setOf(
+            DualApplePods.LidState.OPEN,
+            DualApplePods.LidState.CLOSED,
+            DualApplePods.LidState.NOT_IN_CASE,
+        )
+        if (definitive.contains(basic.caseLidState)) return basic.caseLidState

        return history
-            .filterIsInstance<AirPodsPro>() // TODO why is this AirPodsPro specific here?
-            .lastOrNull { it.caseLidState != DualAirPods.LidState.NOT_IN_CASE }
+            .takeLast(2)
+            .filterIsInstance<DualApplePods>()
+            .lastOrNull { it.caseLidState != DualApplePods.LidState.UNKNOWN }
            ?.caseLidState
+            ?: DualApplePods.LidState.NOT_IN_CASE
+    }
+
+    open fun historyTrimmer(
+        pods: List<ApplePods>
+    ): List<ApplePods> {
+        return pods.takeLast(KnownDevice.MAX_HISTORY)
    }

    internal open fun searchHistory(current: PodType): KnownDevice? {
@@ -93,7 +130,7 @@ abstract class ApplePodsFactory<PodType : ApplePods>(private val tag: String) {
        val message = current.proximityMessage

        knownDevices.values.toList().forEach { knownDevice ->
-            if (knownDevice.isOlderThan(Duration.ofSeconds(20))) {
+            if (knownDevice.isOlderThan(Duration.ofSeconds(30))) {
                log(tag, VERBOSE) { "searchHistory1: Removing stale known device: $knownDevice" }
                knownDevices.remove(knownDevice.id)
            }
@@ -103,7 +140,7 @@ abstract class ApplePodsFactory<PodType : ApplePods>(private val tag: String) {
            .filter { it.history.size > KnownDevice.MAX_HISTORY }
            .toList()
            .forEach {
-                knownDevices[it.id] = it.copy(history = it.history.takeLast(KnownDevice.MAX_HISTORY))
+                knownDevices[it.id] = it.copy(history = historyTrimmer(it.history))
            }

        var recognizedDevice: KnownDevice? = knownDevices.values
@@ -118,7 +155,7 @@ abstract class ApplePodsFactory<PodType : ApplePods>(private val tag: String) {
        }

        if (recognizedDevice == null) {
-            log(tag) { "searchHistory1: Didn't recognize: $message" }
+            log(tag, WARN) { "searchHistory1: Didn't recognize: $message" }
        }

        return recognizedDevice
@@ -129,18 +166,22 @@ abstract class ApplePodsFactory<PodType : ApplePods>(private val tag: String) {

        knownDevices[device.identifier] = when {
            existing != null -> {
+                val history = existing.history.plus(device)
                existing.copy(
                    seenCounter = existing.seenCounter + 1,
-                    history = existing.history.plus(device)
+                    history = history,
+                    lastCaseBattery = history.determineLatestCaseBattery() ?: existing.lastCaseBattery
                )
            }
            else -> {
                log(tag) { "searchHistory1: Creating new history for $device" }
+                val history = listOf(device)
                KnownDevice(
                    id = device.identifier,
                    seenFirstAt = device.seenFirstAt,
                    seenCounter = 1,
-                    history = listOf(device)
+                    history = history,
+                    lastCaseBattery = history.determineLatestCaseBattery()
                )
            }
        }
@@ -1,8 +1,5 @@
 package eu.darken.capod.pods.core.apple

-import android.content.Context
-import androidx.annotation.StringRes
-import eu.darken.capod.common.R
 import eu.darken.capod.common.debug.logging.log
 import eu.darken.capod.common.isBitSet
 import eu.darken.capod.common.lowerNibble
@@ -10,8 +7,8 @@ import eu.darken.capod.common.upperNibble
 import eu.darken.capod.pods.core.*
 import eu.darken.capod.pods.core.DualPodDevice.Pod

-interface DualAirPods : ApplePods, HasChargeDetectionDual, DualPodDevice, HasEarDetectionDual, HasCase,
-    HasStateDetection, HasDualMicrophone, HasAppleColor {
+interface DualApplePods : ApplePods, HasChargeDetectionDual, DualPodDevice, HasEarDetectionDual, HasCase,
+    HasDualMicrophone, HasAppleColor {

    val primaryPod: Pod
        get() = when (rawStatus.isBitSet(5)) {
@@ -142,21 +139,4 @@ interface DualAirPods : ApplePods, HasChargeDetectionDual, DualPodDevice, HasEar
        UNKNOWN(0xFF..0xFF);
    }

-    override val state: ConnectionState
-        get() = ConnectionState.values().firstOrNull { rawSuffix == it.raw } ?: ConnectionState.UNKNOWN
-
-    enum class ConnectionState(val raw: UByte?, @StringRes val labelRes: Int) : HasStateDetection.State {
-        DISCONNECTED(0x00, R.string.pods_connection_state_disconnected_label),
-        IDLE(0x04, R.string.pods_connection_state_idle_label),
-        MUSIC(0x05, R.string.pods_connection_state_music_label),
-        CALL(0x06, R.string.pods_connection_state_call_label),
-        RINGING(0x07, R.string.pods_connection_state_ringing_label),
-        HANGING_UP(0x09, R.string.pods_connection_state_hanging_up_label),
-        UNKNOWN(null, R.string.pods_connection_state_unknown_label);
-
-        override fun getLabel(context: Context): String = context.getString(labelRes)
-
-        constructor(raw: Int, @StringRes labelRes: Int) : this(raw.toUByte(), labelRes)
-    }
-
 }
@@ -4,9 +4,9 @@ import eu.darken.capod.common.debug.logging.Logging.Priority.DEBUG
 import eu.darken.capod.common.debug.logging.log
 import eu.darken.capod.pods.core.PodDevice

-abstract class DualApplePodsFactory(private val tag: String) : ApplePodsFactory<DualAirPods>(tag) {
+abstract class DualApplePodsFactory(private val tag: String) : ApplePodsFactory<DualApplePods>(tag) {

-    fun DualAirPods.getCaseMatchMarkings() = SplitPodsMarkings(
+    fun DualApplePods.getCaseMatchMarkings() = SplitPodsMarkings(
        leftPodBattery = batteryLeftPodPercent,
        rightPodBattery = batteryRightPodPercent,
        microPhoneLeft = isLeftPodMicrophone,
@@ -31,17 +31,17 @@ abstract class DualApplePodsFactory(private val tag: String) : ApplePodsFactory<
        val model: PodDevice.Model,
    )

-    private fun Collection<KnownDevice>.findSplitPodsMatch(device: DualAirPods): Collection<KnownDevice> {
+    private fun Collection<KnownDevice>.findSplitPodsMatch(device: DualApplePods): Collection<KnownDevice> {
        val target = device.getCaseMatchMarkings()

        return filter { known ->
            known.history
-                .filterIsInstance<DualAirPods>()
+                .filterIsInstance<DualApplePods>()
                .any { it.getCaseMatchMarkings() == target }
        }
    }

-    override fun searchHistory(current: DualAirPods): KnownDevice? {
+    override fun searchHistory(current: DualApplePods): KnownDevice? {
        val basicResult = super.searchHistory(current)

        val caseIgnored = knownDevices.values.findSplitPodsMatch(current)
@@ -4,7 +4,7 @@ import eu.darken.capod.common.bluetooth.BleScanResult
 import eu.darken.capod.common.debug.logging.logTag
 import eu.darken.capod.pods.core.PodDevice
 import eu.darken.capod.pods.core.apple.ApplePods
-import eu.darken.capod.pods.core.apple.DualAirPods
+import eu.darken.capod.pods.core.apple.DualApplePods
 import eu.darken.capod.pods.core.apple.DualApplePodsFactory
 import eu.darken.capod.pods.core.apple.protocol.ProximityPairing
 import java.time.Instant
@@ -17,18 +17,18 @@ data class AirPodsGen1 constructor(
    override val seenCounter: Int = 1,
    override val scanResult: BleScanResult,
    override val proximityMessage: ProximityPairing.Message,
-    override val confidence: Float = PodDevice.BASE_CONFIDENCE,
+    override val reliability: Float = PodDevice.BASE_CONFIDENCE,
    private val rssiAverage: Int? = null,
    private val cachedBatteryPercentage: Float? = null,
-    private val cachedCaseState: DualAirPods.LidState? = null
-) : DualAirPods {
+    private val cachedCaseState: DualApplePods.LidState? = null
+) : DualApplePods {

    override val model: PodDevice.Model = PodDevice.Model.AIRPODS_GEN1

    override val batteryCasePercent: Float?
        get() = super.batteryCasePercent ?: cachedBatteryPercentage

-    override val caseLidState: DualAirPods.LidState
+    override val caseLidState: DualApplePods.LidState
        get() = cachedCaseState ?: super.caseLidState

    override val rssi: Int
@@ -55,9 +55,9 @@ data class AirPodsGen1 constructor(
                seenFirstAt = result.seenFirstAt,
                seenLastAt = scanResult.receivedAt,
                seenCounter = result.seenCounter,
-                confidence = result.confidence,
+                reliability = result.reliability,
                cachedBatteryPercentage = result.getLatestCaseBattery(),
-                rssiAverage = result.averageRssi(basic.rssi),
+                rssiAverage = result.rssiSmoothed(basic.rssi),
                cachedCaseState = result.getLatestCaseLidState(basic)
            )
        }
@@ -4,7 +4,7 @@ import eu.darken.capod.common.bluetooth.BleScanResult
 import eu.darken.capod.common.debug.logging.logTag
 import eu.darken.capod.pods.core.PodDevice
 import eu.darken.capod.pods.core.apple.ApplePods
-import eu.darken.capod.pods.core.apple.DualAirPods
+import eu.darken.capod.pods.core.apple.DualApplePods
 import eu.darken.capod.pods.core.apple.DualApplePodsFactory
 import eu.darken.capod.pods.core.apple.protocol.ProximityPairing
 import java.time.Instant
@@ -17,22 +17,22 @@ data class AirPodsGen2 constructor(
    override val seenCounter: Int = 1,
    override val scanResult: BleScanResult,
    override val proximityMessage: ProximityPairing.Message,
-    override val confidence: Float = PodDevice.BASE_CONFIDENCE,
+    override val reliability: Float = PodDevice.BASE_CONFIDENCE,
    private val rssiAverage: Int? = null,
    private val cachedBatteryPercentage: Float? = null,
-    private val cachedCaseState: DualAirPods.LidState? = null
-) : DualAirPods {
+    private val cachedCaseState: DualApplePods.LidState? = null
+) : DualApplePods, HasStateDetectionAirPods {

    override val model: PodDevice.Model = PodDevice.Model.AIRPODS_GEN2

    override val batteryCasePercent: Float?
        get() = super.batteryCasePercent ?: cachedBatteryPercentage

-    override val caseLidState: DualAirPods.LidState
+    override val caseLidState: DualApplePods.LidState
        get() = cachedCaseState ?: super.caseLidState

    override val rssi: Int
-        get() = rssiAverage ?: super.rssi
+        get() = rssiAverage ?: super<DualApplePods>.rssi

    class Factory @Inject constructor() : DualApplePodsFactory(TAG) {

@@ -54,9 +54,9 @@ data class AirPodsGen2 constructor(
                seenFirstAt = result.seenFirstAt,
                seenLastAt = scanResult.receivedAt,
                seenCounter = result.seenCounter,
-                confidence = result.confidence,
+                reliability = result.reliability,
                cachedBatteryPercentage = result.getLatestCaseBattery(),
-                rssiAverage = result.averageRssi(basic.rssi),
+                rssiAverage = result.rssiSmoothed(basic.rssi),
                cachedCaseState = result.getLatestCaseLidState(basic)
            )
        }
@@ -4,7 +4,7 @@ import eu.darken.capod.common.bluetooth.BleScanResult
 import eu.darken.capod.common.debug.logging.logTag
 import eu.darken.capod.pods.core.PodDevice
 import eu.darken.capod.pods.core.apple.ApplePods
-import eu.darken.capod.pods.core.apple.DualAirPods
+import eu.darken.capod.pods.core.apple.DualApplePods
 import eu.darken.capod.pods.core.apple.DualApplePodsFactory
 import eu.darken.capod.pods.core.apple.protocol.ProximityPairing
 import java.time.Instant
@@ -17,21 +17,22 @@ data class AirPodsGen3 constructor(
    override val seenCounter: Int = 1,
    override val scanResult: BleScanResult,
    override val proximityMessage: ProximityPairing.Message,
-    override val confidence: Float = PodDevice.BASE_CONFIDENCE,
+    override val reliability: Float = PodDevice.BASE_CONFIDENCE,
    private val rssiAverage: Int? = null,
    private val cachedBatteryPercentage: Float? = null,
-    private val cachedCaseState: DualAirPods.LidState? = null
-) : DualAirPods {
+    private val cachedCaseState: DualApplePods.LidState? = null
+) : DualApplePods, HasStateDetectionAirPods {
+
    override val model: PodDevice.Model = PodDevice.Model.AIRPODS_GEN3

    override val batteryCasePercent: Float?
        get() = super.batteryCasePercent ?: cachedBatteryPercentage

-    override val caseLidState: DualAirPods.LidState
+    override val caseLidState: DualApplePods.LidState
        get() = cachedCaseState ?: super.caseLidState

    override val rssi: Int
-        get() = rssiAverage ?: super.rssi
+        get() = rssiAverage ?: super<DualApplePods>.rssi

    class Factory @Inject constructor() : DualApplePodsFactory(TAG) {

@@ -53,9 +54,9 @@ data class AirPodsGen3 constructor(
                seenFirstAt = result.seenFirstAt,
                seenLastAt = scanResult.receivedAt,
                seenCounter = result.seenCounter,
-                confidence = result.confidence,
+                reliability = result.reliability,
                cachedBatteryPercentage = result.getLatestCaseBattery(),
-                rssiAverage = result.averageRssi(basic.rssi),
+                rssiAverage = result.rssiSmoothed(basic.rssi),
                cachedCaseState = result.getLatestCaseLidState(basic)
            )
        }
@@ -3,9 +3,11 @@ package eu.darken.capod.pods.core.apple.airpods
 import eu.darken.capod.common.bluetooth.BleScanResult
 import eu.darken.capod.common.debug.logging.logTag
 import eu.darken.capod.common.isBitSet
+import eu.darken.capod.pods.core.HasChargeDetection
 import eu.darken.capod.pods.core.HasEarDetection
 import eu.darken.capod.pods.core.PodDevice
 import eu.darken.capod.pods.core.apple.ApplePods
+import eu.darken.capod.pods.core.apple.HasAppleColor
 import eu.darken.capod.pods.core.apple.SingleApplePods
 import eu.darken.capod.pods.core.apple.SingleApplePodsFactory
 import eu.darken.capod.pods.core.apple.protocol.ProximityPairing
@@ -19,23 +21,20 @@ data class AirPodsMax(
    override val seenCounter: Int = 1,
    override val scanResult: BleScanResult,
    override val proximityMessage: ProximityPairing.Message,
-    override val confidence: Float = PodDevice.BASE_CONFIDENCE,
+    override val reliability: Float = PodDevice.BASE_CONFIDENCE,
    private val rssiAverage: Int? = null,
-) : SingleApplePods, HasEarDetection {
+) : SingleApplePods, HasEarDetection, HasChargeDetection, HasAppleColor {

    override val model: PodDevice.Model = PodDevice.Model.AIRPODS_MAX

    override val rssi: Int
-        get() = rssiAverage ?: super.rssi
+        get() = rssiAverage ?: super<SingleApplePods>.rssi

-    val isHeadphonesBeingWorn: Boolean
-        get() = rawStatus.isBitSet(1)
-
-    val isHeadsetBeingCharged: Boolean
+    override val isHeadsetBeingCharged: Boolean
        get() = rawFlags.isBitSet(0)

    override val isBeingWorn: Boolean
-        get() = isHeadphonesBeingWorn
+        get() = rawStatus.isBitSet(5)

    class Factory @Inject constructor() : SingleApplePodsFactory(TAG) {

@@ -57,8 +56,8 @@ data class AirPodsMax(
                seenFirstAt = result.seenFirstAt,
                seenLastAt = scanResult.receivedAt,
                seenCounter = result.seenCounter,
-                confidence = result.confidence,
-                rssiAverage = result.averageRssi(basic.rssi),
+                reliability = result.reliability,
+                rssiAverage = result.rssiSmoothed(basic.rssi),
            )
        }
    }
@@ -1,11 +1,13 @@
 package eu.darken.capod.pods.core.apple.airpods

+import androidx.annotation.DrawableRes
+import eu.darken.capod.common.R
 import eu.darken.capod.common.bluetooth.BleScanResult
 import eu.darken.capod.common.debug.logging.logTag
 import eu.darken.capod.pods.core.PodDevice
 import eu.darken.capod.pods.core.apple.ApplePods
-import eu.darken.capod.pods.core.apple.DualAirPods
-import eu.darken.capod.pods.core.apple.DualAirPods.LidState
+import eu.darken.capod.pods.core.apple.DualApplePods
+import eu.darken.capod.pods.core.apple.DualApplePods.LidState
 import eu.darken.capod.pods.core.apple.DualApplePodsFactory
 import eu.darken.capod.pods.core.apple.protocol.ProximityPairing
 import java.time.Instant
@@ -18,14 +20,30 @@ data class AirPodsPro(
    override val seenCounter: Int = 1,
    override val scanResult: BleScanResult,
    override val proximityMessage: ProximityPairing.Message,
-    override val confidence: Float = PodDevice.BASE_CONFIDENCE,
+    override val reliability: Float = PodDevice.BASE_CONFIDENCE,
    private val rssiAverage: Int? = null,
    private val cachedBatteryPercentage: Float? = null,
    private val cachedCaseState: LidState? = null
-) : DualAirPods {
+) : DualApplePods, HasStateDetectionAirPods {

    override val model: PodDevice.Model = PodDevice.Model.AIRPODS_PRO

+    @get:DrawableRes
+    override val iconRes: Int
+        get() = R.drawable.devic_airpods_pro2_both
+
+    @get:DrawableRes
+    override val caseIcon: Int
+        get() = R.drawable.devic_airpods_pro2_case
+
+    @get:DrawableRes
+    override val leftPodIcon: Int
+        get() = R.drawable.devic_airpods_pro2_left
+
+    @get:DrawableRes
+    override val rightPodIcon: Int
+        get() = R.drawable.devic_airpods_pro2_right
+
    override val batteryCasePercent: Float?
        get() = super.batteryCasePercent ?: cachedBatteryPercentage

@@ -33,7 +51,7 @@ data class AirPodsPro(
        get() = cachedCaseState ?: super.caseLidState

    override val rssi: Int
-        get() = rssiAverage ?: super.rssi
+        get() = rssiAverage ?: super<DualApplePods>.rssi

    class Factory @Inject constructor() : DualApplePodsFactory(TAG) {

@@ -55,9 +73,9 @@ data class AirPodsPro(
                seenFirstAt = result.seenFirstAt,
                seenLastAt = scanResult.receivedAt,
                seenCounter = result.seenCounter,
-                confidence = result.confidence,
+                reliability = result.reliability,
                cachedBatteryPercentage = result.getLatestCaseBattery(),
-                rssiAverage = result.averageRssi(basic.rssi),
+                rssiAverage = result.rssiSmoothed(basic.rssi),
                cachedCaseState = result.getLatestCaseLidState(basic)
            )
        }
@@ -1,11 +1,13 @@
 package eu.darken.capod.pods.core.apple.airpods

+import androidx.annotation.DrawableRes
+import eu.darken.capod.common.R
 import eu.darken.capod.common.bluetooth.BleScanResult
 import eu.darken.capod.common.debug.logging.logTag
 import eu.darken.capod.pods.core.PodDevice
 import eu.darken.capod.pods.core.apple.ApplePods
-import eu.darken.capod.pods.core.apple.DualAirPods
-import eu.darken.capod.pods.core.apple.DualAirPods.LidState
+import eu.darken.capod.pods.core.apple.DualApplePods
+import eu.darken.capod.pods.core.apple.DualApplePods.LidState
 import eu.darken.capod.pods.core.apple.DualApplePodsFactory
 import eu.darken.capod.pods.core.apple.protocol.ProximityPairing
 import java.time.Instant
@@ -18,14 +20,30 @@ data class AirPodsPro2(
    override val seenCounter: Int = 1,
    override val scanResult: BleScanResult,
    override val proximityMessage: ProximityPairing.Message,
-    override val confidence: Float = PodDevice.BASE_CONFIDENCE,
+    override val reliability: Float = PodDevice.BASE_CONFIDENCE,
    private val rssiAverage: Int? = null,
    private val cachedBatteryPercentage: Float? = null,
    private val cachedCaseState: LidState? = null
-) : DualAirPods {
+) : DualApplePods, HasStateDetectionAirPods {

    override val model: PodDevice.Model = PodDevice.Model.AIRPODS_PRO2

+    @get:DrawableRes
+    override val iconRes: Int
+        get() = R.drawable.devic_airpods_pro2_both
+
+    @get:DrawableRes
+    override val caseIcon: Int
+        get() = R.drawable.devic_airpods_pro2_case
+
+    @get:DrawableRes
+    override val leftPodIcon: Int
+        get() = R.drawable.devic_airpods_pro2_left
+
+    @get:DrawableRes
+    override val rightPodIcon: Int
+        get() = R.drawable.devic_airpods_pro2_right
+
    override val batteryCasePercent: Float?
        get() = super.batteryCasePercent ?: cachedBatteryPercentage

@@ -33,7 +51,7 @@ data class AirPodsPro2(
        get() = cachedCaseState ?: super.caseLidState

    override val rssi: Int
-        get() = rssiAverage ?: super.rssi
+        get() = rssiAverage ?: super<HasStateDetectionAirPods>.rssi

    class Factory @Inject constructor() : DualApplePodsFactory(TAG) {

@@ -55,9 +73,9 @@ data class AirPodsPro2(
                seenFirstAt = result.seenFirstAt,
                seenLastAt = scanResult.receivedAt,
                seenCounter = result.seenCounter,
-                confidence = result.confidence,
+                reliability = result.reliability,
                cachedBatteryPercentage = result.getLatestCaseBattery(),
-                rssiAverage = result.averageRssi(basic.rssi),
+                rssiAverage = result.rssiSmoothed(basic.rssi),
                cachedCaseState = result.getLatestCaseLidState(basic)
            )
        }
@@ -0,0 +1,89 @@
+package eu.darken.capod.pods.core.apple.airpods
+
+import androidx.annotation.DrawableRes
+import eu.darken.capod.common.R
+import eu.darken.capod.common.bluetooth.BleScanResult
+import eu.darken.capod.common.debug.logging.logTag
+import eu.darken.capod.pods.core.PodDevice
+import eu.darken.capod.pods.core.apple.ApplePods
+import eu.darken.capod.pods.core.apple.DualApplePods
+import eu.darken.capod.pods.core.apple.DualApplePods.LidState
+import eu.darken.capod.pods.core.apple.DualApplePodsFactory
+import eu.darken.capod.pods.core.apple.protocol.ProximityPairing
+import java.time.Instant
+import javax.inject.Inject
+
+data class AirPodsPro2Usbc(
+    override val identifier: PodDevice.Id = PodDevice.Id(),
+    override val seenLastAt: Instant = Instant.now(),
+    override val seenFirstAt: Instant = Instant.now(),
+    override val seenCounter: Int = 1,
+    override val scanResult: BleScanResult,
+    override val proximityMessage: ProximityPairing.Message,
+    override val reliability: Float = PodDevice.BASE_CONFIDENCE,
+    private val rssiAverage: Int? = null,
+    private val cachedBatteryPercentage: Float? = null,
+    private val cachedCaseState: LidState? = null
+) : DualApplePods, HasStateDetectionAirPods {
+
+    override val model: PodDevice.Model = PodDevice.Model.AIRPODS_PRO2_USBC
+
+    @get:DrawableRes
+    override val iconRes: Int
+        get() = R.drawable.devic_airpods_pro2_both
+
+    @get:DrawableRes
+    override val caseIcon: Int
+        get() = R.drawable.devic_airpods_pro2_case
+
+    @get:DrawableRes
+    override val leftPodIcon: Int
+        get() = R.drawable.devic_airpods_pro2_left
+
+    @get:DrawableRes
+    override val rightPodIcon: Int
+        get() = R.drawable.devic_airpods_pro2_right
+
+    override val batteryCasePercent: Float?
+        get() = super.batteryCasePercent ?: cachedBatteryPercentage
+
+    override val caseLidState: LidState
+        get() = cachedCaseState ?: super.caseLidState
+
+    override val rssi: Int
+        get() = rssiAverage ?: super<HasStateDetectionAirPods>.rssi
+
+    class Factory @Inject constructor() : DualApplePodsFactory(TAG) {
+
+        override fun isResponsible(message: ProximityPairing.Message): Boolean = message.run {
+            getModelInfo().full == DEVICE_CODE && length == ProximityPairing.PAIRING_MESSAGE_LENGTH
+        }
+
+        override fun create(scanResult: BleScanResult, message: ProximityPairing.Message): ApplePods {
+            var basic = AirPodsPro2Usbc(scanResult = scanResult, proximityMessage = message)
+            val result = searchHistory(basic)
+
+            if (result != null) basic = basic.copy(identifier = result.id)
+            updateHistory(basic)
+
+            if (result == null) return basic
+
+            return basic.copy(
+                identifier = result.id,
+                seenFirstAt = result.seenFirstAt,
+                seenLastAt = scanResult.receivedAt,
+                seenCounter = result.seenCounter,
+                reliability = result.reliability,
+                cachedBatteryPercentage = result.getLatestCaseBattery(),
+                rssiAverage = result.rssiSmoothed(basic.rssi),
+                cachedCaseState = result.getLatestCaseLidState(basic)
+            )
+        }
+
+    }
+
+    companion object {
+        private val DEVICE_CODE = 0x2420.toUShort()
+        private val TAG = logTag("PodDevice", "Apple", "AirPods", "Pro2", "USBC")
+    }
+}
@@ -0,0 +1,27 @@
+package eu.darken.capod.pods.core.apple.airpods
+
+import android.content.Context
+import androidx.annotation.StringRes
+import eu.darken.capod.common.R
+import eu.darken.capod.pods.core.HasStateDetection
+import eu.darken.capod.pods.core.apple.ApplePods
+
+interface HasStateDetectionAirPods : HasStateDetection, ApplePods {
+
+    override val state: ConnectionState
+        get() = ConnectionState.values().firstOrNull { rawSuffix == it.raw } ?: ConnectionState.UNKNOWN
+
+    enum class ConnectionState(val raw: UByte?, @StringRes val labelRes: Int) : HasStateDetection.State {
+        DISCONNECTED(0x00, R.string.pods_connection_state_disconnected_label),
+        IDLE(0x04, R.string.pods_connection_state_idle_label),
+        MUSIC(0x05, R.string.pods_connection_state_music_label),
+        CALL(0x06, R.string.pods_connection_state_call_label),
+        RINGING(0x07, R.string.pods_connection_state_ringing_label),
+        HANGING_UP(0x09, R.string.pods_connection_state_hanging_up_label),
+        UNKNOWN(null, R.string.pods_connection_state_unknown_label);
+
+        override fun getLabel(context: Context): String = context.getString(labelRes)
+
+        constructor(raw: Int, @StringRes labelRes: Int) : this(raw.toUByte(), labelRes)
+    }
+}
@@ -0,0 +1,70 @@
+package eu.darken.capod.pods.core.apple.beats
+
+import eu.darken.capod.common.bluetooth.BleScanResult
+import eu.darken.capod.common.debug.logging.logTag
+import eu.darken.capod.pods.core.PodDevice
+import eu.darken.capod.pods.core.apple.ApplePods
+import eu.darken.capod.pods.core.apple.DualApplePods
+import eu.darken.capod.pods.core.apple.DualApplePodsFactory
+import eu.darken.capod.pods.core.apple.protocol.ProximityPairing
+import java.time.Instant
+import javax.inject.Inject
+
+data class BeatsFitPro(
+    override val identifier: PodDevice.Id = PodDevice.Id(),
+    override val seenLastAt: Instant = Instant.now(),
+    override val seenFirstAt: Instant = Instant.now(),
+    override val seenCounter: Int = 1,
+    override val scanResult: BleScanResult,
+    override val proximityMessage: ProximityPairing.Message,
+    override val reliability: Float = PodDevice.BASE_CONFIDENCE,
+    private val rssiAverage: Int? = null,
+    private val cachedBatteryPercentage: Float? = null,
+    private val cachedCaseState: DualApplePods.LidState? = null
+) : DualApplePods {
+
+    override val model: PodDevice.Model = PodDevice.Model.BEATS_FIT_PRO
+
+    override val batteryCasePercent: Float?
+        get() = super.batteryCasePercent ?: cachedBatteryPercentage
+
+    override val caseLidState: DualApplePods.LidState
+        get() = cachedCaseState ?: super.caseLidState
+
+    override val rssi: Int
+        get() = rssiAverage ?: super.rssi
+
+    class Factory @Inject constructor() : DualApplePodsFactory(TAG) {
+
+        override fun isResponsible(message: ProximityPairing.Message): Boolean = message.run {
+            getModelInfo().full == DEVICE_CODE && length == ProximityPairing.PAIRING_MESSAGE_LENGTH
+        }
+
+        override fun create(scanResult: BleScanResult, message: ProximityPairing.Message): ApplePods {
+            var basic = BeatsFitPro(scanResult = scanResult, proximityMessage = message)
+            val result = searchHistory(basic)
+
+            if (result != null) basic = basic.copy(identifier = result.id)
+            updateHistory(basic)
+
+            if (result == null) return basic
+
+            return basic.copy(
+                identifier = result.id,
+                seenFirstAt = result.seenFirstAt,
+                seenLastAt = scanResult.receivedAt,
+                seenCounter = result.seenCounter,
+                reliability = result.reliability,
+                cachedBatteryPercentage = result.getLatestCaseBattery(),
+                rssiAverage = result.rssiSmoothed(basic.rssi),
+                cachedCaseState = result.getLatestCaseLidState(basic)
+            )
+        }
+
+    }
+
+    companion object {
+        private val DEVICE_CODE = 0x1220.toUShort()
+        private val TAG = logTag("PodDevice", "Beats", "Fit", "Pro")
+    }
+}
@@ -17,7 +17,7 @@ data class BeatsFlex(
    override val seenCounter: Int = 1,
    override val scanResult: BleScanResult,
    override val proximityMessage: ProximityPairing.Message,
-    override val confidence: Float = PodDevice.BASE_CONFIDENCE,
+    override val reliability: Float = PodDevice.BASE_CONFIDENCE,
    private val rssiAverage: Int? = null,
 ) : SingleApplePods {

@@ -46,8 +46,8 @@ data class BeatsFlex(
                seenFirstAt = result.seenFirstAt,
                seenLastAt = scanResult.receivedAt,
                seenCounter = result.seenCounter,
-                confidence = result.confidence,
-                rssiAverage = result.averageRssi(basic.rssi),
+                reliability = result.reliability,
+                rssiAverage = result.rssiSmoothed(basic.rssi),
            )
        }

@@ -17,7 +17,7 @@ data class BeatsSolo3(
    override val seenCounter: Int = 1,
    override val scanResult: BleScanResult,
    override val proximityMessage: ProximityPairing.Message,
-    override val confidence: Float = PodDevice.BASE_CONFIDENCE,
+    override val reliability: Float = PodDevice.BASE_CONFIDENCE,
    private val rssiAverage: Int? = null,
 ) : SingleApplePods {

@@ -45,8 +45,8 @@ data class BeatsSolo3(
                seenFirstAt = result.seenFirstAt,
                seenLastAt = scanResult.receivedAt,
                seenCounter = result.seenCounter,
-                confidence = result.confidence,
-                rssiAverage = result.averageRssi(basic.rssi),
+                reliability = result.reliability,
+                rssiAverage = result.rssiSmoothed(basic.rssi),
            )
        }

@@ -17,7 +17,7 @@ data class BeatsStudio3(
    override val seenCounter: Int = 1,
    override val scanResult: BleScanResult,
    override val proximityMessage: ProximityPairing.Message,
-    override val confidence: Float = PodDevice.BASE_CONFIDENCE,
+    override val reliability: Float = PodDevice.BASE_CONFIDENCE,
    private val rssiAverage: Int? = null,
 ) : SingleApplePods {

@@ -43,8 +43,8 @@ data class BeatsStudio3(
                seenFirstAt = result.seenFirstAt,
                seenLastAt = scanResult.receivedAt,
                seenCounter = result.seenCounter,
-                confidence = result.confidence,
-                rssiAverage = result.averageRssi(basic.rssi),
+                reliability = result.reliability,
+                rssiAverage = result.rssiSmoothed(basic.rssi),
            )
        }
    }
@@ -17,7 +17,7 @@ data class BeatsX(
    override val seenCounter: Int = 1,
    override val scanResult: BleScanResult,
    override val proximityMessage: ProximityPairing.Message,
-    override val confidence: Float = PodDevice.BASE_CONFIDENCE,
+    override val reliability: Float = PodDevice.BASE_CONFIDENCE,
    private val rssiAverage: Int? = null,
 ) : SingleApplePods {

@@ -46,8 +46,8 @@ data class BeatsX(
                seenFirstAt = result.seenFirstAt,
                seenLastAt = scanResult.receivedAt,
                seenCounter = result.seenCounter,
-                confidence = result.confidence,
-                rssiAverage = result.averageRssi(basic.rssi),
+                reliability = result.reliability,
+                rssiAverage = result.rssiSmoothed(basic.rssi),
            )
        }

@@ -17,7 +17,7 @@ data class PowerBeats3(
    override val seenCounter: Int = 1,
    override val scanResult: BleScanResult,
    override val proximityMessage: ProximityPairing.Message,
-    override val confidence: Float = PodDevice.BASE_CONFIDENCE,
+    override val reliability: Float = PodDevice.BASE_CONFIDENCE,
    private val rssiAverage: Int? = null,
 ) : SingleApplePods {

@@ -46,8 +46,8 @@ data class PowerBeats3(
                seenFirstAt = result.seenFirstAt,
                seenLastAt = scanResult.receivedAt,
                seenCounter = result.seenCounter,
-                confidence = result.confidence,
-                rssiAverage = result.averageRssi(basic.rssi),
+                reliability = result.reliability,
+                rssiAverage = result.rssiSmoothed(basic.rssi),
            )
        }
    }
@@ -4,7 +4,7 @@ import eu.darken.capod.common.bluetooth.BleScanResult
 import eu.darken.capod.common.debug.logging.logTag
 import eu.darken.capod.pods.core.PodDevice
 import eu.darken.capod.pods.core.apple.ApplePods
-import eu.darken.capod.pods.core.apple.DualAirPods
+import eu.darken.capod.pods.core.apple.DualApplePods
 import eu.darken.capod.pods.core.apple.DualApplePodsFactory
 import eu.darken.capod.pods.core.apple.protocol.ProximityPairing
 import java.time.Instant
@@ -17,18 +17,18 @@ data class PowerBeatsPro(
    override val seenCounter: Int = 1,
    override val scanResult: BleScanResult,
    override val proximityMessage: ProximityPairing.Message,
-    override val confidence: Float = PodDevice.BASE_CONFIDENCE,
+    override val reliability: Float = PodDevice.BASE_CONFIDENCE,
    private val rssiAverage: Int? = null,
    private val cachedBatteryPercentage: Float? = null,
-    private val cachedCaseState: DualAirPods.LidState? = null
-) : DualAirPods {
+    private val cachedCaseState: DualApplePods.LidState? = null
+) : DualApplePods {

    override val model: PodDevice.Model = PodDevice.Model.POWERBEATS_PRO

    override val batteryCasePercent: Float?
        get() = super.batteryCasePercent ?: cachedBatteryPercentage

-    override val caseLidState: DualAirPods.LidState
+    override val caseLidState: DualApplePods.LidState
        get() = cachedCaseState ?: super.caseLidState

    override val rssi: Int
@@ -54,9 +54,9 @@ data class PowerBeatsPro(
                seenFirstAt = result.seenFirstAt,
                seenLastAt = scanResult.receivedAt,
                seenCounter = result.seenCounter,
-                confidence = result.confidence,
+                reliability = result.reliability,
                cachedBatteryPercentage = result.getLatestCaseBattery(),
-                rssiAverage = result.averageRssi(basic.rssi),
+                rssiAverage = result.rssiSmoothed(basic.rssi),
                cachedCaseState = result.getLatestCaseLidState(basic)
            )
        }
@@ -6,10 +6,7 @@ import eu.darken.capod.common.debug.logging.logTag
 import eu.darken.capod.common.isBitSet
 import eu.darken.capod.common.lowerNibble
 import eu.darken.capod.common.upperNibble
-import eu.darken.capod.pods.core.DualPodDevice
-import eu.darken.capod.pods.core.HasCase
-import eu.darken.capod.pods.core.HasDualMicrophone
-import eu.darken.capod.pods.core.PodDevice
+import eu.darken.capod.pods.core.*
 import eu.darken.capod.pods.core.apple.ApplePods
 import eu.darken.capod.pods.core.apple.ApplePodsFactory
 import eu.darken.capod.pods.core.apple.protocol.ProximityPairing
@@ -19,20 +16,21 @@ import javax.inject.Inject
 /**
 * Basically an AirPods GEN1 clone
 * Similar data structure but a lot of placeholder values or hardcoded values
+ * Marketed as TWS i99999
 */
-data class Twsi99999 constructor(
+data class FakeAirPodsGen1 constructor(
    override val identifier: PodDevice.Id = PodDevice.Id(),
    override val seenLastAt: Instant = Instant.now(),
    override val seenFirstAt: Instant = Instant.now(),
    override val seenCounter: Int = 1,
    override val scanResult: BleScanResult,
    override val proximityMessage: ProximityPairing.Message,
-    override val confidence: Float = PodDevice.BASE_CONFIDENCE,
+    override val reliability: Float = PodDevice.BASE_CONFIDENCE,
    private val rssiAverage: Int? = null,
    private val cachedBatteryPercentage: Float? = null,
-) : ApplePods, DualPodDevice, HasDualMicrophone, HasCase {
+) : ApplePods, DualPodDevice, HasEarDetectionDual, HasChargeDetectionDual, HasCase {

-    override val model: PodDevice.Model = PodDevice.Model.TWS_I99999
+    override val model: PodDevice.Model = PodDevice.Model.FAKE_AIRPODS_GEN1

    override val rssi: Int
        get() = rssiAverage ?: super<ApplePods>.rssi
@@ -78,22 +76,32 @@ data class Twsi99999 constructor(
            }
        }

-    val isThisPodInThecase: Boolean
+    private val isThisPodInThecase: Boolean
        get() = rawStatus.isBitSet(6)

-    /**
-     * The data flip bit is set if the left pod is primary.
-     * For the pod that is in the case, this is flipped again though.
-     */
-    override val isLeftPodMicrophone: Boolean
-        get() = rawStatus.isBitSet(5) xor isThisPodInThecase
+    override val isLeftPodInEar: Boolean
+        get() = when (areValuesFlipped xor isThisPodInThecase) {
+            true -> rawStatus.isBitSet(3)
+            false -> rawStatus.isBitSet(1)
+        }

-    /**
-     * The data flip bit is UNset if the right pod is primary.
-     * For the pod that is in the case, this is flipped again though.
-     */
-    override val isRightPodMicrophone: Boolean
-        get() = !rawStatus.isBitSet(5) xor isThisPodInThecase
+    override val isRightPodInEar: Boolean
+        get() = when (areValuesFlipped xor isThisPodInThecase) {
+            true -> rawStatus.isBitSet(1)
+            false -> rawStatus.isBitSet(3)
+        }
+
+    override val isLeftPodCharging: Boolean
+        get() = when (areValuesFlipped) {
+            false -> rawFlags.isBitSet(0)
+            true -> rawFlags.isBitSet(1)
+        }
+
+    override val isRightPodCharging: Boolean
+        get() = when (areValuesFlipped) {
+            false -> rawFlags.isBitSet(1)
+            true -> rawFlags.isBitSet(0)
+        }

    override val batteryCasePercent: Float?
        get() = when (val value = rawCaseBattery.toInt()) {
@@ -109,7 +117,7 @@ data class Twsi99999 constructor(
    override val isCaseCharging: Boolean
        get() = rawFlags.isBitSet(2)

-    class Factory @Inject constructor() : ApplePodsFactory<Twsi99999>(TAG) {
+    class Factory @Inject constructor() : ApplePodsFactory<FakeAirPodsGen1>(TAG) {

        override fun isResponsible(message: ProximityPairing.Message): Boolean = message.run {
            // Official message length is 19HEX, i.e. binary 25, did they copy this wrong?
@@ -117,7 +125,7 @@ data class Twsi99999 constructor(
        }

        override fun create(scanResult: BleScanResult, message: ProximityPairing.Message): ApplePods {
-            var basic = Twsi99999(scanResult = scanResult, proximityMessage = message)
+            var basic = FakeAirPodsGen1(scanResult = scanResult, proximityMessage = message)
            val result = searchHistory(basic)

            if (result != null) basic = basic.copy(identifier = result.id)
@@ -130,15 +138,15 @@ data class Twsi99999 constructor(
                seenFirstAt = result.seenFirstAt,
                seenLastAt = scanResult.receivedAt,
                seenCounter = result.seenCounter,
-                confidence = result.confidence,
+                reliability = result.reliability,
                cachedBatteryPercentage = result.getLatestCaseBattery(),
-                rssiAverage = result.averageRssi(basic.rssi),
+                rssiAverage = result.rssiSmoothed(basic.rssi),
            )
        }
    }

    companion object {
        private val DEVICE_CODE = 0x0220.toUShort()
-        private val TAG = logTag("PodDevice", "Apple", "TWS", "i99999")
+        private val TAG = logTag("PodDevice", "Apple", "Fake", "AirPods", "Gen1")
    }
 }
@@ -6,10 +6,7 @@ import eu.darken.capod.common.debug.logging.logTag
 import eu.darken.capod.common.isBitSet
 import eu.darken.capod.common.lowerNibble
 import eu.darken.capod.common.upperNibble
-import eu.darken.capod.pods.core.DualPodDevice
-import eu.darken.capod.pods.core.HasCase
-import eu.darken.capod.pods.core.HasDualMicrophone
-import eu.darken.capod.pods.core.PodDevice
+import eu.darken.capod.pods.core.*
 import eu.darken.capod.pods.core.apple.ApplePods
 import eu.darken.capod.pods.core.apple.ApplePodsFactory
 import eu.darken.capod.pods.core.apple.protocol.ProximityPairing
@@ -17,22 +14,21 @@ import java.time.Instant
 import javax.inject.Inject

 /**
- * AirPods Pro clone similar to Twsi999999.
- * Shorter data structure.
+ * Similar data structure but a lot of placeholder values or hardcoded values
 */
-data class VarunrAirPodsPro constructor(
+data class FakeAirPodsGen2 constructor(
    override val identifier: PodDevice.Id = PodDevice.Id(),
    override val seenLastAt: Instant = Instant.now(),
    override val seenFirstAt: Instant = Instant.now(),
    override val seenCounter: Int = 1,
    override val scanResult: BleScanResult,
    override val proximityMessage: ProximityPairing.Message,
-    override val confidence: Float = PodDevice.BASE_CONFIDENCE,
+    override val reliability: Float = PodDevice.BASE_CONFIDENCE,
    private val rssiAverage: Int? = null,
    private val cachedBatteryPercentage: Float? = null,
-) : ApplePods, DualPodDevice, HasDualMicrophone, HasCase {
+) : ApplePods, DualPodDevice, HasEarDetectionDual, HasChargeDetectionDual, HasCase {

-    override val model: PodDevice.Model = PodDevice.Model.VARUNR_AIRPODS_PRO
+    override val model: PodDevice.Model = PodDevice.Model.FAKE_AIRPODS_GEN2

    override val rssi: Int
        get() = rssiAverage ?: super<ApplePods>.rssi
@@ -78,22 +74,32 @@ data class VarunrAirPodsPro constructor(
            }
        }

-    val isThisPodInThecase: Boolean
+    private val isThisPodInThecase: Boolean
        get() = rawStatus.isBitSet(6)

-    /**
-     * The data flip bit is set if the left pod is primary.
-     * For the pod that is in the case, this is flipped again though.
-     */
-    override val isLeftPodMicrophone: Boolean
-        get() = rawStatus.isBitSet(5) xor isThisPodInThecase
+    override val isLeftPodInEar: Boolean
+        get() = when (areValuesFlipped xor isThisPodInThecase) {
+            true -> rawStatus.isBitSet(3)
+            false -> rawStatus.isBitSet(1)
+        }

-    /**
-     * The data flip bit is UNset if the right pod is primary.
-     * For the pod that is in the case, this is flipped again though.
-     */
-    override val isRightPodMicrophone: Boolean
-        get() = !rawStatus.isBitSet(5) xor isThisPodInThecase
+    override val isRightPodInEar: Boolean
+        get() = when (areValuesFlipped xor isThisPodInThecase) {
+            true -> rawStatus.isBitSet(1)
+            false -> rawStatus.isBitSet(3)
+        }
+
+    override val isLeftPodCharging: Boolean
+        get() = when (areValuesFlipped) {
+            false -> rawFlags.isBitSet(0)
+            true -> rawFlags.isBitSet(1)
+        }
+
+    override val isRightPodCharging: Boolean
+        get() = when (areValuesFlipped) {
+            false -> rawFlags.isBitSet(1)
+            true -> rawFlags.isBitSet(0)
+        }

    override val batteryCasePercent: Float?
        get() = when (val value = rawCaseBattery.toInt()) {
@@ -109,7 +115,7 @@ data class VarunrAirPodsPro constructor(
    override val isCaseCharging: Boolean
        get() = rawFlags.isBitSet(2)

-    class Factory @Inject constructor() : ApplePodsFactory<VarunrAirPodsPro>(TAG) {
+    class Factory @Inject constructor() : ApplePodsFactory<FakeAirPodsGen2>(TAG) {

        override fun isResponsible(message: ProximityPairing.Message): Boolean = message.run {
            // Official message length is 19HEX, i.e. binary 25, did they copy this wrong?
@@ -117,7 +123,7 @@ data class VarunrAirPodsPro constructor(
        }

        override fun create(scanResult: BleScanResult, message: ProximityPairing.Message): ApplePods {
-            var basic = VarunrAirPodsPro(scanResult = scanResult, proximityMessage = message)
+            var basic = FakeAirPodsGen2(scanResult = scanResult, proximityMessage = message)
            val result = searchHistory(basic)

            if (result != null) basic = basic.copy(identifier = result.id)
@@ -130,15 +136,15 @@ data class VarunrAirPodsPro constructor(
                seenFirstAt = result.seenFirstAt,
                seenLastAt = scanResult.receivedAt,
                seenCounter = result.seenCounter,
-                confidence = result.confidence,
+                reliability = result.reliability,
                cachedBatteryPercentage = result.getLatestCaseBattery(),
-                rssiAverage = result.averageRssi(basic.rssi),
+                rssiAverage = result.rssiSmoothed(basic.rssi),
            )
        }
    }

    companion object {
-        private val DEVICE_CODE = 0x0E20.toUShort()
-        private val TAG = logTag("PodDevice", "Apple", "Varunr", "AirPodsPro")
+        private val DEVICE_CODE = 0x0F20.toUShort()
+        private val TAG = logTag("PodDevice", "Apple", "Fake", "AirPods", "Gen2")
    }
 }
@@ -0,0 +1,153 @@
+package eu.darken.capod.pods.core.apple.misc
+
+import eu.darken.capod.common.bluetooth.BleScanResult
+import eu.darken.capod.common.debug.logging.log
+import eu.darken.capod.common.debug.logging.logTag
+import eu.darken.capod.common.isBitSet
+import eu.darken.capod.common.lowerNibble
+import eu.darken.capod.common.upperNibble
+import eu.darken.capod.pods.core.*
+import eu.darken.capod.pods.core.apple.ApplePods
+import eu.darken.capod.pods.core.apple.ApplePodsFactory
+import eu.darken.capod.pods.core.apple.protocol.ProximityPairing
+import java.time.Instant
+import javax.inject.Inject
+
+/**
+ * AirPods Gen3 clone
+ * Shorter data structure.
+ * https://discord.com/channels/548521543039189022/927235844127993866/1054404630118924308
+ */
+data class FakeAirPodsGen3 constructor(
+    override val identifier: PodDevice.Id = PodDevice.Id(),
+    override val seenLastAt: Instant = Instant.now(),
+    override val seenFirstAt: Instant = Instant.now(),
+    override val seenCounter: Int = 1,
+    override val scanResult: BleScanResult,
+    override val proximityMessage: ProximityPairing.Message,
+    override val reliability: Float = PodDevice.BASE_CONFIDENCE,
+    private val rssiAverage: Int? = null,
+    private val cachedBatteryPercentage: Float? = null,
+) : ApplePods, DualPodDevice, HasEarDetectionDual, HasChargeDetectionDual, HasCase {
+
+    override val model: PodDevice.Model = PodDevice.Model.FAKE_AIRPODS_GEN3
+
+    override val rssi: Int
+        get() = rssiAverage ?: super<ApplePods>.rssi
+
+    /**
+     * Normally values for the left pod are in the lower nibbles, if the left pod is primary (microphone)
+     * If the right pod is the primary, the values are flipped.
+     */
+    val areValuesFlipped: Boolean
+        get() = !rawStatus.isBitSet(5)
+
+    override val batteryLeftPodPercent: Float?
+        get() {
+            val value = when (areValuesFlipped) {
+                true -> rawPodsBattery.upperNibble.toInt()
+                false -> rawPodsBattery.lowerNibble.toInt()
+            }
+            return when (value) {
+                15 -> null
+                else -> if (value > 10) {
+                    log { "Left pod: Above 100% battery: $value" }
+                    1.0f
+                } else {
+                    (value / 10f)
+                }
+            }
+        }
+
+    override val batteryRightPodPercent: Float?
+        get() {
+            val value = when (areValuesFlipped) {
+                true -> rawPodsBattery.lowerNibble.toInt()
+                false -> rawPodsBattery.upperNibble.toInt()
+            }
+            return when (value) {
+                15 -> null
+                else -> if (value > 10) {
+                    log { "Right pod: Above 100% battery: $value" }
+                    1.0f
+                } else {
+                    value / 10f
+                }
+            }
+        }
+
+    override val isLeftPodCharging: Boolean
+        get() = when (areValuesFlipped) {
+            false -> rawFlags.isBitSet(0)
+            true -> rawFlags.isBitSet(1)
+        }
+
+    override val isRightPodCharging: Boolean
+        get() = when (areValuesFlipped) {
+            false -> rawFlags.isBitSet(1)
+            true -> rawFlags.isBitSet(0)
+        }
+
+    private val isThisPodInThecase: Boolean
+        get() = rawStatus.isBitSet(6)
+
+    override val isLeftPodInEar: Boolean
+        get() = when (areValuesFlipped xor isThisPodInThecase) {
+            true -> rawStatus.isBitSet(3)
+            false -> rawStatus.isBitSet(1)
+        }
+
+    override val isRightPodInEar: Boolean
+        get() = when (areValuesFlipped xor isThisPodInThecase) {
+            true -> rawStatus.isBitSet(1)
+            false -> rawStatus.isBitSet(3)
+        }
+
+    override val batteryCasePercent: Float?
+        get() = when (val value = rawCaseBattery.toInt()) {
+            15 -> cachedBatteryPercentage
+            else -> if (value > 10) {
+                log { "Case: Above 100% battery: $value" }
+                1.0f
+            } else {
+                value / 10f
+            }
+        }
+
+    override val isCaseCharging: Boolean
+        get() = rawFlags.isBitSet(2)
+
+    class Factory @Inject constructor() : ApplePodsFactory<FakeAirPodsGen3>(TAG) {
+
+        override fun isResponsible(message: ProximityPairing.Message): Boolean = message.run {
+            // Official message length is 19HEX, i.e. binary 25, did they copy this wrong?
+            getModelInfo().full == DEVICE_CODE && length == 19
+        }
+
+        override fun create(scanResult: BleScanResult, message: ProximityPairing.Message): ApplePods {
+            var basic = FakeAirPodsGen3(scanResult = scanResult, proximityMessage = message)
+            val result = searchHistory(basic)
+
+            if (result != null) basic = basic.copy(identifier = result.id)
+            updateHistory(basic)
+
+            if (result == null) return basic
+
+            return basic.copy(
+                identifier = result.id,
+                seenFirstAt = result.seenFirstAt,
+                seenLastAt = scanResult.receivedAt,
+                seenCounter = result.seenCounter,
+                reliability = result.reliability,
+                cachedBatteryPercentage = result.getLatestCaseBattery(),
+                rssiAverage = result.rssiSmoothed(basic.rssi),
+            )
+        }
+
+    }
+
+    companion object {
+        private val DEVICE_CODE = 0x1320.toUShort()
+        private val TAG = logTag("PodDevice", "Apple", "Fake", "AirPods", "Gen3")
+    }
+}
@@ -0,0 +1,170 @@
+package eu.darken.capod.pods.core.apple.misc
+
+import androidx.annotation.DrawableRes
+import eu.darken.capod.common.R
+import eu.darken.capod.common.bluetooth.BleScanResult
+import eu.darken.capod.common.debug.logging.log
+import eu.darken.capod.common.debug.logging.logTag
+import eu.darken.capod.common.isBitSet
+import eu.darken.capod.common.lowerNibble
+import eu.darken.capod.common.upperNibble
+import eu.darken.capod.pods.core.*
+import eu.darken.capod.pods.core.apple.ApplePods
+import eu.darken.capod.pods.core.apple.ApplePodsFactory
+import eu.darken.capod.pods.core.apple.protocol.ProximityPairing
+import java.time.Instant
+import javax.inject.Inject
+
+/**
+ * AirPods Pro clone similar to Twsi999999.
+ * Shorter data structure.
+ * https://discord.com/channels/548521543039189022/927235844127993866/962068944196358234
+ */
+data class FakeAirPodsPro constructor(
+    override val identifier: PodDevice.Id = PodDevice.Id(),
+    override val seenLastAt: Instant = Instant.now(),
+    override val seenFirstAt: Instant = Instant.now(),
+    override val seenCounter: Int = 1,
+    override val scanResult: BleScanResult,
+    override val proximityMessage: ProximityPairing.Message,
+    override val reliability: Float = PodDevice.BASE_CONFIDENCE,
+    private val rssiAverage: Int? = null,
+    private val cachedBatteryPercentage: Float? = null,
+) : ApplePods, DualPodDevice, HasChargeDetectionDual, HasEarDetectionDual, HasCase {
+
+    override val model: PodDevice.Model = PodDevice.Model.FAKE_AIRPODS_PRO
+
+    @get:DrawableRes
+    override val iconRes: Int
+        get() = R.drawable.devic_airpods_pro2_both
+
+    @get:DrawableRes
+    override val caseIcon: Int
+        get() = R.drawable.devic_airpods_pro2_case
+
+    @get:DrawableRes
+    override val leftPodIcon: Int
+        get() = R.drawable.devic_airpods_pro2_left
+
+    @get:DrawableRes
+    override val rightPodIcon: Int
+        get() = R.drawable.devic_airpods_pro2_right
+
+    override val rssi: Int
+        get() = rssiAverage ?: super<ApplePods>.rssi
+
+    /**
+     * Normally values for the left pod are in the lower nibbles, if the left pod is primary (microphone)
+     * If the right pod is the primary, the values are flipped.
+     */
+    val areValuesFlipped: Boolean
+        get() = !rawStatus.isBitSet(5)
+
+    override val batteryLeftPodPercent: Float?
+        get() {
+            val value = when (areValuesFlipped) {
+                true -> rawPodsBattery.upperNibble.toInt()
+                false -> rawPodsBattery.lowerNibble.toInt()
+            }
+            return when (value) {
+                15 -> null
+                else -> if (value > 10) {
+                    log { "Left pod: Above 100% battery: $value" }
+                    1.0f
+                } else {
+                    (value / 10f)
+                }
+            }
+        }
+
+    override val batteryRightPodPercent: Float?
+        get() {
+            val value = when (areValuesFlipped) {
+                true -> rawPodsBattery.lowerNibble.toInt()
+                false -> rawPodsBattery.upperNibble.toInt()
+            }
+            return when (value) {
+                15 -> null
+                else -> if (value > 10) {
+                    log { "Right pod: Above 100% battery: $value" }
+                    1.0f
+                } else {
+                    value / 10f
+                }
+            }
+        }
+
+    override val isLeftPodCharging: Boolean
+        get() = when (areValuesFlipped) {
+            false -> rawFlags.isBitSet(0)
+            true -> rawFlags.isBitSet(1)
+        }
+
+    override val isRightPodCharging: Boolean
+        get() = when (areValuesFlipped) {
+            false -> rawFlags.isBitSet(1)
+            true -> rawFlags.isBitSet(0)
+        }
+
+    private val isThisPodInThecase: Boolean
+        get() = rawStatus.isBitSet(6)
+
+    override val isLeftPodInEar: Boolean
+        get() = when (areValuesFlipped xor isThisPodInThecase) {
+            true -> rawStatus.isBitSet(3)
+            false -> rawStatus.isBitSet(1)
+        }
+
+    override val isRightPodInEar: Boolean
+        get() = when (areValuesFlipped xor isThisPodInThecase) {
+            true -> rawStatus.isBitSet(1)
+            false -> rawStatus.isBitSet(3)
+        }
+
+    override val batteryCasePercent: Float?
+        get() = when (val value = rawCaseBattery.toInt()) {
+            15 -> cachedBatteryPercentage
+            else -> if (value > 10) {
+                log { "Case: Above 100% battery: $value" }
+                1.0f
+            } else {
+                value / 10f
+            }
+        }
+
+    override val isCaseCharging: Boolean
+        get() = rawFlags.isBitSet(2)
+
+    class Factory @Inject constructor() : ApplePodsFactory<FakeAirPodsPro>(TAG) {
+
+        override fun isResponsible(message: ProximityPairing.Message): Boolean = message.run {
+            // Official message length is 19HEX, i.e. binary 25, did they copy this wrong?
+            getModelInfo().full == DEVICE_CODE && length == 19
+        }
+
+        override fun create(scanResult: BleScanResult, message: ProximityPairing.Message): ApplePods {
+            var basic = FakeAirPodsPro(scanResult = scanResult, proximityMessage = message)
+            val result = searchHistory(basic)
+
+            if (result != null) basic = basic.copy(identifier = result.id)
+            updateHistory(basic)
+
+            if (result == null) return basic
+
+            return basic.copy(
+                identifier = result.id,
+                seenFirstAt = result.seenFirstAt,
+                seenLastAt = scanResult.receivedAt,
+                seenCounter = result.seenCounter,
+                reliability = result.reliability,
+                cachedBatteryPercentage = result.getLatestCaseBattery(),
+                rssiAverage = result.rssiSmoothed(basic.rssi),
+            )
+        }
+    }
+
+    companion object {
+        private val DEVICE_CODE = 0x0E20.toUShort()
+        private val TAG = logTag("PodDevice", "Apple", "Fake", "AirPods", "Pro")
+    }
+}
@@ -0,0 +1,168 @@
+package eu.darken.capod.pods.core.apple.misc
+
+import androidx.annotation.DrawableRes
+import eu.darken.capod.common.R
+import eu.darken.capod.common.bluetooth.BleScanResult
+import eu.darken.capod.common.debug.logging.log
+import eu.darken.capod.common.debug.logging.logTag
+import eu.darken.capod.common.isBitSet
+import eu.darken.capod.common.lowerNibble
+import eu.darken.capod.common.upperNibble
+import eu.darken.capod.pods.core.*
+import eu.darken.capod.pods.core.apple.ApplePods
+import eu.darken.capod.pods.core.apple.ApplePodsFactory
+import eu.darken.capod.pods.core.apple.DualApplePods
+import eu.darken.capod.pods.core.apple.protocol.ProximityPairing
+import java.time.Instant
+import javax.inject.Inject
+
+/**
+ * AirPods Pro2 clone
+ * https://discord.com/channels/548521543039189022/927235844127993866/1060911213539774504
+ */
+data class FakeAirPodsPro2 constructor(
+    override val identifier: PodDevice.Id = PodDevice.Id(),
+    override val seenLastAt: Instant = Instant.now(),
+    override val seenFirstAt: Instant = Instant.now(),
+    override val seenCounter: Int = 1,
+    override val scanResult: BleScanResult,
+    override val proximityMessage: ProximityPairing.Message,
+    override val reliability: Float = PodDevice.BASE_CONFIDENCE,
+    private val rssiAverage: Int? = null,
+    private val cachedBatteryPercentage: Float? = null,
+    private val cachedCaseState: DualApplePods.LidState? = null,
+) : ApplePods, HasChargeDetectionDual, DualPodDevice, HasEarDetectionDual, HasCase {
+
+    override val model: PodDevice.Model = PodDevice.Model.FAKE_AIRPODS_PRO2
+
+    @get:DrawableRes
+    override val iconRes: Int
+        get() = R.drawable.devic_airpods_pro2_both
+
+    @get:DrawableRes
+    override val caseIcon: Int
+        get() = R.drawable.devic_airpods_pro2_case
+
+    @get:DrawableRes
+    override val leftPodIcon: Int
+        get() = R.drawable.devic_airpods_pro2_left
+
+    @get:DrawableRes
+    override val rightPodIcon: Int
+        get() = R.drawable.devic_airpods_pro2_right
+
+    override val rssi: Int
+        get() = rssiAverage ?: scanResult.rssi
+
+    private val areValuesFlipped: Boolean
+        get() = !rawStatus.isBitSet(5)
+
+    override val batteryLeftPodPercent: Float?
+        get() {
+            val value = when (areValuesFlipped) {
+                true -> rawPodsBattery.upperNibble.toInt()
+                false -> rawPodsBattery.lowerNibble.toInt()
+            }
+            return when (value) {
+                15 -> null
+                else -> if (value > 10) {
+                    log { "Left pod: Above 100% battery: $value" }
+                    1.0f
+                } else {
+                    (value / 10f)
+                }
+            }
+        }
+
+    override val batteryRightPodPercent: Float?
+        get() {
+            val value = when (areValuesFlipped) {
+                true -> rawPodsBattery.lowerNibble.toInt()
+                false -> rawPodsBattery.upperNibble.toInt()
+            }
+            return when (value) {
+                15 -> null
+                else -> if (value > 10) {
+                    log { "Right pod: Above 100% battery: $value" }
+                    1.0f
+                } else {
+                    value / 10f
+                }
+            }
+        }
+
+    private val isThisPodInThecase: Boolean
+        get() = rawStatus.isBitSet(6)
+
+    override val isLeftPodInEar: Boolean
+        get() = when (areValuesFlipped xor isThisPodInThecase) {
+            true -> rawStatus.isBitSet(3)
+            false -> rawStatus.isBitSet(1)
+        }
+
+    override val isRightPodInEar: Boolean
+        get() = when (areValuesFlipped xor isThisPodInThecase) {
+            true -> rawStatus.isBitSet(1)
+            false -> rawStatus.isBitSet(3)
+        }
+
+    override val isLeftPodCharging: Boolean
+        get() = when (areValuesFlipped) {
+            false -> rawFlags.isBitSet(0)
+            true -> rawFlags.isBitSet(1)
+        }
+
+    override val isRightPodCharging: Boolean
+        get() = when (areValuesFlipped) {
+            false -> rawFlags.isBitSet(1)
+            true -> rawFlags.isBitSet(0)
+        }
+
+    override val batteryCasePercent: Float?
+        get() = when (val value = rawCaseBattery.toInt()) {
+            15 -> cachedBatteryPercentage
+            else -> if (value > 10) {
+                log { "Case: Above 100% battery: $value" }
+                1.0f
+            } else {
+                value / 10f
+            }
+        }
+
+    override val isCaseCharging: Boolean
+        get() = rawFlags.isBitSet(2)
+
+    class Factory @Inject constructor() : ApplePodsFactory<FakeAirPodsPro2>(TAG) {
+
+        override fun isResponsible(message: ProximityPairing.Message): Boolean = message.run {
+            // Official message length is 19HEX, i.e. binary 25, did they copy this wrong?
+            getModelInfo().full == DEVICE_CODE && length == 19
+        }
+
+        override fun create(scanResult: BleScanResult, message: ProximityPairing.Message): ApplePods {
+            var basic = FakeAirPodsPro2(scanResult = scanResult, proximityMessage = message)
+            val result = searchHistory(basic)
+
+            if (result != null) basic = basic.copy(identifier = result.id)
+            updateHistory(basic)
+
+            if (result == null) return basic
+
+            return basic.copy(
+                identifier = result.id,
+                seenFirstAt = result.seenFirstAt,
+                seenLastAt = scanResult.receivedAt,
+                seenCounter = result.seenCounter,
+                reliability = result.reliability,
+                cachedBatteryPercentage = result.getLatestCaseBattery(),
+                rssiAverage = result.rssiSmoothed(basic.rssi),
+            )
+        }
+
+    }
+
+    companion object {
+        private val DEVICE_CODE = 0x1420.toUShort()
+        private val TAG = logTag("PodDevice", "Apple", "Fake", "AirPods", "Pro2")
+    }
+}
@@ -18,7 +18,7 @@ data class UnknownAppleDevice(
    override val seenCounter: Int = 1,
    override val scanResult: BleScanResult,
    override val proximityMessage: ProximityPairing.Message,
-    override val confidence: Float = 0f,
+    override val reliability: Float = 0f,
    private val rssiAverage: Int? = null,
 ) : ApplePods {

@@ -49,8 +49,8 @@ data class UnknownAppleDevice(
                seenFirstAt = result.seenFirstAt,
                seenLastAt = scanResult.receivedAt,
                seenCounter = result.seenCounter,
-                confidence = result.confidence,
-                rssiAverage = result.averageRssi(basic.rssi),
+                reliability = result.reliability,
+                rssiAverage = result.rssiSmoothed(basic.rssi),
            )
        }
    }
@@ -13,7 +13,7 @@ data class UnknownDevice(
    override val seenFirstAt: Instant = Instant.now(),
    override val seenCounter: Int = 1,
    override val scanResult: BleScanResult,
-    override val confidence: Float = 0f,
+    override val reliability: Float = 0f,
    private val rssiAverage: Int? = null,
 ) : PodDevice {

@@ -34,8 +34,8 @@ class UnknownDeviceFactory @Inject constructor() {
            seenFirstAt = result.seenFirstAt,
            seenLastAt = scanResult.receivedAt,
            seenCounter = result.seenCounter,
-            confidence = result.confidence,
-            rssiAverage = result.averageRssi(basic.rssi),
+            reliability = result.confidence,
+            rssiAverage = result.rssiSmoothed(basic.rssi),
        )
    }

@@ -52,7 +52,7 @@ class UnknownDeviceFactory @Inject constructor() {
        val confidence: Float
            get() = 0.75f + (history.size / (MAX_HISTORY * 4f))

-        fun averageRssi(latest: Int): Int =
+        fun rssiSmoothed(latest: Int): Int =
            history.map { it.rssi }.plus(latest).takeLast(10).median()

        fun isOlderThan(age: Duration): Boolean {
@@ -70,7 +70,7 @@ class UnknownDeviceFactory @Inject constructor() {
        override fun toString(): String = "KnownDevice(history=${history.size}, last=${history.last()})"

        companion object {
-            const val MAX_HISTORY = 10
+            const val MAX_HISTORY = 20
        }
    }

@@ -47,6 +47,11 @@ class ReactionSettings @Inject constructor(
        false
    )

+    val showPopUpOnConnection = preferences.createFlowPreference(
+        "reaction.popup.connected",
+        false
+    )
+
    val onePodMode = preferences.createFlowPreference(
        "reaction.onepod.enabled",
        false
@@ -58,6 +63,7 @@ class ReactionSettings @Inject constructor(
        autoConnect,
        autoConnectCondition,
        showPopUpOnCaseOpen,
+        showPopUpOnConnection,
        onePodMode,
    )
 }
@@ -10,7 +10,7 @@ import eu.darken.capod.main.core.GeneralSettings
 import eu.darken.capod.monitor.core.PodMonitor
 import eu.darken.capod.pods.core.HasEarDetection
 import eu.darken.capod.pods.core.HasEarDetectionDual
-import eu.darken.capod.pods.core.apple.DualAirPods
+import eu.darken.capod.pods.core.apple.DualApplePods
 import eu.darken.capod.reaction.core.ReactionSettings
 import kotlinx.coroutines.flow.*
 import javax.inject.Inject
@@ -69,7 +69,7 @@ class AutoConnect @Inject constructor(
            val conditionFulfilled = when (condition) {
                AutoConnectCondition.WHEN_SEEN -> true
                AutoConnectCondition.CASE_OPEN -> when (mainDevice) {
-                    is DualAirPods -> mainDevice.caseLidState == DualAirPods.LidState.OPEN
+                    is DualApplePods -> mainDevice.caseLidState == DualApplePods.LidState.OPEN
                    else -> true
                }
                AutoConnectCondition.IN_EAR -> when (mainDevice) {
@@ -3,6 +3,7 @@ package eu.darken.capod.reaction.core.playpause
 import eu.darken.capod.common.MediaControl
 import eu.darken.capod.common.bluetooth.BluetoothManager2
 import eu.darken.capod.common.debug.logging.Logging.Priority.VERBOSE
+import eu.darken.capod.common.debug.logging.Logging.Priority.WARN
 import eu.darken.capod.common.debug.logging.log
 import eu.darken.capod.common.debug.logging.logTag
 import eu.darken.capod.common.flow.setupCommonEventHandlers
@@ -40,46 +41,51 @@ class PlayPause @Inject constructor(
        }
        .distinctUntilChanged()
        .withPrevious()
+        .filter { (previous, current) ->
+            if (previous == null || current == null) return@filter false
+            log(TAG, VERBOSE) { "previous-id=${previous.identifier}, current-id=${current.identifier}" }
+            val match = previous.identifier == current.identifier
+            if (!match) log(TAG, WARN) { "Main device switched, skipping reaction." }
+            match
+        }
        .onEach { (previous, current) ->
-            if (previous is HasEarDetection && current is HasEarDetection) {
-                log(TAG, VERBOSE) { "previous=${previous.isBeingWorn}, current=${current.isBeingWorn}" }
-                log(TAG, VERBOSE) { "previous-id=${previous.identifier}, current-id=${current.identifier}" }
-                if (previous.identifier != current.identifier) {
-                    return@onEach
-                }
+            log(TAG, VERBOSE) { "Checking\nprevious=$previous\ncurrent=$current" }

-                if (previous is HasEarDetectionDual && current is HasEarDetectionDual && reactionSettings.onePodMode.value) {
-                    log(TAG) { "Ear status changed for dual pod device in single pod mode." }
-                    val previousWorn = previous.isEitherPodInEar
-                    val currentWorn = current.isEitherPodInEar
-                    if (!previousWorn && currentWorn && !mediaControl.isPlaying) {
-                        if (reactionSettings.autoPlay.value) {
-                            mediaControl.sendPlay()
-                        } else {
-                            log(TAG) { "autoPlay is disabled" }
-                        }
-                    } else if (!currentWorn && previousWorn && mediaControl.isPlaying) {
-                        if (reactionSettings.autoPause.value) {
-                            mediaControl.sendPause()
-                        } else {
-                            log(TAG) { "autoPause is disabled" }
-                        }
-                    }
-                } else if (previous.isBeingWorn != current.isBeingWorn) {
-                    log(TAG) { "Ear status changed for monitored device." }
-                    if (current.isBeingWorn && !mediaControl.isPlaying) {
-                        if (reactionSettings.autoPlay.value) {
-                            mediaControl.sendPlay()
-                        } else {
-                            log(TAG) { "autoPlay is disabled" }
-                        }
-                    } else if (!current.isBeingWorn && mediaControl.isPlaying) {
-                        if (reactionSettings.autoPause.value) {
-                            mediaControl.sendPause()
-                        } else {
-                            log(TAG) { "autoPause is disabled" }
-                        }
-                    }
+            val previousWorn: Boolean?
+            val currentWorn: Boolean?
+
+            when {
+                reactionSettings.onePodMode.value && previous is HasEarDetectionDual && current is HasEarDetectionDual -> {
+                    previousWorn = previous.isEitherPodInEar
+                    currentWorn = current.isEitherPodInEar
+                    log(TAG, VERBOSE) { "previous: left=${previous.isLeftPodInEar}, right=${previous.isRightPodInEar}" }
+                    log(TAG, VERBOSE) { "current: left${current.isLeftPodInEar}, right=${current.isRightPodInEar}" }
+                }
+                previous is HasEarDetection && current is HasEarDetection -> {
+                    previousWorn = previous.isBeingWorn
+                    currentWorn = current.isBeingWorn
+                    log(TAG, VERBOSE) { "prev.isBeingWorn=${previousWorn}, cur.isBeingWorn=${currentWorn}" }
+                }
+                else -> {
+                    log(TAG, VERBOSE) { "Current devices don't support ear detection." }
+                    previousWorn = null
+                    currentWorn = null
+                }
+            }
+
+            if (previousWorn == false && currentWorn == true && !mediaControl.isPlaying) {
+                if (reactionSettings.autoPlay.value) {
+                    log(TAG) { "autoPlay is triggered, sendPlay()" }
+                    mediaControl.sendPlay()
+                } else {
+                    log(TAG, VERBOSE) { "autoPlay is disabled" }
+                }
+            } else if (previousWorn == true && currentWorn == false && mediaControl.isPlaying) {
+                if (reactionSettings.autoPause.value) {
+                    log(TAG) { "autoPause is triggered, sendPause()" }
+                    mediaControl.sendPause()
+                } else {
+                    log(TAG) { "autoPause is disabled" }
                }
            }
        }
@@ -1,15 +1,26 @@
 package eu.darken.capod.reaction.core.popup

-import eu.darken.capod.common.debug.logging.Logging.Priority.*
+import eu.darken.capod.common.bluetooth.BluetoothManager2
+import eu.darken.capod.common.debug.logging.Logging.Priority.INFO
+import eu.darken.capod.common.debug.logging.Logging.Priority.VERBOSE
+import eu.darken.capod.common.debug.logging.Logging.Priority.WARN
 import eu.darken.capod.common.debug.logging.log
 import eu.darken.capod.common.debug.logging.logTag
 import eu.darken.capod.common.flow.setupCommonEventHandlers
 import eu.darken.capod.common.flow.withPrevious
+import eu.darken.capod.main.core.GeneralSettings
 import eu.darken.capod.monitor.core.PodMonitor
 import eu.darken.capod.pods.core.PodDevice
-import eu.darken.capod.pods.core.apple.DualAirPods
+import eu.darken.capod.pods.core.apple.DualApplePods
 import eu.darken.capod.reaction.core.ReactionSettings
-import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.distinctUntilChangedBy
+import kotlinx.coroutines.flow.emptyFlow
+import kotlinx.coroutines.flow.flatMapLatest
+import kotlinx.coroutines.flow.mapNotNull
+import kotlinx.coroutines.flow.merge
 import java.time.Duration
 import java.time.Instant
 import javax.inject.Inject
@@ -19,11 +30,13 @@ import javax.inject.Singleton
 class PopUpReaction @Inject constructor(
    private val podMonitor: PodMonitor,
    private val reactionSettings: ReactionSettings,
+    private val generalSettings: GeneralSettings,
+    private val bluetoothManager: BluetoothManager2,
 ) {

-    private val coolDowns = mutableMapOf<PodDevice.Id, Instant>()
+    private val caseCoolDowns = mutableMapOf<PodDevice.Id, Instant>()

-    fun monitor(): Flow<Event> = reactionSettings.showPopUpOnCaseOpen.flow
+    private fun monitorCase(): Flow<Event> = reactionSettings.showPopUpOnCaseOpen.flow
        .flatMapLatest { isEnabled ->
            if (isEnabled) {
                podMonitor.mainDevice.distinctUntilChangedBy { it?.rawDataHex }
@@ -32,9 +45,9 @@ class PopUpReaction @Inject constructor(
            }
        }
        .withPrevious()
-        .setupCommonEventHandlers(TAG) { "monitor" }
+        .setupCommonEventHandlers(TAG) { "popUpCase" }
        .mapNotNull { (previous, current) ->
-            if (previous !is DualAirPods? || current !is DualAirPods) {
+            if (previous !is DualApplePods? || current !is DualApplePods) {
                return@mapNotNull null
            }
            log(TAG, VERBOSE) {
@@ -54,35 +67,37 @@ class PopUpReaction @Inject constructor(
            }
            log(TAG) { "Case lid status changed for monitored device." }

-            tryPopWindow(current)
+            throttleCasePopUps(current)
        }

-    private suspend fun tryPopWindow(current: DualAirPods): Event? = when {
-        current.caseLidState == DualAirPods.LidState.OPEN -> {
+    private fun throttleCasePopUps(current: DualApplePods): Event? = when {
+        current.caseLidState == DualApplePods.LidState.OPEN -> {
            log(TAG, INFO) { "Show popup" }

            val now = Instant.now()
-            val lastShown = coolDowns[current.identifier] ?: Instant.MIN
+            val lastShown = caseCoolDowns[current.identifier] ?: Instant.MIN
            val sinceLastPop = Duration.between(lastShown, now)
-            log(TAG) { "Time since last popup: $sinceLastPop" }
+            log(TAG) { "Time since last case popup: $sinceLastPop" }

            if (sinceLastPop >= Duration.ofSeconds(10)) {
-                coolDowns[current.identifier] = Instant.now()
+                caseCoolDowns[current.identifier] = Instant.now()
                Event.PopupShow(device = current)
            } else {
-                log(TAG, INFO) { "Popup is still on cooldown: $sinceLastPop" }
+                log(TAG, INFO) { "Case popup is still on cooldown: $sinceLastPop" }
                null
            }
        }
-        current.caseLidState != DualAirPods.LidState.OPEN -> {
+
+        current.caseLidState != DualApplePods.LidState.OPEN -> {
            when (current.caseLidState) {
-                DualAirPods.LidState.CLOSED -> {
+                DualApplePods.LidState.CLOSED -> {
                    log(TAG, INFO) { "Lid was actively closed, resetting cooldown." }
-                    coolDowns.remove(current.identifier)
+                    caseCoolDowns.remove(current.identifier)
                }
+
                else -> {
                    log(TAG, WARN) { "Lid was was not actively closed, refreshing cooldown." }
-                    coolDowns[current.identifier] = Instant.now()
+                    caseCoolDowns[current.identifier] = Instant.now()
                }
            }

@@ -90,9 +105,78 @@ class PopUpReaction @Inject constructor(

            Event.PopupHide()
        }
+
        else -> null
    }

+    private val connectionCoolDowns = mutableMapOf<String, Instant>()
+
+    private fun monitorConnection(): Flow<Event> = reactionSettings.showPopUpOnConnection.flow
+        .flatMapLatest { isEnabled ->
+            if (!isEnabled) return@flatMapLatest emptyFlow()
+
+            combine(
+                generalSettings.mainDeviceAddress.flow,
+                bluetoothManager.connectedDevices().distinctUntilChanged(),
+                podMonitor.mainDevice.distinctUntilChangedBy { it?.rawDataHex },
+            ) { targetAddress, devices, broadcast ->
+                log(TAG) { "$targetAddress $broadcast $devices " }
+                val direct = devices.singleOrNull { it.address == targetAddress }.also {
+                    log(TAG, VERBOSE) { "Connected main device is $it" }
+                }
+                if (direct == null) {
+                    connectionCoolDowns.remove(targetAddress).also {
+                        if (it != null) log(TAG) { "Cleared connection cooldown for $targetAddress due to disconect" }
+                    }
+                }
+                if (direct != null && broadcast != null) direct to broadcast else null
+            }
+        }
+        .withPrevious()
+        .mapNotNull { (previouss, currents) ->
+            val previousConnected = previouss?.first
+            log(TAG, VERBOSE) { "previousConnected: $previousConnected" }
+            val previousBroadcasted = previouss?.second
+            log(TAG, VERBOSE) { "previousBroadcasted: $previousBroadcasted" }
+            val currentConnected = currents?.first
+            log(TAG, VERBOSE) { "currentConnected: $currentConnected" }
+            val currentBroadcasted = currents?.second
+            log(TAG, VERBOSE) { "currentBroadcasted: $currentBroadcasted" }
+
+            if (previousConnected != null && previousBroadcasted != null && currentConnected == null) {
+                return@mapNotNull Event.PopupHide()
+            }
+
+            if (currentConnected == null || currentBroadcasted == null) {
+                // We need an active connection
+                return@mapNotNull null
+            }
+
+            val ageOfBroadcastedDevice = Duration.between(Instant.now(), currentBroadcasted.seenFirstAt)
+            val ageOfConnectedDevice = Duration.between(Instant.now(), currentConnected.seenFirstAt)
+            if (ageOfBroadcastedDevice > (ageOfConnectedDevice + Duration.ofSeconds(30))) {
+                // This is likely a false positive, some random nearby device
+                // We expect the first broadcasts to not be much older than the first connection
+                log(TAG, VERBOSE) { "Current broadcasted main device is probably a false-positive" }
+                return@mapNotNull null
+            }
+
+            val now = Instant.now()
+            val lastShown = connectionCoolDowns[currentConnected.address]
+            val sinceLastPop = lastShown?.let { Duration.between(it, now) }
+            log(TAG) { "Time since last connection popup: ${sinceLastPop?.seconds}s" }
+
+            if (lastShown == null) {
+                connectionCoolDowns[currentConnected.address] = Instant.now()
+                Event.PopupShow(device = currentBroadcasted)
+            } else {
+                log(TAG) { "Connection popup is still on cooldown: $sinceLastPop" }
+                null
+            }
+        }
+        .setupCommonEventHandlers(TAG) { "popUpConnection" }
+
+    fun monitor(): Flow<Event> = merge(monitorCase(), monitorConnection())

    sealed class Event {
        data class PopupShow(
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
darken	ec7447992f	Release: 2.11.1-rc0	2023-09-23 21:44:04 +02:00
Matthias Urhahn	99958e13eb	Update translations (#166 )	2023-09-23 21:43:24 +02:00
Matthias Urhahn	b9fe5d4a14	Update README.md	2023-09-23 21:38:44 +02:00
darken	1443fd5714	Support for Apple AirPods Pro2 with USB-C See #164	2023-09-23 21:35:30 +02:00
darken	798083b235	Remove link from changelog notes (eggshells)	2023-09-11 23:35:20 +02:00
darken	18a7311089	Release: 2.11.0-rc0	2023-09-11 22:45:47 +02:00
darken	9f49d62f12	Clean up store description and remove WearOS sentences.	2023-09-11 21:09:02 +02:00
darken	0c3c4e7ea1	Update translations	2023-09-11 21:09:02 +02:00
darken	7cdf653842	Remove WearOS part from app description, it's no longer on Google Play.	2023-09-11 21:09:02 +02:00
darken	32d99eada8	Prevent app from crashing if no app to view urls is installed	2023-09-11 20:57:15 +02:00
darken	9e4adb16c6	Hide install, not useful without 3rd party bug tracker	2023-09-11 20:33:06 +02:00
darken	4b5638e4f0	Hide bug reporting setting (but lets keep the setting ID because if we re-add we might use the setting state again).	2023-09-11 20:32:53 +02:00
darken	d8fb9cdd30	Remove bugsnag	2023-09-11 20:32:53 +02:00
Matthias Urhahn	3920489dcd	Extra onboarding step (#158 ) * wip * Add extra onboarding step	2023-09-11 20:32:41 +02:00
Matthias Urhahn	09d013588d	Update PRIVACY_POLICY.md	2023-09-11 01:33:38 +02:00
darken	d8bd03c65d	Remove WearOS build from Google Play pipeline.	2023-07-16 01:05:04 +02:00
darken	8b2c6b9498	Release: 2.10.0-rc2	2023-07-07 10:13:48 +02:00
darken	0f63d3a0d4	Revert "Don't bump WearOS, not needed due to new track system?" This reverts commit `a321bb733c`.	2023-07-07 10:12:56 +02:00
darken	672eb333b0	Update fastlane	2023-07-07 10:12:24 +02:00
darken	de609b4d05	Release: 2.10.0-rc1	2023-07-07 09:05:38 +02:00
darken	7e6e9eee36	Try WearOS first as it is more likely to fail.	2023-07-07 09:04:34 +02:00
darken	a321bb733c	Don't bump WearOS, not needed due to new track system?	2023-07-07 09:04:34 +02:00
darken	490369a3e1	Adjust CI to build and upload to WearOS beta/production tracks	2023-07-07 09:04:34 +02:00
darken	a2cce044ef	Release: 2.10.0-rc0	2023-07-05 09:16:53 +02:00
darken	8884bb88c7	Update translations	2023-07-05 09:15:44 +02:00
darken	313b0e9131	Include changelog in changelog.	2023-07-05 09:15:44 +02:00
darken	47048cf7e7	Update translations	2023-07-05 09:15:44 +02:00
darken	ef1c4615aa	Add reaction option: Popup on new connection	2023-07-05 08:21:37 +02:00
Matthias Urhahn	c9587b2bf0	Update translations (#147 ) * Update translations * Update translations	2023-07-04 12:41:14 +02:00
Sean Singh	669fa2fd22	Support edge-to-edge rendering on Android Q+ (#146 ) * Set nav bars transparent in themes.xml files * App renders edge-to-edge; need to handle scroll overlaps * Add fake padding * Begin version separating * Edge-to-edge working everywhere except main page * Finalized * Cleanup Finalized * Cleanup Finalized * Removed redundant values-v29 & optimize imports * Consolidated insets to Fragment2 * Consolidated insets to Fragment2 (file wasn't staged)	2023-07-04 12:17:44 +02:00
darken	fb8ec72825	Release: 2.9.3-rc0	2023-06-27 22:07:22 +02:00
Matthias Urhahn	d1687f574f	Merge pull request #145 from d4rken-org/bump_workmanager Fix background execution errors.	2023-06-27 22:04:28 +02:00
darken	72f47bec1f	Fix background execution errors. Bump workmanager `2.7.1` -> `2.8.1` to fix ```java android.app.ForegroundServiceStartNotAllowedException: startForegroundService() not allowed due to mAllowStartForeground false: service eu.darken.capod/androidx.work.impl.foreground.SystemForegroundService ```	2023-06-27 21:55:58 +02:00
Matthias Urhahn	20e8aecf83	Merge pull request #144 from d4rken-org/gplay_hates_splash Fix "Missing app icon in splash screen"	2023-06-27 21:49:50 +02:00
Matthias Urhahn	ee41474670	Merge pull request #143 from d4rken-org/gplay_wear_policies_fml Fix "Missing show time"	2023-06-27 21:49:37 +02:00
darken	ac29e28eda	Fix "Missing app icon in splash screen" > Your app does not show a 48x48dp app icon on a black background during app startup. For more information, see Branded launch.	2023-06-27 21:49:05 +02:00
darken	58b96cbdee	Fix "Missing show time" > Your app does not display the time of day clearly at the top of the app home screen and any ongoing activity screens. We recommend that you display the time of day at the top of all activities except dialog and confirmation screens. For more information, see Show the time.	2023-06-27 21:12:16 +02:00
darken	0c1fc15251	Update translations	2023-06-27 20:28:31 +02:00
darken	7b8e0cc952	Update translations	2023-06-27 20:28:31 +02:00
darken	c8aa591feb	Update AGP	2023-06-27 20:28:21 +02:00
darken	afa4d6e807	Release: 2.9.2-rc0	2023-05-16 09:23:59 +02:00
darken	e6b7eda9e7	Update store translations	2023-05-16 09:23:09 +02:00
darken	bbc4e05c8f	Update translations	2023-05-16 09:23:09 +02:00
darken	50bccbaa2e	Update Crowdin tooling	2023-05-16 09:23:09 +02:00
Matthias Urhahn	d71e83a2af	Merge pull request #132 from d4rken-org/tweak_widget_layout Tweak widget layout	2023-05-16 09:14:30 +02:00
Matthias Urhahn	92a67702b7	Merge pull request #131 from d4rken-org/gradle_bump Gradle bump	2023-05-16 09:04:46 +02:00
darken	2f9185efa7	Tweak dual pod widget. Less padding to reduce cutoff chances and put the label at the type bottom as it's the least important info.	2023-05-16 09:00:58 +02:00
darken	a10216520b	Fix resource reference	2023-05-16 08:59:54 +02:00
darken	d5354e5156	Fix resource reference	2023-05-16 08:55:35 +02:00
darken	a8f9b1f732	Use non final resource ids	2023-05-16 08:07:48 +02:00
darken	08a796e621	Fix wear namespace	2023-05-16 08:05:59 +02:00
darken	15f3a68f8e	Use non transitive R classes to improve performance	2023-05-16 07:58:28 +02:00
darken	e0bc6dafa0	Bump gradle	2023-05-16 07:46:13 +02:00
darken	430c1236d7	Fix typo	2023-05-07 20:15:41 +02:00
darken	3ac357161a	Improve strings based on translator feedback	2023-05-07 20:15:41 +02:00
darken	3c5f1bf21f	CI: Remove unused base flavor, all our modules are flavored :)	2023-04-07 11:00:44 +02:00
darken	5544cd3770	CI: Update action dependencies, improve naming and use more specific build commands	2023-04-07 11:00:44 +02:00
darken	71a060feb9	Release: 2.9.1-rc0	2023-04-05 16:19:46 +02:00
darken	25d643257c	Update translations	2023-04-05 13:13:42 +02:00
darken	85900e5bff	Improve final headphones checks and fix IllegalStateException if data changes between the final two checks.	2023-04-05 13:13:42 +02:00
darken	d3257d6c5e	Improve troubleshooting texts	2023-04-05 13:13:42 +02:00
darken	afe1399f72	Release: 2.9.0-rc0	2023-04-02 22:25:17 +02:00
Matthias Urhahn	20ce2d3e22	A troubleshooter that automatically goes through different compatibility settings. (#125 )	2023-04-02 22:22:15 +02:00
Matthias Urhahn	cea8f2290d	More IAP improvements (#121 ) * More IAP improvements * More refactoring * More tolerance towards GPlay API issues. * Bump billing dependency * Migrate away from deprecated methods.	2023-03-20 08:21:54 +01:00
darken	1b5b59c41b	Release: 2.8.4-rc0	2023-03-13 17:28:28 +01:00
Matthias Urhahn	8df7c19e84	Fix billing client disconnection handling (#117 )	2023-03-13 17:28:01 +01:00
darken	88b0069b94	Release: 2.8.3-rc0	2023-03-13 13:48:11 +01:00
Matthias Urhahn	3b8ddc9f06	Fix reversed AirPods Max wear-detection (#116 ) * Fix reversed AirPods Max wear-detection Fixes #115 * Remove unnecessary test	2023-03-13 13:47:32 +01:00
darken	708c7f38ec	Merge remote-tracking branch 'origin/main' into main	2023-03-12 14:05:25 +01:00
darken	139daa1cc2	Update full gplay text	2023-03-12 14:05:20 +01:00
Matthias Urhahn	b85ac778c0	Address that gplay api can emit multiple times (#114 )	2023-03-12 02:58:37 +01:00
Matthias Urhahn	a3e2c9e61d	Bump dependencies and gradle (#113 )	2023-03-11 18:16:24 +01:00
Matthias Urhahn	ad78a0570c	For some reason we can finish the widget update broadcast twice. (#112 ) I can't yet determine why this race-condition occurs, due to the forced timeout, it shouldn't be due to exceeding the receiver ANR window...	2023-03-11 13:01:15 +01:00
Matthias Urhahn	7e6ee274d8	Quick data updates can cause concurrent access and modifying of the notification builder. (#111 ) Internally building the notification can then throw a ConcurrentModificationException.	2023-03-11 13:01:05 +01:00
Matthias Urhahn	daf7411c36	Show worker foreground notification early. (#110 )	2023-03-11 13:00:55 +01:00
darken	d3dedbe6cd	Release: 2.8.2-rc0	2023-03-10 12:13:30 +01:00
Matthias Urhahn	d5411586d5	Update translations (#109 ) * Update translations, add Portuguese * Update translations	2023-03-10 12:12:31 +01:00
Matthias Urhahn	94e2d40554	Fix AirPods Max wear detection. (#108 ) Closes #106	2023-03-10 11:30:40 +01:00
Matthias Urhahn	db80fa1b46	Wear: Remove unused code (#104 ) * Wear: Remove unused code * Remove more code	2023-03-02 16:39:11 +01:00
Matthias Urhahn	9b569b8d07	Update Turkish translation (#100 )	2023-02-20 09:39:27 +01:00
darken	90288880fb	Add f-droid as source	2023-02-20 09:14:20 +01:00
darken	870e518ff6	Release: 2.8.1-rc0	2023-02-09 22:01:02 +01:00
darken	6d89169bae	Update release.sh script to create default changelogs for f-droid	2023-02-09 21:59:44 +01:00
darken	ac77ee2703	Update default changelog for GPlay	2023-02-09 21:53:33 +01:00
darken	18dcf603e9	Release: 2.8.0-rc0	2023-02-03 22:32:01 +01:00
Matthias Urhahn	71aaba1b86	Fix data display for non dual apple pods (#98 ) * Fix data display for fake pods and beats devices (with two pods) * Rename methods	2023-02-03 22:31:23 +01:00
Matthias Urhahn	64b9d5f17a	Remove ~ and % from signal quality value, it's not necessarily a 0 to 100 percent indicator. (#96 )	2023-02-02 16:47:06 +01:00
Matthias Urhahn	a9f23c4bfe	Change defaults setting for "Show all devices" (#95 ) * Fix potential widget issue where a broadcast race condition causes the goAsync() to fail. * Enable "show all devices" by default to help new users.	2023-02-02 16:46:52 +01:00
Matthias Urhahn	f454f46778	Fix potential widget issue where a broadcast race condition causes the goAsync() to fail. (#94 )	2023-02-02 16:46:36 +01:00
Matthias Urhahn	432936ea2c	Merge pull request #93 from d4rken-org/crowd_reliability Improve tracking in crowds	2023-02-02 16:46:08 +01:00
Matthias Urhahn	8211b0ac88	Track case battery state outside of history list and simplify history clean up. (#92 )	2023-02-02 16:45:39 +01:00
Matthias Urhahn	c314987e13	Fix popup icon sizes (#91 )	2023-02-02 16:45:22 +01:00
Matthias Urhahn	fc6cd74752	If the current pods don't have a lid state value, and there is none in recent history, we can assume NOT_IN_CASE. (#90 )	2023-02-02 16:45:05 +01:00
Matthias Urhahn	a47011e579	Merge branch 'main' into crowd_reliability	2023-02-02 14:57:04 +01:00
darken	fbeeec6539	Boost signal quality rating by up to 25% depending on how long they have been tracked.	2023-02-02 14:46:29 +01:00
darken	e1cd79cd9d	Cap reliability at 100%	2023-02-02 14:45:44 +01:00
darken	692ced1ee7	Timeout after 30 not 20 seconds.	2023-02-02 14:45:22 +01:00
darken	c5cc127df4	Smooth rssi values and use reliability (missed signals) as boost, not as factor.	2023-02-02 11:50:33 +01:00
Matthias Urhahn	5f00f10ae8	Remove short hash from generated apk file names (#89 )	2023-02-02 08:38:22 +01:00
Matthias Urhahn	0fc9716f06	Only apply Bugsnag to gplay build flavor (#88 ) * wip * Setup bugsnag only in gplay builds. * Bugsnag does not support uploading mapping files or build information from library modules. This should be done from the application module which produces your APK instead. * Only apply Bugsnag plugin for the right flavors. * Run unit tests in debug, otherwise we run issues requiring api keys in the env	2023-02-01 11:17:50 +01:00
darken	48fd3543e3	Release: 2.7.2-rc0	2023-01-30 13:38:53 +01:00
Matthias Urhahn	41985794c2	Adjust supported AirPods Max features. (#86 ) Remove state detection (was UNKNOWN when it should have been MUSIC). Add PodStyle detection.	2023-01-30 13:37:40 +01:00
Matthias Urhahn	87a92fd001	Fix feature display for single pods inside the app. (#87 )	2023-01-30 13:37:31 +01:00
darken	f6f53f2a15	Release: 2.7.1-rc1	2023-01-28 22:14:47 +01:00
Matthias Urhahn	2531769b79	Update translations (#85 ) Add arabic and update chinese (TW)	2023-01-28 22:12:25 +01:00
darken	e9fa9f6cb8	Release: 2.7.0-rc0	2023-01-25 16:54:32 +01:00
Matthias Urhahn	b98ca86886	Faster CI checks (#83 ) * Parallelize CI code checks * Only assemble debug variant, otherwise we need to setup signing.	2023-01-25 16:47:46 +01:00
Matthias Urhahn	d917c8ffe6	New compatibility option for receiving BLE data (#82 ) * Improve compat options: Add alternative method for receiving BLE scan results via PendingIntents * Add missing logtags * Reduce log spam * Make the linter happy	2023-01-25 16:27:29 +01:00
Matthias Urhahn	5d44737199	Merge pull request #80 from d4rken-org/compatibility_options Improve compatibility options	2023-01-25 14:56:10 +01:00
Matthias Urhahn	6e8693a6b0	Merge pull request #81 from d4rken-org/modularize_permissions Move shared permissions into the common module	2023-01-25 14:55:54 +01:00
darken	6d9e7404a1	Improve compatibility options	2023-01-25 14:46:20 +01:00
darken	70ceb389b5	Move shared permissions into the common module.	2023-01-25 14:44:38 +01:00
darken	832e364a2f	Update translations	2023-01-25 09:26:50 +01:00
darken	51f9c5c7d8	Release: 2.6.1-rc0	2023-01-20 12:55:28 +01:00
Matthias Urhahn	15141c8528	More granular pod features (#76 ) * Make pod features more granular Don't assume all AirPods/Beats return a correct connection state. * Refactoring * Fix refactoring regression * AirPods Gen1 don't support state detection	2023-01-18 22:15:38 +01:00
Matthias Urhahn	0cdac10fd4	Update README.md	2023-01-14 16:45:11 +01:00
darken	aaab548bfd	Release: 2.6.0-rc0	2023-01-14 16:44:16 +01:00
Matthias Urhahn	46611b5606	Add preliminary support for Beats Fit Pro (#75 )	2023-01-14 16:35:04 +01:00
Matthias Urhahn	fdbdb46577	Overhaul play/pause reaction code (#74 )	2023-01-14 16:21:57 +01:00
darken	e7fd81d0eb	Release: 2.5.3-rc1	2023-01-12 12:51:46 +01:00
darken	ce50bae6a0	Merge branch 'main' of github.com:d4rken-org/capod into main	2023-01-12 12:51:03 +01:00
darken	8331cf3866	Release: 2.5.3-rc0	2023-01-12 12:50:53 +01:00
Matthias Urhahn	670262e53b	Update README.md	2023-01-12 12:50:44 +01:00
Matthias Urhahn	c584f942cf	Support for fake AirPods 2. Generation (#73 )	2023-01-12 12:32:44 +01:00
darken	e83b6bb583	Update readme	2023-01-12 12:11:46 +01:00
darken	cc5de668f0	Add additional test data for fake AirPods Pro2	2023-01-12 12:07:24 +01:00
darken	653c7b8c4b	Release: 2.5.2-rc0	2023-01-06 16:45:28 +01:00
darken	4e38bcd4cc	Fix left pod icon tint.	2023-01-06 16:44:30 +01:00
Matthias Urhahn	fcbeda4888	Improve feature support for fake AirPods Gen3 (#72 ) Remove microphone detection and add ear detection.	2023-01-06 16:40:03 +01:00
Matthias Urhahn	4101fddc5b	Improve feature support for fake AirPods Gen1 (#71 ) Remove microphone detection and add ear detection and pod charge detection.	2023-01-06 16:39:46 +01:00
darken	86df7bea22	Improve feature support for fake AirPods Pro Remove microphone detection and add pod charging and ear detection.	2023-01-06 16:02:38 +01:00
darken	4db8c0c286	Add support for fake AirPods Pro 2	2023-01-06 16:02:25 +01:00
darken	1d03335903	Improve dual pod widget layout, use same style as notification.	2023-01-02 18:26:33 +01:00
darken	b1b541014f	Release: 2.5.1-rc0	2022-12-24 11:57:34 +01:00
darken	b40a7e435f	Update translations	2022-12-24 11:56:46 +01:00
Matthias Urhahn	8305fb4c5f	Airpod pro2 icon iteration (#64 ) * Update airpods pro icons to SVG variant * Fix AirPodsPro2 not using the new icons * Revert "Update airpods pro icons to SVG variant" This reverts commit `d7ca13d439`. * Add padding to icons	2022-12-24 11:48:32 +01:00
darken	6c678be511	Release: 2.5.0-rc1	2022-12-23 09:54:19 +01:00
darken	2823663f09	Merge branch 'main' of github.com:d4rken-org/capod into main	2022-12-23 09:53:08 +01:00
darken	033c2264f8	Release: 2.5.0-rc0	2022-12-23 09:52:59 +01:00
darken	8eb6ce19f7	Add support for specific left/right/case icons. Add AirPods Pro 2 Icons by @christoschronopoulos	2022-12-23 09:52:17 +01:00
darken	1cfc4e6f65	Merge branch 'improve_fake_airpod_support' into main	2022-12-23 08:27:00 +01:00
darken	454d76e305	Release: 2.4.0-rc0	2022-12-19 17:10:30 +01:00
darken	f3609fc3a5	Update translations	2022-12-19 17:09:55 +01:00
darken	16da51d095	Refactor fake airpods code and improve tests	2022-12-19 17:09:55 +01:00
darken	51fb4c7a29	Update translations	2022-12-19 17:03:17 +01:00
darken	0b27cb55dc	Refactor fake airpods code and improve tests	2022-12-19 17:03:17 +01:00
darken	9e836eef69	Add support for fake AirPods Gen3	2022-12-19 16:32:09 +01:00
darken	07be4b8258	Release: 2.3.1-rc0	2022-11-07 22:51:12 +01:00
darken	217087c6d4	Clean up tests	2022-11-07 22:50:52 +01:00
Matthias Urhahn	2315a18c86	Improve history caching for AirPods. (#55 ) Don't throw away the last history item that contains case infos.	2022-11-07 22:28:13 +01:00
Matthias Urhahn	f59e9d2dc5	Fix comparison that determines which list item is the primary device. (#54 )	2022-11-07 19:42:31 +01:00
Matthias Urhahn	1da220085c	Merge pull request #53 from d4rken-org/improve_automatic_monitor_mode Improve automatic monitor mode	2022-11-07 19:36:30 +01:00
Matthias Urhahn	962b2a01f1	Merge branch 'main' into improve_automatic_monitor_mode	2022-11-07 19:35:49 +01:00
darken	eeda14f424	When in MonitorMode.AUTOMATIC and there is no mainDeviceAddress set, then just keep running while there is any connected headset device.	2022-11-07 19:25:31 +01:00
darken	6269e20085	When selecting automatic monitor-mode, check if the user has selected a device address, if not pop up the selection dialog.	2022-11-07 19:08:52 +01:00
Matthias Urhahn	3d05296eb2	Merge pull request #51 from GitGitro/main add monochrome icon	2022-11-07 18:36:48 +01:00
GitGitro	e90ab95cd0	add monochrome icon, closes #50,closes #23	2022-11-07 15:31:31 +01:00
Matthias Urhahn	23ec2f025e	Update README.md	2022-11-05 12:31:21 +01:00