Use official Tesla API for availability data

does not work yet

.github/workflows/apikeys-ci.xml

@@ -6,4 +6,5 @@
    <string name="openchargemap_key" translatable="false">ci</string>
    <string name="fronyx_key" translatable="false">ci</string>
    <string name="acra_credentials" translatable="false">ci:ci</string>
+   <string name="tesla_credentials" translatable="false">ci:ci</string>
 </resources>

.github/workflows/release.yml

@@ -11,10 +11,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
 
       - name: Set up Java environment
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v2
         with:
           java-version: 17
           distribution: 'zulu'
@@ -22,7 +22,7 @@ jobs:
       - name: Decrypt keystore
         run: openssl aes-256-cbc -K  ${{ secrets.encrypted_53968681344a_key }} -iv  ${{ secrets.encrypted_53968681344a_iv }} -in _ci/keystore.jks.enc -out _ci/keystore.jks -d
       - name: Extract version code
-        run: echo "VERSION_CODE=$(grep -o "^\s*versionCode\s*=\s*[0-9]\+" app/build.gradle.kts | awk '{ print $3 }' | tr -d \''"\\')" >> $GITHUB_ENV
+        run: echo "VERSION_CODE=$(grep -o "^\s*versionCode\s\+[0-9]*" app/build.gradle | awk '{ print $2 }' | tr -d \''"\\')" >> $GITHUB_ENV
 
       - name: Build app release
         env:

.github/workflows/tests.yml

@@ -16,10 +16,10 @@ jobs:
         buildvariant: [ FossNormal, FossAutomotive, GoogleNormal, GoogleAutomotive ]
     steps:
       - name: Check out code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
 
       - name: Set up Java environment
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v2
         with:
           java-version: 17
           distribution: 'zulu'

app/build.gradle

@@ -0,0 +1,304 @@
+plugins {
+    id 'com.adarshr.test-logger' version '3.1.0'
+}
+
+apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-parcelize'
+apply plugin: 'kotlin-kapt'
+apply plugin: 'androidx.navigation.safeargs.kotlin'
+apply plugin: 'com.mikepenz.aboutlibraries.plugin'
+apply plugin: 'pt.jcosta.resourceplaceholders'
+
+def supportedLocales = "en,de,fr,nb-rNO,nl,pt,ro"
+
+android {
+    defaultConfig {
+        applicationId "net.vonforst.evmap"
+        compileSdk 34
+        minSdkVersion 21
+        targetSdkVersion 34
+        // NOTE: always increase versionCode by 2 since automotive flavor uses versionCode + 1
+        versionCode 204
+        versionName "1.7.0"
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        resConfigs supportedLocales.split(',')
+        buildConfigField("String", "supportedLocales", '"' + supportedLocales + '"')
+    }
+
+    signingConfigs {
+        release {
+            def isRunningOnCI = System.getenv("CI") == "true"
+            if (isRunningOnCI) {
+                // configure keystore
+                storeFile = file("../_ci/keystore.jks")
+                storePassword = System.getenv("KEYSTORE_PASSWORD")
+                keyAlias = System.getenv("KEYSTORE_ALIAS")
+                keyPassword = System.getenv("KEYSTORE_ALIAS_PASSWORD")
+            }
+        }
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            signingConfig signingConfigs.release
+        }
+        debug {
+            applicationIdSuffix ".debug"
+            debuggable true
+        }
+    }
+
+    flavorDimensions "dependencies", "automotive"
+    productFlavors {
+        foss {
+            dimension "dependencies"
+        }
+        google {
+            dimension "dependencies"
+            versionNameSuffix "-google"
+        }
+        normal {
+            dimension "automotive"
+        }
+        automotive {
+            dimension "automotive"
+            versionNameSuffix "-automotive"
+            versionCode defaultConfig.versionCode + 1
+            minSdkVersion 29
+        }
+    }
+
+    compileOptions {
+        coreLibraryDesugaringEnabled true
+        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_1_8
+    }
+
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_1_8.toString()
+    }
+
+    tasks.withType(org.jetbrains.kotlin.gradle.tasks.KaptGenerateStubs).configureEach {
+        kotlinOptions {
+            jvmTarget = "1.8"
+        }
+    }
+
+    buildFeatures {
+        dataBinding = true
+        viewBinding true
+    }
+    lint {
+        disable 'NullSafeMutableLiveData'
+        warning 'MissingTranslation'
+    }
+
+    testOptions {
+        unitTests.includeAndroidResources true
+    }
+
+    resourcePlaceholders {
+        files = ['xml/shortcuts.xml']
+    }
+    namespace 'net.vonforst.evmap'
+
+    // add API keys from environment variable if not set in apikeys.xml
+    applicationVariants.all { variant ->
+        ext.env = System.getenv()
+        def goingelectricKey = env.GOINGELECTRIC_API_KEY ?: project.findProperty("GOINGELECTRIC_API_KEY")
+        if (goingelectricKey != null) {
+            variant.resValue "string", "goingelectric_key", goingelectricKey
+        }
+        def openchargemapKey = env.OPENCHARGEMAP_API_KEY ?: project.findProperty("OPENCHARGEMAP_API_KEY")
+        if (openchargemapKey == null && project.hasProperty("OPENCHARGEMAP_API_KEY_ENCRYPTED")) {
+            openchargemapKey = decode(project.findProperty("OPENCHARGEMAP_API_KEY_ENCRYPTED"), "FmK.d,-f*p+rD+WK!eds")
+        }
+        if (openchargemapKey != null) {
+            variant.resValue "string", "openchargemap_key", openchargemapKey
+        }
+        def googleMapsKey = env.GOOGLE_MAPS_API_KEY ?: project.findProperty("GOOGLE_MAPS_API_KEY")
+        if (googleMapsKey != null && variant.flavorName.startsWith('google')) {
+            variant.resValue "string", "google_maps_key", googleMapsKey
+        }
+        def mapboxKey = env.MAPBOX_API_KEY ?: project.findProperty("MAPBOX_API_KEY")
+        if (mapboxKey == null && project.hasProperty("MAPBOX_API_KEY_ENCRYPTED")) {
+            mapboxKey = decode(project.findProperty("MAPBOX_API_KEY_ENCRYPTED"), "FmK.d,-f*p+rD+WK!eds")
+        }
+        if (mapboxKey != null) {
+            variant.resValue "string", "mapbox_key", mapboxKey
+        }
+        def chargepriceKey = env.CHARGEPRICE_API_KEY ?: project.findProperty("CHARGEPRICE_API_KEY")
+        if (chargepriceKey == null && project.hasProperty("CHARGEPRICE_API_KEY_ENCRYPTED")) {
+            chargepriceKey = decode(project.findProperty("CHARGEPRICE_API_KEY_ENCRYPTED"), "FmK.d,-f*p+rD+WK!eds")
+        }
+        if (chargepriceKey != null) {
+            variant.resValue "string", "chargeprice_key", chargepriceKey
+        }
+        def fronyxKey = env.FRONYX_API_KEY ?: project.findProperty("FRONYX_API_KEY")
+        if (fronyxKey == null && project.hasProperty("FRONYX_API_KEY_ENCRYPTED")) {
+            fronyxKey = decode(project.findProperty("FRONYX_API_KEY_ENCRYPTED"), "FmK.d,-f*p+rD+WK!eds")
+        }
+        if (fronyxKey != null) {
+            variant.resValue "string", "fronyx_key", fronyxKey
+        }
+        def acraKey = env.ACRA_CRASHREPORT_CREDENTIALS ?: project.findProperty("ACRA_CRASHREPORT_CREDENTIALS")
+        if (acraKey == null && project.hasProperty("ACRA_CRASHREPORT_CREDENTIALS_ENCRYPTED")) {
+            acraKey = decode(project.findProperty("ACRA_CRASHREPORT_CREDENTIALS_ENCRYPTED"), "FmK.d,-f*p+rD+WK!eds")
+        }
+        if (acraKey != null) {
+            variant.resValue "string", "acra_credentials", acraKey
+        }
+        def teslaKey = env.TESLA_CREDENTIALS ?: project.findProperty("TESLA_CREDENTIALS")
+        if (teslaKey == null && project.hasProperty("TESLA_CREDENTIALS_ENCRYPTED")) {
+            teslaKey = decode(project.findProperty("TESLA_CREDENTIALS_ENCRYPTED"), "FmK.d,-f*p+rD+WK!eds")
+        }
+        if (teslaKey != null) {
+            variant.resValue "string", "tesla_credentials", teslaKey
+        }
+    }
+
+    packagingOptions {
+        pickFirst 'lib/x86/libc++_shared.so'
+        pickFirst 'lib/arm64-v8a/libc++_shared.so'
+        pickFirst 'lib/x86_64/libc++_shared.so'
+        pickFirst 'lib/armeabi-v7a/libc++_shared.so'
+    }
+}
+
+configurations {
+    googleNormalImplementation {}
+    googleAutomotiveImplementation {}
+}
+
+dependencies {
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'androidx.core:core-ktx:1.12.0'
+    implementation 'androidx.core:core-splashscreen:1.0.1'
+    implementation "androidx.activity:activity-ktx:1.7.2"
+    implementation "androidx.fragment:fragment-ktx:1.6.1"
+    implementation 'androidx.cardview:cardview:1.0.0'
+    implementation 'androidx.preference:preference-ktx:1.2.1'
+    implementation 'com.google.android.material:material:1.9.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation 'androidx.recyclerview:recyclerview:1.3.1'
+    implementation 'androidx.browser:browser:1.6.0'
+    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
+    implementation 'androidx.security:security-crypto:1.1.0-alpha06'
+    implementation "androidx.work:work-runtime-ktx:2.8.1"
+    implementation 'com.github.ev-map:CustomBottomSheetBehavior:e48f73ea7b'
+    implementation 'com.squareup.retrofit2:retrofit:2.9.0'
+    implementation 'com.squareup.retrofit2:converter-moshi:2.9.0'
+    implementation 'com.squareup.okhttp3:okhttp:4.11.0'
+    implementation 'com.squareup.okhttp3:okhttp-urlconnection:4.11.0'
+    implementation 'com.squareup.moshi:moshi-kotlin:1.15.0'
+    implementation 'com.squareup.moshi:moshi-adapters:1.15.0'
+    implementation 'com.markomilos.jsonapi:jsonapi-retrofit:1.1.0'
+    implementation 'io.coil-kt:coil:2.4.0'
+    implementation 'com.github.ev-map:StfalconImageViewer:5082ebd392'
+    implementation "com.mikepenz:aboutlibraries-core:$about_libs_version"
+    implementation "com.mikepenz:aboutlibraries:$about_libs_version"
+    implementation 'com.airbnb.android:lottie:4.1.0'
+    implementation 'io.michaelrocks.bimap:bimap:1.1.0'
+    implementation 'com.google.guava:guava:29.0-android'
+    implementation 'com.github.pengrad:mapscaleview:1.6.0'
+    implementation 'com.github.romandanylyk:PageIndicatorView:b1bad589b5'
+
+    // Android Auto
+    def carAppVersion = '1.4.0-beta02'
+    implementation "androidx.car.app:app:$carAppVersion"
+    normalImplementation "androidx.car.app:app-projected:$carAppVersion"
+    automotiveImplementation "androidx.car.app:app-automotive:$carAppVersion"
+
+    // AnyMaps
+    def anyMapsVersion = '8f1226e1c5'
+    implementation "com.github.ev-map.AnyMaps:anymaps-base:$anyMapsVersion"
+    googleImplementation "com.github.ev-map.AnyMaps:anymaps-google:$anyMapsVersion"
+    googleImplementation 'com.google.android.gms:play-services-maps:18.1.0'
+    implementation("com.github.ev-map.AnyMaps:anymaps-mapbox:$anyMapsVersion") {
+        exclude group: 'com.mapbox.mapboxsdk', module: 'mapbox-android-accounts'
+        exclude group: 'com.mapbox.mapboxsdk', module: 'mapbox-android-telemetry'
+        exclude group: 'com.google.android.gms', module: 'play-services-location'
+        exclude group: 'com.mapbox.mapboxsdk', module: 'mapbox-android-core'
+    }
+    // original version of mapbox-android-core
+    googleImplementation 'com.mapbox.mapboxsdk:mapbox-android-core:2.0.1'
+    // patched version that removes build-time dependency on GMS (-> no Google location services)
+    fossImplementation 'com.github.ev-map:mapbox-events-android:a21c324501'
+
+    // Google Places
+    googleImplementation 'com.google.android.libraries.places:places:3.2.0'
+    googleImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.7.1'
+
+    // Mapbox Geocoding
+    implementation 'com.mapbox.mapboxsdk:mapbox-sdk-services:5.5.0'
+
+    // navigation library
+    implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
+    implementation "androidx.navigation:navigation-ui-ktx:$nav_version"
+
+    // viewmodel library
+    def lifecycle_version = "2.6.2"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
+
+    // room library
+    def room_version = "2.6.0-beta01"
+    implementation "androidx.room:room-runtime:$room_version"
+    kapt "androidx.room:room-compiler:$room_version"
+    implementation "androidx.room:room-ktx:$room_version"
+    implementation 'com.github.anboralabs:spatia-room:0.2.7'
+
+    // billing library
+    def billing_version = "6.0.1"
+    googleImplementation "com.android.billingclient:billing:$billing_version"
+    googleImplementation "com.android.billingclient:billing-ktx:$billing_version"
+
+    // ACRA (crash reporting)
+    def acraVersion = "5.11.1"
+    implementation("ch.acra:acra-http:$acraVersion")
+    implementation("ch.acra:acra-dialog:$acraVersion")
+    implementation("ch.acra:acra-limiter:$acraVersion")
+
+    // debug tools
+    debugImplementation 'com.facebook.flipper:flipper:0.190.0'
+    debugImplementation 'com.facebook.soloader:soloader:0.10.5'
+    debugImplementation 'com.facebook.flipper:flipper-network-plugin:0.190.0'
+
+    // testing
+    testImplementation 'junit:junit:4.13.2'
+    testImplementation "com.squareup.okhttp3:mockwebserver:4.11.0"
+    //noinspection GradleDependency
+    testImplementation 'org.json:json:20080701'
+    testImplementation 'org.robolectric:robolectric:4.10.3'
+    testImplementation 'androidx.test:core:1.5.0'
+    testImplementation 'androidx.arch.core:core-testing:2.2.0'
+
+    // testing for car app
+    testGoogleImplementation "androidx.car.app:app-testing:$carAppVersion"
+    testGoogleImplementation 'androidx.test:core:1.5.0'
+
+    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+    androidTestImplementation 'androidx.arch.core:core-testing:2.2.0'
+
+    kapt "com.squareup.moshi:moshi-kotlin-codegen:1.15.0"
+
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.3'
+}
+
+private static String decode(String s, String key) {
+    return new String(xorWithKey(s.decodeBase64(), key.getBytes()), "UTF-8");
+}
+
+private static byte[] xorWithKey(byte[] a, byte[] key) {
+    byte[] out = new byte[a.length];
+    for (int i = 0; i < a.length; i++) {
+        out[i] = (byte) (a[i] ^ key[i%key.length]);
+    }
+    return out;
+}

app/build.gradle.kts

@@ -1,353 +0,0 @@
-import java.util.Base64
-
-plugins {
-    id("com.adarshr.test-logger") version "3.1.0"
-    id("com.android.application")
-    id("kotlin-android")
-    id("kotlin-parcelize")
-    id("kotlin-kapt")
-    id("androidx.navigation.safeargs.kotlin")
-    id("com.mikepenz.aboutlibraries.plugin")
-    id("pt.jcosta.resourceplaceholders")
-}
-
-val supportedLocales = "en,de,fr,nb-rNO,nl,pt,ro"
-
-android {
-    defaultConfig {
-        applicationId = "net.vonforst.evmap"
-        compileSdk = 34
-        minSdk = 21
-        targetSdk = 34
-        // NOTE: always increase versionCode by 2 since automotive flavor uses versionCode + 1
-        versionCode = 206
-        versionName = "1.7.1"
-
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        resourceConfigurations += supportedLocales.split(",")
-        buildConfigField("String", "supportedLocales", "\"$supportedLocales\"")
-    }
-
-    signingConfigs {
-        create("release") {
-            val isRunningOnCI = System.getenv("CI") == "true"
-            if (isRunningOnCI) {
-                // configure keystore
-                storeFile = file("../_ci/keystore.jks")
-                storePassword = System.getenv("KEYSTORE_PASSWORD")
-                keyAlias = System.getenv("KEYSTORE_ALIAS")
-                keyPassword = System.getenv("KEYSTORE_ALIAS_PASSWORD")
-            }
-        }
-    }
-
-    buildTypes {
-        release {
-            isMinifyEnabled = false
-            proguardFiles(
-                getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
-            )
-            signingConfig = signingConfigs.getByName("release")
-        }
-        debug {
-            applicationIdSuffix = ".debug"
-            isDebuggable = true
-        }
-    }
-
-    flavorDimensions += listOf("dependencies", "automotive")
-    productFlavors {
-        create("foss") {
-            dimension = "dependencies"
-        }
-        create("google") {
-            dimension = "dependencies"
-            versionNameSuffix = "-google"
-        }
-        create("normal") {
-            dimension = "automotive"
-        }
-        create("automotive") {
-            dimension = "automotive"
-            versionNameSuffix = "-automotive"
-            versionCode = defaultConfig.versionCode!! + 1
-            minSdk = 29
-        }
-    }
-
-    compileOptions {
-        isCoreLibraryDesugaringEnabled = true
-        targetCompatibility = JavaVersion.VERSION_1_8
-        sourceCompatibility = JavaVersion.VERSION_1_8
-    }
-
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8.toString()
-    }
-
-    tasks.withType<org.jetbrains.kotlin.gradle.tasks.KaptGenerateStubs>().configureEach {
-        kotlinOptions {
-            jvmTarget = "1.8"
-        }
-    }
-
-    buildFeatures {
-        dataBinding = true
-        viewBinding = true
-    }
-    lint {
-        disable += listOf("NullSafeMutableLiveData")
-        warning += listOf("MissingTranslation")
-    }
-
-    testOptions {
-        unitTests {
-            isIncludeAndroidResources = true
-        }
-    }
-
-    resourcePlaceholders {
-        files("xml/shortcuts.xml")
-    }
-    namespace = "net.vonforst.evmap"
-
-    // add API keys from environment variable if not set in apikeys.xml
-    applicationVariants.all {
-        val goingelectricKey =
-            System.getenv("GOINGELECTRIC_API_KEY") ?: project.findProperty("GOINGELECTRIC_API_KEY")
-                ?.toString()
-        if (goingelectricKey != null) {
-            resValue("string", "goingelectric_key", goingelectricKey)
-        }
-        var openchargemapKey =
-            System.getenv("OPENCHARGEMAP_API_KEY") ?: project.findProperty("OPENCHARGEMAP_API_KEY")
-                ?.toString()
-        if (openchargemapKey == null && project.hasProperty("OPENCHARGEMAP_API_KEY_ENCRYPTED")) {
-            openchargemapKey = decode(
-                project.findProperty("OPENCHARGEMAP_API_KEY_ENCRYPTED").toString(),
-                "FmK.d,-f*p+rD+WK!eds"
-            )
-        }
-        if (openchargemapKey != null) {
-            resValue("string", "openchargemap_key", openchargemapKey)
-        }
-        val googleMapsKey =
-            System.getenv("GOOGLE_MAPS_API_KEY") ?: project.findProperty("GOOGLE_MAPS_API_KEY")
-                ?.toString()
-        if (googleMapsKey != null && flavorName.startsWith("google")) {
-            resValue("string", "google_maps_key", googleMapsKey)
-        }
-        var mapboxKey =
-            System.getenv("MAPBOX_API_KEY") ?: project.findProperty("MAPBOX_API_KEY")?.toString()
-        if (mapboxKey == null && project.hasProperty("MAPBOX_API_KEY_ENCRYPTED")) {
-            mapboxKey = decode(
-                project.findProperty("MAPBOX_API_KEY_ENCRYPTED").toString(),
-                "FmK.d,-f*p+rD+WK!eds"
-            )
-        }
-        if (mapboxKey != null) {
-            resValue("string", "mapbox_key", mapboxKey)
-        }
-        var chargepriceKey =
-            System.getenv("CHARGEPRICE_API_KEY") ?: project.findProperty("CHARGEPRICE_API_KEY")
-                ?.toString()
-        if (chargepriceKey == null && project.hasProperty("CHARGEPRICE_API_KEY_ENCRYPTED")) {
-            chargepriceKey = decode(
-                project.findProperty("CHARGEPRICE_API_KEY_ENCRYPTED").toString(),
-                "FmK.d,-f*p+rD+WK!eds"
-            )
-        }
-        if (chargepriceKey != null) {
-            resValue("string", "chargeprice_key", chargepriceKey)
-        }
-        var fronyxKey =
-            System.getenv("FRONYX_API_KEY") ?: project.findProperty("FRONYX_API_KEY")?.toString()
-        if (fronyxKey == null && project.hasProperty("FRONYX_API_KEY_ENCRYPTED")) {
-            fronyxKey = decode(
-                project.findProperty("FRONYX_API_KEY_ENCRYPTED").toString(),
-                "FmK.d,-f*p+rD+WK!eds"
-            )
-        }
-        if (fronyxKey != null) {
-            resValue("string", "fronyx_key", fronyxKey)
-        }
-        var acraKey = System.getenv("ACRA_CRASHREPORT_CREDENTIALS")
-            ?: project.findProperty("ACRA_CRASHREPORT_CREDENTIALS")?.toString()
-        if (acraKey == null && project.hasProperty("ACRA_CRASHREPORT_CREDENTIALS_ENCRYPTED")) {
-            acraKey = decode(
-                project.findProperty("ACRA_CRASHREPORT_CREDENTIALS_ENCRYPTED").toString(),
-                "FmK.d,-f*p+rD+WK!eds"
-            )
-        }
-        if (acraKey != null) {
-            resValue("string", "acra_credentials", acraKey)
-        }
-    }
-
-    packaging {
-        jniLibs {
-            pickFirsts.addAll(
-                listOf(
-                    "lib/x86/libc++_shared.so",
-                    "lib/arm64-v8a/libc++_shared.so",
-                    "lib/x86_64/libc++_shared.so",
-                    "lib/armeabi-v7a/libc++_shared.so"
-                )
-            )
-        }
-    }
-}
-
-configurations {
-    create("googleNormalImplementation") {}
-    create("googleAutomotiveImplementation") {}
-}
-
-aboutLibraries {
-    allowedLicenses = arrayOf(
-        "Apache-2.0", "mit", "BSD-2-Clause",
-        "asdkl",  // Android SDK
-        "Dual OpenSSL and SSLeay License",  // Android NDK OpenSSL
-        "Google Maps Platform Terms of Service"  // Google Maps SDK
-    )
-    strictMode = com.mikepenz.aboutlibraries.plugin.StrictMode.FAIL
-}
-
-dependencies {
-    val kotlinVersion: String by rootProject.extra
-    val aboutLibsVersion: String by rootProject.extra
-    val navVersion: String by rootProject.extra
-    val normalImplementation by configurations
-    val googleImplementation by configurations
-    val automotiveImplementation by configurations
-    val fossImplementation by configurations
-    val testGoogleImplementation by configurations
-
-    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion")
-    implementation("androidx.appcompat:appcompat:1.6.1")
-    implementation("androidx.core:core-ktx:1.12.0")
-    implementation("androidx.core:core-splashscreen:1.0.1")
-    implementation("androidx.activity:activity-ktx:1.8.0")
-    implementation("androidx.fragment:fragment-ktx:1.6.2")
-    implementation("androidx.cardview:cardview:1.0.0")
-    implementation("androidx.preference:preference-ktx:1.2.1")
-    implementation("com.google.android.material:material:1.10.0")
-    implementation("androidx.constraintlayout:constraintlayout:2.1.4")
-    implementation("androidx.recyclerview:recyclerview:1.3.2")
-    implementation("androidx.browser:browser:1.6.0")
-    implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
-    implementation("androidx.security:security-crypto:1.1.0-alpha06")
-    implementation("androidx.work:work-runtime-ktx:2.8.1")
-    implementation("com.github.ev-map:CustomBottomSheetBehavior:e48f73ea7b")
-    implementation("com.squareup.retrofit2:retrofit:2.9.0")
-    implementation("com.squareup.retrofit2:converter-moshi:2.9.0")
-    implementation("com.squareup.okhttp3:okhttp:4.11.0")
-    implementation("com.squareup.okhttp3:okhttp-urlconnection:4.11.0")
-    implementation("com.squareup.moshi:moshi-kotlin:1.15.0")
-    implementation("com.squareup.moshi:moshi-adapters:1.15.0")
-    implementation("com.markomilos.jsonapi:jsonapi-retrofit:1.1.0")
-    implementation("io.coil-kt:coil:2.4.0")
-    implementation("com.github.ev-map:StfalconImageViewer:5082ebd392")
-    implementation("com.mikepenz:aboutlibraries-core:$aboutLibsVersion")
-    implementation("com.mikepenz:aboutlibraries:$aboutLibsVersion")
-    implementation("com.airbnb.android:lottie:4.1.0")
-    implementation("io.michaelrocks.bimap:bimap:1.1.0")
-    implementation("com.google.guava:guava:29.0-android")
-    implementation("com.github.pengrad:mapscaleview:1.6.0")
-    implementation("com.github.romandanylyk:PageIndicatorView:b1bad589b5")
-
-    // Android Auto
-    val carAppVersion = "1.4.0-rc01"
-    implementation("androidx.car.app:app:$carAppVersion")
-    normalImplementation("androidx.car.app:app-projected:$carAppVersion")
-    automotiveImplementation("androidx.car.app:app-automotive:$carAppVersion")
-
-    // AnyMaps
-    val anyMapsVersion = "8f1226e1c5"
-    implementation("com.github.ev-map.AnyMaps:anymaps-base:$anyMapsVersion")
-    googleImplementation("com.github.ev-map.AnyMaps:anymaps-google:$anyMapsVersion")
-    googleImplementation("com.google.android.gms:play-services-maps:18.2.0")
-    implementation("com.github.ev-map.AnyMaps:anymaps-mapbox:$anyMapsVersion") {
-        exclude(group = "com.mapbox.mapboxsdk", module = "mapbox-android-accounts")
-        exclude(group = "com.mapbox.mapboxsdk", module = "mapbox-android-telemetry")
-        exclude(group = "com.google.android.gms", module = "play-services-location")
-        exclude(group = "com.mapbox.mapboxsdk", module = "mapbox-android-core")
-    }
-    // original version of mapbox-android-core
-    googleImplementation("com.mapbox.mapboxsdk:mapbox-android-core:2.0.1")
-    // patched version that removes build-time dependency on GMS (-> no Google location services)
-    fossImplementation("com.github.ev-map:mapbox-events-android:a21c324501")
-
-    // Google Places
-    googleImplementation("com.google.android.libraries.places:places:3.2.0")
-    googleImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.7.3")
-
-    // Mapbox Geocoding
-    implementation("com.mapbox.mapboxsdk:mapbox-sdk-services:5.5.0")
-
-    // navigation library
-    implementation("androidx.navigation:navigation-fragment-ktx:$navVersion")
-    implementation("androidx.navigation:navigation-ui-ktx:$navVersion")
-
-    // viewmodel library
-    val lifecycle_version = "2.6.2"
-    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version")
-    implementation("androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version")
-
-    // room library
-    val room_version = "2.6.0"
-    implementation("androidx.room:room-runtime:$room_version")
-    kapt("androidx.room:room-compiler:$room_version")
-    implementation("androidx.room:room-ktx:$room_version")
-    implementation("com.github.anboralabs:spatia-room:0.2.7")
-
-    // billing library
-    val billing_version = "6.0.1"
-    googleImplementation("com.android.billingclient:billing:$billing_version")
-    googleImplementation("com.android.billingclient:billing-ktx:$billing_version")
-
-    // ACRA (crash reporting)
-    val acraVersion = "5.11.1"
-    implementation("ch.acra:acra-http:$acraVersion")
-    implementation("ch.acra:acra-dialog:$acraVersion")
-    implementation("ch.acra:acra-limiter:$acraVersion")
-
-    // debug tools
-    debugImplementation("com.facebook.flipper:flipper:0.190.0")
-    debugImplementation("com.facebook.soloader:soloader:0.10.5")
-    debugImplementation("com.facebook.flipper:flipper-network-plugin:0.190.0")
-
-    // testing
-    testImplementation("junit:junit:4.13.2")
-    testImplementation("com.squareup.okhttp3:mockwebserver:4.11.0")
-    //noinspection GradleDependency
-    testImplementation("org.json:json:20080701")
-    testImplementation("org.robolectric:robolectric:4.10.3")
-    testImplementation("androidx.test:core:1.5.0")
-    testImplementation("androidx.arch.core:core-testing:2.2.0")
-
-    // testing for car app
-    testGoogleImplementation("androidx.car.app:app-testing:$carAppVersion")
-    testGoogleImplementation("androidx.test:core:1.5.0")
-
-    androidTestImplementation("androidx.test.ext:junit:1.1.5")
-    androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
-    androidTestImplementation("androidx.arch.core:core-testing:2.2.0")
-
-    kapt("com.squareup.moshi:moshi-kotlin-codegen:1.15.0")
-
-    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.4")
-}
-
-fun decode(s: String, key: String): String {
-    return String(xorWithKey(Base64.getDecoder().decode(s), key.toByteArray()), Charsets.UTF_8)
-}
-
-fun xorWithKey(a: ByteArray, key: ByteArray): ByteArray {
-    val out = ByteArray(a.size)
-    for (i in a.indices) {
-        out[i] = (a[i].toInt() xor key[i % key.size].toInt()).toByte()
-    }
-    return out
-}

app/proguard-rules.pro

@@ -1,6 +1,6 @@
 # Add project specific ProGuard rules here.
 # You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.kts.
+# proguardFiles setting in build.gradle.
 #
 # For more details, see
 #   http://developer.android.com/guide/developing/tools/proguard.html

app/src/foss/java/net/vonforst/evmap/Inits.kt

@@ -3,12 +3,10 @@ package net.vonforst.evmap
 import android.app.Activity
 import android.content.Context
 
-@Suppress("UNUSED_PARAMETER")
 fun init(context: Context) {
 
 }
 
-@Suppress("UNUSED_PARAMETER")
 fun checkPlayServices(activity: Activity): Boolean {
     return true
 }

app/src/main/java/net/vonforst/evmap/EvMapApplication.kt

@@ -72,7 +72,7 @@ class EvMapApplication : Application(), Configuration.Provider {
                 }
             }.build()).build()
         WorkManager.getInstance(this).enqueueUniquePeriodicWork(
-            "CleanupCacheWorker", ExistingPeriodicWorkPolicy.UPDATE, cleanupCacheRequest
+            "CleanupCacheWorker", ExistingPeriodicWorkPolicy.REPLACE, cleanupCacheRequest
         )
     }
 

app/src/main/java/net/vonforst/evmap/adapter/DataBindingAdapters.kt

@@ -30,7 +30,6 @@ abstract class DataBindingAdapter<T : Equatable>(getKey: ((T) -> Any)? = null) :
     ListAdapter<T, DataBindingAdapter.ViewHolder<T>>(DiffCallback(getKey)) {
 
     var onClickListener: ((T) -> Unit)? = null
-    var onLongClickListener: ((T) -> Boolean)? = null
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder<T> {
         val layoutInflater = LayoutInflater.from(parent.context)
@@ -55,12 +54,6 @@ abstract class DataBindingAdapter<T : Equatable>(getKey: ((T) -> Any)? = null) :
                 listener(item)
             }
         }
-        if (onLongClickListener != null) {
-            holder.binding.root.setOnLongClickListener {
-                val listener = onLongClickListener ?: return@setOnLongClickListener false
-                return@setOnLongClickListener listener(item)
-            }
-        }
     }
 
     class DiffCallback<T : Equatable>(val getKey: ((T) -> Any)?) : DiffUtil.ItemCallback<T>() {

app/src/main/java/net/vonforst/evmap/api/availability/AvailabilityDetector.kt

@@ -3,6 +3,7 @@ package net.vonforst.evmap.api.availability
 import android.content.Context
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
+import net.vonforst.evmap.R
 import net.vonforst.evmap.addDebugInterceptors
 import net.vonforst.evmap.api.RateLimitInterceptor
 import net.vonforst.evmap.api.await
@@ -170,8 +171,15 @@ class AvailabilityRepository(context: Context) {
         .connectTimeout(10, TimeUnit.SECONDS)
         .cookieJar(JavaNetCookieJar(cookieManager))
         .build()
-    private val teslaAvailabilityDetector =
-        TeslaAvailabilityDetector(okhttp, EncryptedPreferenceDataStore(context))
+    private val teslaAvailabilityDetector = run {
+        val (clientId, clientSecret) = context.getString(R.string.tesla_credentials).split(":")
+        TeslaAvailabilityDetector(
+            okhttp,
+            EncryptedPreferenceDataStore(context),
+            clientId,
+            clientSecret
+        )
+    }
     private val availabilityDetectors = listOf(
         RheinenergieAvailabilityDetector(okhttp),
         teslaAvailabilityDetector,

app/src/main/java/net/vonforst/evmap/api/availability/TeslaAvailabilityDetector.kt

@@ -35,22 +35,24 @@ interface TeslaAuthenticationApi {
     @JsonClass(generateAdapter = true)
     class AuthCodeRequest(
         val code: String,
-        @Json(name = "code_verifier") val codeVerifier: String,
-        @Json(name = "redirect_uri") val redirectUri: String = "https://auth.tesla.com/void/callback",
-        scope: String = "openid email offline_access",
-        @Json(name = "client_id") clientId: String = "ownerapi"
-    ) : OAuth2Request(scope, clientId)
+        @Json(name = "redirect_uri") val redirectUri: String = "https://ev-map.app/void/callback",
+        scope: String = "openid offline_access vehicle_device_data",
+        @Json(name = "client_id") clientId: String,
+        @Json(name = "client_secret") clientSecret: String
+    ) : OAuth2Request(scope, clientId, clientSecret)
 
     @JsonClass(generateAdapter = true)
     class RefreshTokenRequest(
         @Json(name = "refresh_token") val refreshToken: String,
-        scope: String = "openid email offline_access",
-        @Json(name = "client_id") clientId: String = "ownerapi"
-    ) : OAuth2Request(scope, clientId)
+        scope: String = "openid offline_access vehicle_device_data",
+        @Json(name = "client_id") clientId: String,
+        @Json(name = "client_secret") clientSecret: String,
+    ) : OAuth2Request(scope, clientId, clientSecret)
 
     sealed class OAuth2Request(
         val scope: String,
-        val clientId: String
+        val clientId: String,
+        val clientSecret: String
     )
 
     @JsonClass(generateAdapter = true)
@@ -85,36 +87,15 @@ interface TeslaAuthenticationApi {
             return retrofit.create(TeslaAuthenticationApi::class.java)
         }
 
-        fun generateCodeVerifier(): String {
-            val code = ByteArray(64)
-            SecureRandom().nextBytes(code)
-            return Base64.encodeToString(
-                code,
-                Base64.URL_SAFE or Base64.NO_WRAP or Base64.NO_PADDING
-            )
-        }
-
-        fun generateCodeChallenge(codeVerifier: String): String {
-            val bytes = codeVerifier.toByteArray()
-            val messageDigest = MessageDigest.getInstance("SHA-256")
-            messageDigest.update(bytes, 0, bytes.size)
-            return Base64.encodeToString(
-                messageDigest.digest(),
-                Base64.URL_SAFE or Base64.NO_WRAP or Base64.NO_PADDING
-            )
-        }
-
-        fun buildSignInUri(codeChallenge: String): Uri =
+        fun buildSignInUri(clientId: String): Uri =
             Uri.parse("https://auth.tesla.com/oauth2/v3/authorize").buildUpon()
-                .appendQueryParameter("client_id", "ownerapi")
-                .appendQueryParameter("code_challenge", codeChallenge)
-                .appendQueryParameter("code_challenge_method", "S256")
-                .appendQueryParameter("redirect_uri", "https://auth.tesla.com/void/callback")
+                .appendQueryParameter("client_id", clientId)
+                .appendQueryParameter("redirect_uri", "https://ev-map.app/void/callback")
                 .appendQueryParameter("response_type", "code")
-                .appendQueryParameter("scope", "openid email offline_access")
+                .appendQueryParameter("scope", "openid offline_access vehicle_device_data")
                 .appendQueryParameter("state", "123").build()
 
-        val resultUrlPrefix = "https://auth.tesla.com/void/callback"
+        val resultUrlPrefix = "https://ev-map.app/void/callback"
     }
 }
 
@@ -316,13 +297,13 @@ interface TeslaGraphQlApi {
     @JsonClass(generateAdapter = true)
     data class ChargerId(
         val id: Text,
-        val label: Value<String>?,
+        val label: Value<String>,
         val name: String?
     ) {
         val labelNumber
-            get() = label?.value?.replace(Regex("""\D"""), "")?.toInt()
+            get() = label.value.replace(Regex("""\D"""), "").toInt()
         val labelLetter
-            get() = label?.value?.replace(Regex("""\d"""), "")
+            get() = label.value.replace(Regex("""\d"""), "")
     }
 
     @JsonClass(generateAdapter = true)
@@ -500,6 +481,8 @@ fun Coordinate.asTeslaCoord() =
 class TeslaAvailabilityDetector(
     private val client: OkHttpClient,
     private val tokenStore: TokenStore,
+    private val clientId: String,
+    private val clientSecret: String,
     private val baseUrl: String? = null
 ) :
     BaseAvailabilityDetector(client) {
@@ -570,16 +553,8 @@ class TeslaAvailabilityDetector(
             "charger has unknown connectors"
         )
 
-        var statusSorted = details.siteDynamic.chargerDetails
-            .sortedBy { c ->
-                c.charger.labelLetter
-                    ?: details.siteStatic.chargers.find { it.id == c.charger.id }?.labelLetter
-            }
-            .sortedBy { c ->
-                c.charger.labelNumber
-                    ?: details.siteStatic.chargers.find { it.id == c.charger.id }?.labelNumber
-            }
-            .map { it.availability }
+        var statusSorted = details.siteDynamic.chargerDetails.sortedBy { it.charger.labelLetter }
+            .sortedBy { it.charger.labelNumber }.map { it.availability }
         if (statusSorted.size != scV2Connectors.sumOf { it.count } + scV3Connectors.sumOf { it.count }) {
             // apparently some connectors are missing in Tesla data
             // If we have just one type of charger, we can still match
@@ -652,7 +627,9 @@ class TeslaAvailabilityDetector(
                             val response =
                                 authApi.getToken(
                                     TeslaAuthenticationApi.RefreshTokenRequest(
-                                        refreshToken
+                                        refreshToken,
+                                        clientId = clientId,
+                                        clientSecret = clientSecret
                                     )
                                 )
                             tokenStore.teslaAccessToken = response.accessToken

app/src/main/java/net/vonforst/evmap/auto/FilterScreen.kt

@@ -227,7 +227,7 @@ class FilterScreen(ctx: CarContext, val session: EVMapSession) : Screen(ctx) {
                                     CarToast.makeText(
                                         carContext,
                                         carContext.getString(
-                                            R.string.deleted_item,
+                                            R.string.deleted_filterprofile,
                                             it.name
                                         ),
                                         CarToast.LENGTH_SHORT
@@ -344,7 +344,7 @@ class EditFiltersScreen(ctx: CarContext) : Screen(ctx) {
                                 CarToast.makeText(
                                     carContext,
                                     carContext.getString(
-                                        R.string.deleted_item,
+                                        R.string.deleted_filterprofile,
                                         currentProfile.name
                                     ),
                                     CarToast.LENGTH_SHORT

app/src/main/java/net/vonforst/evmap/auto/SettingsScreens.kt

@@ -8,9 +8,6 @@ import android.content.pm.PackageManager.NameNotFoundException
 import android.hardware.Sensor
 import android.hardware.SensorManager
 import android.net.Uri
-import android.os.Bundle
-import android.os.IInterface
-import android.text.Html
 import androidx.annotation.StringRes
 import androidx.car.app.CarContext
 import androidx.car.app.CarToast
@@ -23,7 +20,6 @@ import androidx.core.graphics.drawable.IconCompat
 import androidx.core.text.HtmlCompat
 import androidx.lifecycle.lifecycleScope
 import androidx.localbroadcastmanager.content.LocalBroadcastManager
-import com.google.android.material.snackbar.Snackbar
 import kotlinx.coroutines.launch
 import net.vonforst.evmap.*
 import net.vonforst.evmap.api.availability.TeslaAuthenticationApi
@@ -240,12 +236,9 @@ class DataSettingsScreen(ctx: CarContext) : Screen(ctx) {
     }
 
     private fun teslaLogin() {
-        val codeVerifier = TeslaAuthenticationApi.generateCodeVerifier()
-        val codeChallenge = TeslaAuthenticationApi.generateCodeChallenge(codeVerifier)
-        val uri = TeslaAuthenticationApi.buildSignInUri(codeChallenge)
-
+        val (clientId, _) = carContext.getString(R.string.tesla_credentials).split(":")
         val args = OAuthLoginFragmentArgs(
-            uri.toString(),
+            TeslaAuthenticationApi.buildSignInUri(clientId = clientId).toString(),
             TeslaAuthenticationApi.resultUrlPrefix,
             "#000000"
         ).toBundle()
@@ -261,7 +254,7 @@ class DataSettingsScreen(ctx: CarContext) : Screen(ctx) {
                         OAuthLoginFragment.EXTRA_URL,
                         Uri::class.java
                     )
-                    teslaGetAccessToken(url!!, codeVerifier)
+                    teslaGetAccessToken(url!!)
                 }
             }, IntentFilter(OAuthLoginFragment.ACTION_OAUTH_RESULT))
 
@@ -276,22 +269,27 @@ class DataSettingsScreen(ctx: CarContext) : Screen(ctx) {
         }
     }
 
-    private fun teslaGetAccessToken(url: Uri, codeVerifier: String) {
+    private fun teslaGetAccessToken(url: Uri) {
         teslaLoggingIn = true
         invalidate()
 
         val code = url.getQueryParameter("code") ?: return
         val okhttp = OkHttpClient.Builder().addDebugInterceptors().build()
-        val request = TeslaAuthenticationApi.AuthCodeRequest(code, codeVerifier)
+        val (clientId, clientSecret) = carContext.getString(R.string.tesla_credentials).split(":")
+        val request = TeslaAuthenticationApi.AuthCodeRequest(
+            code,
+            clientId = clientId,
+            clientSecret = clientSecret
+        )
         lifecycleScope.launch {
             try {
                 val time = Instant.now().epochSecond
                 val response =
                     TeslaAuthenticationApi.create(okhttp).getToken(request)
-                val userResponse =
-                    TeslaOwnerApi.create(okhttp, response.accessToken).getUserInfo()
+//                val userResponse =
+//                    TeslaOwnerApi.create(okhttp, response.accessToken).getUserInfo()
 
-                encryptedPrefs.teslaEmail = userResponse.response.email
+                encryptedPrefs.teslaEmail = "user@example.com"
                 encryptedPrefs.teslaAccessToken = response.accessToken
                 encryptedPrefs.teslaAccessTokenExpiry = time + response.expiresIn
                 encryptedPrefs.teslaRefreshToken = response.refreshToken

app/src/main/java/net/vonforst/evmap/fragment/FavoritesFragment.kt

@@ -28,6 +28,7 @@ import net.vonforst.evmap.databinding.FragmentFavoritesBinding
 import net.vonforst.evmap.databinding.ItemFavoriteBinding
 import net.vonforst.evmap.location.FusionEngine
 import net.vonforst.evmap.location.LocationEngine
+import net.vonforst.evmap.model.Favorite
 import net.vonforst.evmap.model.FavoriteWithDetail
 import net.vonforst.evmap.utils.checkAnyLocationPermission
 import net.vonforst.evmap.viewmodel.FavoritesViewModel
@@ -36,6 +37,7 @@ import net.vonforst.evmap.viewmodel.viewModelFactory
 class FavoritesFragment : Fragment() {
     private lateinit var binding: FragmentFavoritesBinding
     private lateinit var locationEngine: LocationEngine
+    private var toDelete: Favorite? = null
     private var deleteSnackbar: Snackbar? = null
     private lateinit var adapter: FavoritesAdapter
 
@@ -111,32 +113,6 @@ class FavoritesFragment : Fragment() {
                 binding.swipeRefresh.isRefreshing = false
             }
         }
-
-        vm.deletedFavorite.observe(viewLifecycleOwner) { fav ->
-            if (fav == null) {
-                deleteSnackbar?.dismiss()
-                return@observe
-            }
-            val snackbar = Snackbar.make(
-                requireView(),
-                getString(
-                    R.string.deleted_item,
-                    fav.charger.name
-                ),
-                Snackbar.LENGTH_LONG
-            ).setAction(R.string.undo) {
-                vm.undoDeletion()
-            }.addCallback(object : Snackbar.Callback() {
-                override fun onDismissed(transientBottomBar: Snackbar?, event: Int) {
-                    // if undo was not clicked, actually delete
-                    if (event == DISMISS_EVENT_TIMEOUT || event == DISMISS_EVENT_SWIPE) {
-                        vm.deletedFavorite.value = null
-                    }
-                }
-            })
-            deleteSnackbar = snackbar
-            snackbar.show()
-        }
     }
 
     override fun onStart() {
@@ -151,7 +127,41 @@ class FavoritesFragment : Fragment() {
     }
 
     fun delete(fav: FavoriteWithDetail) {
-        vm.deleteFavoriteWithUndo(fav)
+        val position =
+            vm.listData.value?.indexOfFirst { it.fav.favorite.favoriteId == fav.favorite.favoriteId }
+                ?: return
+        // if there is already a profile to delete, delete it now
+        actuallyDelete()
+        deleteSnackbar?.dismiss()
+
+        toDelete = fav.favorite
+
+        view?.let {
+            val snackbar = Snackbar.make(
+                it,
+                getString(R.string.deleted_filterprofile, fav.charger.name),
+                Snackbar.LENGTH_LONG
+            ).setAction(R.string.undo) {
+                toDelete = null
+                adapter.notifyItemChanged(position)
+            }.addCallback(object : Snackbar.Callback() {
+                override fun onDismissed(transientBottomBar: Snackbar?, event: Int) {
+                    // if undo was not clicked, actually delete
+                    if (event == DISMISS_EVENT_TIMEOUT || event == DISMISS_EVENT_SWIPE) {
+                        actuallyDelete()
+                    }
+                }
+            })
+            deleteSnackbar = snackbar
+            snackbar.show()
+        } ?: run {
+            actuallyDelete()
+        }
+    }
+
+    private fun actuallyDelete() {
+        toDelete?.let { vm.deleteFavorite(it) }
+        toDelete = null
     }
 
     private fun createTouchHelper(): ItemTouchHelper {

app/src/main/java/net/vonforst/evmap/fragment/FilterProfilesFragment.kt

@@ -230,7 +230,7 @@ class FilterProfilesFragment : Fragment() {
         view?.let {
             val snackbar = Snackbar.make(
                 it,
-                getString(R.string.deleted_item, fp.name),
+                getString(R.string.deleted_filterprofile, fp.name),
                 Snackbar.LENGTH_LONG
             ).setAction(R.string.undo) {
                 toDelete = null

app/src/main/java/net/vonforst/evmap/fragment/MapFragment.kt

@@ -3,12 +3,9 @@ package net.vonforst.evmap.fragment
 import android.Manifest.permission.ACCESS_COARSE_LOCATION
 import android.Manifest.permission.ACCESS_FINE_LOCATION
 import android.annotation.SuppressLint
-import android.content.ClipData
-import android.content.ClipboardManager
 import android.content.Context
 import android.content.res.Configuration
 import android.graphics.Color
-import android.os.Build
 import android.os.Bundle
 import android.text.method.KeyListener
 import android.view.*
@@ -75,6 +72,7 @@ import net.vonforst.evmap.autocomplete.ApiUnavailableException
 import net.vonforst.evmap.autocomplete.PlaceWithBounds
 import net.vonforst.evmap.bold
 import net.vonforst.evmap.databinding.FragmentMapBinding
+import net.vonforst.evmap.fragment.preference.DataSettingsFragmentArgs
 import net.vonforst.evmap.location.FusionEngine
 import net.vonforst.evmap.location.LocationEngine
 import net.vonforst.evmap.location.Priority
@@ -87,7 +85,6 @@ import net.vonforst.evmap.utils.boundingBox
 import net.vonforst.evmap.utils.checkAnyLocationPermission
 import net.vonforst.evmap.utils.checkFineLocationPermission
 import net.vonforst.evmap.utils.distanceBetween
-import net.vonforst.evmap.utils.formatDecimal
 import net.vonforst.evmap.viewmodel.*
 import java.io.IOException
 import kotlin.collections.component1
@@ -826,69 +823,15 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
                             R.drawable.ic_fault_report -> {
                                 (activity as? MapsActivity)?.openUrl(charger.url)
                             }
-
                             R.drawable.ic_payment -> {
                                 showPaymentMethodsDialog(charger)
                             }
-
                             R.drawable.ic_network -> {
                                 charger.networkUrl?.let { (activity as? MapsActivity)?.openUrl(it) }
                             }
                         }
                     }
                 }
-                onLongClickListener = {
-                    val charger = vm.chargerDetails.value?.data
-                    val clipboardManager =
-                        requireContext().getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
-                    if (charger != null) {
-                        when (it.icon) {
-                            R.drawable.ic_address -> {
-                                if (charger.address != null) {
-                                    val clip = ClipData.newPlainText(
-                                        getString(R.string.address),
-                                        charger.address.toString()
-                                    )
-                                    clipboardManager.setPrimaryClip(clip)
-
-                                    if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.S_V2) {
-                                        Snackbar.make(
-                                            requireView(),
-                                            R.string.copied,
-                                            Toast.LENGTH_SHORT
-                                        )
-                                            .show()
-                                    }
-                                    true
-                                } else {
-                                    false
-                                }
-                            }
-
-                            R.drawable.ic_location -> {
-                                val clip = ClipData.newPlainText(
-                                    getString(R.string.coordinates),
-                                    charger.coordinates.formatDecimal()
-                                )
-                                clipboardManager.setPrimaryClip(clip)
-
-                                if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.S_V2) {
-                                    Snackbar.make(
-                                        requireView(),
-                                        R.string.copied,
-                                        Toast.LENGTH_SHORT
-                                    )
-                                        .show()
-                                }
-                                true
-                            }
-
-                            else -> false
-                        }
-                    } else {
-                        false
-                    }
-                }
             }
             itemAnimator = null
             layoutManager =
@@ -1384,6 +1327,11 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
         filterView?.setOnLongClickListener {
             // enable/disable filters
             vm.toggleFilters()
+            // haptic feedback
+            filterView.performHapticFeedback(
+                HapticFeedbackConstants.LONG_PRESS,
+                HapticFeedbackConstants.FLAG_IGNORE_GLOBAL_SETTING
+            )
             // show snackbar
             Snackbar.make(
                 requireView(), if (vm.filterStatus.value != FILTERS_DISABLED) {

app/src/main/java/net/vonforst/evmap/fragment/OnboardingFragment.kt

@@ -14,7 +14,6 @@ import android.view.ViewGroup
 import android.view.animation.DecelerateInterpolator
 import android.widget.ImageView
 import androidx.core.content.ContextCompat
-import androidx.core.text.HtmlCompat
 import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.findNavController
 import androidx.viewpager2.adapter.FragmentStateAdapter
@@ -227,12 +226,7 @@ class DataSourceSelectFragment : OnboardingPageFragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         binding.cbAcceptPrivacy.text =
-            HtmlCompat.fromHtml(
-                getString(
-                    R.string.accept_privacy,
-                    getString(R.string.privacy_link)
-                ), HtmlCompat.FROM_HTML_MODE_LEGACY
-            )
+            Html.fromHtml(getString(R.string.accept_privacy, getString(R.string.privacy_link)))
         binding.cbAcceptPrivacy.linksClickable = true
         binding.cbAcceptPrivacy.movementMethod = LinkMovementMethod.getInstance()
         binding.btnGetStarted.visibility = View.INVISIBLE

app/src/main/java/net/vonforst/evmap/fragment/preference/AboutFragment.kt

@@ -102,6 +102,7 @@ class AboutFragment : PreferenceFragmentCompat() {
                     .withAboutVersionShown(false)
                     .withAboutIconShown(false)
                     .withActivityTitle(getString(R.string.oss_licenses))
+                    .withExcludedLibraries()
                     .start(requireActivity())
                 true
             }

app/src/main/java/net/vonforst/evmap/fragment/preference/DataSettingsFragment.kt

@@ -139,10 +139,8 @@ class DataSettingsFragment : BaseSettingsFragment() {
     }
 
     private fun teslaLogin() {
-        val codeVerifier = TeslaAuthenticationApi.generateCodeVerifier()
-        val codeChallenge = TeslaAuthenticationApi.generateCodeChallenge(codeVerifier)
-        val uri = TeslaAuthenticationApi.buildSignInUri(codeChallenge)
-
+        val (clientId, _) = getString(R.string.tesla_credentials).split(":")
+        val uri = TeslaAuthenticationApi.buildSignInUri(clientId = clientId)
         val args = OAuthLoginFragmentArgs(
             uri.toString(),
             TeslaAuthenticationApi.resultUrlPrefix,
@@ -150,28 +148,33 @@ class DataSettingsFragment : BaseSettingsFragment() {
         ).toBundle()
 
         setFragmentResultListener(uri.toString()) { _, result ->
-            teslaGetAccessToken(result, codeVerifier)
+            teslaGetAccessToken(result)
         }
 
         findNavController().navigate(R.id.oauth_login, args)
     }
 
-    private fun teslaGetAccessToken(result: Bundle, codeVerifier: String) {
+    private fun teslaGetAccessToken(result: Bundle) {
         teslaAccountPreference.summary = getString(R.string.logging_in)
 
         val url = Uri.parse(result.getString("url"))
         val code = url.getQueryParameter("code") ?: return
         val okhttp = OkHttpClient.Builder().addDebugInterceptors().build()
-        val request = TeslaAuthenticationApi.AuthCodeRequest(code, codeVerifier)
+        val (clientId, clientSecret) = getString(R.string.tesla_credentials).split(":")
+        val request = TeslaAuthenticationApi.AuthCodeRequest(
+            code,
+            clientId = clientId,
+            clientSecret = clientSecret
+        )
         lifecycleScope.launch {
             try {
                 val time = Instant.now().epochSecond
                 val response =
                     TeslaAuthenticationApi.create(okhttp).getToken(request)
-                val userResponse =
-                    TeslaOwnerApi.create(okhttp, response.accessToken).getUserInfo()
+//                val userResponse =
+//                    TeslaOwnerApi.create(okhttp, response.accessToken).getUserInfo()
 
-                encryptedPrefs.teslaEmail = userResponse.response.email
+                encryptedPrefs.teslaEmail = "user@example.com"
                 encryptedPrefs.teslaAccessToken = response.accessToken
                 encryptedPrefs.teslaAccessTokenExpiry = time + response.expiresIn
                 encryptedPrefs.teslaRefreshToken = response.refreshToken

app/src/main/java/net/vonforst/evmap/ui/BarGraphView.kt

@@ -9,7 +9,6 @@ import android.text.TextPaint
 import android.text.style.ForegroundColorSpan
 import android.text.style.StyleSpan
 import android.util.AttributeSet
-import android.util.TypedValue
 import android.view.MotionEvent
 import android.view.View
 import androidx.appcompat.content.res.AppCompatResources
@@ -28,6 +27,7 @@ import kotlin.math.roundToInt
 
 class BarGraphView(context: Context, attrs: AttributeSet) : View(context, attrs) {
     private val dp = context.resources.displayMetrics.density
+    private val sp = context.resources.displayMetrics.scaledDensity
     var zeroHeight = 4 * dp
     var barWidth = 16 * dp
     var barMargin = 2 * dp
@@ -35,9 +35,7 @@ class BarGraphView(context: Context, attrs: AttributeSet) : View(context, attrs)
     var legendLineLength = 4 * dp
     var legendLineWidth = 1 * dp
     var dashLength = 4 * dp
-    var bubbleTextSize =
-        TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP, 12f, context.resources.displayMetrics)
-            .roundToInt()
+    var bubbleTextSize = (12 * sp).roundToInt()
     var bubblePadding = (6 * dp).roundToInt()
     var selectedBar: Int = 0
     var bubbleStrokeWidth = 1 * dp

app/src/main/java/net/vonforst/evmap/viewmodel/FavoritesViewModel.kt

@@ -33,7 +33,7 @@ class FavoritesViewModel(application: Application) :
         MediatorLiveData<Map<Long, Resource<ChargeLocationStatus>>>().apply {
             addSource(favorites) { favorites ->
                 if (favorites != null) {
-                    reloadAvailability(forceReload = false)
+                    reloadAvailability()
                 } else {
                     value = null
                 }
@@ -41,10 +41,9 @@ class FavoritesViewModel(application: Application) :
         }
     }
 
-    fun reloadAvailability(forceReload: Boolean = true, callback: (() -> Unit)? = null) {
+    fun reloadAvailability(callback: (() -> Unit)? = null) {
         val favorites = favorites.value ?: return
         val chargers = favorites.map { it.charger }
-        val previous = availability.value
 
         viewModelScope.launch {
             val data = hashMapOf<Long, Resource<ChargeLocationStatus>>()
@@ -55,13 +54,8 @@ class FavoritesViewModel(application: Application) :
 
             chargers.map { charger ->
                 async {
-                    if (!forceReload && previous?.get(charger.id)?.status == Status.SUCCESS) {
-                        data[charger.id] = previous[charger.id]!!
-                        availability.value = data
-                    } else {
-                        data[charger.id] = availabilityRepo.getAvailability(charger)
-                        availability.value = data
-                    }
+                    data[charger.id] = availabilityRepo.getAvailability(charger)
+                    availability.value = data
                 }
             }.awaitAll()
             callback?.invoke()
@@ -123,24 +117,6 @@ class FavoritesViewModel(application: Application) :
         }
     }
 
-    val deletedFavorite: MutableLiveData<FavoriteWithDetail?> by lazy {
-        MutableLiveData<FavoriteWithDetail?>()
-    }
-
-    fun deleteFavoriteWithUndo(fav: FavoriteWithDetail) {
-        deletedFavorite.value = fav
-        deleteFavorite(fav.favorite)
-    }
-
-    fun undoDeletion() {
-        deletedFavorite.value?.let {
-            viewModelScope.launch {
-                insertFavorite(it.charger)
-            }
-            deletedFavorite.value = null
-        }
-    }
-
     fun deleteFavorite(fav: Favorite) {
         viewModelScope.launch {
             db.favoritesDao().delete(fav)

app/src/main/res/values-de/strings.xml

@@ -161,7 +161,7 @@
     <string name="donation_dialog_detail">EVMap ist kostenlos und Open Source. Über GitHub kann jeder zur Weiterentwicklung der App beitragen. Um die laufenden Kosten für die Datenquellen zu decken, freut sich der Entwickler über Spenden mit einem Betrag deiner Wahl.</string>
     <string name="chargeprice_donation_dialog_title">Du bist ein richtiger Sparfuchs!</string>
     <string name="chargeprice_donation_dialog_detail">Anscheinend nutzt du den Preisvergleich sehr gern. Mit einer Spende für EVMap kannst du helfen, die Kosten für den Datenzugriff zu decken.</string>
-    <string name="deleted_item">„%s” gelöscht</string>
+    <string name="deleted_filterprofile">„%s” gelöscht</string>
     <string name="undo">Rückgängig</string>
     <string name="rename">Umbenennen</string>
     <string name="charging_barrierfree">Ohne Vertrag / Registrierung nutzbar</string>
@@ -305,8 +305,8 @@
     <string name="logging_in">Anmelden…</string>
     <string name="log_out">Abmelden</string>
     <string name="logged_out">Abgemeldet</string>
-    <string name="login">Anmelden</string>
-    <string name="login_error">Anmeldung fehlgeschlagen</string>
+    <string name="login">Login</string>
+    <string name="login_error">Login fehlgeschlagen</string>
     <string name="tesla_pricing_owners">Nur Tesla-Fahrzeuge:</string>
     <string name="tesla_pricing_members">Tesla-Fahrzeuge &amp; Mitglieder:</string>
     <string name="tesla_pricing_others">Andere Kunden:</string>
@@ -326,7 +326,7 @@
     <string name="settings_cache_count">Cache-Größe</string>
     <string name="settings_cache_clear">Cache leeren</string>
     <string name="settings_cache_clear_summary">Löscht alle gespeicherten Ladestationen außer Favoriten</string>
-    <string name="settings_cache_count_summary">%1$d Ladestationen gespeichert, %2$.1f MB</string>
+    <string name="settings_cache_count_summary">%d Ladestationen gespeichert, %.1f MB</string>
     <string name="auto_location_service">EVMap läuft unter Android Auto und nutzt dafür deinen Standort.</string>
     <string name="auto_no_chargers_found">Keine Ladestationen in der Nähe gefunden</string>
     <string name="auto_no_favorites_found">Keine Favoriten gefunden</string>
@@ -360,12 +360,11 @@
     <string name="selecting_none">alle Einträge abgewählt</string>
     <string name="loading">Lade…</string>
     <string name="auto_multipage_goto">Seite %d</string>
-    <string name="auto_multipage">(%1$d/%2$d)</string>
+    <string name="auto_multipage">(%d/%d)</string>
     <string name="reload">Neu laden</string>
     <string name="accept_privacy"><![CDATA[Ich habe die <a href=\"%s\">Datenschutzerklärung</a> von EVMap gelesen und bin damit einverstanden.]]></string>
     <string name="referrals">Empfehlungslinks</string>
     <string name="referrals_info">Du kannst auch einen der Empfehlungslinks unten benutzen, um den Entwickler mit deinem Kauf zu unterstützen.</string>
     <string name="referral_tesla">Tesla</string>
     <string name="generic_connection_error">Daten konnten nicht geladen werden</string>
-    <string name="copied">In Zwischenablage kopiert</string>
 </resources>

app/src/main/res/values-fr/strings.xml

@@ -75,7 +75,7 @@
     <string name="welcome_2_detail">Cela peut également être vu dans \"À propos\" → \"Foire aux questions\"</string>
     <string name="donation_dialog_title">Merci d\'utiliser EVMap</string>
     <string name="chargeprice_donation_dialog_title">Vous êtes un vrai chasseur de bonnes affaires !</string>
-    <string name="deleted_item">\"%s\" supprimé</string>
+    <string name="deleted_filterprofile">\"%s\" supprimé</string>
     <string name="undo">Annuler</string>
     <string name="rename">Renommer</string>
     <string name="verified">vérifié</string>
@@ -330,5 +330,5 @@
     <string name="welcome_android_auto_detail">Vous pouvez également utiliser EVMap à partir d\'Android Auto sur les voitures prises en charge. Il suffit de sélectionner l\'application EVMap dans le menu Android Auto.</string>
     <string name="loading">Chargement…</string>
     <string name="auto_multipage_goto">Page %d</string>
-    <string name="auto_multipage">(%1$d/%2$d)</string>
+    <string name="auto_multipage">(%d/%d)</string>
 </resources>

app/src/main/res/values-nb-rNO/strings.xml

@@ -144,7 +144,7 @@
     <string name="save_profile_enter_name">Skriv inn navnet på filterprofilen:</string>
     <string name="filterprofiles_empty_state">Du har ikke noen lagrede filterprofiler</string>
     <string name="chargeprice_donation_dialog_title">Du er en sann gjerrigknark.</string>
-    <string name="deleted_item">Slettet «%s»</string>
+    <string name="deleted_filterprofile">Slettet «%s»</string>
     <string name="charging_barrierfree">Kan brukes uten registrering</string>
     <string name="welcome_1">Finn kjøretøyladere der du er</string>
     <string name="welcome_2">Hver laders farge samsvarer med dens høyeste ladeeffekt</string>
@@ -330,7 +330,7 @@
     <string name="auto_chargers_ahead">Kun ladere i kjøreretningen</string>
     <string name="loading">Laster inn …</string>
     <string name="auto_multipage_goto">Side %d</string>
-    <string name="auto_multipage">(%1$d/%2$d)</string>
+    <string name="auto_multipage">(%d/%d)</string>
     <string name="charge_price_minute_format">%2$s%1$.2f/min</string>
     <string name="website">Nettside</string>
     <string name="pref_tesla_account_enabled">Innlogget som %s</string>

app/src/main/res/values-nl/strings.xml

@@ -145,7 +145,7 @@
     <string name="donation_dialog_title">Bedankt om EVMap te gebruiken</string>
     <string name="chargeprice_donation_dialog_title">Jij bent een echte koopjeszoeker!</string>
     <string name="chargeprice_donation_dialog_detail">Blijkbaar maak je dankbaar gebruik van de prijsvergelijkingen. Met een donatie kan je de kosten voor deze data helpen dragen.</string>
-    <string name="deleted_item">“%s” verwijderd</string>
+    <string name="deleted_filterprofile">“%s” verwijderd</string>
     <string name="undo">Ongedaan maken</string>
     <string name="rename">Hernoem</string>
     <plurals name="charge_cards_compatible_num">
@@ -327,6 +327,6 @@
     <string name="selecting_none">alle items gedeselecteerd</string>
     <string name="loading">Laden…</string>
     <string name="auto_multipage_goto">Pagina %d</string>
-    <string name="auto_multipage">(%1$d/%2$d)</string>
+    <string name="auto_multipage">(%d/%d)</string>
     <string name="auto_chargeprice_vehicle_unknown">Geen enkel voertuig geselecteerd in de app komt overeen met dit voertuig (%1$s %2$s).</string>
 </resources>

app/src/main/res/values-pt/strings.xml

@@ -8,7 +8,7 @@
     <string name="welcome_2_detail">Também pode encontrar esta informação em \"Sobre\" → \"Perguntas frequentes\"</string>
     <string name="chargeprice_donation_dialog_title">Você é um verdadeiro caçador de pechinchas!</string>
     <string name="donation_dialog_title">Obrigado por usar o EVMap</string>
-    <string name="deleted_item">“%s” removido</string>
+    <string name="deleted_filterprofile">“%s” removido</string>
     <string name="undo">Refazer</string>
     <string name="rename">Renomear</string>
     <string name="chargeprice_donation_dialog_detail">Você faz grande uso da comparação de preços. Ajude a cobrir os custos de acesso à informação apoiando o EVMap com uma doação.</string>
@@ -323,7 +323,7 @@
     <string name="data_retrieved_at">Informação atualizada %s</string>
     <string name="settings_cache_count">Tamanho da cache</string>
     <string name="settings_cache_clear">Limpar cache</string>
-    <string name="settings_cache_count_summary">%1$d carregadores na base de dados, %2$.1f MB</string>
+    <string name="settings_cache_count_summary">%d carregadores na base de dados, %.1f MB</string>
     <string name="settings_caching">Caching (base de dados local)</string>
     <string name="settings_cache_clear_summary">Elimina todos os carregadores guardados localmente, com a exceção dos seus favoritos</string>
     <string name="auto_no_chargers_found">Não foram encontrados carregadores próximo de si</string>
@@ -341,7 +341,7 @@
     <string name="selecting_all">todos os items selecionados</string>
     <string name="loading">Carregando…</string>
     <string name="auto_multipage_goto">Página %d</string>
-    <string name="auto_multipage">(%1$d/%2$d)</string>
+    <string name="auto_multipage">(%d/%d)</string>
     <string name="settings_android_auto_chargeprice_range">Escala de carregamento para comparação de preços</string>
     <string name="auto_location_service">O EVMap está a funcionar no Android Auto e usando a sua localização.</string>
     <string name="auto_fault_report_date">⚠️ Problemas (%s)</string>

app/src/main/res/values-ro/strings.xml

@@ -160,7 +160,7 @@
     <string name="donation_dialog_detail">EVMap este libera si gratuita. Contributiile pe GitHub sunt apreciate. Pentru a acoperi costurile pentru acces la date, va rugam sa donati orice suma pentru dezvoltator.</string>
     <string name="chargeprice_donation_dialog_title">Stii sa cauti ofertele cele mai bune!</string>
     <string name="chargeprice_donation_dialog_detail">Stii sa folosesti optiunea de comparare preturi. Puteti ajuta pentru a acoperi costurile pentru accesul la aceste date donand pentru EVMap.</string>
-    <string name="deleted_item">“%s” a fost sters</string>
+    <string name="deleted_filterprofile">“%s” a fost sters</string>
     <string name="undo">Anuleaza</string>
     <string name="rename">Redenumeste</string>
     <string name="charging_barrierfree">Utilizabile fara inregistrare</string>

app/src/main/res/values/donottranslate.xml

@@ -28,8 +28,7 @@
         pt2121\n
         nautilusx\n
         Bobby Galati\n
-        programmin1\n
-        Jean-BaptisteC
+        programmin1
     </string>
     <string name="hide_on_scroll_fab_behavior">net.vonforst.evmap.ui.HideOnScrollFabBehavior</string>
     <string name="paypal_link" translatable="false">https://paypal.me/johan98</string>

app/src/main/res/values/strings.xml

@@ -161,7 +161,7 @@
     <string name="donation_dialog_detail">EVMap is open source and free of charge. Code contributions on GitHub are much appreciated. To help cover the running costs for data access, please consider donating an amount of your choice to the developer.</string>
     <string name="chargeprice_donation_dialog_title">You\'re a real bargain hunter!</string>
     <string name="chargeprice_donation_dialog_detail">You make great use of the price comparison feature. Please help cover the costs for this data by supporting EVMap with a donation.</string>
-    <string name="deleted_item">Deleted “%s”</string>
+    <string name="deleted_filterprofile">Deleted “%s”</string>
     <string name="undo">Undo</string>
     <string name="rename">Rename</string>
     <string name="charging_barrierfree">Usable without registration</string>
@@ -326,7 +326,7 @@
     <string name="settings_cache_count">Cache size</string>
     <string name="settings_cache_clear">Clear cache</string>
     <string name="settings_cache_clear_summary">Deletes all cached chargers except favorites</string>
-    <string name="settings_cache_count_summary">%1$d chargers cached, %2$.1f MB</string>
+    <string name="settings_cache_count_summary">%d chargers cached, %.1f MB</string>
     <string name="auto_location_service">EVMap is running on Android Auto and using your location.</string>
     <string name="auto_no_chargers_found">No nearby chargers found</string>
     <string name="auto_no_favorites_found">No favorites found</string>
@@ -360,12 +360,11 @@
     <string name="selecting_none">deselected all items</string>
     <string name="loading">Loading…</string>
     <string name="auto_multipage_goto">Page %d</string>
-    <string name="auto_multipage">(%1$d/%2$d)</string>
+    <string name="auto_multipage">(%d/%d)</string>
     <string name="reload">Reload</string>
     <string name="accept_privacy"><![CDATA[I have read and accepted EVMap\'s <a href=\"%s\">privacy policy</a>.]]></string>
     <string name="referrals">Referral links</string>
     <string name="referrals_info">You can also use one of the referral links below to support the developer with your purchase.</string>
     <string name="referral_tesla">Tesla</string>
     <string name="generic_connection_error">Could not load data</string>
-    <string name="copied">Copied to clipboard</string>
 </resources>

build.gradle

@@ -0,0 +1,35 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
+    ext.kotlin_version = '1.9.0'
+    ext.about_libs_version = '8.9.4'
+    ext.nav_version = '2.7.2'
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:8.1.1'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:$about_libs_version"
+        classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$nav_version"
+        classpath "pt.jcosta.resourceplaceholders:plugin:0.7"
+
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle files
+    }
+}
+
+allprojects {
+    repositories {
+        google()
+        mavenCentral()
+        //noinspection JcenterRepositoryObsolete
+        maven { url 'https://jitpack.io' }
+    }
+}
+
+task clean(type: Delete) {
+    delete rootProject.buildDir
+}

build.gradle.kts

@@ -1,35 +0,0 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-
-buildscript {
-    val kotlinVersion by extra("1.9.10")
-    val aboutLibsVersion by extra("10.9.1")
-    val navVersion by extra("2.7.5")
-    repositories {
-        google()
-        mavenCentral()
-        gradlePluginPortal()
-    }
-    dependencies {
-        classpath("com.android.tools.build:gradle:8.1.2")
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
-        classpath("com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:$aboutLibsVersion")
-        classpath("androidx.navigation:navigation-safe-args-gradle-plugin:$navVersion")
-        classpath("pt.jcosta.resourceplaceholders:plugin:0.7")
-
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
-    }
-}
-
-allprojects {
-    repositories {
-        google()
-        mavenCentral()
-        //noinspection JcenterRepositoryObsolete
-        maven { setUrl("https://jitpack.io") }
-    }
-}
-
-tasks.register("clean", Delete::class) {
-    delete(rootProject.layout.buildDirectory)
-}

doc/android_auto.md

@@ -23,7 +23,9 @@ Install Android Auto
 
 If you haven't already, install the
 [Android Auto](https://play.google.com/store/apps/details?id=com.google.android.projection.gearhead)
-app on your test device from the Google Play Store.
+and
+[Android Auto for phone screens](https://play.google.com/store/apps/details?id=com.google.android.projection.gearhead.phonescreen)
+apps on your test device from the Google Play Store.
 
 If you are using the Android Emulator, the Play Store may show the Android Auto app as incompatible.
 In that case, download the APK for the newest version from a site like
@@ -31,12 +33,12 @@ In that case, download the APK for the newest version from a site like
 (choosing the correct architecture for your emulator - x86_64, x86 or ARM)
 and drag it onto the running emulator window to install.
 
-Starting and connecting to the DHU
-----------------------------------
+Starting the DHU
+----------------
 (see also the corresponding section on
 the [Android Developers site](https://developer.android.com/training/cars/testing#running-dhu))
 
-1. Go to Android Auto settings (Settings app -> Connected devices -> Connection preferences -> Android Auto)
+1. Start the Android Auto for phone screens app, tap the menu icon on the top left to go to settings
 2. Scroll all the way down to the app version, tap it 10 times
 3. Click *OK* in the dialog that appears to enable developer mode
 4. In the menu on the top left, tap *Start head unit server*

doc/api_keys.md

@@ -149,6 +149,21 @@ in German.
 
 </details>
 
+### **Tesla**
+
+[API documentation](https://developer.tesla.com/docs/fleet-api)
+
+<details>
+<summary>How to obtain an API key</summary>
+
+1. [Sign up](https://www.tesla.com/teslaaccount) for a Tesla account
+2. In the [Tesla Developer Portal](https://developer.tesla.com/), click on "Request app access"
+3. Enter the details of your app
+4. You will receive a *Client ID* and *Client Secret*. Enter them both into `tesla_credentials`,
+   separated by a colon (`:`).
+
+</details>
+
 Pricing providers
 -----------------
 

fastlane/metadata/android/de-DE/changelogs/206.txt

@@ -1,11 +0,0 @@
-Neue Funktionen:
-- Adresse oder Koordinaten gedrückt halten um sie in die Zwischenablage zu kopieren
-
-Verbesserungen:
-- OpenChargeMap: Links verweisen nun auf die mobile Website
-
-Fehler behoben:
-- Favoriten löschen funktionierte nicht bei Rotieren des Bildschirms
-- Fehler beim Wechsel zwischen mehreren Fahrzeugen im Preisvergleich
-- Android Auto: Adresse wurde nicht korrekt an TomTom GO-Navigation übergeben
-- Abstürze behoben

fastlane/metadata/android/en-US/changelogs/206.txt

@@ -1,11 +0,0 @@
-New features:
-- Copy address or coordinates using long press
-
-Improvements:
-- OpenChargeMap: links now refer to mobile website
-
-Bugfixes:
-- Deleting favorites did not work when rotating the screen
-- Price comparison: error when switching between different vehicles
-- Android Auto: Address was not correctly passed to TomTom GO navigation
-- Fixed crashes

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Sat Aug 06 15:33:46 CEST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

settings.gradle

@@ -0,0 +1,2 @@
+rootProject.name='EVMap'
+include ':app'

settings.gradle.kts

@@ -1,2 +0,0 @@
-rootProject.name="EVMap"
-include (":app")