Release: 2.2.1-rc1

Update release script
More version plumping
2026-09-14 18:26:11 -04:00 · 2022-10-27 17:40:57 +02:00 · 2022-10-27 17:38:50 +02:00 · 2022-10-27 17:38:50 +02:00 · 2022-10-27 17:38:50 +02:00 · 2022-10-27 08:09:49 +02:00
655 changed files with 7706 additions and 3579 deletions
@@ -1,4 +1,5 @@
 # These are supported funding model platforms
-
+github:
+  - d4rken
 custom:
  - "https://www.buymeacoffee.com/tydarken"
@@ -68,7 +68,9 @@ jobs:
          tag_name: ${{ steps.tagger.outputs.tag }}
          name: ${{ steps.tagger.outputs.tag }}
          generate_release_notes: true
-          files: app/build/outputs/apk/beta/*.apk
+          files: |
+            app/build/outputs/apk/foss/beta/*.apk
+            app-wear/build/outputs/apk/foss/beta/*.apk
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

@@ -80,7 +82,9 @@ jobs:
          tag_name: ${{ steps.tagger.outputs.tag }}
          name: ${{ steps.tagger.outputs.tag }}
          generate_release_notes: true
-          files: app/build/outputs/apk/release/*.apk
+          files: |
+            app/build/outputs/apk/foss/release/*.apk
+            app-wear/build/outputs/apk/foss/release/*.apk
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

@@ -1,9 +1,6 @@
-.idea
-.gradle
-build/
-/fastlane/report.xml
 *.iml
-local.properties
+.gradle
+/local.properties
 .DS_Store
 /build
 /captures
@@ -14,3 +11,4 @@ local.properties
 !/.idea/codeStyles/**/*
 *.jks
 .local/*
+/fastlane/report.xml
@@ -0,0 +1,167 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <option name="RIGHT_MARGIN" value="120" />
+    <JSON>
+      <option name="OBJECT_WRAPPING" value="1" />
+      <option name="ARRAY_WRAPPING" value="1" />
+    </JSON>
+    <JavaCodeStyleSettings>
+      <option name="DO_NOT_WRAP_AFTER_SINGLE_ANNOTATION" value="true" />
+      <option name="IMPORT_LAYOUT_TABLE">
+        <value>
+          <package name="android" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="com" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="junit" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="net" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="org" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="java" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="javax" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="" withSubpackages="true" static="true" />
+          <emptyLine />
+        </value>
+      </option>
+    </JavaCodeStyleSettings>
+    <JetCodeStyleSettings>
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+    </JetCodeStyleSettings>
+    <codeStyleSettings language="JAVA">
+      <option name="KEEP_SIMPLE_BLOCKS_IN_ONE_LINE" value="true" />
+      <option name="KEEP_SIMPLE_METHODS_IN_ONE_LINE" value="true" />
+      <option name="KEEP_SIMPLE_LAMBDAS_IN_ONE_LINE" value="true" />
+      <option name="KEEP_SIMPLE_CLASSES_IN_ONE_LINE" value="true" />
+      <option name="FIELD_ANNOTATION_WRAP" value="1" />
+    </codeStyleSettings>
+    <codeStyleSettings language="JSON">
+      <indentOptions>
+        <option name="USE_TAB_CHARACTER" value="true" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="XML">
+      <indentOptions>
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+      </indentOptions>
+      <arrangement>
+        <rules>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:android</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:id</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>style</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>ANDROID_ATTRIBUTE_ORDER</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>.*</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+        </rules>
+      </arrangement>
+    </codeStyleSettings>
+    <codeStyleSettings language="kotlin">
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+      <option name="METHOD_ANNOTATION_WRAP" value="1" />
+      <option name="CLASS_ANNOTATION_WRAP" value="1" />
+      <option name="FIELD_ANNOTATION_WRAP" value="1" />
+    </codeStyleSettings>
+  </code_scheme>
+</component>
@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </state>
+</component>
@@ -8,20 +8,20 @@ GEM
    artifactory (3.0.15)
    atomos (0.1.3)
    aws-eventstream (1.2.0)
-    aws-partitions (1.554.0)
-    aws-sdk-core (3.126.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)
-      jmespath (~> 1.0)
-    aws-sdk-kms (1.54.0)
-      aws-sdk-core (~> 3, >= 3.126.0)
+      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.112.0)
-      aws-sdk-core (~> 3, >= 3.126.0)
+    aws-sdk-s3 (1.114.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
      aws-sdk-kms (~> 1)
      aws-sigv4 (~> 1.4)
-    aws-sigv4 (1.4.0)
+    aws-sigv4 (1.5.1)
      aws-eventstream (~> 1, >= 1.0.2)
    babosa (1.0.4)
    claide (1.1.0)
@@ -36,8 +36,8 @@ GEM
      unf (>= 0.0.5, < 1.0.0)
    dotenv (2.7.6)
    emoji_regex (3.2.3)
-    excon (0.91.0)
-    faraday (1.9.3)
+    excon (0.92.4)
+    faraday (1.10.0)
      faraday-em_http (~> 1.0)
      faraday-em_synchrony (~> 1.0)
      faraday-excon (~> 1.1)
@@ -56,8 +56,8 @@ GEM
    faraday-em_synchrony (1.0.0)
    faraday-excon (1.1.0)
    faraday-httpclient (1.0.1)
-    faraday-multipart (1.0.3)
-      multipart-post (>= 1.2, < 3)
+    faraday-multipart (1.0.4)
+      multipart-post (~> 2)
    faraday-net_http (1.0.1)
    faraday-net_http_persistent (1.2.0)
    faraday-patron (1.0.0)
@@ -66,7 +66,7 @@ GEM
    faraday_middleware (1.2.0)
      faraday (~> 1.0)
    fastimage (2.2.6)
-    fastlane (2.204.3)
+    fastlane (2.208.0)
      CFPropertyList (>= 2.3, < 4.0.0)
      addressable (>= 2.8, < 3.0.0)
      artifactory (~> 3.0)
@@ -106,9 +106,9 @@ GEM
      xcpretty (~> 0.3.0)
      xcpretty-travis-formatter (>= 0.0.3)
    gh_inspector (1.1.3)
-    google-apis-androidpublisher_v3 (0.16.0)
-      google-apis-core (>= 0.4, < 2.a)
-    google-apis-core (0.4.2)
+    google-apis-androidpublisher_v3 (0.25.0)
+      google-apis-core (>= 0.7, < 2.a)
+    google-apis-core (0.7.0)
      addressable (~> 2.5, >= 2.5.1)
      googleauth (>= 0.16.2, < 2.a)
      httpclient (>= 2.8.1, < 3.a)
@@ -117,19 +117,19 @@ GEM
      retriable (>= 2.0, < 4.a)
      rexml
      webrick
-    google-apis-iamcredentials_v1 (0.10.0)
-      google-apis-core (>= 0.4, < 2.a)
-    google-apis-playcustomapp_v1 (0.7.0)
-      google-apis-core (>= 0.4, < 2.a)
-    google-apis-storage_v1 (0.11.0)
-      google-apis-core (>= 0.4, < 2.a)
+    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-cloud-errors (~> 1.0)
-    google-cloud-env (1.5.0)
-      faraday (>= 0.17.3, < 2.0)
+    google-cloud-env (1.6.0)
+      faraday (>= 0.17.3, < 3.0)
    google-cloud-errors (1.2.0)
-    google-cloud-storage (1.36.1)
+    google-cloud-storage (1.37.0)
      addressable (~> 2.8)
      digest-crc (~> 0.4)
      google-apis-iamcredentials_v1 (~> 0.1)
@@ -137,20 +137,20 @@ GEM
      google-cloud-core (~> 1.6)
      googleauth (>= 0.16.2, < 2.a)
      mini_mime (~> 1.0)
-    googleauth (1.1.0)
-      faraday (>= 0.17.3, < 2.0)
+    googleauth (1.2.0)
+      faraday (>= 0.17.3, < 3.a)
      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.4)
+    http-cookie (1.0.5)
      domain_name (~> 0.5)
    httpclient (2.8.3)
-    jmespath (1.5.0)
-    json (2.6.1)
-    jwt (2.3.0)
+    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)
@@ -161,9 +161,9 @@ GEM
    optparse (0.1.1)
    os (1.1.4)
    plist (3.6.0)
-    public_suffix (4.0.6)
+    public_suffix (4.0.7)
    rake (13.0.6)
-    representable (3.1.1)
+    representable (3.2.0)
      declarative (< 0.1.0)
      trailblazer-option (>= 0.1.1, < 0.2.0)
      uber (< 0.2.0)
@@ -173,9 +173,9 @@ GEM
    ruby2_keywords (0.0.5)
    rubyzip (2.3.2)
    security (0.1.3)
-    signet (0.16.0)
+    signet (0.17.0)
      addressable (~> 2.8)
-      faraday (>= 0.17.3, < 2.0)
+      faraday (>= 0.17.5, < 3.a)
      jwt (>= 1.5, < 3.0)
      multi_json (~> 1.10)
    simctl (1.6.8)
@@ -192,11 +192,11 @@ GEM
    uber (0.1.0)
    unf (0.1.4)
      unf_ext
-    unf_ext (0.0.8)
+    unf_ext (0.0.8.2)
    unicode-display_width (1.8.0)
    webrick (1.7.0)
    word_wrap (1.0.0)
-    xcodeproj (1.21.0)
+    xcodeproj (1.22.0)
      CFPropertyList (>= 2.3.3, < 4.0)
      atomos (~> 0.1.3)
      claide (>= 1.0.2, < 2.0)
@@ -2,7 +2,7 @@

 # 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)
-[![Code tests & eval](https://github.com/d4rken/capod/actions/workflows/code-checks.yml/badge.svg)](https://github.com/d4rken/capod/actions/workflows/code-checks.yml)
+[![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)

@@ -15,6 +15,7 @@ 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

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

@@ -23,7 +24,8 @@ Currently supported models:
 * AirPods 1. Generation
 * AirPods 2. Generation
 * AirPods 3. Generation
-* AirPods Pro
+* AirPods Pro 1. Generation
+* AirPods Pro 2. Generation
 * AirPods Max
 * Power Beats Pro
 * Power Beats 3
@@ -36,17 +38,18 @@ Currently supported models:

 * [Google Play](https://play.google.com/store/apps/details?id=eu.darken.capod)
 * [GitHub](https://github.com/d4rken-org/capod/releases/latest)
+* [IzzyOnDroid](https://apt.izzysoft.de/fdroid/index/apk/eu.darken.capod)

 ## Support the project

 * Buy the CAPod Pro In-App purchase on [Google Play](https://play.google.com/store/apps/details?id=eu.darken.capod)
+* [Sponsor development](https://github.com/sponsors/d4rken) on GitHub
 * Help translate CAPod [on Crowdin](https://crowdin.com/project/capod)

 ## Get help

 * [Github Issues](https://github.com/d4rken-org/capod/issues)
 * [Discord](https://discord.gg/vHubYPp)
-* [Email](mailto:support@darken.eu)

 ## Screenshots

@@ -0,0 +1 @@
+2.2.1-rc1 20201010
@@ -0,0 +1 @@
+/build
@@ -0,0 +1,100 @@
+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")
+
+}
@@ -0,0 +1,21 @@
+# 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
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="eu.darken.capod.common">
+
+</manifest>
@@ -1,7 +1,5 @@
 package eu.darken.capod.common

-import eu.darken.capod.BuildConfig
-

 // Can't be const because that prevents them from being mocked in tests
@Suppress("MayBeConstant")
@@ -34,12 +32,14 @@ object BuildConfigWrap {
        ;
    }

-    val APPLICATION_ID = BuildConfig.APPLICATION_ID
+    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"
 }
@@ -13,6 +13,6 @@ object BuildWrap {
    }
 }

-fun hasApiLevel(level: Int): Boolean = BuildWrap.VERSION.SDK_INT >= level
+fun hasApiLevel(level: Int): Boolean = BuildWrap.VersionWrap.SDK_INT >= level

-fun withinApiLevel(start: Int, end: Int): Boolean = BuildWrap.VERSION.SDK_INT in start..end
+fun withinApiLevel(start: Int, end: Int): Boolean = BuildWrap.VersionWrap.SDK_INT in start..end
@@ -0,0 +1,5 @@
+package eu.darken.capod.common
+
+object PrivacyPolicy {
+    const val URL = "https://github.com/d4rken-org/capod/blob/main/PRIVACY_POLICY.md"
+}
@@ -3,14 +3,19 @@ package eu.darken.capod.common.bluetooth
 import android.bluetooth.le.ScanResult
 import android.os.Parcelable
 import androidx.core.util.forEach
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
 import kotlinx.parcelize.Parcelize
+import java.time.Instant

@Parcelize
+@JsonClass(generateAdapter = true)
 data class BleScanResult(
-    val address: String,
-    val rssi: Int,
-    val generatedAtNanos: Long,
-    val manufacturerSpecificData: Map<Int, ByteArray>
+    @Json(name = "receivedAt") val receivedAt: Instant,
+    @Json(name = "address") val address: String,
+    @Json(name = "rssi") val rssi: Int,
+    @Json(name = "generatedAtNanos") val generatedAtNanos: Long,
+    @Json(name = "manufacturerSpecificData") val manufacturerSpecificData: Map<Int, ByteArray>
 ) : Parcelable {

    fun getManufacturerSpecificData(id: Int): ByteArray? = manufacturerSpecificData[id]
@@ -25,6 +30,7 @@ data class BleScanResult(

    companion object {
        fun fromScanResult(scanResult: ScanResult) = BleScanResult(
+            receivedAt = Instant.now(),
            address = scanResult.device.address,
            rssi = scanResult.rssi,
            generatedAtNanos = scanResult.timestampNanos,
@@ -10,7 +10,6 @@ import dagger.hilt.android.qualifiers.ApplicationContext
 import eu.darken.capod.common.debug.logging.Logging.Priority.*
 import eu.darken.capod.common.debug.logging.log
 import eu.darken.capod.common.debug.logging.logTag
-import eu.darken.capod.main.core.ScannerMode
 import kotlinx.coroutines.channels.awaitClose
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.Flow
@@ -36,7 +35,7 @@ class BleScanner @Inject constructor(
        log(TAG, VERBOSE) { "scan(filters=$filters, scannerMode=$scannerMode, compatMode=$compatMode)" }
        if (compatMode) log(TAG, WARN) { "Using compatibilityMode!" }

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

        val supportsOffloadFiltering = adapter.isOffloadedFilteringSupported.also {
            log(TAG, if (it) DEBUG else WARN) { "isOffloadedFilteringSupported=$it" }
@@ -46,7 +45,7 @@ class BleScanner @Inject constructor(
            log(TAG, if (it) DEBUG else WARN) { "isOffloadedScanBatchingSupported=$it" }
        } && !compatMode

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

        val callback = object : ScanCallback() {
            var lastScanAt = System.currentTimeMillis()
@@ -20,7 +20,6 @@ import kotlinx.coroutines.channels.awaitClose
 import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.launch
 import java.io.IOException
-import java.util.*
 import javax.inject.Inject
 import javax.inject.Singleton

@@ -31,12 +30,11 @@ class BluetoothManager2 @Inject constructor(
    private val dispatcherProvider: DispatcherProvider,
 ) {

-    val adapter: BluetoothAdapter
+    val adapter: BluetoothAdapter?
        get() = manager.adapter

-    val scanner: BluetoothLeScanner
-        get() = adapter.bluetoothLeScanner
-            ?: throw IllegalStateException("Bluetooth is disabled or permissiong missing")
+    val scanner: BluetoothLeScanner?
+        get() = adapter?.bluetoothLeScanner

    val isBluetoothEnabled: Flow<Boolean> = callbackFlow {
        send(manager.adapter?.isEnabled ?: false)
@@ -159,7 +157,9 @@ class BluetoothManager2 @Inject constructor(
            }
        }

-    fun bondedDevices(): Set<BluetoothDevice> = adapter.bondedDevices
+    fun bondedDevices(): Flow<Set<BluetoothDevice>> = flow {
+        emit(adapter?.bondedDevices ?: throw IllegalStateException("Bluetooth adapter unavailable"))
+    }

    suspend fun nudgeConnection(device: BluetoothDevice): Boolean = getBluetoothProfile().map { bluetoothProfile ->
        try {
@@ -3,6 +3,7 @@ package eu.darken.capod.common.bluetooth
 import dagger.Reusable
 import eu.darken.capod.common.SystemClockWrap
 import eu.darken.capod.common.debug.autoreport.DebugSettings
+import java.time.Instant
 import javax.inject.Inject
 import kotlin.random.Random

@@ -20,6 +21,7 @@ class FakeBleData @Inject constructor(
        val fakeDevices = mutableListOf<BleScanResult>()
        // AirPods Gen1
        BleScanResult(
+            receivedAt = Instant.now(),
            address = "78:73:AF:B4:85:22",
            rssi = Random.nextInt(100) * -1,
            generatedAtNanos = SystemClockWrap.elapsedRealtimeNanos + 100,
@@ -32,6 +34,7 @@ class FakeBleData @Inject constructor(

        // AirPods Gen2
        BleScanResult(
+            receivedAt = Instant.now(),
            address = "78:73:FF:B4:85:5E",
            rssi = Random.nextInt(100) * -1,
            generatedAtNanos = SystemClockWrap.elapsedRealtimeNanos + 100,
@@ -44,6 +47,7 @@ class FakeBleData @Inject constructor(

        // AirPods Gen3
        BleScanResult(
+            receivedAt = Instant.now(),
            address = "4E:9E:D1:49:D2:6D",
            rssi = Random.nextInt(15, 75) * -1,
            generatedAtNanos = SystemClockWrap.elapsedRealtimeNanos + 200,
@@ -55,6 +59,7 @@ class FakeBleData @Inject constructor(
        }
        // AirPods Max
        BleScanResult(
+            receivedAt = Instant.now(),
            address = "7E:E5:C7:65:D2:B5",
            rssi = Random.nextInt(15, 75) * -1,
            generatedAtNanos = SystemClockWrap.elapsedRealtimeNanos + 300,
@@ -66,6 +71,7 @@ class FakeBleData @Inject constructor(
        }
        // BeatsFlex
        BleScanResult(
+            receivedAt = Instant.now(),
            address = "5E:9E:D1:49:D2:6D",
            rssi = Random.nextInt(15, 75) * -1,
            generatedAtNanos = SystemClockWrap.elapsedRealtimeNanos + 400,
@@ -78,6 +84,7 @@ class FakeBleData @Inject constructor(

        // Tws i99999
        BleScanResult(
+            receivedAt = Instant.now(),
            address = "5E:9E:D1:29:D2:6D",
            rssi = Random.nextInt(15, 75) * -1,
            generatedAtNanos = SystemClockWrap.elapsedRealtimeNanos + 400,
@@ -90,6 +97,7 @@ class FakeBleData @Inject constructor(

        // Unknown Device
        BleScanResult(
+            receivedAt = Instant.now(),
            address = "6E:9E:D1:49:D2:6D",
            rssi = Random.nextInt(15, 75) * -1,
            generatedAtNanos = SystemClockWrap.elapsedRealtimeNanos + 500,
@@ -1,9 +1,9 @@
-package eu.darken.capod.main.core
+package eu.darken.capod.common.bluetooth

 import androidx.annotation.StringRes
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import eu.darken.capod.R
+import eu.darken.capod.common.R

@JsonClass(generateAdapter = false)
 enum class ScannerMode(
@@ -6,7 +6,6 @@ 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.BuildConfig
 import eu.darken.capod.common.BuildConfigWrap
 import eu.darken.capod.common.debug.autoreport.DebugSettings
 import eu.darken.capod.common.debug.logging.Logging.Priority.WARN
@@ -26,13 +25,13 @@ class BugsnagErrorHandler @Inject constructor(
        bugsnagLogger.injectLog(event)

        TAB_APP.also { tab ->
-            event.addMetadata(tab, "gitSha", BuildConfig.GITSHA)
-            event.addMetadata(tab, "buildTime", BuildConfig.BUILDTIME)
+            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 && !BuildConfigWrap.DEBUG
+        return debugSettings.isAutoReportingEnabled.value && !eu.darken.capod.common.BuildConfigWrap.DEBUG
    }

    companion object {
@@ -1,7 +1,7 @@
 package eu.darken.capod.common.error

 import android.content.Context
-import eu.darken.capod.R
+import eu.darken.capod.common.R

 interface HasLocalizedError {
    fun getLocalizedError(context: Context): LocalizedError
@@ -25,7 +25,8 @@ class DynamicStateFlow<T>(
    loggingTag: String? = null,
    parentScope: CoroutineScope,
    coroutineContext: CoroutineContext = parentScope.coroutineContext,
-    private val startValueProvider: suspend CoroutineScope.() -> T
+    private val onRelease: CoroutineScope.(T) -> Unit = {},
+    private val startValueProvider: suspend CoroutineScope.() -> T,
 ) {
    private val lTag = loggingTag?.let { "$it:DSFlow" }

@@ -47,6 +48,12 @@ class DynamicStateFlow<T>(
            }
        }

+        invokeOnClose {
+            lTag?.let { log(it, VERBOSE) { "invokeOnClose executing..." } }
+            onRelease(currentValue)
+            lTag?.let { log(it, VERBOSE) { "internal channelFlow finished." } }
+        }
+
        updateActions.collect { update ->
            currentValue = valueGuard.withLock {
                try {
@@ -68,12 +75,11 @@ class DynamicStateFlow<T>(
                }
            }
        }
-
-        lTag?.let { log(it, VERBOSE) { "internal channelFlow finished." } }
    }

    private val internalFlow = producer
        .onStart { lTag?.let { log(it, VERBOSE) { "Internal onStart" } } }
+//        .onEach { value -> lTag?.let { log(it, VERBOSE) { "New value: $value" } } }
        .onCompletion { err ->
            when {
                err is CancellationException -> {
@@ -40,7 +40,7 @@ fun <T : Any?> Flow<T>.replayingShare(scope: CoroutineScope) = this.shareIn(
    started = SharingStarted.WhileSubscribed(replayExpiration = Duration.ZERO)
 )

-internal fun <T> Flow<T>.withPrevious(): Flow<Pair<T?, T>> = this
+fun <T> Flow<T>.withPrevious(): Flow<Pair<T?, T>> = this
    .scan(Pair<T?, T?>(null, null)) { previous, current -> Pair(previous.second, current) }
    .drop(1)
    .map {
@@ -6,8 +6,8 @@ import android.os.Build
 import android.os.PowerManager
 import androidx.annotation.StringRes
 import androidx.core.content.ContextCompat
-import eu.darken.capod.R
 import eu.darken.capod.common.BuildConfigWrap
+import eu.darken.capod.common.R
 import eu.darken.capod.common.withinApiLevel

 enum class Permission(
@@ -71,7 +71,13 @@ enum class Permission(
        isGranted = {
            android.provider.Settings.canDrawOverlays(it)
        },
-    )
+    ),
+    POST_NOTIFICATIONS(
+        minApiLevel = Build.VERSION_CODES.S,
+        labelRes = R.string.permission_post_notifications_label,
+        descriptionRes = R.string.permission_post_notifications_description,
+        permissionId = "android.permission.POST_NOTIFICATIONS",
+    ),
 }

 fun Permission.isRequired(context: Context): Boolean = when {
@@ -2,7 +2,7 @@ package eu.darken.capod.common.preferences

 import android.content.SharedPreferences
 import androidx.core.content.edit
-import eu.darken.capod.common.debug.logging.Logging.Priority.*
+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
@@ -9,5 +9,5 @@ class JavaInstantAdapter {
    fun toJson(obj: Instant): Long = obj.toEpochMilli()

    @FromJson
-    fun fromJson(epochMillis: Long): Instant = Instant.ofEpochSecond(epochMillis)
+    fun fromJson(epochMillis: Long): Instant = Instant.ofEpochMilli(epochMillis)
 }
@@ -9,6 +9,8 @@ interface UpgradeRepo {

    fun launchBillingFlow(activity: Activity)

+    fun getSponsorUrl(): String? = null
+
    interface Info {
        val type: Type

@@ -8,7 +8,8 @@ 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.*
+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
@@ -5,6 +5,7 @@ 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
@@ -3,7 +3,7 @@ package eu.darken.capod.main.core
 import androidx.annotation.StringRes
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import eu.darken.capod.R
+import eu.darken.capod.common.R

@JsonClass(generateAdapter = false)
 enum class MonitorMode(
@@ -6,7 +6,7 @@ import eu.darken.capod.common.debug.logging.log
 import eu.darken.capod.common.debug.logging.logTag
 import eu.darken.capod.common.permissions.Permission
 import eu.darken.capod.common.permissions.isRequired
-import eu.darken.capod.reaction.settings.ReactionSettings
+import eu.darken.capod.reaction.core.ReactionSettings
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.combine
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
darken	63f37e51ad	Release: 2.2.1-rc1	2022-10-27 17:40:57 +02:00
darken	01ea08a5cb	Update release script	2022-10-27 17:38:50 +02:00
darken	bddb20c5bb	More version plumping	2022-10-27 17:38:50 +02:00
darken	f9a97297da	Add a release script base. Based on https://gist.github.com/jv-k/703e79306554c26a65a7cfdb9ca119c6 WIP	2022-10-27 17:38:50 +02:00
darken	5fc2b56635	Update translations	2022-10-27 08:09:49 +02:00
darken	172953ccb3	Fix monitor mode being set to ALWAYS when visiting the reactions settings screen. Fixes #41	2022-10-27 07:59:21 +02:00
darken	d55300f53d	Fix bold highlighting of the main pod device not being reset.	2022-10-22 10:49:45 +03:00
darken	c3d4500e3a	Version bump (v2.2.1-rc0)	2022-09-24 15:50:25 +02:00
darken	cf72e28727	Fix app crash if Bluetooth adapter is null and we can't retrieve the list of bonded devices in settings.	2022-09-24 15:49:56 +02:00
darken	b488a1be16	Version bump (v2.2.0-rc0)	2022-09-24 12:00:21 +02:00
darken	805d0cb4b6	Update translations	2022-09-24 11:59:58 +02:00
darken	fa045c2504	Increase worker scheduling flex interval for WearOS.	2022-09-24 11:59:09 +02:00
Matthias Urhahn	23fd373a9b	AirPods Pro 2 (#32 ) * Preliminary support for AirPods Pro 2, based on #31, assuming identifier is `11 20` * Fix AirPods Pro 2 identifier (it's 0x1420) * Add second AirPods Pro 2 test case from reddit user. * Update Readme with AirPods Pro 2	2022-09-24 11:51:53 +02:00
darken	ab619cb073	Version bump (2.1.1-rc0)	2022-09-19 22:26:43 +02:00
darken	2d96822014	Add request for POST_NOTIFICATIONS on Android 13. Closes #29	2022-09-19 22:26:43 +02:00
darken	887adc87de	Reduce background monitor time to reduce battery usage.	2022-09-16 09:31:18 +02:00
darken	4219bd02c5	Setup fastlane for uploading app and wearos AAB	2022-09-14 21:40:13 +02:00
darken	48544464ae	Version bump	2022-09-14 21:19:07 +02:00
darken	9b4f2477e4	Add sponsor link to settings toolbar	2022-09-14 21:15:21 +02:00
darken	26e8840484	On Foss upgrade navigate to gituhb sponsors directly	2022-09-14 21:06:09 +02:00
darken	b6ef6d3ce9	Fix upgrade check	2022-09-14 21:00:15 +02:00
darken	cdfcd24049	Ensure that BLEScanner only starts when all necessary permissions are granted. (Or rather that scanner is restarted when permissions change). + some refactoring to improve readability	2022-09-14 20:51:39 +02:00
darken	95a8e0b125	Version bump	2022-09-14 19:55:56 +02:00
darken	84b7509f33	Adjust versioning for GPlay wear os bundle upload	2022-09-14 19:39:30 +02:00
darken	a53baec9dc	Version bump	2022-09-14 18:59:08 +02:00
darken	4b4bc86cf7	Fix Github release for WearOS APK	2022-09-14 18:31:34 +02:00
darken	4d3860089e	Add fastlane wear screenshots	2022-09-14 18:00:18 +02:00
darken	758f55f13c	Update README.md	2022-09-14 18:00:18 +02:00
darken	1e191c3adc	More translation updates	2022-09-14 18:00:18 +02:00
darken	1ba2cf7c9d	Sync translations with Crowdin (remove duplicate strings between modules)	2022-09-14 18:00:18 +02:00
darken	9ed1cc00d5	Fix crowdin configuration	2022-09-14 18:00:18 +02:00
darken	3be1173197	Tweak dual pods wear layout	2022-09-14 18:00:18 +02:00
darken	f6e69c62b1	Clean up strings	2022-09-14 18:00:18 +02:00
darken	6d9679a7fc	More cleanup	2022-09-14 18:00:18 +02:00
darken	6ea260a81f	More resource cleanup	2022-09-14 18:00:18 +02:00
darken	26da600761	Fix module packagename	2022-09-14 18:00:18 +02:00
darken	33172a7aee	Use the default low_latency mode for wearOS too, we want to get as many BLEScanRecords as possible in a short time frame and then sleep again.	2022-09-14 18:00:18 +02:00
darken	7eb9f6ac95	Fix failing test	2022-09-14 18:00:18 +02:00
darken	fc06c285d5	Fix periodic checks aborting with no data.	2022-09-14 18:00:18 +02:00
darken	ca2e4fec79	Implement periodic checks for wear	2022-09-14 18:00:18 +02:00
darken	87ca90f6cc	Fix "last seen at".	2022-09-14 18:00:18 +02:00
darken	7dfea78c87	Simplify WearOS app because this is such a cluster fuck and I've ran out of motivation.	2022-09-14 18:00:18 +02:00
darken	d7808009dc	Tweak main overview	2022-09-14 18:00:18 +02:00
darken	62afb7a130	Cache main pod device	2022-09-14 18:00:18 +02:00
darken	87bef9cb9c	Icon and reintroduce splash screen	2022-09-14 18:00:18 +02:00
darken	3860cb21c6	Code fluff	2022-09-14 18:00:18 +02:00
darken	bf4ad7886c	Improve wear os overview screen	2022-09-14 18:00:18 +02:00
darken	1d51c207f4	Basic working data display in wear-app	2022-09-14 18:00:18 +02:00
darken	2eb3f70e0c	Wear UI wip	2022-09-14 18:00:18 +02:00
darken	eb4d883194	More refactoring and modularization	2022-09-14 18:00:18 +02:00
darken	3f5c9ff9de	Fix reaction settings fragment crash	2022-09-14 18:00:18 +02:00
darken	47039796de	Nicer text display if we don't use raw github	2022-09-14 18:00:18 +02:00
darken	fd054abcca	Add codestyle	2022-09-14 18:00:18 +02:00
darken	2861bfbd47	Fix worker inject	2022-09-14 18:00:18 +02:00
darken	6ea3127f9c	More refactoring to split up modules, both compile. Wear is still WIP.	2022-09-14 18:00:18 +02:00
darken	f7acb5e115	Fix copy paste regressions	2022-09-14 18:00:18 +02:00
darken	b1ad1f7699	Cleanup	2022-09-14 18:00:18 +02:00
darken	ab713df3c0	Fix warnings	2022-09-14 18:00:18 +02:00
darken	e0d44f2f1c	Use Kotlin for Gradle DSL	2022-09-14 18:00:18 +02:00
darken	61463bc05f	More refactoring	2022-09-14 18:00:18 +02:00
darken	a219fc3527	Fix build issues	2022-09-14 18:00:18 +02:00
darken	1cd4028ce8	Adjust crowdin config	2022-09-14 18:00:18 +02:00
darken	de9a30eb93	Refactoring	2022-09-14 18:00:18 +02:00
darken	2210561af3	Refactoring	2022-09-14 18:00:18 +02:00
darken	c5ddc474c4	Update translations	2022-09-14 18:00:18 +02:00
darken	688748da36	Go multi-module: app-common, app-phone, app-wear	2022-09-14 18:00:18 +02:00
darken	753d311593	Tweak versioning and bump (1.3.14-rc0)	2022-08-24 11:56:42 +02:00
darken	5bae3d9931	Remove in-app email shortcut	2022-08-24 11:40:16 +02:00
darken	a3495a8218	Update translations	2022-08-24 11:33:48 +02:00
Poussinou	5fa68f77a2	Update README.md	2022-07-31 11:13:51 +02:00
darken	dbba2e9791	Another fastlane gplay upload fix.	2022-07-25 21:00:43 +02:00
darken	6207f26a68	Update fastlane to 2.208	2022-07-25 20:57:24 +02:00
darken	7fcd39822e	Update fastlane to 2.208	2022-07-25 20:56:45 +02:00
darken	d20f8a604f	Fix CI issues with Google Play upload (part 2...)	2022-07-25 20:47:26 +02:00
darken	a742646127	Fix CI github release apk search path.	2022-07-25 20:09:37 +02:00
darken	f5078d5ef2	Tell fastlane to skip APK upload	2022-07-25 20:04:22 +02:00
darken	3784084abc	Fix fastlane build arguments	2022-07-25 19:53:23 +02:00
darken	2f463b7735	Adjust description to pass markdown parsing	2022-07-25 19:42:15 +02:00
darken	7be5625d66	Fix gplay deploy script	2022-07-25 19:40:49 +02:00
darken	aef14a9cd2	Create changelog file for v1.3.13(1031300)	2022-07-25 17:42:26 +02:00
darken	67648a04d3	Update translations	2022-07-25 17:36:29 +02:00
Matthias Urhahn	58345e3194	Update FUNDING.yml	2022-07-25 10:22:32 +02:00
darken	4cb2ad9a5a	Adjust support item order	2022-07-25 01:29:18 +02:00
darken	27395d8e22	Remove email from readme	2022-07-25 01:29:07 +02:00
darken	230c5ea180	Adjust donation links in foss build	2022-07-25 01:22:07 +02:00
Matthias Urhahn	4d4370ddce	Update README.md	2022-07-24 16:01:07 +02:00