Release: 4.0.2-rc0

Wrap super.onCreate() (Hilt injection) in try-catch to prevent

DI failures from crashing the process. The service is already

foreground at this point, so a graceful stopSelf() satisfies the

FGS timeout requirement without killing the app.

.claude/.gitignore

@@ -0,0 +1 @@
+worktrees/

.claude/CLAUDE.md

@@ -0,0 +1,49 @@
+# CAPod - Companion for AirPods
+
+Android app that detects and monitors AirPods via Bluetooth LE. Displays battery levels, triggers popup notifications on case open, and provides home screen widgets.
+
+## Project Structure
+
+| Module | Description |
+|--------|-------------|
+| `app/` | Main Android app (FOSS and Google Play flavors) |
+| `app-common/` | Shared code between phone and Wear OS apps |
+
+## Build Flavors
+
+- **FOSS** (`foss`): Open-source, no Google Play dependencies
+- **Google Play** (`gplay`): Includes billing client for IAP
+
+Quick build check: `./gradlew assembleFossDebug`
+
+## Key Locations
+
+| Path | Contains |
+|------|----------|
+| `app/src/main/java/` | Main app source (activities, fragments, services) |
+| `app-common/src/main/java/` | Shared logic (monitor, bluetooth, models) |
+| `app/src/main/res/` | Layouts, drawables, strings |
+| `app-common/src/test/` | Unit tests |
+| `app/build.gradle.kts` | App build config, dependencies, flavors |
+| `app/src/debug/java/.../screenshots/` | Play Store screenshot content composables |
+| `fastlane/` | Screenshot generation scripts, Play Store metadata |
+
+## Development Tips
+
+- Use `assembleFossDebug` as the fastest build variant for iteration
+- Shared code goes in `app-common/`, app-specific code in `app/`
+- Follow existing patterns — the codebase uses MVVM + Hilt + Coroutines
+- Always use string resources for user-facing text (see localization rules)
+- Check `git log --oneline -20` for commit message style before committing
+
+## Rules Reference
+
+Detailed guidelines are in `.claude/rules/`:
+
+- `architecture.md` — Module structure, key components, data flow, dependencies
+- `build-commands.md` — Build, test, lint, and release commands
+- `localization.md` — String resource naming conventions
+- `commit-guidelines.md` — Commit message format and prefixes
+- `pull-requests.md` — PR title and description conventions
+- `agent-instructions.md` — Sub-agent delegation and critical thinking
+- `screenshots.md` — Play Store screenshot pipeline, commands, adding new screens

.claude/rules/agent-instructions.md

@@ -0,0 +1,39 @@
+---
+description: Instructions for Claude Code sub-agents and task delegation
+globs:
+  - "**"
+---
+
+# Agent Instructions
+
+## Critical Thinking
+
+- Do not blindly accept information at face value
+- Verify assumptions against actual code before proceeding
+- When encountering unexpected behavior, investigate root causes rather than applying workarounds
+- If something seems wrong, it probably is — dig deeper
+
+## Explore vs. Implement
+
+- **Explore first**: Before making changes, understand the existing code structure and patterns
+- **Read before writing**: Always read relevant files before modifying them
+- **Follow existing patterns**: Match the code style and architecture already in use
+- **Minimal changes**: Only change what's necessary to accomplish the task
+
+## Sub-Agent Delegation
+
+When using Task tool to spawn sub-agents:
+
+- Provide complete context — sub-agents don't share your conversation history unless noted
+- Be specific about what you need: research only, or research + implementation
+- Use `Explore` agent type for codebase investigation
+- Use `Bash` agent type for running builds and tests
+- Parallelize independent sub-agent tasks for efficiency
+
+## Common Pitfalls
+
+- Don't create new files when editing existing ones would suffice
+- Don't add features beyond what was requested
+- Don't refactor surrounding code when fixing a bug
+- Don't add comments or documentation to code you didn't change
+- Don't guess at file paths — use Glob/Grep to find them

.claude/rules/architecture.md

@@ -0,0 +1,84 @@
+---
+description: Architecture overview, module structure, key components, data flow, and dependencies
+globs:
+  - "app/**/*.kt"
+  - "app-common/**/*.kt"
+  - "**/*.gradle.kts"
+---
+
+# Architecture
+
+## Multi-Module Structure
+
+- **app/**: Main Android application with FOSS and Google Play flavors
+- **app-common/**: Shared code between main app and Wear OS app
+
+## Core Patterns
+
+- **MVVM**: ViewModels with LiveData/StateFlow for UI state management
+- **Dependency Injection**: Hilt/Dagger for dependency management
+- **Coroutines**: Kotlin coroutines for async operations
+- **Repository Pattern**: Data layer abstraction for monitoring and settings
+
+## Key Components
+
+### PodMonitor System
+
+- `PodMonitor`: Core service that detects and tracks AirPods via Bluetooth LE
+- `MonitorControl`: Manages MonitorService lifecycle
+- `MonitorService`: Foreground service that continuously scans for AirPods
+- `BluetoothEventReceiver`: Handles system Bluetooth events
+
+### Reaction System
+
+- `ReactionSettingsFragment`: Configuration for popup notifications
+- `PopUpWindow`: Displays AirPods status when case is opened
+- `PopUpPodViewFactory`: Creates UI components for different pod models
+
+### Common Utilities
+
+- `EdgeToEdgeHelper`: Handles Android edge-to-edge display insets
+
+## Build Configuration
+
+### Flavors
+
+- **FOSS**: Open-source version without Google Play dependencies
+- **Google Play (gplay)**: Version with billing client for in-app purchases
+
+### Build Types
+
+- **debug**: Unobfuscated, full logging, no minification
+- **beta**: Obfuscated, production-ready with strict lint checks
+- **release**: Fully optimized for production distribution
+
+## Data Flow
+
+The app follows a unidirectional data flow:
+
+1. `BluetoothEventReceiver` detects Bluetooth events
+2. `MonitorService` scans for AirPods beacon data
+3. `PodMonitor` processes and stores device information
+4. ViewModels observe monitor data via repositories
+5. UI components react to ViewModel state changes
+6. `ReactionSystem` triggers popups and notifications
+
+## Bluetooth LE Implementation
+
+The app uses Android's Bluetooth LE APIs to scan for Apple device advertisements. The core scanning logic is in `MonitorService` which runs as a foreground service.
+
+## Multi-Platform Considerations
+
+Code shared between phone and Wear OS apps is placed in `app-common`. When modifying shared functionality, ensure compatibility across both platforms.
+
+## Testing Strategy
+
+- **Unit Tests**: Located in `app-common/src/test/` for shared logic
+- **Test Flavors**: Separate test configurations for FOSS and Google Play variants
+
+## Key Dependencies
+
+- **Hilt**: Dependency injection framework
+- **AndroidX Navigation**: Fragment navigation with SafeArgs
+- **kotlinx.serialization**: JSON serialization for configuration and caching
+- **Material Design**: UI components following Material Design guidelines

.claude/rules/build-commands.md

@@ -0,0 +1,71 @@
+---
+description: Build, test, lint, and release commands for Gradle
+globs:
+  - "**/*.gradle.kts"
+  - "**/*.gradle"
+  - "gradle/**"
+---
+
+# Build Commands
+
+## Build
+
+```bash
+# Build debug version
+./gradlew assembleDebug
+
+# Build all variants (FOSS and Google Play flavors)
+./gradlew assemble
+
+# Build specific flavor and type
+./gradlew assembleFossDebug
+./gradlew assembleGplayRelease
+
+# Build app bundles for Play Store
+./gradlew bundleGplayRelease
+```
+
+## Testing
+
+```bash
+# Run all unit tests
+./gradlew test
+
+# Run unit tests for specific variant
+./gradlew testFossDebugUnitTest
+
+# Run instrumentation tests (requires connected device/emulator)
+./gradlew connectedAndroidTest
+./gradlew connectedFossDebugAndroidTest
+
+# Run all checks (lint + tests)
+./gradlew check
+```
+
+## Code Quality
+
+```bash
+# Run lint for all variants
+./gradlew lint
+
+# Run lint for specific variant
+./gradlew lintFossDebug
+
+# Auto-fix lint issues where possible
+./gradlew lintFix
+
+# Update lint baseline
+./gradlew updateLintBaseline
+```
+
+## Release
+
+```bash
+./gradlew assembleFossRelease assembleGplayRelease
+```
+
+## Notes
+
+- Use `assembleFossDebug` as the default quick-check build (fastest variant)
+- Run `./gradlew check` before submitting changes to catch lint and test issues
+- Instrumentation tests require a connected device or running emulator

.claude/rules/commit-guidelines.md

@@ -0,0 +1,41 @@
+---
+description: Git commit message format and conventions
+globs:
+  - "**"
+---
+
+# Commit Guidelines
+
+## Format
+
+```
+<prefix>: <Short summary>
+```
+
+Summary line should be concise and describe the change. No period at the end.
+
+## Prefixes
+
+Use the existing commit history as reference. Common prefixes:
+
+- **fix**: Bug fixes (e.g., `fix: Handle display cutouts in landscape mode`)
+- **feat**: New features
+- **refactor**: Code restructuring without behavior change
+- **chore**: Maintenance, dependency updates, build config
+- **docs**: Documentation changes
+
+## Component Scope (optional)
+
+When a change is scoped to a specific area, include it after the prefix:
+
+- `fix(widget): Fix layout for devices with single charge detection`
+- `feat(monitor): Add battery level caching`
+- `refactor(popup): Extract pod view factory`
+
+## Rules
+
+- Keep the summary line under 72 characters
+- Use imperative mood ("Add feature" not "Added feature")
+- Reference issue numbers when applicable
+- Do not include `Co-authored-by` trailers
+- Look at recent `git log` output to match the project's existing style

.claude/rules/localization.md

@@ -0,0 +1,21 @@
+---
+description: Guidelines for adding and naming Android string resources
+globs:
+  - "**/res/values*/strings.xml"
+---
+
+# Localization Guidelines
+
+When adding new user-facing strings:
+
+- **Always use string resources**: Never hardcode user-facing text in layouts or code
+- **Follow naming conventions**: Use descriptive, hierarchical naming (e.g., `profiles_name_default`, `settings_bluetooth_enabled`)
+- **Provide context**: String names should indicate usage and location
+- **Consider pluralization**: Use Android plural resources (`<plurals>`) when quantities vary
+
+## Naming Examples
+
+- `profiles_create_title` (screen title)
+- `profiles_name_label` (form field label)
+- `profiles_delete_confirmation` (dialog message)
+- `error_network_unavailable` (error message)

.claude/rules/pull-requests.md

@@ -0,0 +1,78 @@
+---
+description: Pull request naming and description conventions
+globs:
+  - "**"
+---
+
+# Pull Request Guidelines
+
+## PR Title Format
+
+```
+<Category>: <Short user-facing summary>
+```
+
+PR titles appear in auto-generated changelogs and are read by users. Use **ELI5, user-facing language** — no internal class names, library names, or implementation details.
+
+## Category Prefixes
+
+| Prefix | Covers |
+|--------|--------|
+| **Widget** | Home screen widget |
+| **Reaction** | Case-open popup, auto-play/pause, notification triggers |
+| **Device** | AirPods detection, compatibility, Bluetooth scanning, battery reading, device profiles |
+| **General** | Dashboard, settings, notifications, themes, onboarding, support, app-wide UI |
+| **Fix** | Bug fixes spanning multiple areas |
+
+### Title Examples
+
+- `Widget: Add color themes and transparency slider`
+- `Reaction: Fix popup appearing twice when opening AirPods case`
+- `Device: Add support for AirPods 4 with ANC`
+- `General: Add dark mode and color theme settings`
+- `Fix: Fix battery display stuck at 0% after reconnecting`
+
+### Bad Titles (too technical)
+
+- `refactor(settings): Migrate preferences to AndroidX DataStore`
+- `feat(widget): Migrate to Jetpack Glance`
+- `refactor(ui): Migrate from Fragments to Jetpack Compose`
+
+## PR Description Format
+
+### What changed
+
+User-friendly explanation of what this PR does. Describe the problem that was fixed or the feature that was added from the user's perspective. No internal class or method names.
+
+For non-user-facing PRs (refactors, tests, CI, dependency bumps): write "No user-facing behavior change" followed by a brief internal description.
+
+### Technical Context
+
+Explain what's hard to extract from the diff alone. Focus on:
+
+- **Why** this approach was chosen (and alternatives considered/rejected)
+- **Root cause** for bug fixes (the diff shows the fix, not what caused it)
+- **Non-obvious side effects** or behavioral changes not apparent from reading the code
+- **Review guidance** — what's tricky or deserves close attention
+
+Keep it scannable with bullet points. Don't restate what's visible in the diff (file names, class renames, line-level changes).
+
+### Example
+
+```markdown
+## What changed
+
+Fixed a crash that could happen when the AirPods case is opened while Bluetooth is turning off.
+
+## Technical Context
+
+- Root cause: `MonitorService` continued processing scan results during Bluetooth adapter state change, hitting a null adapter reference
+- Chose to gate on adapter state in the scan callback rather than adding a separate BroadcastReceiver, since the service already observes adapter state for restart logic
+- The timing window is ~200ms between ACTION_STATE_CHANGING and ACTION_STATE_OFF — only reproducible on Pixel devices with aggressive Bluetooth power management
+```
+
+## Conventions
+
+- **Issue references**: Use "Closes #123", "Fixes #123", or "Resolves #123"
+- **Breaking changes**: Mark with "BREAKING:" prefix if applicable
+- **No `Co-authored-by` trailers** (per project convention)

.claude/rules/screenshots.md

@@ -0,0 +1,68 @@
+# Play Store Screenshot Pipeline
+
+## Overview
+
+Localized screenshots are generated using Compose Preview Screenshot Testing (alpha), rendered offline (no device needed), and sorted into fastlane metadata directories for Play Store upload.
+
+## Pipeline
+
+```
+ScreenshotContent.kt (mock data + composables)
+    → PlayStoreScreenshots.kt (@PreviewTest entry points)
+    → PlayStoreLocales.kt (multi-preview locale annotations, auto-generated per batch)
+    → generate_screenshots.sh (batched Gradle runs to avoid OOM)
+    → copy_screenshots.sh (sort PNGs into fastlane locale dirs)
+    → fastlane/metadata/android/{locale}/images/phoneScreenshots/
+```
+
+## Key Files
+
+| File | Purpose |
+|------|---------|
+| `app/src/debug/java/.../screenshots/ScreenshotContent.kt` | Mock data composables for each screen (8 screens) |
+| `app/src/screenshotTest/kotlin/.../screenshots/PlayStoreScreenshots.kt` | `@PreviewTest` functions that wire content to locale annotations |
+| `app/src/screenshotTest/kotlin/.../screenshots/PlayStoreLocales.kt` | Multi-preview annotations (auto-generated by batch script) |
+| `fastlane/generate_screenshots.sh` | Batched generation across 68 locales |
+| `fastlane/copy_screenshots.sh` | Copies rendered PNGs into fastlane structure |
+
+## Commands
+
+```bash
+# Full run — all 68 locales, ~12 batches, ~7 minutes
+./fastlane/generate_screenshots.sh
+
+# Smoke test — 6 locales (en, de, ja, ar, zh-CN, pt-BR), single batch
+./fastlane/generate_screenshots.sh --smoke
+
+# Copy into fastlane directories (run after generate)
+./fastlane/copy_screenshots.sh
+
+# Clean copy (removes old screenshots first)
+./fastlane/copy_screenshots.sh --clean
+```
+
+## Adding a New Screenshot
+
+1. Add a composable content function in `ScreenshotContent.kt` (e.g. `NewScreenContent()`)
+2. Add a `@PreviewTest` function in `PlayStoreScreenshots.kt` that calls it
+3. Add the function name → filename mapping in `copy_screenshots.sh` `SCREEN_MAP`
+4. Update the expected count in `generate_screenshots.sh` (composables per locale)
+5. Run the full pipeline: `generate_screenshots.sh` then `copy_screenshots.sh`
+
+## After UI Changes
+
+When modifying a screen that appears in screenshots (check `ScreenshotContent.kt`), regenerate:
+
+```bash
+./fastlane/generate_screenshots.sh
+./fastlane/copy_screenshots.sh --clean
+```
+
+## Technical Notes
+
+- Batch size defaults to 2 locales (16 renders) to avoid layoutlib memory leak (~10MB/image)
+- Gradle daemon is stopped between batches to release memory
+- `PlayStoreLocales.kt` is temporarily rewritten per batch and restored via trap
+- Device spec: 1080x2400px @ 428 DPI (Pixel-class phone)
+- Uses `com.android.compose.screenshot` plugin v0.0.1-alpha13
+- Output: `app/src/screenshotTestGplayDebug/reference/`

.claude/settings.json

@@ -0,0 +1,16 @@
+{
+  "permissions": {
+	"allow": [
+	  "mcp__ide__getDiagnostics",
+	  "WebSearch"
+	],
+	"deny": []
+  },
+  "enabledPlugins": {
+	"android-translation@claude-code-cafe": true,
+	"debugbadger@claude-code-cafe": true,
+	"jvm-tools@claude-code-cafe": true,
+	"frontend-design@claude-plugins-official": true,
+	"kotlin-lsp@claude-plugins-official": true
+  }
+}

.github/actions/common-setup/action.yml

@@ -0,0 +1,42 @@
+name: 'Common project setup'
+description: 'Setup the base project'
+runs:
+  using: "composite"
+  steps:
+    - name: Set up JDK 17
+      uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 #v5.2.0
+      with:
+        java-version: '17'
+        distribution: 'temurin'
+
+    - name: Grant execute permission for gradlew
+      shell: bash
+      run: chmod +x gradlew
+
+    - name: Cache Gradle Wrapper
+      uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 #v5.0.3
+      with:
+        path: |
+          ~/.gradle/wrapper
+          !~/.gradle/wrapper/dists/**/gradle*.zip
+        key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradle-wrapper.properties') }}
+        restore-keys: |
+          ${{ runner.os }}-gradle-wrapper-
+
+    - name: Cache Gradle Dependencies
+      uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 #v5.0.3
+      with:
+        path: |
+          ~/.gradle/caches
+        key: ${{ runner.os }}-gradle-caches-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties', 'buildSrc/**/*.kt') }}
+        restore-keys: |
+          ${{ runner.os }}-gradle-caches-
+
+    - name: Cache Android Global Build-Cache
+      uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 #v5.0.3
+      with:
+        path: |
+          ~/.android/build-cache
+        key: ${{ runner.os }}-android-build-cache-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+        restore-keys: |
+          ${{ runner.os }}-android-build-cache-

.github/release.yml

@@ -0,0 +1,14 @@
+changelog:
+  exclude:
+    labels:
+      - changelog-ignore
+  categories:
+    - title: ":rocket: Enhancements"
+      labels:
+        - enhancement
+    - title: ":lady_beetle: Bug fixes"
+      labels:
+        - bug
+    - title: ":shrug: Other changes"
+      labels:
+        - "*"

.github/workflows/code-checks.yml

@@ -7,46 +7,64 @@ on:
     branches: [ main ]
 
 jobs:
-  build-all:
-    name: Assemble all variants
+  lint-vital:
+    name: Lint vitals
+    strategy:
+      fail-fast: false
+      matrix:
+        flavor: [ Foss,Gplay ]
+        variant: [ Beta,Release ]
+        module: [ app ]
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout source code
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd #v6.0.2
+      - name: Setup project and build environment
+        uses: ./.github/actions/common-setup
+
+      - name: Check for fatal lint issues
+        run: ./gradlew lintVital${{ matrix.flavor }}${{ matrix.variant }}
+
+  build-modules:
+    name: Build apps
     strategy:
       fail-fast: false
       matrix:
         flavor: [ Foss,Gplay ]
         variant: [ Debug ]
-    runs-on: ubuntu-latest
+        module: [ app ]
+    runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 11
-        uses: actions/setup-java@v2
-        with:
-          java-version: '11'
-          distribution: 'adopt'
-          cache: gradle
-      - name: Grant execute permission for gradlew
-        run: chmod +x gradlew
+      - name: Checkout source code
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd #v6.0.2
+      - name: Setup project and build environment
+        uses: ./.github/actions/common-setup
 
-      - name: Build (Flavor ${{ matrix.flavor }}, Variant ${{ matrix.variant }})
-        run: ./gradlew assemble${{ matrix.flavor }}${{ matrix.variant }}
+      - name: Build modules
+        run: ./gradlew ${{ matrix.module }}:assemble${{ matrix.flavor }}${{ matrix.variant }}
 
-  test-all:
-    name: Run all tests
+  test-modules:
+    name: Unit tests
     strategy:
       fail-fast: false
       matrix:
-        flavor: [ Foss,Gplay ]
-        variant: [ Release ]
-    runs-on: ubuntu-latest
+        variant: [ Debug ]
+        flavor: [ testFoss,testGplay ]
+    runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 11
-        uses: actions/setup-java@v2
-        with:
-          java-version: '11'
-          distribution: 'adopt'
-          cache: gradle
-      - name: Grant execute permission for gradlew
-        run: chmod +x gradlew
+      - name: Checkout source code
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd #v6.0.2
+      - name: Setup project and build environment
+        uses: ./.github/actions/common-setup
 
-      - name: Run tests (Flavor ${{ matrix.flavor }}, Variant ${{ matrix.variant }})
-        run: ./gradlew test${{ matrix.flavor }}${{ matrix.variant }}
+      - name: Test modules
+        run: ./gradlew ${{ matrix.flavor }}${{ matrix.variant }}UnitTest
+
+  check-fastlane-metadata:
+    name: Fastlane metadata
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout source code
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd #v6.0.2
+      - name: Validate metadata lengths
+        run: bash fastlane/check_metadata_length.sh

.github/workflows/gradle-wrapper-validation.yml

@@ -11,7 +11,7 @@ on:
 jobs:
   validation:
     name: "Validation"
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v2
-      - uses: gradle/wrapper-validation-action@v1
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd #v6.0.2
+      - uses: gradle/actions/wrapper-validation@0723195856401067f7a2779048b490ace7a47d7c #v5.0.2

.github/workflows/release-tag.yml

@@ -4,11 +4,19 @@ on:
   push:
     tags:
       - 'v*'
+  workflow_dispatch:
+    inputs:
+      dry_run:
+        description: 'Build only, skip release/upload'
+        type: boolean
+        default: true
 
 jobs:
   release-github:
     name: Create GitHub release
-    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    runs-on: ubuntu-22.04
     environment: foss-production
     steps:
       - name: Decode Keystore
@@ -21,76 +29,59 @@ jobs:
           echo $ENCODED_KEYSTORE | base64 -di > "${TMP_KEYSTORE_FILE_PATH}"
           echo "STORE_PATH=$(echo $TMP_KEYSTORE_FILE_PATH)" >> $GITHUB_ENV
 
-      - name: Checkout
-        uses: actions/checkout@v3
+      - name: Checkout source code
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd #v6.0.2
         with:
           fetch-depth: 0
 
-      - name: Get the version
-        id: tagger
-        uses: jimschubert/query-tag-action@v2
-        with:
-          skip-unshallow: 'true'
-          abbrev: false
-          commit-ish: HEAD
-
-      - name: Install JDK ${{ matrix.java_version }}
-        uses: actions/setup-java@v3
-        with:
-          distribution: 'adopt'
-          java-version: 11
+      - name: Setup project and build environment
+        uses: ./.github/actions/common-setup
 
       - name: Assemble beta APK
-        if: contains(steps.tagger.outputs.tag, '-beta')
+        if: contains(github.ref_name, '-beta')
         run: ./gradlew assembleFossBeta
         env:
           VERSION: ${{ github.ref }}
           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')"
+        if: "!contains(github.ref_name, '-beta')"
         run: ./gradlew assembleFossRelease
         env:
           VERSION: ${{ github.ref }}
           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')
-        uses: softprops/action-gh-release@v1
+        if: contains(github.ref_name, '-beta') && !(github.event_name == 'workflow_dispatch' && inputs.dry_run)
+        uses: softprops/action-gh-release@a06a81a03ee405af7f2048a818ed3f03bbf83c7b #v2.5.0
         with:
           prerelease: true
-          tag_name: ${{ steps.tagger.outputs.tag }}
-          name: ${{ steps.tagger.outputs.tag }}
+          tag_name: ${{ github.ref_name }}
+          name: ${{ github.ref_name }}
           generate_release_notes: true
-          files: |
-            app/build/outputs/apk/foss/beta/*.apk
-            app-wear/build/outputs/apk/foss/beta/*.apk
+          files: app/build/outputs/apk/foss/beta/eu.darken.capod-*.apk
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Create release
-        if: "!contains(steps.tagger.outputs.tag, '-beta')"
-        uses: softprops/action-gh-release@v1
+        if: "!contains(github.ref_name, '-beta') && !(github.event_name == 'workflow_dispatch' && inputs.dry_run)"
+        uses: softprops/action-gh-release@a06a81a03ee405af7f2048a818ed3f03bbf83c7b #v2.5.0
         with:
           prerelease: false
-          tag_name: ${{ steps.tagger.outputs.tag }}
-          name: ${{ steps.tagger.outputs.tag }}
+          tag_name: ${{ github.ref_name }}
+          name: ${{ github.ref_name }}
           generate_release_notes: true
-          files: |
-            app/build/outputs/apk/foss/release/*.apk
-            app-wear/build/outputs/apk/foss/release/*.apk
+          files: app/build/outputs/apk/foss/release/eu.darken.capod-*.apk
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
   release-gplay:
     name: Create Google Play release
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     environment: gplay-production
     steps:
       - name: Decode Keystore
@@ -113,45 +104,32 @@ jobs:
           echo $ENCODED_SERVICE_KEY | base64 -di > "${TMP_SERVICEKEY_FILE_PATH}"
           echo "SUPPLY_JSON_KEY=$(echo $TMP_SERVICEKEY_FILE_PATH)" >> $GITHUB_ENV
 
-      - name: Checkout
-        uses: actions/checkout@v3
+      - name: Checkout source code
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd #v6.0.2
         with:
           fetch-depth: 0
 
-      - name: Get the version
-        id: tagger
-        uses: jimschubert/query-tag-action@v2
-        with:
-          skip-unshallow: 'true'
-          abbrev: false
-          commit-ish: HEAD
-
-      - name: Install JDK ${{ matrix.java_version }}
-        uses: actions/setup-java@v3
-        with:
-          distribution: 'adopt'
-          java-version: 11
+      - name: Setup project and build environment
+        uses: ./.github/actions/common-setup
 
       - name: Set up ruby env
-        uses: ruby/setup-ruby@v1
+        uses: ruby/setup-ruby@4eb9f110bac952a8b68ecf92e3b5c7a987594ba6 #v1.292.0
         with:
-          ruby-version: 2.7.6
+          ruby-version: 3.3.6
           bundler-cache: true
 
       - name: Assemble beta and upload to Google Play
-        if: contains(steps.tagger.outputs.tag, '-beta')
+        if: contains(github.ref_name, '-beta') && !(github.event_name == 'workflow_dispatch' && inputs.dry_run)
         run: bundle exec fastlane beta
         env:
           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 and upload to Google Play
-        if: "!contains(steps.tagger.outputs.tag, '-beta')"
+        if: "!contains(github.ref_name, '-beta') && !(github.event_name == 'workflow_dispatch' && inputs.dry_run)"
         run: bundle exec fastlane production
         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 }}

.gitignore

@@ -12,3 +12,8 @@
 *.jks
 .local/*
 /fastlane/report.xml
+/fastlane/Appfile
+/fastlane/README.md
+.kotlin
+# Screenshot test reference images (ephemeral, regenerated on demand)
+app/src/screenshotTest*/reference/

.idea/codeStyles/Project.xml

@@ -9,6 +9,7 @@
       <option name="DO_NOT_WRAP_AFTER_SINGLE_ANNOTATION" value="true" />
       <option name="IMPORT_LAYOUT_TABLE">
         <value>
+          <package name="" withSubpackages="true" static="false" module="true" />
           <package name="android" withSubpackages="true" static="false" />
           <emptyLine />
           <package name="com" withSubpackages="true" static="false" />

CHANGELOG.md

@@ -0,0 +1,90 @@
+---
+layout: plain
+permalink: /changelog
+title: "Changelog"
+---
+
+# Changelog for CAPod
+
+{% for release in site.github.releases %}
+
+## {{ release.tag_name }} - {{ release.published_at | date: "%B %d, %Y" }}
+
+{% assign clean_body = release.body | strip %}
+{% assign no_comments = clean_body | replace: "<!-- Release notes generated using configuration in .github/release.yml", "" %}
+{% assign no_comments = no_comments | split: "-->" %}
+{% if no_comments.size > 1 %}
+  {% assign clean_content = no_comments[1] | strip %}
+{% else %}
+  {% assign clean_content = no_comments[0] | strip %}
+{% endif %}
+
+{% comment %} Make links clickable {% endcomment %}
+{% assign lines = clean_content | split: "
+" %}
+{% assign processed_lines = "" %}
+{% for line in lines %}
+  {% if line contains "**Full Changelog**:" %}
+    {% comment %} Handle Full Changelog links {% endcomment %}
+    {% assign parts = line | split: ": " %}
+    {% if parts.size > 1 %}
+      {% assign url = parts[1] | strip %}
+      {% assign clickable_line = "**[View Changes](" | append: url | append: ")**" %}
+      {% assign processed_lines = processed_lines | append: clickable_line | append: "
+" %}
+    {% else %}
+      {% assign processed_lines = processed_lines | append: line | append: "
+" %}
+    {% endif %}
+  {% elsif line contains " in https://github.com/" and line contains "/pull/" %}
+    {% comment %} Handle pull request links {% endcomment %}
+    {% assign pr_parts = line | split: " in https://github.com/" %}
+    {% if pr_parts.size > 1 %}
+      {% assign before_url = pr_parts[0] %}
+      {% assign after_url = pr_parts[1] %}
+      {% assign url = "https://github.com/" | append: after_url %}
+      {% assign pr_number = after_url | split: "/pull/" %}
+      {% if pr_number.size > 1 %}
+        {% assign pr_num = pr_number[1] | split: " " | first %}
+        {% assign clickable_line = before_url | append: " in [#" | append: pr_num | append: "](" | append: url | append: ")" %}
+        {% assign processed_lines = processed_lines | append: clickable_line | append: "
+" %}
+      {% else %}
+        {% assign processed_lines = processed_lines | append: line | append: "
+" %}
+      {% endif %}
+    {% else %}
+      {% assign processed_lines = processed_lines | append: line | append: "
+" %}
+    {% endif %}
+  {% else %}
+    {% assign processed_lines = processed_lines | append: line | append: "
+" %}
+  {% endif %}
+{% endfor %}
+
+{% comment %} Add proper spacing between sections and bullet points {% endcomment %}
+{% assign final_content = processed_lines | replace: "
+### ", "
+
+### " %}
+{% assign final_content = final_content | replace: "
+## ", "
+
+## " %}
+{% assign final_content = final_content | replace: "
+- ", "
+
+- " %}
+
+{% comment %} Check if there are any bullet points (actual release notes) {% endcomment %}
+{% if final_content contains "## " or final_content contains "- " %}
+  {{ final_content | markdownify }}
+{% else %}
+  *No release notes available.*
+  
+  {{ final_content | markdownify }}
+{% endif %}
+
+---
+{% endfor %}

CNAME

@@ -0,0 +1 @@
+capod.darken.eu

Gemfile.lock

@@ -1,43 +1,49 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.5)
-      rexml
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
-    artifactory (3.0.15)
+    CFPropertyList (3.0.8)
+    abbrev (0.1.2)
+    addressable (2.8.8)
+      public_suffix (>= 2.0.2, < 8.0)
+    artifactory (3.0.17)
     atomos (0.1.3)
-    aws-eventstream (1.2.0)
-    aws-partitions (1.610.0)
-    aws-sdk-core (3.131.3)
-      aws-eventstream (~> 1, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.525.0)
-      aws-sigv4 (~> 1.1)
+    aws-eventstream (1.4.0)
+    aws-partitions (1.1216.0)
+    aws-sdk-core (3.242.0)
+      aws-eventstream (~> 1, >= 1.3.0)
+      aws-partitions (~> 1, >= 1.992.0)
+      aws-sigv4 (~> 1.9)
+      base64
+      bigdecimal
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.58.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.114.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+      logger
+    aws-sdk-kms (1.122.0)
+      aws-sdk-core (~> 3, >= 3.241.4)
+      aws-sigv4 (~> 1.5)
+    aws-sdk-s3 (1.213.0)
+      aws-sdk-core (~> 3, >= 3.241.4)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.4)
-    aws-sigv4 (1.5.1)
+      aws-sigv4 (~> 1.5)
+    aws-sigv4 (1.12.1)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
+    base64 (0.2.0)
+    benchmark (0.5.0)
+    bigdecimal (4.0.1)
     claide (1.1.0)
     colored (1.2)
     colored2 (3.1.2)
     commander (4.6.0)
       highline (~> 2.0.0)
+    csv (3.3.5)
     declarative (0.0.20)
-    digest-crc (0.6.4)
+    digest-crc (0.7.0)
       rake (>= 12.0.0, < 14.0.0)
-    domain_name (0.5.20190701)
-      unf (>= 0.0.5, < 1.0.0)
-    dotenv (2.7.6)
+    domain_name (0.6.20240107)
+    dotenv (2.8.1)
     emoji_regex (3.2.3)
-    excon (0.92.4)
-    faraday (1.10.0)
+    excon (0.112.0)
+    faraday (1.10.5)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
@@ -49,32 +55,36 @@ GEM
       faraday-rack (~> 1.0)
       faraday-retry (~> 1.0)
       ruby2_keywords (>= 0.0.4)
-    faraday-cookie_jar (0.0.7)
+    faraday-cookie_jar (0.0.8)
       faraday (>= 0.8.0)
-      http-cookie (~> 1.0.0)
+      http-cookie (>= 1.0.0)
     faraday-em_http (1.0.0)
-    faraday-em_synchrony (1.0.0)
+    faraday-em_synchrony (1.0.1)
     faraday-excon (1.1.0)
     faraday-httpclient (1.0.1)
-    faraday-multipart (1.0.4)
-      multipart-post (~> 2)
-    faraday-net_http (1.0.1)
+    faraday-multipart (1.2.0)
+      multipart-post (~> 2.0)
+    faraday-net_http (1.0.2)
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
     faraday-retry (1.0.3)
-    faraday_middleware (1.2.0)
+    faraday_middleware (1.2.1)
       faraday (~> 1.0)
-    fastimage (2.2.6)
-    fastlane (2.208.0)
+    fastimage (2.4.0)
+    fastlane (2.232.1)
       CFPropertyList (>= 2.3, < 4.0.0)
+      abbrev (~> 0.1.2)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
-      aws-sdk-s3 (~> 1.0)
+      aws-sdk-s3 (~> 1.197)
       babosa (>= 1.0.3, < 2.0.0)
-      bundler (>= 1.12.0, < 3.0.0)
-      colored
+      base64 (~> 0.2.0)
+      benchmark (>= 0.1.0)
+      bundler (>= 1.17.3, < 5.0.0)
+      colored (~> 1.2)
       commander (~> 4.6)
+      csv (~> 3.3)
       dotenv (>= 2.1.1, < 3.0.0)
       emoji_regex (>= 0.1, < 4.0)
       excon (>= 0.71.0, < 1.0.0)
@@ -82,133 +92,145 @@ GEM
       faraday-cookie_jar (~> 0.0.6)
       faraday_middleware (~> 1.0)
       fastimage (>= 2.1.0, < 3.0.0)
+      fastlane-sirp (>= 1.0.0)
       gh_inspector (>= 1.1.2, < 2.0.0)
       google-apis-androidpublisher_v3 (~> 0.3)
       google-apis-playcustomapp_v1 (~> 0.1)
+      google-cloud-env (>= 1.6.0, <= 2.1.1)
       google-cloud-storage (~> 1.31)
       highline (~> 2.0)
+      http-cookie (~> 1.0.5)
       json (< 3.0.0)
       jwt (>= 2.1.0, < 3)
+      logger (>= 1.6, < 2.0)
       mini_magick (>= 4.9.4, < 5.0.0)
-      multipart-post (~> 2.0.0)
+      multipart-post (>= 2.0.0, < 3.0.0)
+      mutex_m (~> 0.3.0)
       naturally (~> 2.2)
-      optparse (~> 0.1.1)
+      nkf (~> 0.2.0)
+      optparse (>= 0.1.1, < 1.0.0)
+      ostruct (>= 0.1.0)
       plist (>= 3.1.0, < 4.0.0)
       rubyzip (>= 2.0.0, < 3.0.0)
-      security (= 0.1.3)
+      security (= 0.1.5)
       simctl (~> 1.6.3)
       terminal-notifier (>= 2.0.0, < 3.0.0)
-      terminal-table (>= 1.4.5, < 2.0.0)
+      terminal-table (~> 3)
       tty-screen (>= 0.6.3, < 1.0.0)
       tty-spinner (>= 0.8.0, < 1.0.0)
       word_wrap (~> 1.0.0)
       xcodeproj (>= 1.13.0, < 2.0.0)
-      xcpretty (~> 0.3.0)
-      xcpretty-travis-formatter (>= 0.0.3)
+      xcpretty (~> 0.4.1)
+      xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
+    fastlane-sirp (1.0.0)
+      sysrandom (~> 1.0)
     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.96.0)
+      google-apis-core (>= 0.15.0, < 2.a)
+    google-apis-core (0.18.0)
       addressable (~> 2.5, >= 2.5.1)
-      googleauth (>= 0.16.2, < 2.a)
-      httpclient (>= 2.8.1, < 3.a)
+      googleauth (~> 1.9)
+      httpclient (>= 2.8.3, < 3.a)
       mini_mime (~> 1.0)
+      mutex_m
       representable (~> 3.0)
       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-cloud-core (1.6.0)
-      google-cloud-env (~> 1.0)
+    google-apis-iamcredentials_v1 (0.26.0)
+      google-apis-core (>= 0.15.0, < 2.a)
+    google-apis-playcustomapp_v1 (0.17.0)
+      google-apis-core (>= 0.15.0, < 2.a)
+    google-apis-storage_v1 (0.60.0)
+      google-apis-core (>= 0.15.0, < 2.a)
+    google-cloud-core (1.8.0)
+      google-cloud-env (>= 1.0, < 3.a)
       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-env (2.1.1)
+      faraday (>= 1.0, < 3.a)
+    google-cloud-errors (1.5.0)
+    google-cloud-storage (1.58.0)
       addressable (~> 2.8)
       digest-crc (~> 0.4)
-      google-apis-iamcredentials_v1 (~> 0.1)
-      google-apis-storage_v1 (~> 0.1)
+      google-apis-core (>= 0.18, < 2)
+      google-apis-iamcredentials_v1 (~> 0.18)
+      google-apis-storage_v1 (>= 0.42)
       google-cloud-core (~> 1.6)
-      googleauth (>= 0.16.2, < 2.a)
+      googleauth (~> 1.9)
       mini_mime (~> 1.0)
-    googleauth (1.2.0)
-      faraday (>= 0.17.3, < 3.a)
+    googleauth (1.11.2)
+      faraday (>= 1.0, < 3.a)
+      google-cloud-env (~> 2.1)
       jwt (>= 1.4, < 3.0)
-      memoist (~> 0.16)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
     highline (2.0.3)
-    http-cookie (1.0.5)
+    http-cookie (1.0.8)
       domain_name (~> 0.5)
-    httpclient (2.8.3)
-    jmespath (1.6.1)
-    json (2.6.2)
-    jwt (2.4.1)
-    memoist (0.16.2)
-    mini_magick (4.11.0)
-    mini_mime (1.1.2)
-    multi_json (1.15.0)
-    multipart-post (2.0.0)
-    nanaimo (0.3.0)
-    naturally (2.2.1)
-    optparse (0.1.1)
+    httpclient (2.9.0)
+      mutex_m
+    jmespath (1.6.2)
+    json (2.18.1)
+    jwt (2.10.2)
+      base64
+    logger (1.7.0)
+    mini_magick (4.13.2)
+    mini_mime (1.1.5)
+    multi_json (1.19.1)
+    multipart-post (2.4.1)
+    mutex_m (0.3.0)
+    nanaimo (0.4.0)
+    naturally (2.3.0)
+    nkf (0.2.0)
+    optparse (0.8.1)
     os (1.1.4)
-    plist (3.6.0)
-    public_suffix (4.0.7)
-    rake (13.0.6)
+    ostruct (0.6.3)
+    plist (3.7.2)
+    public_suffix (7.0.2)
+    rake (13.3.1)
     representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
-    retriable (3.1.2)
-    rexml (3.2.5)
-    rouge (2.0.7)
+    retriable (3.2.0)
+    rexml (3.4.4)
+    rouge (3.28.0)
     ruby2_keywords (0.0.5)
-    rubyzip (2.3.2)
-    security (0.1.3)
-    signet (0.17.0)
+    rubyzip (2.4.1)
+    security (0.1.5)
+    signet (0.21.0)
       addressable (~> 2.8)
       faraday (>= 0.17.5, < 3.a)
-      jwt (>= 1.5, < 3.0)
+      jwt (>= 1.5, < 4.0)
       multi_json (~> 1.10)
-    simctl (1.6.8)
+    simctl (1.6.10)
       CFPropertyList
       naturally
+    sysrandom (1.0.5)
     terminal-notifier (2.0.0)
-    terminal-table (1.8.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
     trailblazer-option (0.1.2)
     tty-cursor (0.7.1)
-    tty-screen (0.8.1)
+    tty-screen (0.8.2)
     tty-spinner (0.9.3)
       tty-cursor (~> 0.7)
     uber (0.1.0)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.8.2)
-    unicode-display_width (1.8.0)
-    webrick (1.7.0)
+    unicode-display_width (2.6.0)
     word_wrap (1.0.0)
-    xcodeproj (1.22.0)
+    xcodeproj (1.27.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
-      nanaimo (~> 0.3.0)
-      rexml (~> 3.2.4)
-    xcpretty (0.3.0)
-      rouge (~> 2.0.7)
+      nanaimo (~> 0.4.0)
+      rexml (>= 3.3.6, < 4.0)
+    xcpretty (0.4.1)
+      rouge (~> 3.28.0)
     xcpretty-travis-formatter (1.0.1)
       xcpretty (~> 0.2, >= 0.0.7)
 
 PLATFORMS
+  universal-darwin-24
   x86_64-linux
 
 DEPENDENCIES

PRIVACY_POLICY.md

@@ -1,5 +1,11 @@
+---
+layout: plain
+permalink: /privacy
+title: "Privacy Policy"
+---
+
 # Privacy policy
-This is the privacy policy for the Android app "CAPod - Companion for AirPods".
+This is the privacy policy for the Android app "CAPod - Companion for AirPods" by Matthias Urhahn (darken).
 
 ## Preamble
 CAPod respects your privacy.
@@ -20,23 +26,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.

README.md

@@ -1,10 +1,13 @@
 <img src="https://github.com/d4rken-org/capod/raw/main/.assets/banner.png" width="400">
 
 # Companion App for AirPods (CAPod)
+
 [![GitHub release (latest SemVer including pre-releases)](https://img.shields.io/github/v/release/d4rken-org/capod?include_prereleases)](https://github.com/d4rken-org/capod/releases/latest)
+[![RB Status](https://shields.rbtlog.dev/simple/eu.darken.capod)](https://shields.rbtlog.dev/eu.darken.capod)
 [![Code tests & eval](https://github.com/d4rken-org/capod/actions/workflows/code-checks.yml/badge.svg)](https://github.com/d4rken/capod/actions/workflows/code-checks.yml)
 [![Crowdin](https://badges.crowdin.net/capod/localized.svg)](https://crowdin.com/project/capod)
-[![Github All Releases](https://img.shields.io/github/downloads/d4rken-org/capod/total.svg)](https://github.com/d4rken-org/capod/releases/latest)
+[![Github Downloads](https://img.shields.io/github/downloads/d4rken-org/capod/total.svg?label=GitHub%20Downloads&logo=github)](https://github.com/d4rken-org/capod/edit/main/README.md#download)
+[![Google Play Downloads](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%24totalinstalls)](https://github.com/d4rken-org/capod/edit/main/README.md#download)
 
 A companion app that adds support for AirPod specific features to Android:
 
@@ -15,7 +18,6 @@ A companion app that adds support for AirPod specific features to Android:
 * Ear detection with automatic play/pause.
 * 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.
@@ -25,11 +27,16 @@ Currently supported models:
 * AirPods 1. Generation
 * AirPods 2. Generation
 * AirPods 3. Generation
+* AirPods 4. Generation
+* AirPods 4. Generation with ANC
 * AirPods Pro 1. Generation
 * AirPods Pro 2. Generation
+* AirPods Pro 2. Generation (USB-C)
+* AirPods Pro 3. Generation
 * AirPods Max
 * Power Beats Pro
 * Power Beats 3
+* Power Beats 4
 * Beats Solo 3
 * Beats Studio 3
 * Beats X
@@ -43,13 +50,14 @@ Currently supported models:
 
 ## Download
 
-| 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 (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/)                                                                                                 |
-
+| Source                                                                       | Status                                                                                                                                                                                                                                                         |
+|------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| [Google Play](https://play.google.com/store/apps/details?id=eu.darken.capod) | [![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://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 (Release)](https://github.com/d4rken-org/capod/releases)             | ![https://github.com/d4rken-org/capod/releases](https://img.shields.io/github/v/release/d4rken-org/capod?display_name=release&logo=github&label=GitHub%20(Release)) ![](https://img.shields.io/github/downloads/d4rken-org/capod/latest/total?label=%20)                                                   |
+| [Github (Pre-Release)](https://github.com/d4rken-org/capod/releases)         | ![https://github.com/d4rken-org/capod/releases](https://img.shields.io/github/v/release/d4rken-org/capod?include_prereleases&display_name=release&logo=github&label=GitHub%20(Pre-Release)) ![](https://img.shields.io/github/downloads-pre/d4rken-org/capod/latest/total?label=%20)                       |
+| [F-Droid](https://f-droid.org/en/packages/eu.darken.capod/)                  | [![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://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
 
@@ -66,6 +74,7 @@ Currently supported models:
 
 <img src="https://github.com/d4rken-org/capod/raw/main/.assets/screenshots/1.png" width="200"><img src="https://github.com/d4rken-org/capod/raw/main/.assets/screenshots/2.png" width="200"><img src="https://github.com/d4rken-org/capod/raw/main/.assets/screenshots/3.png" width="200"><img src="https://github.com/d4rken-org/capod/raw/main/.assets/screenshots/4.png" width="200">
 <img src="https://raw.githubusercontent.com/d4rken-org/capod/main/fastlane/metadata/android/en-US/images/phoneScreenshots/5.png" width="200">
+
 ## Thanks to
 
 * The [OpenPods](https://github.com/adolfintel/OpenPods) project,
@@ -74,6 +83,10 @@ Currently supported models:
   Travis & Rye, Erik & Sipes, Brandon & Teplov, Sam. (2019). Handoff All Your Privacy – A Review of Apple’s Bluetooth
   Low Energy Continuity Protocol. Proceedings on Privacy Enhancing Technologies. 2019. 34-53. 10.2478/popets-2019-0057.
 * Celosia, Guillaume. (2020). Privacy Challenges in Wireless Communications of the Internet of Things.
+* The [MagicPods](https://github.com/steam3d/MagicPods-Windows) project. If you are looking for "CAPod for Windows",
+  check it out.
+* [@kavishdevar](https://github.com/kavishdevar/librepods) and
+  his [LibrePods project](https://github.com/kavishdevar/librepods) for sharing a lot of cool stuff.
 
 ## License
 

VERSION

@@ -1 +1 @@
-2.7.2-rc0 20702000
+4.0.2-rc0 40002000

_config.yml

@@ -0,0 +1,28 @@
+theme: minima
+plugins:
+  - jekyll-relative-links
+  - jekyll-github-metadata
+  - jemoji
+
+relative_links:
+  enabled: true
+  collections: true
+
+title: "CAPod"
+description: "A companion app for AirPods on Android."
+author: "by Matthias Urhahn"
+
+include:
+  - PRIVACY_POLICY.md
+  - README.md
+  - CHANGELOG.md
+exclude:
+  - buildSrc
+  - gradle/wrapper
+  - fastlane
+  - Gemfile
+  - Gemfile.lock
+  - crowdin*
+  - app
+  - app-common
+  - CONTRIBUTING.md

_layouts/plain.html

@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html lang="{{ page.lang | default: site.lang | default: 'en' }}">
+
+  {%- include head.html -%}
+
+  <body>
+
+    <main class="page-content" aria-label="Content">
+      <div class="wrapper">
+        {{ content }}
+      </div>
+    </main>
+
+    {%- include footer.html -%}
+
+  </body>
+
+</html>

app-common/.gitignore

@@ -1 +0,0 @@
-/build

app-common/build.gradle.kts

@@ -1,100 +0,0 @@
-plugins {
-    id("com.android.library")
-    id("kotlin-android")
-    id("kotlin-kapt")
-    id("kotlin-parcelize")
-}
-apply(plugin = "dagger.hilt.android.plugin")
-
-android {
-    compileSdk = ProjectConfig.compileSdk
-
-    defaultConfig {
-        minSdk = ProjectConfig.minSdk
-        targetSdk = ProjectConfig.targetSdk
-
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles("consumer-rules.pro")
-
-        buildConfigField("Long", "VERSION_CODE", "${ProjectConfig.Version.code}L")
-        buildConfigField("String", "VERSION_NAME", "\"${ProjectConfig.Version.name}\"")
-        buildConfigField("String", "APPLICATION_ID", "\"${ProjectConfig.packageName}\"")
-        buildConfigField("String", "GITSHA", "\"${lastCommitHash()}\"")
-        buildConfigField("String", "BUILDTIME", "\"${buildTime()}\"")
-    }
-
-    buildFeatures {
-        viewBinding = true
-    }
-
-    compileOptions {
-        isCoreLibraryDesugaringEnabled = true
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-
-    kotlinOptions {
-        jvmTarget = "1.8"
-        freeCompilerArgs = freeCompilerArgs + listOf(
-            "-opt-in=kotlin.ExperimentalStdlibApi",
-            "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
-            "-opt-in=kotlin.time.ExperimentalTime",
-            "-opt-in=kotlin.ExperimentalUnsignedTypes",
-        )
-    }
-
-    flavorDimensions.add("version")
-    productFlavors {
-        create("foss") {
-            dimension = "version"
-        }
-        create("gplay") {
-            dimension = "version"
-        }
-    }
-
-    buildTypes {
-        val customProguardRules = fileTree(File("../proguard")) {
-            include("*.pro")
-        }
-        debug {
-            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"))
-            proguardFiles(*customProguardRules.toList().toTypedArray())
-            proguardFiles("proguard-rules-debug.pro")
-        }
-        create("beta") {
-            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"))
-            proguardFiles(*customProguardRules.toList().toTypedArray())
-        }
-        release {
-            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"))
-            proguardFiles(*customProguardRules.toList().toTypedArray())
-        }
-    }
-
-    testOptions {
-        unitTests {
-            isIncludeAndroidResources = true
-        }
-        tasks.withType<Test> {
-            useJUnitPlatform()
-        }
-    }
-}
-
-dependencies {
-    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.1.5")
-
-    addBaseAndroid()
-    addBaseAndroidUi()
-    addBaseKotlin()
-    addDagger()
-    addMoshi()
-    addBaseWorkManager()
-    addNavigation()
-
-    addTesting()
-
-    implementation("com.bugsnag:bugsnag-android:5.9.2")
-
-}

app-common/proguard-rules.pro

@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile

app-common/src/main/AndroidManifest.xml

@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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>

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

@@ -1,45 +0,0 @@
-package eu.darken.capod.common
-
-
-// Can't be const because that prevents them from being mocked in tests
-@Suppress("MayBeConstant")
-object BuildConfigWrap {
-    val DEBUG: Boolean = BuildConfig.DEBUG
-
-    val BUILD_TYPE: BuildType = when (val typ = BuildConfig.BUILD_TYPE) {
-        "debug" -> BuildType.DEV
-        "beta" -> BuildType.BETA
-        "release" -> BuildType.RELEASE
-        else -> throw IllegalArgumentException("Unknown buildtype: $typ")
-    }
-
-    enum class BuildType {
-        DEV,
-        BETA,
-        RELEASE,
-        ;
-    }
-
-    val FLAVOR: Flavor = when (val flav = BuildConfig.FLAVOR) {
-        "gplay" -> Flavor.GPLAY
-        "foss" -> Flavor.FOSS
-        else -> throw IllegalStateException("Unknown flavor: $flav")
-    }
-
-    enum class Flavor {
-        GPLAY,
-        FOSS,
-        ;
-    }
-
-    val APPLICATION_ID: String = BuildConfig.APPLICATION_ID
-
-    val VERSION_CODE: Long = BuildConfig.VERSION_CODE.toLong()
-    val VERSION_NAME: String = BuildConfig.VERSION_NAME
-    val GIT_SHA: String = BuildConfig.GITSHA
-    val BUILDTIME: String = BuildConfig.BUILDTIME
-
-    val VERSION_DESCRIPTION_LONG: String = "v$VERSION_NAME ($VERSION_CODE) [$GIT_SHA] ${FLAVOR}_$BUILD_TYPE"
-    val VERSION_DESCRIPTION_SHORT: String = "v$VERSION_NAME [$GIT_SHA] $FLAVOR"
-    val VERSION_DESCRIPTION_TINY: String = "v$VERSION_NAME"
-}

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

@@ -1,40 +0,0 @@
-package eu.darken.capod.common
-
-import android.annotation.SuppressLint
-import android.content.ComponentName
-import android.content.Context
-import android.content.Intent
-import android.content.res.TypedArray
-import androidx.annotation.AttrRes
-import androidx.annotation.ColorInt
-import androidx.annotation.ColorRes
-import androidx.core.content.ContextCompat
-import androidx.fragment.app.Fragment
-
-
-@ColorInt
-fun Context.getColorForAttr(@AttrRes attrId: Int): Int {
-    var typedArray: TypedArray? = null
-    try {
-        typedArray = this.theme.obtainStyledAttributes(intArrayOf(attrId))
-        return typedArray.getColor(0, 0)
-    } finally {
-        typedArray?.recycle()
-    }
-}
-
-@ColorInt
-fun Fragment.getColorForAttr(@AttrRes attrId: Int): Int = requireContext().getColorForAttr(attrId)
-
-@ColorInt
-fun Context.getCompatColor(@ColorRes attrId: Int): Int {
-    return ContextCompat.getColor(this, attrId)
-}
-
-@ColorInt
-fun Fragment.getCompatColor(@ColorRes attrId: Int): Int = requireContext().getCompatColor(attrId)
-
-@SuppressLint("NewApi")
-fun Context.startServiceCompat(intent: Intent): ComponentName? {
-    return if (hasApiLevel(26)) startForegroundService(intent) else startService(intent)
-}

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

@@ -1,5 +0,0 @@
-package eu.darken.capod.common
-
-object PrivacyPolicy {
-    const val URL = "https://github.com/d4rken-org/capod/blob/main/PRIVACY_POLICY.md"
-}

app-common/src/main/java/eu/darken/capod/common/bluetooth/BluetoothManager2.kt

@@ -1,185 +0,0 @@
-package eu.darken.capod.common.bluetooth
-
-import android.bluetooth.*
-import android.bluetooth.le.BluetoothLeScanner
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import android.content.IntentFilter
-import android.os.Handler
-import android.os.HandlerThread
-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.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.launch
-import java.io.IOException
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class BluetoothManager2 @Inject constructor(
-    private val manager: BluetoothManager,
-    @ApplicationContext private val context: Context,
-    private val dispatcherProvider: DispatcherProvider,
-) {
-
-    val adapter: BluetoothAdapter?
-        get() = manager.adapter
-
-    val scanner: BluetoothLeScanner?
-        get() = adapter?.bluetoothLeScanner
-
-    val isBluetoothEnabled: Flow<Boolean> = callbackFlow {
-        send(manager.adapter?.isEnabled ?: false)
-
-        val receiver = object : BroadcastReceiver() {
-            override fun onReceive(context: Context, intent: Intent) {
-                if (BluetoothAdapter.ACTION_STATE_CHANGED != intent.action) {
-                    log(TAG) { "Unknown BluetoothAdapter action: $intent" }
-                    return
-                }
-
-                val value = when (intent.getIntExtra(BluetoothAdapter.EXTRA_STATE, -1)) {
-                    BluetoothAdapter.STATE_OFF -> false
-                    BluetoothAdapter.STATE_ON -> true
-                    else -> false
-                }
-
-                trySend(value)
-            }
-        }
-        context.registerReceiver(receiver, IntentFilter(BluetoothAdapter.ACTION_STATE_CHANGED))
-        awaitClose { context.unregisterReceiver(receiver) }
-    }
-
-    fun getBluetoothProfile(profile: Int = BluetoothProfile.HEADSET): Flow<BluetoothProfile2> = callbackFlow {
-        log(TAG, VERBOSE) { "getBluetoothProfile(profile=$profile)" }
-
-        var profileProxy: BluetoothProfile2? = null
-        manager.adapter.getProfileProxy(context, object : BluetoothProfile.ServiceListener {
-            override fun onServiceConnected(profile: Int, proxy: BluetoothProfile) {
-                log(TAG, VERBOSE) { "onServiceConnected(profile=$profile, proxy=$proxy)" }
-
-                profileProxy = BluetoothProfile2(
-                    profileType = profile,
-                    profileProxy = proxy,
-                ).also { trySend(it) }
-            }
-
-            override fun onServiceDisconnected(profile: Int) {
-                log(TAG, WARN) { "onServiceDisconnected(profile=$profile" }
-                close(IOException("BluetoothProfile service disconnected (profile=$profile)"))
-            }
-
-        }, profile)
-
-        awaitClose {
-            log(TAG) { "Closing BluetoothProfile: $profileProxy" }
-            profileProxy?.let {
-                manager.adapter.closeProfileProxy(it.profileType, it.proxy)
-            }
-        }
-    }
-
-
-    private fun monitorDevicesForProfile(
-        profile: Int = BluetoothProfile.HEADSET
-    ): Flow<Set<BluetoothDevice>> = getBluetoothProfile(profile).flatMapLatest { bluetoothProfile ->
-        callbackFlow {
-            log(TAG, VERBOSE) { "connectedDevices(profile=$profile) starting" }
-            trySend(bluetoothProfile.connectedDevices)
-
-            val filter = IntentFilter().apply {
-                addAction(BluetoothDevice.ACTION_ACL_CONNECTED)
-                addAction(BluetoothDevice.ACTION_ACL_DISCONNECTED)
-            }
-
-            val handlerThread = HandlerThread("BluetoothEventReceiver").apply {
-                start()
-            }
-            val handler = Handler(handlerThread.looper)
-
-            val receiver: BroadcastReceiver = object : BroadcastReceiver() {
-                override fun onReceive(context: Context, intent: Intent) {
-                    log(TAG, VERBOSE) { "Bluetooth event (intent=$intent, extras=${intent.extras})" }
-                    val action = intent.action
-                    if (action == null) {
-                        log(TAG, ERROR) { "Bluetooth event without action, how did we get this?" }
-                        return
-                    }
-                    val device = intent.getParcelableExtra<BluetoothDevice?>(BluetoothDevice.EXTRA_DEVICE)
-                    if (device == null) {
-                        log(TAG, ERROR) { "Connection event is missing EXTRA_DEVICE: ${intent.extras}" }
-                        return
-                    }
-
-                    this@callbackFlow.launch {
-                        val currentDevices = bluetoothProfile.connectedDevices
-
-                        when (action) {
-                            BluetoothDevice.ACTION_ACL_CONNECTED -> {
-                                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))
-                            }
-                        }
-                    }
-                }
-            }
-            context.registerReceiver(receiver, filter, null, handler)
-
-            awaitClose {
-                log(TAG, VERBOSE) { "connectedDevices(profile=$profile) closed." }
-                context.unregisterReceiver(receiver)
-            }
-        }
-    }
-
-    fun connectedDevices(
-        featureFilter: Set<ParcelUuid> = ContinuityProtocol.BLE_FEATURE_UUIDS
-    ): Flow<List<BluetoothDevice>> = isBluetoothEnabled
-        .flatMapLatest { monitorDevicesForProfile(BluetoothProfile.HEADSET) }
-        .map { devices ->
-            devices.filter { device ->
-                featureFilter.any { feature ->
-                    device.hasFeature(feature)
-                }
-            }
-        }
-
-    fun bondedDevices(): Flow<Set<BluetoothDevice>> = flow {
-        emit(adapter?.bondedDevices ?: throw IllegalStateException("Bluetooth adapter unavailable"))
-    }
-
-    suspend fun nudgeConnection(device: BluetoothDevice): Boolean = getBluetoothProfile().map { bluetoothProfile ->
-        try {
-            log(TAG) { "Nudging Android connection to $device" }
-
-            val connectMethod = BluetoothHeadset::class.java.getDeclaredMethod(
-                "connect", BluetoothDevice::class.java
-            ).apply { isAccessible = true }
-
-            connectMethod.invoke(bluetoothProfile.proxy, device)
-
-            log(TAG) { "Nudged connection to $device" }
-            true
-        } catch (e: Exception) {
-            Bugs.report(tag = TAG, "BluetoothHeadset.connect(device) is unavailable", exception = e)
-            false
-        }
-    }.first()
-
-    companion object {
-        private val TAG = logTag("Bluetooth", "Manager2")
-    }
-}

app-common/src/main/java/eu/darken/capod/common/debug/autoreport/AutoReporting.kt

@@ -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")
-    }
-}

app-common/src/main/java/eu/darken/capod/common/debug/autoreport/DebugSettings.kt

@@ -1,38 +0,0 @@
-package eu.darken.capod.common.debug.autoreport
-
-import android.content.Context
-import android.content.SharedPreferences
-import androidx.preference.PreferenceDataStore
-import dagger.hilt.android.qualifiers.ApplicationContext
-import eu.darken.capod.common.BuildConfigWrap
-import eu.darken.capod.common.preferences.PreferenceStoreMapper
-import eu.darken.capod.common.preferences.Settings
-import eu.darken.capod.common.preferences.createFlowPreference
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class DebugSettings @Inject constructor(
-    @ApplicationContext private val context: Context,
-) : Settings() {
-
-    override val preferences: SharedPreferences = context.getSharedPreferences("settings_debug", Context.MODE_PRIVATE)
-
-    val isAutoReportingEnabled = preferences.createFlowPreference(
-        key = "debug.bugreport.automatic.enabled",
-        // Reporting is opt-out for gplay, and opt-in for github builds
-        defaultValue = BuildConfigWrap.FLAVOR == BuildConfigWrap.Flavor.GPLAY
-    )
-    val isDebugModeEnabled = preferences.createFlowPreference("debug.mode.enabled", false)
-
-    val showFakeData = preferences.createFlowPreference("debug.fakedata.enabled", false)
-
-    val showUnfiltered = preferences.createFlowPreference("debug.blescanner.unfiltered.enabled", false)
-
-    override val preferenceDataStore: PreferenceDataStore = PreferenceStoreMapper(
-        isDebugModeEnabled,
-        showFakeData,
-        showUnfiltered,
-    )
-
-}

app-common/src/main/java/eu/darken/capod/common/debug/autoreport/bugsnag/BugsnagErrorHandler.kt

@@ -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
-        }
-    }
-
-}

app-common/src/main/java/eu/darken/capod/common/debug/autoreport/bugsnag/BugsnagLogger.kt

@@ -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"
-        }
-    }
-}

app-common/src/main/java/eu/darken/capod/common/debug/autoreport/bugsnag/NOPBugsnagErrorHandler.kt

@@ -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
-    }
-
-}

app-common/src/main/java/eu/darken/capod/common/error/ErrorDialog.kt

@@ -1,18 +0,0 @@
-package eu.darken.capod.common.error
-
-import android.content.Context
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-
-fun Throwable.asErrorDialogBuilder(
-    context: Context
-) = MaterialAlertDialogBuilder(context).apply {
-    val error = this@asErrorDialogBuilder
-    val localizedError = error.localized(context)
-
-    setTitle(localizedError.label)
-    setMessage(localizedError.description)
-
-    setPositiveButton(android.R.string.ok) { _, _ ->
-
-    }
-}

app-common/src/main/java/eu/darken/capod/common/lists/BaseAdapter.kt

@@ -1,58 +0,0 @@
-package eu.darken.capod.common.lists
-
-import android.content.Context
-import android.content.res.Resources
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.annotation.*
-import androidx.core.content.ContextCompat
-import androidx.recyclerview.widget.RecyclerView
-import eu.darken.capod.common.getColorForAttr
-
-abstract class BaseAdapter<T : BaseAdapter.VH> : RecyclerView.Adapter<T>() {
-
-    @CallSuper
-    final override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): T {
-        return onCreateBaseVH(parent, viewType)
-    }
-
-    abstract fun onCreateBaseVH(parent: ViewGroup, viewType: Int): T
-
-    @CallSuper
-    final override fun onBindViewHolder(holder: T, position: Int) {
-        onBindBaseVH(holder, position, mutableListOf())
-    }
-
-    @CallSuper
-    final override fun onBindViewHolder(holder: T, position: Int, payloads: MutableList<Any>) {
-        onBindBaseVH(holder, position, payloads)
-    }
-
-    abstract fun onBindBaseVH(holder: T, position: Int, payloads: MutableList<Any> = mutableListOf())
-
-    abstract class VH(@LayoutRes layoutRes: Int, private val parent: ViewGroup) : RecyclerView.ViewHolder(
-        LayoutInflater.from(parent.context).inflate(layoutRes, parent, false)
-    ) {
-
-        val context: Context
-            get() = parent.context
-
-        val resources: Resources
-            get() = context.resources
-
-        val layoutInflater: LayoutInflater
-            get() = LayoutInflater.from(context)
-
-        fun getColor(@ColorRes colorRes: Int): Int = ContextCompat.getColor(context, colorRes)
-
-        fun getColorForAttr(@AttrRes attrRes: Int): Int = context.getColorForAttr(attrRes)
-
-        fun getString(@StringRes stringRes: Int, vararg args: Any): String = context.getString(stringRes, *args)
-
-        fun getQuantityString(@PluralsRes pluralRes: Int, quantity: Int, vararg args: Any): String =
-            context.resources.getQuantityString(pluralRes, quantity, *args)
-
-        fun getQuantityString(@PluralsRes pluralRes: Int, quantity: Int): String =
-            context.resources.getQuantityString(pluralRes, quantity, quantity)
-    }
-}

app-common/src/main/java/eu/darken/capod/common/lists/BindableVH.kt

@@ -1,26 +0,0 @@
-package eu.darken.capod.common.lists
-
-import androidx.viewbinding.ViewBinding
-
-interface BindableVH<ItemT, ViewBindingT : ViewBinding> {
-
-    val viewBinding: Lazy<ViewBindingT>
-
-    val onBindData: ViewBindingT.(item: ItemT, payloads: List<Any>) -> Unit
-
-    fun bind(item: ItemT, payloads: MutableList<Any> = mutableListOf()) = with(viewBinding.value) {
-        onBindData(item, payloads)
-    }
-}
-
-@Suppress("unused")
-inline fun <reified ItemT, ViewBindingT : ViewBinding> BindableVH<ItemT, ViewBindingT>.binding(
-    payload: Boolean = true,
-    crossinline block: ViewBindingT.(ItemT) -> Unit,
-): ViewBindingT.(item: ItemT, payloads: List<Any>) -> Unit = { item: ItemT, payloads: List<Any> ->
-    val newestItem = when (payload) {
-        true -> payloads.filterIsInstance<ItemT>().lastOrNull() ?: item
-        false -> item
-    }
-    block(newestItem)
-}

app-common/src/main/java/eu/darken/capod/common/lists/DataAdapter.kt

@@ -1,13 +0,0 @@
-package eu.darken.capod.common.lists
-
-import androidx.recyclerview.widget.RecyclerView
-
-interface DataAdapter<T> {
-    val data: MutableList<T>
-}
-
-fun <X, T> X.update(newData: List<T>?, notify: Boolean = true) where X : DataAdapter<T>, X : RecyclerView.Adapter<*> {
-    data.clear()
-    if (newData != null) data.addAll(newData)
-    if (notify) notifyDataSetChanged()
-}

app-common/src/main/java/eu/darken/capod/common/lists/ListItem.kt

@@ -1,3 +0,0 @@
-package eu.darken.capod.common.lists
-
-interface ListItem

app-common/src/main/java/eu/darken/capod/common/lists/RecyclerViewExtensions.kt

@@ -1,13 +0,0 @@
-package eu.darken.capod.common.lists
-
-import androidx.recyclerview.widget.DefaultItemAnimator
-import androidx.recyclerview.widget.DividerItemDecoration
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-
-fun RecyclerView.setupDefaults(adapter: RecyclerView.Adapter<*>? = null, dividers: Boolean = true) = apply {
-    layoutManager = LinearLayoutManager(context)
-    itemAnimator = DefaultItemAnimator()
-    if (dividers) addItemDecoration(DividerItemDecoration(context, DividerItemDecoration.VERTICAL))
-    if (adapter != null) this.adapter = adapter
-}

app-common/src/main/java/eu/darken/capod/common/lists/differ/AsyncDiffer.kt

@@ -1,43 +0,0 @@
-package eu.darken.capod.common.lists.differ
-
-import androidx.recyclerview.widget.AsyncListDiffer
-import androidx.recyclerview.widget.DiffUtil
-import eu.darken.capod.common.lists.modular.ModularAdapter
-import eu.darken.capod.common.lists.modular.mods.StableIdMod
-
-class AsyncDiffer<A, T : DifferItem> internal constructor(
-    adapter: A,
-    compareItem: (T, T) -> Boolean = { i1, i2 -> i1.stableId == i2.stableId },
-    compareItemContent: (T, T) -> Boolean = { i1, i2 -> i1 == i2 },
-    determinePayload: (T, T) -> Any? = { i1, i2 ->
-        when {
-            i1::class == i2::class -> i1.payloadProvider?.invoke(i1, i2)
-            else -> null
-        }
-    }
-) where A : HasAsyncDiffer<T>, A : ModularAdapter<*> {
-    private val callback = object : DiffUtil.ItemCallback<T>() {
-        override fun areItemsTheSame(oldItem: T, newItem: T): Boolean = compareItem(oldItem, newItem)
-        override fun areContentsTheSame(oldItem: T, newItem: T): Boolean = compareItemContent(oldItem, newItem)
-        override fun getChangePayload(oldItem: T, newItem: T): Any? = determinePayload(oldItem, newItem)
-    }
-
-    private val internalList = mutableListOf<T>()
-    private val listDiffer = AsyncListDiffer(adapter, callback)
-
-    val currentList: List<T>
-        get() = synchronized(internalList) { internalList }
-
-    init {
-        adapter.modules.add(0, StableIdMod(currentList))
-    }
-
-    fun submitUpdate(newData: List<T>) {
-        listDiffer.submitList(newData) {
-            synchronized(internalList) {
-                internalList.clear()
-                internalList.addAll(newData)
-            }
-        }
-    }
-}

app-common/src/main/java/eu/darken/capod/common/lists/differ/AsyncDifferExtensions.kt

@@ -1,15 +0,0 @@
-package eu.darken.capod.common.lists.differ
-
-import androidx.recyclerview.widget.RecyclerView
-import eu.darken.capod.common.lists.modular.ModularAdapter
-
-
-fun <X, T> X.update(newData: List<T>?)
-        where X : HasAsyncDiffer<T>, X : RecyclerView.Adapter<*> {
-
-    asyncDiffer.submitUpdate(newData ?: emptyList())
-}
-
-fun <A, T : DifferItem> A.setupDiffer(): AsyncDiffer<A, T>
-        where A : HasAsyncDiffer<T>, A : ModularAdapter<*> =
-    AsyncDiffer(this)

app-common/src/main/java/eu/darken/capod/common/lists/differ/DifferItem.kt

@@ -1,10 +0,0 @@
-package eu.darken.capod.common.lists.differ
-
-import eu.darken.capod.common.lists.ListItem
-
-interface DifferItem : ListItem {
-    val stableId: Long
-
-    val payloadProvider: ((DifferItem, DifferItem) -> DifferItem?)?
-        get() = null
-}

app-common/src/main/java/eu/darken/capod/common/lists/differ/HasAsyncDiffer.kt

@@ -1,10 +0,0 @@
-package eu.darken.capod.common.lists.differ
-
-interface HasAsyncDiffer<T : DifferItem> {
-
-    val data: List<T>
-        get() = asyncDiffer.currentList
-
-    val asyncDiffer: AsyncDiffer<*, T>
-
-}

app-common/src/main/java/eu/darken/capod/common/lists/modular/ModularAdapter.kt

@@ -1,95 +0,0 @@
-package eu.darken.capod.common.lists.modular
-
-import android.view.ViewGroup
-import androidx.annotation.CallSuper
-import androidx.annotation.LayoutRes
-import androidx.recyclerview.widget.RecyclerView
-import eu.darken.capod.common.lists.BaseAdapter
-
-abstract class ModularAdapter<VH : ModularAdapter.VH> : BaseAdapter<VH>() {
-    val modules = mutableListOf<Module>()
-
-    init {
-        modules.filterIsInstance<Module.Setup>().forEach { it.onAdapterReady(this) }
-    }
-
-    override fun getItemId(position: Int): Long {
-        modules.filterIsInstance<Module.ItemId>().forEach {
-            val id = it.getItemId(this, position)
-            if (id != null) return id
-        }
-        return super.getItemId(position)
-    }
-
-    @CallSuper
-    override fun getItemViewType(position: Int): Int {
-        modules.filterIsInstance<Module.Typing>().forEach {
-            val type = it.onGetItemType(this, position)
-            if (type != null) return type
-        }
-        return super.getItemViewType(position)
-    }
-
-    override fun onCreateBaseVH(parent: ViewGroup, viewType: Int): VH {
-        modules.filterIsInstance<Module.Creator<VH>>().forEach {
-            val vh = it.onCreateModularVH(this, parent, viewType)
-            if (vh != null) return vh
-        }
-        throw IllegalStateException("Couldn't create VH for type $viewType with $parent")
-    }
-
-    @CallSuper
-    override fun onBindBaseVH(holder: VH, position: Int, payloads: MutableList<Any>) {
-        modules.filterIsInstance<Module.Binder<VH>>().forEach {
-            it.onBindModularVH(this, holder, position, payloads)
-            it.onPostBind(this, holder, position)
-        }
-    }
-
-    @CallSuper
-    override fun onAttachedToRecyclerView(recyclerView: RecyclerView) {
-        modules.filterIsInstance<Module.RecyclerViewLifecycle>().forEach { it.onAttachedToRecyclerView(recyclerView) }
-        super.onAttachedToRecyclerView(recyclerView)
-    }
-
-    @CallSuper
-    override fun onDetachedFromRecyclerView(recyclerView: RecyclerView) {
-        modules.filterIsInstance<Module.RecyclerViewLifecycle>().forEach { it.onDetachedFromRecyclerView(recyclerView) }
-        super.onDetachedFromRecyclerView(recyclerView)
-    }
-
-    abstract class VH(@LayoutRes layoutRes: Int, parent: ViewGroup) : BaseAdapter.VH(layoutRes, parent)
-
-    interface Module {
-        interface Setup {
-            fun onAdapterReady(adapter: ModularAdapter<*>)
-        }
-
-        interface Creator<T : VH> : Module {
-            fun onCreateModularVH(adapter: ModularAdapter<T>, parent: ViewGroup, viewType: Int): T?
-        }
-
-        interface Binder<T : VH> : Module {
-            fun onBindModularVH(adapter: ModularAdapter<T>, vh: T, pos: Int, payloads: MutableList<Any>) {
-                // NOOP
-            }
-
-            fun onPostBind(adapter: ModularAdapter<T>, vh: T, pos: Int) {
-                // NOOP
-            }
-        }
-
-        interface Typing : Module {
-            fun onGetItemType(adapter: ModularAdapter<*>, pos: Int): Int?
-        }
-
-        interface ItemId : Module {
-            fun getItemId(adapter: ModularAdapter<*>, position: Int): Long?
-        }
-
-        interface RecyclerViewLifecycle : Module {
-            fun onDetachedFromRecyclerView(recyclerView: RecyclerView)
-            fun onAttachedToRecyclerView(recyclerView: RecyclerView)
-        }
-    }
-}

app-common/src/main/java/eu/darken/capod/common/lists/modular/mods/ClickMod.kt

@@ -1,12 +0,0 @@
-package eu.darken.capod.common.lists.modular.mods
-
-import eu.darken.capod.common.lists.modular.ModularAdapter
-
-class ClickMod<VHT : ModularAdapter.VH> constructor(
-    private val listener: (VHT, Int) -> Unit
-) : ModularAdapter.Module.Binder<VHT> {
-
-    override fun onBindModularVH(adapter: ModularAdapter<VHT>, vh: VHT, pos: Int, payloads: MutableList<Any>) {
-        vh.itemView.setOnClickListener { listener.invoke(vh, pos) }
-    }
-}

app-common/src/main/java/eu/darken/capod/common/lists/modular/mods/DataBinderMod.kt

@@ -1,17 +0,0 @@
-package eu.darken.capod.common.lists.modular.mods
-
-import androidx.viewbinding.ViewBinding
-import eu.darken.capod.common.lists.BindableVH
-import eu.darken.capod.common.lists.modular.ModularAdapter
-
-class DataBinderMod<ItemT, HolderT> constructor(
-    private val data: List<ItemT>,
-    private val customBinder: (
-        (adapter: ModularAdapter<HolderT>, vh: HolderT, pos: Int, payload: MutableList<Any>) -> Unit
-    )? = null
-) : ModularAdapter.Module.Binder<HolderT> where HolderT : BindableVH<ItemT, ViewBinding>, HolderT : ModularAdapter.VH {
-
-    override fun onBindModularVH(adapter: ModularAdapter<HolderT>, vh: HolderT, pos: Int, payloads: MutableList<Any>) {
-        customBinder?.invoke(adapter, vh, pos, mutableListOf()) ?: vh.bind(data[pos], payloads)
-    }
-}

app-common/src/main/java/eu/darken/capod/common/lists/modular/mods/SimpleVHCreatorMod.kt

@@ -1,15 +0,0 @@
-package eu.darken.capod.common.lists.modular.mods
-
-import android.view.ViewGroup
-import eu.darken.capod.common.lists.modular.ModularAdapter
-
-class SimpleVHCreatorMod<HolderT> constructor(
-    private val viewType: Int = 0,
-    private val factory: (ViewGroup) -> HolderT
-) : ModularAdapter.Module.Creator<HolderT> where HolderT : ModularAdapter.VH {
-
-    override fun onCreateModularVH(adapter: ModularAdapter<HolderT>, parent: ViewGroup, viewType: Int): HolderT? {
-        if (this.viewType != viewType) return null
-        return factory.invoke(parent)
-    }
-}

app-common/src/main/java/eu/darken/capod/common/lists/modular/mods/StableIdMod.kt

@@ -1,21 +0,0 @@
-package eu.darken.capod.common.lists.modular.mods
-
-import androidx.recyclerview.widget.RecyclerView
-import eu.darken.capod.common.lists.differ.DifferItem
-import eu.darken.capod.common.lists.modular.ModularAdapter
-
-class StableIdMod<ItemT : DifferItem> constructor(
-    private val data: List<ItemT>,
-    private val customResolver: (position: Int) -> Long = {
-        (data[it] as? DifferItem)?.stableId ?: RecyclerView.NO_ID
-    }
-) : ModularAdapter.Module.ItemId, ModularAdapter.Module.Setup {
-
-    override fun onAdapterReady(adapter: ModularAdapter<*>) {
-        adapter.setHasStableIds(true)
-    }
-
-    override fun getItemId(adapter: ModularAdapter<*>, position: Int): Long? {
-        return customResolver.invoke(position)
-    }
-}

app-common/src/main/java/eu/darken/capod/common/lists/modular/mods/TypedVHCreatorMod.kt

@@ -1,29 +0,0 @@
-package eu.darken.capod.common.lists.modular.mods
-
-import android.view.ViewGroup
-import eu.darken.capod.common.lists.modular.ModularAdapter
-
-class TypedVHCreatorMod<HolderT> constructor(
-    private val typeResolver: (Int) -> Boolean,
-    private val factory: (ViewGroup) -> HolderT
-) : ModularAdapter.Module.Typing,
-    ModularAdapter.Module.Creator<HolderT> where HolderT : ModularAdapter.VH {
-
-    private fun ModularAdapter<*>.determineOurViewType(): Int {
-        val typingModules = modules.filterIsInstance(ModularAdapter.Module.Typing::class.java)
-        return typingModules.indexOf(this@TypedVHCreatorMod)
-    }
-
-    override fun onGetItemType(adapter: ModularAdapter<*>, pos: Int): Int? {
-        return if (typeResolver.invoke(pos)) adapter.determineOurViewType() else null
-    }
-
-    override fun onCreateModularVH(
-        adapter: ModularAdapter<HolderT>,
-        parent: ViewGroup,
-        viewType: Int
-    ): HolderT? {
-        if (adapter.determineOurViewType() != viewType) return null
-        return factory.invoke(parent)
-    }
-}

app-common/src/main/java/eu/darken/capod/common/navigation/FragmentExtensions.kt

@@ -1,38 +0,0 @@
-package eu.darken.capod.common.navigation
-
-import android.app.Activity
-import androidx.annotation.IdRes
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.FragmentContainerView
-import androidx.fragment.app.FragmentManager
-import androidx.navigation.NavController
-import androidx.navigation.NavDirections
-import androidx.navigation.fragment.NavHostFragment
-import androidx.navigation.fragment.findNavController
-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
-
-fun Fragment.doNavigate(direction: NavDirections) = findNavController().doNavigate(direction)
-
-fun Fragment.popBackStack(): Boolean {
-    if (!isAdded) {
-        IllegalStateException("Fragment is not added").also {
-            log(WARN) { "Trying to pop backstack on Fragment that isn't added to an Activity: ${it.asLog()}" }
-        }
-        return false
-    }
-    return findNavController().popBackStack()
-}
-
-/**
- * [FragmentContainerView] does not access [NavController] in [Activity.onCreate]
- * as workaround [FragmentManager] is used to get the [NavController]
- * @param id [Int] NavFragment id
- * @see <a href="https://issuetracker.google.com/issues/142847973">issue-142847973</a>
- */
-@Throws(IllegalStateException::class)
-fun FragmentManager.findNavController(@IdRes id: Int): NavController {
-    val fragment = findFragmentById(id) ?: throw IllegalStateException("Fragment is not found for id:$id")
-    return NavHostFragment.findNavController(fragment)
-}

app-common/src/main/java/eu/darken/capod/common/navigation/NavArgsExtensions.kt

@@ -1,20 +0,0 @@
-package eu.darken.capod.common.navigation
-
-import android.os.Bundle
-import android.os.Parcelable
-import androidx.lifecycle.SavedStateHandle
-import androidx.navigation.NavArgs
-import androidx.navigation.NavArgsLazy
-import java.io.Serializable
-
-// TODO Remove with "androidx.navigation:navigation-safe-args-gradle-plugin:2.4.0-alpha/stable"
-inline fun <reified Args : NavArgs> SavedStateHandle.navArgs() = NavArgsLazy(Args::class) {
-    Bundle().apply {
-        keys().forEach {
-            when (val value = get<Any>(it)) {
-                is Serializable -> putSerializable(it, value)
-                is Parcelable -> putParcelable(it, value)
-            }
-        }
-    }
-}

app-common/src/main/java/eu/darken/capod/common/navigation/NavControllerExtensions.kt

@@ -1,22 +0,0 @@
-package eu.darken.capod.common.navigation
-
-import android.os.Bundle
-import androidx.annotation.IdRes
-import androidx.navigation.NavController
-import androidx.navigation.NavDirections
-
-fun NavController.navigateIfNotThere(@IdRes resId: Int, args: Bundle? = null) {
-    if (currentDestination?.id == resId) return
-    navigate(resId, args)
-}
-
-fun NavController.doNavigate(direction: NavDirections) {
-    currentDestination?.getAction(direction.actionId)?.let { navigate(direction) }
-}
-
-fun NavController.isGraphSet(): Boolean = try {
-    graph
-    true
-} catch (e: IllegalStateException) {
-    false
-}

app-common/src/main/java/eu/darken/capod/common/navigation/NavDestinationExtensions.kt

@@ -1,9 +0,0 @@
-package eu.darken.capod.common.navigation
-
-import androidx.annotation.IdRes
-import androidx.navigation.NavDestination
-
-fun NavDestination?.hasAction(@IdRes id: Int): Boolean {
-    if (this == null) return false
-    return getAction(id) != null
-}

app-common/src/main/java/eu/darken/capod/common/preferences/FlowPreference.kt

@@ -1,63 +0,0 @@
-package eu.darken.capod.common.preferences
-
-import android.content.SharedPreferences
-import androidx.core.content.edit
-import eu.darken.capod.common.debug.logging.Logging.Priority.VERBOSE
-import eu.darken.capod.common.debug.logging.log
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.MutableStateFlow
-
-class FlowPreference<T> constructor(
-    private val preferences: SharedPreferences,
-    val key: String,
-    val rawReader: (Any?) -> T,
-    val rawWriter: (T) -> Any?
-) {
-
-    private val flowInternal = MutableStateFlow(value)
-    val flow: Flow<T> = flowInternal
-
-    private val preferenceChangeListener =
-        SharedPreferences.OnSharedPreferenceChangeListener { changedPrefs, changedKey ->
-            if (changedKey != key) return@OnSharedPreferenceChangeListener
-
-            val newValue = rawReader(changedPrefs.all[key])
-
-            val currentValue = flowInternal.value
-            if (currentValue != newValue && flowInternal.compareAndSet(currentValue, newValue)) {
-                log(VERBOSE) { "$changedPrefs:$changedKey changed to $newValue" }
-            }
-        }
-
-    init {
-        preferences.registerOnSharedPreferenceChangeListener(preferenceChangeListener)
-    }
-
-    var value: T
-        get() = rawReader(valueRaw)
-        set(newVal) {
-            valueRaw = rawWriter(newVal)
-        }
-
-    var valueRaw: Any?
-        get() = preferences.all[key] ?: rawWriter(rawReader(null))
-        set(value) {
-            preferences.edit {
-                when (value) {
-                    is Boolean -> putBoolean(key, value)
-                    is String -> putString(key, value)
-                    is Int -> putInt(key, value)
-                    is Long -> putLong(key, value)
-                    is Float -> putFloat(key, value)
-                    null -> remove(key)
-                    else -> throw NotImplementedError()
-                }
-
-            }
-            flowInternal.value = rawReader(value)
-        }
-
-    fun update(update: (T) -> T) {
-        value = update(value)
-    }
-}

app-common/src/main/java/eu/darken/capod/common/preferences/FlowPreferenceExtension.kt

@@ -1,43 +0,0 @@
-package eu.darken.capod.common.preferences
-
-import android.content.SharedPreferences
-
-
-inline fun <reified T> basicReader(defaultValue: T): (rawValue: Any?) -> T =
-    { rawValue ->
-        (rawValue ?: defaultValue) as T
-    }
-
-inline fun <reified T> basicWriter(): (T) -> Any? =
-    { value ->
-        when (value) {
-            is Boolean -> value
-            is String -> value
-            is Int -> value
-            is Long -> value
-            is Float -> value
-            null -> null
-            else -> throw NotImplementedError()
-        }
-    }
-
-inline fun <reified T : Any?> SharedPreferences.createFlowPreference(
-    key: String,
-    defaultValue: T = null as T
-) = FlowPreference(
-    preferences = this,
-    key = key,
-    rawReader = basicReader(defaultValue),
-    rawWriter = basicWriter()
-)
-
-inline fun <reified T : Any?> SharedPreferences.createFlowPreference(
-    key: String,
-    noinline reader: (rawValue: Any?) -> T,
-    noinline writer: (value: T) -> Any?
-) = FlowPreference(
-    preferences = this,
-    key = key,
-    rawReader = reader,
-    rawWriter = writer
-)

app-common/src/main/java/eu/darken/capod/common/preferences/FlowPreferenceMoshiExtension.kt

@@ -1,35 +0,0 @@
-package eu.darken.capod.common.preferences
-
-import android.content.SharedPreferences
-import com.squareup.moshi.Moshi
-
-inline fun <reified T> moshiReader(
-    moshi: Moshi,
-    defaultValue: T,
-): (Any?) -> T {
-    val adapter = moshi.adapter(T::class.java)
-    return { rawValue ->
-        rawValue as String?
-        rawValue?.let { adapter.fromJson(it) } ?: defaultValue
-    }
-}
-
-inline fun <reified T> moshiWriter(
-    moshi: Moshi,
-): (T) -> Any? {
-    val adapter = moshi.adapter(T::class.java)
-    return { newValue: T ->
-        newValue?.let { adapter.toJson(it) }
-    }
-}
-
-inline fun <reified T : Any?> SharedPreferences.createFlowPreference(
-    key: String,
-    defaultValue: T = null as T,
-    moshi: Moshi,
-) = FlowPreference(
-    preferences = this,
-    key = key,
-    rawReader = moshiReader(moshi, defaultValue),
-    rawWriter = moshiWriter(moshi)
-)

app-common/src/main/java/eu/darken/capod/common/preferences/PreferenceStoreMapper.kt

@@ -1,81 +0,0 @@
-package eu.darken.capod.common.preferences
-
-import androidx.preference.PreferenceDataStore
-
-open class PreferenceStoreMapper(
-    private vararg val flowPreferences: FlowPreference<*>
-) : PreferenceDataStore() {
-
-    override fun getBoolean(key: String, defValue: Boolean): Boolean {
-        return flowPreferences.singleOrNull { it.key == key }?.let { flowPref ->
-            flowPref.valueRaw as Boolean
-        } ?: throw NotImplementedError("getBoolean(key=$key, defValue=$defValue)")
-    }
-
-    override fun putBoolean(key: String, value: Boolean) {
-        flowPreferences.singleOrNull { it.key == key }?.let { flowPref ->
-            flowPref.valueRaw = value
-        } ?: throw NotImplementedError("putBoolean(key=$key, defValue=$value)")
-    }
-
-    override fun getString(key: String, defValue: String?): String? {
-        val pref = flowPreferences.singleOrNull { it.key == key }
-            ?: throw NotImplementedError("getString(key=$key, defValue=$defValue)")
-
-        return pref.let { flowPref ->
-            flowPref.valueRaw as String?
-        }
-    }
-
-    override fun putString(key: String, value: String?) {
-        val pref = flowPreferences.singleOrNull { it.key == key }
-            ?: throw NotImplementedError("putString(key=$key, defValue=$value)")
-        pref.let { flowPref ->
-            flowPref.valueRaw = value
-        }
-    }
-
-    override fun getInt(key: String?, defValue: Int): Int {
-        return flowPreferences.singleOrNull { it.key == key }?.let { flowPref ->
-            flowPref.valueRaw as Int
-        } ?: throw NotImplementedError("getInt(key=$key, defValue=$defValue)")
-    }
-
-    override fun putInt(key: String?, value: Int) {
-        flowPreferences.singleOrNull { it.key == key }?.let { flowPref ->
-            flowPref.valueRaw = value
-        } ?: throw NotImplementedError("putInt(key=$key, defValue=$value)")
-    }
-
-    override fun getLong(key: String?, defValue: Long): Long {
-        return flowPreferences.singleOrNull { it.key == key }?.let { flowPref ->
-            flowPref.valueRaw as Long
-        } ?: throw NotImplementedError("getLong(key=$key, defValue=$defValue)")
-    }
-
-    override fun putLong(key: String?, value: Long) {
-        flowPreferences.singleOrNull { it.key == key }?.let { flowPref ->
-            flowPref.valueRaw = value
-        } ?: throw NotImplementedError("putLong(key=$key, defValue=$value)")
-    }
-
-    override fun getFloat(key: String?, defValue: Float): Float {
-        return flowPreferences.singleOrNull { it.key == key }?.let { flowPref ->
-            flowPref.valueRaw as Float
-        } ?: throw NotImplementedError("getFloat(key=$key, defValue=$defValue)")
-    }
-
-    override fun putFloat(key: String?, value: Float) {
-        flowPreferences.singleOrNull { it.key == key }?.let { flowPref ->
-            flowPref.valueRaw = value
-        } ?: throw NotImplementedError("putFloat(key=$key, defValue=$value)")
-    }
-
-    override fun putStringSet(key: String?, values: MutableSet<String>?) {
-        throw NotImplementedError("putStringSet(key=$key, defValue=$values)")
-    }
-
-    override fun getStringSet(key: String?, defValues: MutableSet<String>?): MutableSet<String> {
-        throw NotImplementedError("getStringSet(key=$key, defValue=$defValues)")
-    }
-}

app-common/src/main/java/eu/darken/capod/common/preferences/Settings.kt

@@ -1,12 +0,0 @@
-package eu.darken.capod.common.preferences
-
-import android.content.SharedPreferences
-import androidx.preference.PreferenceDataStore
-
-abstract class Settings {
-
-    abstract val preferenceDataStore: PreferenceDataStore
-
-    abstract val preferences: SharedPreferences
-
-}

app-common/src/main/java/eu/darken/capod/common/preferences/SharedPreferenceExtensions.kt

@@ -1,16 +0,0 @@
-package eu.darken.capod.common.preferences
-
-import android.content.SharedPreferences
-import androidx.core.content.edit
-import eu.darken.capod.common.debug.logging.Logging.Priority.VERBOSE
-import eu.darken.capod.common.debug.logging.log
-
-fun SharedPreferences.clearAndNotify() {
-    val currentKeys = this.all.keys.toSet()
-    log(VERBOSE) { "$this clearAndNotify(): $currentKeys" }
-    edit {
-        currentKeys.forEach { remove(it) }
-    }
-    // Clear does not notify anyone using registerOnSharedPreferenceChangeListener
-    edit(commit = true) { clear() }
-}

app-common/src/main/java/eu/darken/capod/common/serialization/JavaInstantAdapter.kt

@@ -1,13 +0,0 @@
-package eu.darken.capod.common.serialization
-
-import com.squareup.moshi.FromJson
-import com.squareup.moshi.ToJson
-import java.time.Instant
-
-class JavaInstantAdapter {
-    @ToJson
-    fun toJson(obj: Instant): Long = obj.toEpochMilli()
-
-    @FromJson
-    fun fromJson(epochMillis: Long): Instant = Instant.ofEpochMilli(epochMillis)
-}

app-common/src/main/java/eu/darken/capod/common/serialization/SerializationModule.kt

@@ -1,20 +0,0 @@
-package eu.darken.capod.common.serialization
-
-import com.squareup.moshi.Moshi
-import dagger.Module
-import dagger.Provides
-import dagger.hilt.InstallIn
-import dagger.hilt.components.SingletonComponent
-import javax.inject.Singleton
-
-@InstallIn(SingletonComponent::class)
-@Module
-class SerializationModule {
-
-    @Provides
-    @Singleton
-    fun moshi(): Moshi = Moshi.Builder()
-        .add(JavaInstantAdapter())
-        .build()
-
-}

app-common/src/main/java/eu/darken/capod/common/uix/Fragment2.kt

@@ -1,80 +0,0 @@
-package eu.darken.capod.common.uix
-
-import android.content.Context
-import android.content.Intent
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.annotation.LayoutRes
-import androidx.fragment.app.Fragment
-import eu.darken.capod.common.debug.logging.Logging.Priority.VERBOSE
-import eu.darken.capod.common.debug.logging.log
-import eu.darken.capod.common.debug.logging.logTag
-
-
-abstract class Fragment2(@LayoutRes val layoutRes: Int?) : Fragment(layoutRes ?: 0) {
-
-    constructor() : this(null)
-
-    internal val tag: String =
-        logTag("Fragment", "${this.javaClass.simpleName}(${Integer.toHexString(hashCode())})")
-
-    override fun onAttach(context: Context) {
-        log(tag, VERBOSE) { "onAttach(context=$context)" }
-        super.onAttach(context)
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        log(tag, VERBOSE) { "onCreate(savedInstanceState=$savedInstanceState)" }
-        super.onCreate(savedInstanceState)
-    }
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        log(tag, VERBOSE) {
-            "onCreateView(inflater=$inflater, container=$container, savedInstanceState=$savedInstanceState"
-        }
-        return layoutRes?.let { inflater.inflate(it, container, false) }
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        log(tag, VERBOSE) { "onViewCreated(view=$view, savedInstanceState=$savedInstanceState)" }
-        super.onViewCreated(view, savedInstanceState)
-    }
-
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        log(tag, VERBOSE) { "onActivityCreated(savedInstanceState=$savedInstanceState)" }
-        super.onActivityCreated(savedInstanceState)
-    }
-
-    override fun onResume() {
-        log(tag, VERBOSE) { "onResume()" }
-        super.onResume()
-    }
-
-    override fun onPause() {
-        log(tag, VERBOSE) { "onPause()" }
-        super.onPause()
-    }
-
-    override fun onDestroyView() {
-        log(tag, VERBOSE) { "onDestroyView()" }
-        super.onDestroyView()
-    }
-
-    override fun onDetach() {
-        log(tag, VERBOSE) { "onDetach()" }
-        super.onDetach()
-    }
-
-    override fun onDestroy() {
-        log(tag, VERBOSE) { "onDestroy()" }
-        super.onDestroy()
-    }
-
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        log(tag, VERBOSE) { "onActivityResult(requestCode=$requestCode, resultCode=$resultCode, data=$data)" }
-        super.onActivityResult(requestCode, resultCode, data)
-    }
-
-}

app-common/src/main/java/eu/darken/capod/common/uix/Fragment3.kt

@@ -1,53 +0,0 @@
-package eu.darken.capod.common.uix
-
-import android.os.Bundle
-import android.view.View
-import androidx.annotation.LayoutRes
-import androidx.lifecycle.LiveData
-import androidx.viewbinding.ViewBinding
-import eu.darken.capod.common.debug.logging.log
-import eu.darken.capod.common.error.asErrorDialogBuilder
-import eu.darken.capod.common.navigation.doNavigate
-import eu.darken.capod.common.navigation.popBackStack
-
-
-abstract class Fragment3(@LayoutRes layoutRes: Int?) : Fragment2(layoutRes) {
-
-    constructor() : this(null)
-
-    abstract val ui: ViewBinding?
-    abstract val vm: ViewModel3
-
-    var onErrorEvent: ((Throwable) -> Boolean)? = null
-
-    var onFinishEvent: (() -> Unit)? = null
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        vm.navEvents.observe2(ui) {
-            log { "navEvents: $it" }
-
-            it?.run { doNavigate(this) } ?: onFinishEvent?.invoke() ?: popBackStack()
-        }
-
-        vm.errorEvents.observe2(ui) {
-            val showDialog = onErrorEvent?.invoke(it) ?: true
-            if (showDialog) it.asErrorDialogBuilder(requireContext()).show()
-        }
-    }
-
-    inline fun <T> LiveData<T>.observe2(
-        crossinline callback: (T) -> Unit
-    ) {
-        observe(viewLifecycleOwner) { callback.invoke(it) }
-    }
-
-    inline fun <T, reified VB : ViewBinding?> LiveData<T>.observe2(
-        ui: VB,
-        crossinline callback: VB.(T) -> Unit
-    ) {
-        observe(viewLifecycleOwner) { callback.invoke(ui, it) }
-    }
-
-}

app-common/src/main/java/eu/darken/capod/common/uix/ViewModelLazyKeyed.kt

@@ -1,174 +0,0 @@
-package eu.darken.capod.common.uix
-
-/*
- * Copyright 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-import androidx.activity.ComponentActivity
-import androidx.annotation.MainThread
-import androidx.fragment.app.Fragment
-import androidx.lifecycle.*
-import kotlin.reflect.KClass
-
-/**
- * Returns an existing ViewModel or creates a new one in the scope (usually, a fragment or
- * an activity), associated with this `ViewModelProvider`.
- *
- * @see ViewModelProvider.get(Class)
- */
-//@MainThread
-//inline fun <reified VM : ViewModel> ViewModelProvider.get() = get(VM::class.java)
-
-/**
- * An implementation of [Lazy] used by [androidx.fragment.app.Fragment.viewModels] and
- * [androidx.activity.ComponentActivity.viewmodels].
- *
- * [storeProducer] is a lambda that will be called during initialization, [VM] will be created
- * in the scope of returned [ViewModelStore].
- *
- * [factoryProducer] is a lambda that will be called during initialization,
- * returned [ViewModelProvider.Factory] will be used for creation of [VM]
- */
-class ViewModelLazyKeyed<VM : ViewModel>(
-    private val viewModelClass: KClass<VM>,
-    private val keyProducer: (() -> String)? = null,
-    private val storeProducer: () -> ViewModelStore,
-    private val factoryProducer: () -> ViewModelProvider.Factory
-) : Lazy<VM> {
-    private var cached: VM? = null
-
-    override val value: VM
-        get() {
-            val viewModel = cached
-            return if (viewModel == null) {
-                val factory = factoryProducer()
-                val store = storeProducer()
-                val key = keyProducer?.invoke() ?: "androidx.lifecycle.ViewModelProvider.DefaultKey"
-                ViewModelProvider(store, factory).get(
-                    key + ":" + viewModelClass.java.canonicalName,
-                    viewModelClass.java
-                ).also {
-                    cached = it
-                }
-            } else {
-                viewModel
-            }
-        }
-
-    override fun isInitialized() = cached != null
-}
-
-/**
- * Returns a property delegate to access [ViewModel] by **default** scoped to this [Fragment]:
- * ```
- * class MyFragment : Fragment() {
- *     val viewmodel: NYViewModel by viewmodels()
- * }
- * ```
- *
- * Custom [ViewModelProvider.Factory] can be defined via [factoryProducer] parameter,
- * factory returned by it will be used to create [ViewModel]:
- * ```
- * class MyFragment : Fragment() {
- *     val viewmodel: MYViewModel by viewmodels { myFactory }
- * }
- * ```
- *
- * Default scope may be overridden with parameter [ownerProducer]:
- * ```
- * class MyFragment : Fragment() {
- *     val viewmodel: MYViewModel by viewmodels ({requireParentFragment()})
- * }
- * ```
- *
- * This property can be accessed only after this Fragment is attached i.e., after
- * [Fragment.onAttach()], and access prior to that will result in IllegalArgumentException.
- */
-@MainThread
-inline fun <reified VM : ViewModel> Fragment.viewModelsKeyed(
-    noinline keyProducer: (() -> String)? = null,
-    noinline ownerProducer: () -> ViewModelStoreOwner = { this },
-    noinline factoryProducer: (() -> ViewModelProvider.Factory)? = null
-) = createViewModelLazyKeyed(VM::class, keyProducer, { ownerProducer().viewModelStore }, factoryProducer)
-
-/**
- * Returns a property delegate to access parent activity's [ViewModel],
- * if [factoryProducer] is specified then [ViewModelProvider.Factory]
- * returned by it will be used to create [ViewModel] first time.
- *
- * ```
- * class MyFragment : Fragment() {
- *     val viewmodel: MyViewModel by activityViewModels()
- * }
- * ```
- *
- * This property can be accessed only after this Fragment is attached i.e., after
- * [Fragment.onAttach()], and access prior to that will result in IllegalArgumentException.
- */
-@MainThread
-inline fun <reified VM : ViewModel> Fragment.activityViewModelsKeyed(
-    noinline keyProducer: (() -> String)? = null,
-    noinline factoryProducer: (() -> ViewModelProvider.Factory)? = null
-) = createViewModelLazyKeyed(VM::class, keyProducer, { requireActivity().viewModelStore }, factoryProducer)
-
-/**
- * Helper method for creation of [ViewModelLazy], that resolves `null` passed as [factoryProducer]
- * to default factory.
- */
-@MainThread
-fun <VM : ViewModel> Fragment.createViewModelLazyKeyed(
-    viewModelClass: KClass<VM>,
-    keyProducer: (() -> String)? = null,
-    storeProducer: () -> ViewModelStore,
-    factoryProducer: (() -> ViewModelProvider.Factory)? = null
-): Lazy<VM> {
-    val factoryPromise = factoryProducer ?: {
-        val application = activity?.application ?: throw IllegalStateException(
-            "ViewModel can be accessed only when Fragment is attached"
-        )
-        ViewModelProvider.AndroidViewModelFactory.getInstance(application)
-    }
-    return ViewModelLazyKeyed(viewModelClass, keyProducer, storeProducer, factoryPromise)
-}
-
-/**
- * Returns a [Lazy] delegate to access the ComponentActivity's ViewModel, if [factoryProducer]
- * is specified then [ViewModelProvider.Factory] returned by it will be used
- * to create [ViewModel] first time.
- *
- * ```
- * class MyComponentActivity : ComponentActivity() {
- *     val viewmodel: MyViewModel by viewmodels()
- * }
- * ```
- *
- * This property can be accessed only after the Activity is attached to the Application,
- * and access prior to that will result in IllegalArgumentException.
- */
-@MainThread
-inline fun <reified VM : ViewModel> ComponentActivity.viewModelsKeyed(
-    noinline keyProducer: (() -> String)? = null,
-    noinline factoryProducer: (() -> ViewModelProvider.Factory)? = null
-): Lazy<VM> {
-    val factoryPromise = factoryProducer ?: {
-        val application = application ?: throw IllegalArgumentException(
-            "ViewModel can be accessed only when Activity is attached"
-        )
-        ViewModelProvider.AndroidViewModelFactory.getInstance(application)
-    }
-
-    return ViewModelLazyKeyed(VM::class, keyProducer, { viewModelStore }, factoryPromise)
-}

app-common/src/main/java/eu/darken/capod/common/viewbinding/ViewBindingExtensions.kt

@@ -1,94 +0,0 @@
-package eu.darken.capod.common.viewbinding
-
-import android.os.Handler
-import android.os.Looper
-import android.view.View
-import androidx.annotation.MainThread
-import androidx.fragment.app.Fragment
-import androidx.lifecycle.DefaultLifecycleObserver
-import androidx.lifecycle.LifecycleOwner
-import androidx.viewbinding.ViewBinding
-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 kotlin.properties.ReadOnlyProperty
-import kotlin.reflect.KProperty
-
-inline fun <FragmentT : Fragment, reified BindingT : ViewBinding> FragmentT.viewBinding() =
-    this.viewBinding(
-        bindingProvider = {
-            val bindingMethod = BindingT::class.java.getMethod("bind", View::class.java)
-            bindingMethod(null, requireView()) as BindingT
-        },
-        lifecycleOwnerProvider = { viewLifecycleOwner }
-    )
-
-@Suppress("unused")
-fun <FragmentT : Fragment, BindingT : ViewBinding> FragmentT.viewBinding(
-    bindingProvider: FragmentT.() -> BindingT,
-    lifecycleOwnerProvider: FragmentT.() -> LifecycleOwner
-) = ViewBindingProperty(bindingProvider, lifecycleOwnerProvider)
-
-class ViewBindingProperty<ComponentT : LifecycleOwner, BindingT : ViewBinding>(
-    private val bindingProvider: (ComponentT) -> BindingT,
-    private val lifecycleOwnerProvider: ComponentT.() -> LifecycleOwner
-) : ReadOnlyProperty<ComponentT, BindingT> {
-
-    private val uiHandler = Handler(Looper.getMainLooper())
-    private var localRef: ComponentT? = null
-    private var viewBinding: BindingT? = null
-
-    private val onDestroyObserver = object : DefaultLifecycleObserver {
-        // Called right before Fragment.onDestroyView
-        override fun onDestroy(owner: LifecycleOwner) {
-            localRef?.lifecycle?.removeObserver(this) ?: return
-
-            localRef = null
-
-            uiHandler.post {
-                log(VERBOSE) { "Resetting viewBinding" }
-                viewBinding = null
-            }
-        }
-    }
-
-    @MainThread
-    override fun getValue(thisRef: ComponentT, property: KProperty<*>): BindingT {
-        if (localRef == null && viewBinding != null) {
-            log(WARN) { "Fragment.onDestroyView() was called, but the handler didn't execute our delayed reset." }
-            /**
-             * There is a fragment racecondition if you navigate to another fragment and quickly popBackStack().
-             * Our uiHandler.post { } will not have executed for some reason.
-             * In that case we manually null the old viewBinding, to allow for clean recreation.
-             */
-            viewBinding = null
-        }
-
-        /**
-         * When quickly navigating, a fragment may be created that was never visible to the user.
-         * It's possible that [Fragment.onDestroyView] is called, but [DefaultLifecycleObserver.onDestroy] is not.
-         * This means the ViewBinding will is not be set to `null` and it still holds the previous layout,
-         * instead of the new layout that the Fragment inflated when navigating back to it.
-         */
-        (localRef as? Fragment)?.view?.let {
-            if (it != viewBinding?.root && localRef === thisRef) {
-                log(WARN) { "Different view for the same fragment, resetting old viewBinding." }
-                viewBinding = null
-            }
-        }
-
-        viewBinding?.let {
-            // Only accessible from within the same component
-            require(localRef === thisRef)
-            return@getValue it
-        }
-
-        val lifecycle = lifecycleOwnerProvider(thisRef).lifecycle
-
-        return bindingProvider(thisRef).also {
-            viewBinding = it
-            localRef = thisRef
-            lifecycle.addObserver(onDestroyObserver)
-        }
-    }
-}

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

@@ -1,54 +0,0 @@
-package eu.darken.capod.main.core
-
-import android.content.Context
-import android.content.SharedPreferences
-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.preferences.PreferenceStoreMapper
-import eu.darken.capod.common.preferences.Settings
-import eu.darken.capod.common.preferences.createFlowPreference
-import eu.darken.capod.pods.core.PodDevice
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class GeneralSettings @Inject constructor(
-    @ApplicationContext private val context: Context,
-    debugSettings: DebugSettings,
-    moshi: Moshi,
-) : Settings() {
-
-    override val preferences: SharedPreferences = context.getSharedPreferences("settings_general", Context.MODE_PRIVATE)
-
-    val monitorMode = preferences.createFlowPreference("core.monitor.mode", MonitorMode.AUTOMATIC, moshi)
-    val scannerMode = preferences.createFlowPreference("core.scanner.mode", ScannerMode.BALANCED, moshi)
-
-    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("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)
-
-    override val preferenceDataStore: PreferenceDataStore = PreferenceStoreMapper(
-        monitorMode,
-        scannerMode,
-        showAll,
-        minimumSignalQuality,
-        mainDeviceAddress,
-        isOffloadedFilteringDisabled,
-        isOffloadedBatchingDisabled,
-        useIndirectScanResultCallback,
-        debugSettings.isAutoReportingEnabled,
-    )
-}

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

@@ -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
-    }
-}

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

@@ -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
-
-}

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

@@ -1,8 +0,0 @@
-package eu.darken.capod.monitor.core
-
-import javax.inject.Qualifier
-
-@Qualifier
-@MustBeDocumented
-@Retention(AnnotationRetention.RUNTIME)
-annotation class MonitorScope

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

@@ -1,69 +0,0 @@
-package eu.darken.capod.monitor.core
-
-import android.content.Context
-import com.squareup.moshi.Moshi
-import com.squareup.moshi.adapter
-import dagger.hilt.android.qualifiers.ApplicationContext
-import eu.darken.capod.common.bluetooth.BleScanResult
-import eu.darken.capod.common.coroutine.DispatcherProvider
-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.asLog
-import eu.darken.capod.common.debug.logging.log
-import eu.darken.capod.common.debug.logging.logTag
-import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.sync.withLock
-import kotlinx.coroutines.withContext
-import java.io.File
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Suppress("BlockingMethodInNonBlockingContext")
-@Singleton
-class PodDeviceCache @Inject constructor(
-    @ApplicationContext private val context: Context,
-    private val dispatcherProvider: DispatcherProvider,
-    moshi: Moshi,
-) {
-    private val cacheDir by lazy {
-        File(context.cacheDir, "device_cache").apply { mkdirs() }
-    }
-    private val mainDeviceCacheFile = File(cacheDir, "main_device.raw")
-    private val jsonAdapter = moshi.adapter<BleScanResult>()
-    private val lock = Mutex()
-
-    suspend fun saveMainDevice(device: BleScanResult?) = withContext(dispatcherProvider.IO) {
-        log(TAG, VERBOSE) { "saveMainDevice(device=$device)" }
-        lock.withLock {
-            try {
-                if (device == null) {
-                    mainDeviceCacheFile.delete()
-                } else {
-                    val json = jsonAdapter.toJson(device)
-                    mainDeviceCacheFile.writeText(json)
-                }
-            } catch (e: Exception) {
-                log(TAG, ERROR) { "Failed to save $device:${e.asLog()}" }
-            }
-        }
-    }
-
-    suspend fun loadMainDevice(): BleScanResult? = withContext(dispatcherProvider.IO) {
-        log(TAG, VERBOSE) { "loadMainDevice()" }
-        lock.withLock {
-            if (!mainDeviceCacheFile.exists()) return@withLock null
-            try {
-                val raw = mainDeviceCacheFile.readText()
-                jsonAdapter.fromJson(raw)
-            } catch (e: Exception) {
-                log(TAG, ERROR) { "Failed to read main-device:${e.asLog()}" }
-                null
-            }
-        }
-    }
-
-    companion object {
-        private val TAG = logTag("Monitor", "PodMonitor", "Cache")
-    }
-}
-

app-common/src/main/java/eu/darken/capod/pods/core/PodDevice.kt

@@ -1,138 +0,0 @@
-package eu.darken.capod.pods.core
-
-import android.content.Context
-import androidx.annotation.DrawableRes
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
-import eu.darken.capod.common.R
-import eu.darken.capod.common.bluetooth.BleScanResult
-import java.time.Instant
-import java.util.*
-import kotlin.math.abs
-import kotlin.math.max
-
-interface PodDevice {
-
-    val identifier: Id
-
-    val model: Model
-
-    val address: String
-        get() = scanResult.address
-
-    val seenLastAt: Instant
-
-    val seenFirstAt: Instant
-
-    val seenCounter: Int
-
-    val scanResult: BleScanResult
-
-    val rssi: Int
-        get() = scanResult.rssi
-
-    val confidence: 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))
-
-    val rawData: Map<Int, ByteArray>
-        get() = scanResult.manufacturerSpecificData
-
-    val rawDataHex: List<String>
-        get() = rawData.entries.map { entry ->
-            "${entry.key}: ${entry.value.joinToString(separator = " ") { String.format("%02X", it) }}"
-        }
-
-    fun getLabel(context: Context): String = model.label
-
-    @get:DrawableRes
-    val iconRes: Int
-        get() = model.iconRes
-
-    @JvmInline
-    value class Id(private val id: UUID = UUID.randomUUID())
-
-    @JsonClass(generateAdapter = false)
-    enum class Model(
-        val label: String,
-        @DrawableRes val iconRes: Int = R.drawable.devic_earbuds_generic_both,
-    ) {
-        @Json(name = "airpods.gen1") AIRPODS_GEN1(
-            label = "AirPods (Gen 1)",
-            iconRes = R.drawable.devic_airpods_gen1_both,
-        ),
-        @Json(name = "airpods.gen2") AIRPODS_GEN2(
-            "AirPods (Gen 2)",
-            R.drawable.devic_airpods_gen2_both,
-        ),
-        @Json(name = "airpods.gen3") AIRPODS_GEN3(
-            "AirPods (Gen 3)",
-            R.drawable.devic_airpods_gen2_both,
-        ),
-        @Json(name = "airpods.pro") AIRPODS_PRO(
-            "AirPods Pro",
-            R.drawable.devic_airpods_pro2_both
-        ),
-        @Json(name = "airpods.pro2") AIRPODS_PRO2(
-            "AirPods Pro 2",
-            R.drawable.devic_airpods_pro2_both
-        ),
-        @Json(name = "airpods.max") AIRPODS_MAX(
-            "AirPods Max",
-            R.drawable.devic_headphones_generic
-        ),
-        @Json(name = "beats.flex") BEATS_FLEX(
-            "Beats Flex"
-        ),
-        @Json(name = "beats.solo.3") BEATS_SOLO_3(
-            "Beats Solo 3"
-        ),
-        @Json(name = "beats.studio.3") BEATS_STUDIO_3(
-            "Beats Studio 3"
-        ),
-        @Json(name = "beats.x") BEATS_X(
-            "Beats X"
-        ),
-        @Json(name = "beats.powerbeats.3") POWERBEATS_3(
-            "Power Beats 3"
-        ),
-        @Json(name = "beats.powerbeats.pro") POWERBEATS_PRO(
-            "Power Beats Pro"
-        ),
-        @Json(name = "beats.fit.pro") BEATS_FIT_PRO(
-            "Beats Fit 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"
-        );
-    }
-
-    companion object {
-        const val BASE_CONFIDENCE = 0.5f
-    }
-}

app-common/src/main/java/eu/darken/capod/pods/core/apple/AppleFactory.kt

@@ -1,66 +0,0 @@
-package eu.darken.capod.pods.core.apple
-
-import eu.darken.capod.common.bluetooth.BleScanResult
-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.pods.core.PodDevice
-import eu.darken.capod.pods.core.apple.misc.UnknownAppleDevice
-import eu.darken.capod.pods.core.apple.protocol.ContinuityProtocol
-import eu.darken.capod.pods.core.apple.protocol.ProximityPairing
-import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.sync.withLock
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class AppleFactory @Inject constructor(
-    private val continuityProtocolDecoder: ContinuityProtocol.Decoder,
-    private val proximityPairingDecoder: ProximityPairing.Decoder,
-    private val podFactories: @JvmSuppressWildcards Set<ApplePodsFactory<out ApplePods>>,
-    private val unknownAppleFactory: UnknownAppleDevice.Factory,
-) {
-
-    private val lock = Mutex()
-
-    private fun getMessage(scanResult: BleScanResult): ProximityPairing.Message? {
-        val messages = try {
-            continuityProtocolDecoder.decode(scanResult)
-        } catch (e: Exception) {
-            log(TAG, WARN) { "Data wasn't continuity protocol conform:\n${e.asLog()}" }
-            return null
-        }
-        if (messages.isEmpty()) {
-            log(TAG, WARN) { "Data contained no continuity messages: $scanResult" }
-            return null
-        }
-
-        if (messages.size > 1) {
-            log(TAG, WARN) { "Decoded multiple continuity messages, picking first: $messages" }
-        }
-
-        val proximityMessage = proximityPairingDecoder.decode(messages.first())
-        if (proximityMessage == null) {
-            log(TAG) { "Not a proximity pairing message: $messages" }
-            return null
-        }
-
-        return proximityMessage
-    }
-
-    suspend fun create(scanResult: BleScanResult): PodDevice? = lock.withLock {
-        val pm = getMessage(scanResult) ?: return@withLock null
-
-        val factory = podFactories.firstOrNull { it.isResponsible(pm) }
-
-        return@withLock (factory ?: unknownAppleFactory).create(
-            scanResult = scanResult,
-            message = pm,
-        )
-    }
-
-    companion object {
-        private val TAG = logTag("Pod", "Apple", "Factory")
-    }
-}

app-common/src/main/java/eu/darken/capod/pods/core/apple/AppleFactoryModule.kt

@@ -1,37 +0,0 @@
-package eu.darken.capod.pods.core.apple
-
-import dagger.Binds
-import dagger.Module
-import dagger.hilt.InstallIn
-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.*
-
-@InstallIn(SingletonComponent::class)
-@Module
-abstract class AppleFactoryModule {
-
-    @Binds @IntoSet abstract fun airPodsGen1(factory: AirPodsGen1.Factory): ApplePodsFactory<out ApplePods>
-    @Binds @IntoSet abstract fun airPodsGen2(factory: AirPodsGen2.Factory): ApplePodsFactory<out ApplePods>
-    @Binds @IntoSet abstract fun airPodsGen3(factory: AirPodsGen3.Factory): ApplePodsFactory<out ApplePods>
-
-    @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 airPodsMax(factory: AirPodsMax.Factory): ApplePodsFactory<out ApplePods>
-
-    @Binds @IntoSet abstract fun beatsFlex(factory: BeatsFlex.Factory): ApplePodsFactory<out ApplePods>
-    @Binds @IntoSet abstract fun beatsSolo3(factory: BeatsSolo3.Factory): ApplePodsFactory<out ApplePods>
-    @Binds @IntoSet abstract fun beatsStudio3(factory: BeatsStudio3.Factory): ApplePodsFactory<out ApplePods>
-    @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 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>
-}

app-common/src/main/java/eu/darken/capod/pods/core/apple/ApplePods.kt

@@ -1,48 +0,0 @@
-package eu.darken.capod.pods.core.apple
-
-import eu.darken.capod.common.lowerNibble
-import eu.darken.capod.common.toHex
-import eu.darken.capod.common.upperNibble
-import eu.darken.capod.pods.core.PodDevice
-import eu.darken.capod.pods.core.apple.protocol.ProximityPairing
-
-interface ApplePods : PodDevice {
-
-    val proximityMessage: ProximityPairing.Message
-
-    // We start counting at the airpods prefix byte
-    val rawPrefix: UByte
-        get() = proximityMessage.data[0]
-
-    val rawDeviceModel: UShort
-        get() = (((proximityMessage.data[1].toInt() and 255) shl 8) or (proximityMessage.data[2].toInt() and 255)).toUShort()
-
-    val rawStatus: UByte
-        get() = proximityMessage.data[3]
-
-    val rawStatusHex: String
-        get() = rawStatus.toHex()
-
-    val rawPodsBattery: UByte
-        get() = proximityMessage.data[4]
-
-    val rawPodsBatteryHex: String
-        get() = rawPodsBattery.toHex()
-
-    val rawFlags: UShort
-        get() = proximityMessage.data[5].upperNibble
-
-    val rawCaseBattery: UShort
-        get() = proximityMessage.data[5].lowerNibble
-
-    val rawCaseLidState: UByte
-        get() = proximityMessage.data[6]
-
-    val rawDeviceColor: UByte
-        get() = proximityMessage.data[7]
-
-    val rawSuffix: UByte
-        get() = proximityMessage.data[8]
-
-
-}

app-common/src/main/java/eu/darken/capod/pods/core/apple/ApplePodsFactory.kt

@@ -1,182 +0,0 @@
-package eu.darken.capod.pods.core.apple
-
-import eu.darken.capod.common.bluetooth.BleScanResult
-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
-
-abstract class ApplePodsFactory<PodType : ApplePods>(private val tag: String) {
-
-    data class Markings(
-        val vendor: UByte,
-        val length: UByte,
-        val device: UShort,
-        val podBatteryData: Set<UShort>,
-        val caseBatteryData: UShort,
-        val deviceColor: UByte,
-    )
-
-    private fun ProximityPairing.Message.getApplePodsMarkings(): Markings = Markings(
-        vendor = ProximityPairing.CONTINUITY_PROTOCOL_MESSAGE_TYPE_PROXIMITY_PAIRING,
-        length = ProximityPairing.PAIRING_MESSAGE_LENGTH.toUByte(),
-        device = (((data[1].toInt() and 255) shl 8) or (data[2].toInt() and 255)).toUShort(),
-        // Make comparison order independent
-        podBatteryData = setOf(data[4].upperNibble, data[4].lowerNibble),
-        caseBatteryData = data[5].lowerNibble,
-        deviceColor = data[7]
-    )
-
-    data class KnownDevice(
-        val id: PodDevice.Id,
-        val seenFirstAt: Instant,
-        val seenCounter: Int,
-        val history: List<ApplePods>
-    ) {
-        val lastMessage: ProximityPairing.Message
-            get() = history.last().proximityMessage
-
-        val lastAddress: String
-            get() = history.last().address
-
-        val confidence: Float
-            get() = 0.75f + (history.size / (MAX_HISTORY * 4f))
-
-        fun averageRssi(latest: Int): Int =
-            history.map { it.rssi }.plus(latest).takeLast(10).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 = 20
-        }
-    }
-
-    internal val knownDevices = mutableMapOf<PodDevice.Id, KnownDevice>()
-
-
-    fun KnownDevice.getLatestCaseBattery(): Float? = history
-        .filterIsInstance<HasCase>()
-        .mapNotNull { it.batteryCasePercent }
-        .lastOrNull()
-
-    fun KnownDevice.getLatestCaseLidState(basic: DualApplePods): DualApplePods.LidState? {
-        val definitive = setOf(DualApplePods.LidState.OPEN, DualApplePods.LidState.CLOSED)
-        if (definitive.contains(basic.caseLidState)) return null
-
-        return history
-            .filterIsInstance<AirPodsPro>() // TODO why is this AirPodsPro specific here?
-            .lastOrNull { it.caseLidState != DualApplePods.LidState.NOT_IN_CASE }
-            ?.caseLidState
-    }
-
-    open fun historyTrimmer(
-        pods: List<ApplePods>
-    ): List<ApplePods> {
-        var trimmed = pods.takeLast(KnownDevice.MAX_HISTORY)
-
-        // We want to keep the case information
-        // If both pods are removed, and produce more history, we otherwise lose the case battery info.
-        val caseInfoFat = pods.lastOrNull { it is HasCase && it.batteryCasePercent != null }
-        val caseInfoTrimmed = trimmed.lastOrNull { it is HasCase && it.batteryCasePercent != null }
-        if (caseInfoFat != null && caseInfoTrimmed == null) {
-            trimmed = listOf(caseInfoFat) + trimmed.takeLast(KnownDevice.MAX_HISTORY - 1)
-        }
-
-        return trimmed
-    }
-
-    internal open fun searchHistory(current: PodType): KnownDevice? {
-        val scanResult = current.scanResult
-        val message = current.proximityMessage
-
-        knownDevices.values.toList().forEach { knownDevice ->
-            if (knownDevice.isOlderThan(Duration.ofSeconds(20))) {
-                log(tag, VERBOSE) { "searchHistory1: Removing stale known device: $knownDevice" }
-                knownDevices.remove(knownDevice.id)
-            }
-        }
-
-        knownDevices.values
-            .filter { it.history.size > KnownDevice.MAX_HISTORY }
-            .toList()
-            .forEach {
-                knownDevices[it.id] = it.copy(history = historyTrimmer(it.history))
-            }
-
-        var recognizedDevice: KnownDevice? = knownDevices.values
-            .firstOrNull { it.lastAddress == scanResult.address }
-            ?.also { log(tag, VERBOSE) { "searchHistory1: Recovered previous ID via address: $it" } }
-
-        if (recognizedDevice == null) {
-            val currentMarkers = message.getApplePodsMarkings()
-            recognizedDevice = knownDevices.values
-                .firstOrNull { it.lastMessage.getApplePodsMarkings() == currentMarkers }
-                ?.also { log(tag) { "searchHistory1: Close match based on similarity: $currentMarkers" } }
-        }
-
-        if (recognizedDevice == null) {
-            log(tag, WARN) { "searchHistory1: Didn't recognize: $message" }
-        }
-
-        return recognizedDevice
-    }
-
-    fun updateHistory(device: PodType) {
-        val existing = knownDevices[device.identifier]
-
-        knownDevices[device.identifier] = when {
-            existing != null -> {
-                existing.copy(
-                    seenCounter = existing.seenCounter + 1,
-                    history = existing.history.plus(device)
-                )
-            }
-            else -> {
-                log(tag) { "searchHistory1: Creating new history for $device" }
-                KnownDevice(
-                    id = device.identifier,
-                    seenFirstAt = device.seenFirstAt,
-                    seenCounter = 1,
-                    history = listOf(device)
-                )
-            }
-        }
-    }
-
-    data class ModelInfo(
-        val full: UShort,
-        val dirty: UByte,
-    )
-
-    fun ProximityPairing.Message.getModelInfo(): ModelInfo = ModelInfo(
-        full = (((data[1].toInt() and 255) shl 8) or (data[2].toInt() and 255)).toUShort(),
-        dirty = data[1]
-    )
-
-    abstract fun isResponsible(message: ProximityPairing.Message): Boolean
-
-    abstract fun create(
-        scanResult: BleScanResult,
-        message: ProximityPairing.Message,
-    ): ApplePods
-}

app-common/src/main/java/eu/darken/capod/pods/core/apple/DualApplePodsFactory.kt

@@ -1,68 +0,0 @@
-package eu.darken.capod.pods.core.apple
-
-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<DualApplePods>(tag) {
-
-    fun DualApplePods.getCaseMatchMarkings() = SplitPodsMarkings(
-        leftPodBattery = batteryLeftPodPercent,
-        rightPodBattery = batteryRightPodPercent,
-        microPhoneLeft = isLeftPodMicrophone,
-        microPhoneRight = isRightPodMicrophone,
-        chargingLeft = isLeftPodCharging,
-        chargingRight = isRightPodCharging,
-        color = rawDeviceColor,
-        model = model
-    )
-
-    /**
-     * Split pods, one in case, one not.
-     */
-    data class SplitPodsMarkings(
-        val leftPodBattery: Float?,
-        val rightPodBattery: Float?,
-        val microPhoneLeft: Boolean,
-        val microPhoneRight: Boolean,
-        val chargingLeft: Boolean,
-        val chargingRight: Boolean,
-        val color: UByte,
-        val model: PodDevice.Model,
-    )
-
-    private fun Collection<KnownDevice>.findSplitPodsMatch(device: DualApplePods): Collection<KnownDevice> {
-        val target = device.getCaseMatchMarkings()
-
-        return filter { known ->
-            known.history
-                .filterIsInstance<DualApplePods>()
-                .any { it.getCaseMatchMarkings() == target }
-        }
-    }
-
-    override fun searchHistory(current: DualApplePods): KnownDevice? {
-        val basicResult = super.searchHistory(current)
-
-        val caseIgnored = knownDevices.values.findSplitPodsMatch(current)
-
-        log(tag, DEBUG) { "searchHistory2: Case ignored matches(${caseIgnored.size}): $caseIgnored" }
-
-        return when (caseIgnored.size) {
-            0 -> basicResult
-            1 -> caseIgnored.single()
-            else -> {
-                log(tag) { "searchHistory2:  More than one result when ignoring case markers." }
-                val oldest = caseIgnored.maxByOrNull { it.history.size } ?: return null
-
-                caseIgnored.minus(oldest).forEach {
-                    log(tag) { "searchHistory2: Removing outlier: $it" }
-                    knownDevices.remove(it.id)
-                }
-
-                oldest
-            }
-        }
-    }
-
-}

app-common/src/main/java/eu/darken/capod/pods/core/apple/SingleApplePods.kt

@@ -1,22 +0,0 @@
-package eu.darken.capod.pods.core.apple
-
-import eu.darken.capod.common.debug.logging.log
-import eu.darken.capod.common.lowerNibble
-import eu.darken.capod.pods.core.SinglePodDevice
-
-/**
- * Devices that only present a single charge level, e.g. most Beats devices
- */
-interface SingleApplePods : ApplePods, SinglePodDevice, HasAppleColor {
-
-    override val batteryHeadsetPercent: Float?
-        get() = when (val value = rawPodsBattery.lowerNibble.toInt()) {
-            15 -> null
-            else -> if (value > 10) {
-                log { "Headset above 100% battery: $value" }
-                1.0f
-            } else {
-                (value / 10f)
-            }
-        }
-}

app-common/src/main/java/eu/darken/capod/pods/core/apple/SingleApplePodsFactory.kt

@@ -1,3 +0,0 @@
-package eu.darken.capod.pods.core.apple
-
-abstract class SingleApplePodsFactory(private val tag: String) : ApplePodsFactory<SingleApplePods>(tag)

app-common/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsMax.kt

@@ -1,71 +0,0 @@
-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.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
-import java.time.Instant
-import javax.inject.Inject
-
-data class AirPodsMax(
-    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,
-    private val rssiAverage: Int? = null,
-) : SingleApplePods, HasEarDetection, HasAppleColor {
-
-    override val model: PodDevice.Model = PodDevice.Model.AIRPODS_MAX
-
-    override val rssi: Int
-        get() = rssiAverage ?: super<SingleApplePods>.rssi
-
-    val isHeadphonesBeingWorn: Boolean
-        get() = rawStatus.isBitSet(1)
-
-    val isHeadsetBeingCharged: Boolean
-        get() = rawFlags.isBitSet(0)
-
-    override val isBeingWorn: Boolean
-        get() = isHeadphonesBeingWorn
-
-    class Factory @Inject constructor() : SingleApplePodsFactory(TAG) {
-
-        override fun isResponsible(message: ProximityPairing.Message): Boolean = message.run {
-            getModelInfo().dirty == DEVICE_CODE_DIRTY && length == ProximityPairing.PAIRING_MESSAGE_LENGTH
-        }
-
-        override fun create(scanResult: BleScanResult, message: ProximityPairing.Message): ApplePods {
-            var basic = AirPodsMax(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,
-                confidence = result.confidence,
-                rssiAverage = result.averageRssi(basic.rssi),
-            )
-        }
-    }
-
-    companion object {
-        private val DEVICE_CODE_DIRTY = 10.toUByte()
-        private val TAG = logTag("PodDevice", "Apple", "AirPods", "Max")
-    }
-}

app-common/src/main/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsGen1.kt

@@ -1,152 +0,0 @@
-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
-
-/**
- * Basically an AirPods GEN1 clone
- * Similar data structure but a lot of placeholder values or hardcoded values
- * Marketed as TWS i99999
- */
-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,
-    private val rssiAverage: Int? = null,
-    private val cachedBatteryPercentage: Float? = null,
-) : ApplePods, DualPodDevice, HasEarDetectionDual, HasChargeDetectionDual, HasCase {
-
-    override val model: PodDevice.Model = PodDevice.Model.FAKE_AIRPODS_GEN1
-
-    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
-                }
-            }
-        }
-
-    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<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?
-            getModelInfo().full == DEVICE_CODE && length == 19
-        }
-
-        override fun create(scanResult: BleScanResult, message: ProximityPairing.Message): ApplePods {
-            var basic = FakeAirPodsGen1(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,
-                confidence = result.confidence,
-                cachedBatteryPercentage = result.getLatestCaseBattery(),
-                rssiAverage = result.averageRssi(basic.rssi),
-            )
-        }
-    }
-
-    companion object {
-        private val DEVICE_CODE = 0x0220.toUShort()
-        private val TAG = logTag("PodDevice", "Apple", "Fake", "AirPods", "Gen1")
-    }
-}

app-common/src/main/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsGen2.kt

@@ -1,150 +0,0 @@
-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
-
-/**
- * Similar data structure but a lot of placeholder values or hardcoded values
- */
-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,
-    private val rssiAverage: Int? = null,
-    private val cachedBatteryPercentage: Float? = null,
-) : ApplePods, DualPodDevice, HasEarDetectionDual, HasChargeDetectionDual, HasCase {
-
-    override val model: PodDevice.Model = PodDevice.Model.FAKE_AIRPODS_GEN2
-
-    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
-                }
-            }
-        }
-
-    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<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?
-            getModelInfo().full == DEVICE_CODE && length == 19
-        }
-
-        override fun create(scanResult: BleScanResult, message: ProximityPairing.Message): ApplePods {
-            var basic = FakeAirPodsGen2(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,
-                confidence = result.confidence,
-                cachedBatteryPercentage = result.getLatestCaseBattery(),
-                rssiAverage = result.averageRssi(basic.rssi),
-            )
-        }
-    }
-
-    companion object {
-        private val DEVICE_CODE = 0x0F20.toUShort()
-        private val TAG = logTag("PodDevice", "Apple", "Fake", "AirPods", "Gen2")
-    }
-}

app-common/src/main/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsGen3.kt

@@ -1,153 +0,0 @@
-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 confidence: 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,
-                confidence = result.confidence,
-                cachedBatteryPercentage = result.getLatestCaseBattery(),
-                rssiAverage = result.averageRssi(basic.rssi),
-            )
-        }
-
-    }
-
-    companion object {
-        private val DEVICE_CODE = 0x1320.toUShort()
-        private val TAG = logTag("PodDevice", "Apple", "Fake", "AirPods", "Gen3")
-    }
-}

app-common/src/main/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsPro.kt

@@ -1,170 +0,0 @@
-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 confidence: 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,
-                confidence = result.confidence,
-                cachedBatteryPercentage = result.getLatestCaseBattery(),
-                rssiAverage = result.averageRssi(basic.rssi),
-            )
-        }
-    }
-
-    companion object {
-        private val DEVICE_CODE = 0x0E20.toUShort()
-        private val TAG = logTag("PodDevice", "Apple", "Fake", "AirPods", "Pro")
-    }
-}

app-common/src/main/java/eu/darken/capod/pods/core/apple/misc/FakeAirPodsPro2.kt

@@ -1,168 +0,0 @@
-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 confidence: 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,
-                confidence = result.confidence,
-                cachedBatteryPercentage = result.getLatestCaseBattery(),
-                rssiAverage = result.averageRssi(basic.rssi),
-            )
-        }
-
-    }
-
-    companion object {
-        private val DEVICE_CODE = 0x1420.toUShort()
-        private val TAG = logTag("PodDevice", "Apple", "Fake", "AirPods", "Pro2")
-    }
-}

app-common/src/main/java/eu/darken/capod/reaction/core/ReactionSettings.kt

@@ -1,63 +0,0 @@
-package eu.darken.capod.reaction.core
-
-import android.content.Context
-import android.content.SharedPreferences
-import androidx.preference.PreferenceDataStore
-import com.squareup.moshi.Moshi
-import dagger.hilt.android.qualifiers.ApplicationContext
-import eu.darken.capod.common.preferences.PreferenceStoreMapper
-import eu.darken.capod.common.preferences.Settings
-import eu.darken.capod.common.preferences.createFlowPreference
-import eu.darken.capod.reaction.core.autoconnect.AutoConnectCondition
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class ReactionSettings @Inject constructor(
-    @ApplicationContext private val context: Context,
-    moshi: Moshi,
-) : Settings() {
-
-    override val preferences: SharedPreferences =
-        context.getSharedPreferences("settings_reaction", Context.MODE_PRIVATE)
-
-    val autoPause = preferences.createFlowPreference(
-        "reaction.autopause.enabled",
-        false
-    )
-
-    val autoPlay = preferences.createFlowPreference(
-        "reaction.autoplay.enabled",
-        false
-    )
-
-    val autoConnect = preferences.createFlowPreference(
-        "reaction.autoconnect.enabled",
-        false
-    )
-
-    val autoConnectCondition = preferences.createFlowPreference(
-        "reaction.autoconnect.condition",
-        AutoConnectCondition.WHEN_SEEN,
-        moshi
-    )
-
-    val showPopUpOnCaseOpen = preferences.createFlowPreference(
-        "reaction.popup.caseopen",
-        false
-    )
-
-    val onePodMode = preferences.createFlowPreference(
-        "reaction.onepod.enabled",
-        false
-    )
-
-    override val preferenceDataStore: PreferenceDataStore = PreferenceStoreMapper(
-        autoPause,
-        autoPlay,
-        autoConnect,
-        autoConnectCondition,
-        showPopUpOnCaseOpen,
-        onePodMode,
-    )
-}

app-common/src/main/java/eu/darken/capod/reaction/core/autoconnect/AutoConnect.kt

@@ -1,98 +0,0 @@
-package eu.darken.capod.reaction.core.autoconnect
-
-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
-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.DualApplePods
-import eu.darken.capod.reaction.core.ReactionSettings
-import kotlinx.coroutines.flow.*
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class AutoConnect @Inject constructor(
-    private val bluetoothManager: BluetoothManager2,
-    private val podMonitor: PodMonitor,
-    private val generalSettings: GeneralSettings,
-    private val reactionSettings: ReactionSettings
-) {
-
-    fun monitor(): Flow<Unit> = reactionSettings.autoConnect.flow
-        .flatMapLatest { isAutoConnectEnabled ->
-            if (isAutoConnectEnabled) {
-                combine(
-                    bluetoothManager.connectedDevices().distinctUntilChanged(),
-                    podMonitor.mainDevice.filterNotNull().distinctUntilChangedBy { it.rawDataHex },
-                ) { connectedDevices, mainDevice ->
-                    connectedDevices to mainDevice
-                }
-            } else {
-                emptyFlow()
-            }
-        }
-        .map { (connectedDevices, mainDevice) ->
-            log(TAG, VERBOSE) { "mainPodDevice is $mainDevice" }
-
-            val mainDeviceAddr = generalSettings.mainDeviceAddress.value
-            if (mainDeviceAddr.isNullOrEmpty()) {
-                log(TAG, WARN) { "mainDeviceAddress is null" }
-                return@map
-            }
-
-            val bondedDevice = bluetoothManager.bondedDevices().first().firstOrNull { it.address == mainDeviceAddr }
-
-            if (bondedDevice == null) {
-                log(TAG, WARN) { "No bonded device matches $mainDeviceAddr" }
-                return@map
-            } else {
-                log(TAG, VERBOSE) { "Found target device: $bondedDevice" }
-            }
-
-            val isAlreadyConnected = connectedDevices.any {
-                it.address == bondedDevice.address
-            }
-
-            if (isAlreadyConnected) {
-                log(TAG) { "We are already connected to the target device: $bondedDevice" }
-                return@map
-            }
-
-            val condition = reactionSettings.autoConnectCondition.value
-            log(TAG) { "Checking condition $condition" }
-            val conditionFulfilled = when (condition) {
-                AutoConnectCondition.WHEN_SEEN -> true
-                AutoConnectCondition.CASE_OPEN -> when (mainDevice) {
-                    is DualApplePods -> mainDevice.caseLidState == DualApplePods.LidState.OPEN
-                    else -> true
-                }
-                AutoConnectCondition.IN_EAR -> when (mainDevice) {
-                    is HasEarDetection -> {
-                        if (mainDevice is HasEarDetectionDual && reactionSettings.onePodMode.value) {
-                            mainDevice.isEitherPodInEar
-                        } else {
-                            mainDevice.isBeingWorn
-                        }
-                    }
-                    else -> true
-                }
-            }
-            if (!conditionFulfilled) {
-                log(TAG) { "Auto connect condition ($condition) is not fullfilled." }
-                return@map
-            }
-            val result = bluetoothManager.nudgeConnection(bondedDevice)
-            log(TAG) { "nudgeConnection($bondedDevice) returned $result" }
-        }
-        .setupCommonEventHandlers(TAG) { "monitor" }
-
-    companion object {
-        private val TAG = logTag("Reaction", "AutoConnect")
-    }
-}

app-common/src/main/java/eu/darken/capod/reaction/core/playpause/PlayPause.kt

@@ -1,97 +0,0 @@
-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
-import eu.darken.capod.common.flow.withPrevious
-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.reaction.core.ReactionSettings
-import kotlinx.coroutines.flow.*
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class PlayPause @Inject constructor(
-    private val podMonitor: PodMonitor,
-    private val bluetoothManager: BluetoothManager2,
-    private val reactionSettings: ReactionSettings,
-    private val mediaControl: MediaControl,
-) {
-
-    fun monitor() = combine(
-        reactionSettings.autoPlay.flow,
-        reactionSettings.autoPause.flow,
-        reactionSettings.onePodMode.flow,
-    ) { play, pause, _ -> play || pause }
-        .flatMapLatest { if (it) bluetoothManager.connectedDevices() else emptyFlow() }
-        .flatMapLatest {
-            if (it.isEmpty()) {
-                log(TAG) { "No known devices connected." }
-                emptyFlow()
-            } else {
-                log(TAG) { "Known devices connected: $it" }
-                podMonitor.mainDevice
-            }
-        }
-        .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) ->
-            log(TAG, VERBOSE) { "Checking\nprevious=$previous\ncurrent=$current" }
-
-            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" }
-                }
-            }
-        }
-        .setupCommonEventHandlers(TAG) { "monitor" }
-
-    companion object {
-        private val TAG = logTag("Reaction", "PlayPause")
-    }
-}

app-common/src/main/java/eu/darken/capod/reaction/core/popup/PopUpReaction.kt

@@ -1,111 +0,0 @@
-package eu.darken.capod.reaction.core.popup
-
-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.flow.setupCommonEventHandlers
-import eu.darken.capod.common.flow.withPrevious
-import eu.darken.capod.monitor.core.PodMonitor
-import eu.darken.capod.pods.core.PodDevice
-import eu.darken.capod.pods.core.apple.DualApplePods
-import eu.darken.capod.reaction.core.ReactionSettings
-import kotlinx.coroutines.flow.*
-import java.time.Duration
-import java.time.Instant
-import javax.inject.Inject
-import javax.inject.Singleton
-
-@Singleton
-class PopUpReaction @Inject constructor(
-    private val podMonitor: PodMonitor,
-    private val reactionSettings: ReactionSettings,
-) {
-
-    private val coolDowns = mutableMapOf<PodDevice.Id, Instant>()
-
-    fun monitor(): Flow<Event> = reactionSettings.showPopUpOnCaseOpen.flow
-        .flatMapLatest { isEnabled ->
-            if (isEnabled) {
-                podMonitor.mainDevice.distinctUntilChangedBy { it?.rawDataHex }
-            } else {
-                emptyFlow()
-            }
-        }
-        .withPrevious()
-        .setupCommonEventHandlers(TAG) { "monitor" }
-        .mapNotNull { (previous, current) ->
-            if (previous !is DualApplePods? || current !is DualApplePods) {
-                return@mapNotNull null
-            }
-            log(TAG, VERBOSE) {
-                val prev = previous?.rawCaseLidState?.let { String.format("%02X", it.toByte()) }
-                val cur = current.rawCaseLidState.let { String.format("%02X", it.toByte()) }
-                "previous=$prev (${previous?.caseLidState}), current=$cur (${current.caseLidState})"
-            }
-            log(TAG, VERBOSE) { "previous-id=${previous?.identifier}, current-id=${current.identifier}" }
-
-            val isSameDeviceWithCaseNowOpen =
-                previous?.identifier == current.identifier && previous.caseLidState != current.caseLidState
-            val isNewDeviceWithJustOpenedCase =
-                previous?.identifier != current.identifier && previous?.caseLidState != current.caseLidState
-
-            if (!isSameDeviceWithCaseNowOpen && !isNewDeviceWithJustOpenedCase) {
-                return@mapNotNull null
-            }
-            log(TAG) { "Case lid status changed for monitored device." }
-
-            tryPopWindow(current)
-        }
-
-    private suspend fun tryPopWindow(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 sinceLastPop = Duration.between(lastShown, now)
-            log(TAG) { "Time since last popup: $sinceLastPop" }
-
-            if (sinceLastPop >= Duration.ofSeconds(10)) {
-                coolDowns[current.identifier] = Instant.now()
-                Event.PopupShow(device = current)
-            } else {
-                log(TAG, INFO) { "Popup is still on cooldown: $sinceLastPop" }
-                null
-            }
-        }
-        current.caseLidState != DualApplePods.LidState.OPEN -> {
-            when (current.caseLidState) {
-                DualApplePods.LidState.CLOSED -> {
-                    log(TAG, INFO) { "Lid was actively closed, resetting cooldown." }
-                    coolDowns.remove(current.identifier)
-                }
-                else -> {
-                    log(TAG, WARN) { "Lid was was not actively closed, refreshing cooldown." }
-                    coolDowns[current.identifier] = Instant.now()
-                }
-            }
-
-            log(TAG, INFO) { "Hide popup" }
-
-            Event.PopupHide()
-        }
-        else -> null
-    }
-
-
-    sealed class Event {
-        data class PopupShow(
-            val eventAt: Instant = Instant.now(),
-            val device: PodDevice,
-        ) : Event()
-
-        data class PopupHide(
-            val eventAt: Instant = Instant.now(),
-        ) : Event()
-    }
-
-    companion object {
-        private val TAG = logTag("Reaction", "PopUp")
-    }
-}

app-common/src/main/res/drawable/devic_airpods_gen1_both.xml

@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="512"
-    android:viewportHeight="512"
-    android:tint="?attr/colorControlNormal">
-    <path
-        android:fillColor="@android:color/white"
-        android:fillType="evenOdd"
-        android:pathData="M125,52.87c-40.4,0 -80,23.12 -101.74,56.89V222.6c21,32.5 59.38,54.26 103.28,54.26a127.75,127.75 0,0 0,49.33 -9.78V438.13a21,21 0,0 0,21 21h28.91a21,21 0,0 0,21 -21V165.42C246.66,102.73 206.5,52.87 125,52.87ZM81.81,181.52a15.48,15.48 0,1 1,15.41 -15.47A15.44,15.44 0,0 1,81.81 181.52ZM228.25,430.8a6,6 0,0 1,-6 6H201.88a6,6 0,0 1,-6 -6v-0.38a6,6 0,0 1,6 -6h20.37a6,6 0,0 1,6 6Z" />
-    <path
-        android:fillColor="@android:color/white"
-        android:fillType="evenOdd"
-        android:pathData="M387,52.87c40.4,0 80,23.12 101.74,56.89L488.74,222.6c-21,32.5 -59.38,54.26 -103.28,54.26a127.75,127.75 0,0 1,-49.33 -9.78L336.13,438.13a21,21 0,0 1,-21 21L286.25,459.13a21,21 0,0 1,-21 -21L265.25,165.42C265.34,102.73 305.5,52.87 387,52.87ZM430.16,181.52a15.48,15.48 0,1 0,-15.41 -15.47A15.44,15.44 0,0 0,430.19 181.52ZM283.75,430.8a6,6 0,0 0,6 6h20.37a6,6 0,0 0,6 -6v-0.38a6,6 0,0 0,-6 -6L289.75,424.42a6,6 0,0 0,-6 6Z" />
-</vector>

app-common/src/main/res/drawable/devic_airpods_gen1_case.xml

@@ -1,19 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="512"
-    android:viewportHeight="512"
-    android:tint="?attr/colorControlNormal">
-    <path
-        android:fillColor="@android:color/white"
-        android:fillType="evenOdd"
-        android:pathData="M347.5,205.5h91v160a92,92 0,0 1,-92 92h-181a92,92 0,0 1,-92 -92v-160h101v10a29,29 0,0 0,29 29h115a29,29 0,0 0,29 -29Z" />
-    <path
-        android:fillColor="@android:color/white"
-        android:fillType="evenOdd"
-        android:pathData="M438.5,146.5v42H73.5v-42a92,92 0,0 1,92 -92h181A92,92 0,0 1,438.5 146.5Z" />
-    <path
-        android:fillColor="@android:color/white"
-        android:fillType="evenOdd"
-        android:pathData="M209.5,225.5a10,10 0,0 1,-10 -10v-10h113v10a10,10 0,0 1,-10 10Z" />
-</vector>

app-common/src/main/res/drawable/devic_airpods_gen1_left.xml

@@ -1,11 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="512"
-    android:viewportHeight="512"
-    android:tint="?attr/colorControlNormal">
-    <path
-        android:fillColor="@android:color/white"
-        android:fillType="evenOdd"
-        android:pathData="M246,52.87c-40.4,0 -80,23.12 -101.74,56.89V222.6c21,32.5 59.38,54.26 103.28,54.26a127.75,127.75 0,0 0,49.33 -9.78V438.13a21,21 0,0 0,21 21h28.91a21,21 0,0 0,21 -21V165.42C367.67,102.73 327.51,52.87 246,52.87ZM202.82,181.52a15.48,15.48 0,1 1,15.41 -15.47A15.44,15.44 0,0 1,202.82 181.52ZM349.26,430.8a6,6 0,0 1,-6 6H322.89a6,6 0,0 1,-6 -6v-0.38a6,6 0,0 1,6 -6h20.37a6,6 0,0 1,6 6Z" />
-</vector>

app-common/src/main/res/drawable/devic_airpods_gen1_right.xml

@@ -1,11 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="512"
-    android:viewportHeight="512"
-    android:tint="?attr/colorControlNormal">
-    <path
-        android:fillColor="@android:color/white"
-        android:fillType="evenOdd"
-        android:pathData="M266,52.87c40.4,0 80,23.12 101.74,56.89L367.74,222.6c-21,32.5 -59.38,54.26 -103.28,54.26a127.75,127.75 0,0 1,-49.33 -9.78L215.13,438.13a21,21 0,0 1,-21 21L165.24,459.13a21,21 0,0 1,-21 -21L144.24,165.42C144.33,102.73 184.49,52.87 266,52.87ZM309.16,181.52a15.48,15.48 0,1 0,-15.41 -15.47A15.44,15.44 0,0 0,309.18 181.52ZM162.74,430.8a6,6 0,0 0,6 6h20.37a6,6 0,0 0,6 -6v-0.38a6,6 0,0 0,-6 -6L168.74,424.42a6,6 0,0 0,-6 6Z" />
-</vector>

app-common/src/main/res/drawable/devic_airpods_gen2_both.xml

@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="?attr/colorControlNormal"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="m16,10.9789v7.5211c0,0.8284 -0.6716,1.5 -1.5,1.5s-1.5,-0.6716 -1.5,-1.5v-11c0,-2.2761 1.2239,-3.5 3.5,-3.5 1.4806,0 2.9336,0.7265 4.3536,2.1464 0.0938,0.0938 0.1464,0.2209 0.1464,0.3536v2c0,0.1326 -0.0527,0.2598 -0.1464,0.3536 -1.4199,1.4199 -2.873,2.1464 -4.3536,2.1464 -0.1728,0 -0.3394,-0.007 -0.5,-0.0211zM14,10.2016v8.2984c0,0.2761 0.2239,0.5 0.5,0.5s0.5,-0.2239 0.5,-0.5v-7.7243c-0.3884,-0.1333 -0.7223,-0.3253 -1,-0.5741zM11,7.5v11c0,0.8284 -0.6716,1.5 -1.5,1.5 -0.8284,0 -1.5,-0.6716 -1.5,-1.5v-7.5211c-0.1606,0.014 -0.3272,0.0211 -0.5,0.0211 -1.4806,0 -2.9336,-0.7265 -4.3536,-2.1464 -0.0938,-0.0938 -0.1464,-0.2209 -0.1464,-0.3536v-2c0,-0.1326 0.0527,-0.2598 0.1464,-0.3536 1.4199,-1.4199 2.873,-2.1464 4.3536,-2.1464 2.2761,0 3.5,1.2239 3.5,3.5zM9,10.7757v7.7243c0,0.2761 0.2239,0.5 0.5,0.5s0.5,-0.2239 0.5,-0.5v-8.2984c-0.2777,0.2488 -0.6116,0.4408 -1,0.5741zM4,8.2901c1.1954,1.1497 2.3604,1.7099 3.5,1.7099 1.7239,0 2.5,-0.7761 2.5,-2.5s-0.7761,-2.5 -2.5,-2.5c-1.1396,0 -2.3046,0.5602 -3.5,1.7099zM6.5,8c-0.2761,0 -0.5,-0.2239 -0.5,-0.5s0.2239,-0.5 0.5,-0.5h2c0.2761,0 0.5,0.2239 0.5,0.5s-0.2239,0.5 -0.5,0.5zM16.5,5c-1.7239,0 -2.5,0.7761 -2.5,2.5s0.7761,2.5 2.5,2.5c1.1396,0 2.3046,-0.5602 3.5,-1.7099v-1.5802c-1.1954,-1.1497 -2.3604,-1.7099 -3.5,-1.7099zM15.5,8c-0.2761,0 -0.5,-0.2239 -0.5,-0.5s0.2239,-0.5 0.5,-0.5h2c0.2761,0 0.5,0.2239 0.5,0.5s-0.2239,0.5 -0.5,0.5z" />
-</vector>